Commit 4ef7148d by zhengnw@sobot.com

picture 1.2.6

parent 06ff406d
...@@ -42,7 +42,7 @@ dependencies { ...@@ -42,7 +42,7 @@ dependencies {
implementation 'com.github.bumptech.glide:glide:4.9.0' implementation 'com.github.bumptech.glide:glide:4.9.0'
// api 'com.sobot.chat:sobotsupport-glidev4:3.8' // api 'com.sobot.chat:sobotsupport-glidev4:3.8'
// implementation 'com.facebook.fresco:fresco:1.13.0' implementation 'com.facebook.fresco:fresco:1.13.0'
//android x 可以用这个 ,普通版不能用这个 //android x 可以用这个 ,普通版不能用这个
// implementation 'com.facebook.fresco:fresco:2.6.0' // implementation 'com.facebook.fresco:fresco:2.6.0'
implementation 'com.squareup.okhttp3:okhttp:4.4.0' implementation 'com.squareup.okhttp3:okhttp:4.4.0'
......
...@@ -73,7 +73,7 @@ Gradle窗口 --> 模块 --> Tasks --> build --> publishing --> 点击publishRele ...@@ -73,7 +73,7 @@ Gradle窗口 --> 模块 --> Tasks --> build --> publishing --> 点击publishRele
//androidX //androidX
// api 'com.sobot.library:utils:1.1.3' // api 'com.sobot.library:utils:1.1.3'
// api 'com.sobot.library:picture_x:1.2.5' // api 'com.sobot.library:picture_x:1.2.6'
// api 'com.sobot.library:net:1.2.9.3' // api 'com.sobot.library:net:1.2.9.3'
// api 'com.sobot.library:gson:1.2.0' // api 'com.sobot.library:gson:1.2.0'
......
...@@ -37,7 +37,7 @@ dependencies { ...@@ -37,7 +37,7 @@ dependencies {
api 'org.greenrobot:eventbus:3.3.1' api 'org.greenrobot:eventbus:3.3.1'
api 'com.sobot.library:utils:1.1.3' api 'com.sobot.library:utils:1.1.3'
api 'com.sobot.library:picture_x:1.2.5' api 'com.sobot.library:picture_x:1.2.6'
api 'com.sobot.library:net:1.2.9.3' api 'com.sobot.library:net:1.2.9.3'
api 'com.sobot.library:gson:1.2.0' api 'com.sobot.library:gson:1.2.0'
} }
......
...@@ -16,7 +16,7 @@ api 'com.sobot.library:模块名字:版本号' ...@@ -16,7 +16,7 @@ api 'com.sobot.library:模块名字:版本号'
api 'com.sobot.library:picture:1.2.5' api 'com.sobot.library:picture:1.2.5'
//androidx版 //androidx版
api 'com.sobot.library:picture_x:1.2.5' api 'com.sobot.library:picture_x:1.2.6'
``` ```
......
...@@ -12,7 +12,7 @@ task androidSourcesJar(type: Jar) { ...@@ -12,7 +12,7 @@ task androidSourcesJar(type: Jar) {
ext { ext {
PUBLISH_GROUP_ID = "com.sobot.library" //项目包名 PUBLISH_GROUP_ID = "com.sobot.library" //项目包名
PUBLISH_ARTIFACT_ID = 'picture_x' //项目名 PUBLISH_ARTIFACT_ID = 'picture_x' //项目名
PUBLISH_VERSION = '1.2.5' //版本号 PUBLISH_VERSION = '1.2.6' //版本号
} }
......
...@@ -5,6 +5,7 @@ import android.graphics.Bitmap; ...@@ -5,6 +5,7 @@ import android.graphics.Bitmap;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import android.widget.ImageView; import android.widget.ImageView;
import androidx.annotation.DrawableRes; import androidx.annotation.DrawableRes;
...@@ -33,6 +34,12 @@ public class SobotFrescoImageLoader extends SobotImageLoader { ...@@ -33,6 +34,12 @@ public class SobotFrescoImageLoader extends SobotImageLoader {
if (imageView == null) { if (imageView == null) {
return; return;
} }
if (!Fresco.hasBeenInitialized()) {
// 执行初始化逻辑
Log.e("sobot_log","SobotFrescoImageLoader.displayImage() Fresco未初始化,不继续加载图片");
return;
}
ImageRequestBuilder builder; ImageRequestBuilder builder;
if (path.startsWith("http")) { if (path.startsWith("http")) {
builder = ImageRequestBuilder.newBuilderWithSource(Uri.parse(path)); builder = ImageRequestBuilder.newBuilderWithSource(Uri.parse(path));
......
...@@ -28,7 +28,7 @@ dependencies { ...@@ -28,7 +28,7 @@ dependencies {
compileOnly 'androidx.appcompat:appcompat:1.0.0' compileOnly 'androidx.appcompat:appcompat:1.0.0'
compileOnly 'androidx.recyclerview:recyclerview:1.0.0' compileOnly 'androidx.recyclerview:recyclerview:1.0.0'
api 'com.sobot.library:utils:1.1.3' api 'com.sobot.library:utils:1.1.3'
api 'com.sobot.library:picture_x:1.2.5' api 'com.sobot.library:picture_x:1.2.6'
// api project(':sobot_pictureframe') // api project(':sobot_pictureframe')
// api project(':sobot_utils') // api project(':sobot_utils')
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment