Skip to content

S
Sobot_module_Dev
Commit 6ac79ee6 by zhengnw@sobot.com
Options

更新组件库

parent 1cefe8d1
Showing with 48 additions and 48 deletions
README.md
......@@ -23,10 +23,10 @@ api 'com.sobot.library:模块名字:版本号'
例如
api 'com.sobot.library:sobotcommon:1.1.8'
api 'com.sobot.library:utils:1.1.1'
api 'com.sobot.library:picture:1.1'
api 'com.sobot.library:net:1.1.1'
api 'com.sobot.library:gson:1.1.2'
api 'com.sobot.library:utils:1.1.3'
api 'com.sobot.library:picture:1.2.5'
api 'com.sobot.library:net:1.2.9.3'
api 'com.sobot.library:gson:1.2.0'
api 'com.sobot.library:widget:0.6'
```
......
gradle/wrapper/gradle-wrapper.properties
#Thu Jul 15 17:29:28 CST 2021
#Tue Nov 19 15:03:00 CST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
sobot_album/build.gradle
......@@ -21,10 +21,10 @@ dependencies {
compileOnly 'androidx.appcompat:appcompat:1.1.0'
compileOnly 'androidx.recyclerview:recyclerview:1.0.0'
compileOnly 'com.google.android.material:material:1.4.0'
api 'com.sobot.library:widget_x:1.3.2'
api 'com.sobot.library:sobotcommon_x:2.2.2'
// implementation project(':sobot_common')
// implementation project(':sobot_widget')
// api 'com.sobot.library:widget_x:1.3.2'
// api 'com.sobot.library:sobotcommon_x:2.2.2'
implementation project(':sobot_common')
implementation project(':sobot_widget')
}
......
sobot_common/README.md
......@@ -66,16 +66,16 @@ Gradle窗口 --> 模块 --> Tasks --> build --> publishing --> 点击publishRele
```
//support
api 'com.sobot.library:utils:1.1.1'
api 'com.sobot.library:picture:1.1'
api 'com.sobot.library:net:1.1.1'
api 'com.sobot.library:gson:1.1.2'
api 'com.sobot.library:utils:1.1.3'
api 'com.sobot.library:picture:1.2.5'
api 'com.sobot.library:net:1.2.9.3'
api 'com.sobot.library:gson:1.2.0'
//androidX
// api 'com.sobot.library:utils:1.1.1'
// api 'com.sobot.library:picture_x:1.1'
// api 'com.sobot.library:net:1.1.1'
// api 'com.sobot.library:gson:1.1.2'
// api 'com.sobot.library:utils:1.1.3'
// api 'com.sobot.library:picture_x:1.2.5'
// api 'com.sobot.library:net:1.2.9.3'
// api 'com.sobot.library:gson:1.2.0'
```
sobot_common/build.gradle
......@@ -36,9 +36,9 @@ dependencies {
api 'com.sobot.library:utils:1.1.3'
api 'com.sobot.library:picture_x:1.2.4'
api 'com.sobot.library:picture_x:1.2.5'
api 'com.sobot.library:net:1.2.9.3'
api 'com.sobot.library:gson:1.1.2'
api 'com.sobot.library:gson:1.2.0'
}
......
sobot_common/src/main/java/com/sobot/common/login/SobotLoginTools.java
......@@ -3,6 +3,8 @@ package com.sobot.common.login;
import android.content.Context;
import android.text.TextUtils;
import com.sobot.chat.gson.SobotGsonUtil;
import com.sobot.chat.gson.reflect.TypeToken;
import com.sobot.common.login.callback.SobotResultBlock;
import com.sobot.common.login.callback.SobotResultCode;
import com.sobot.common.login.db.FunctionManager;
......@@ -16,7 +18,6 @@ import com.sobot.common.login.model.SobotServiceInfoModel;
import com.sobot.common.login.model.TokenModel;
import com.sobot.common.login.permission.SobotPermissionApi;
import com.sobot.common.login.permission.SobotPermissionManager;
import com.sobot.gson.SobotGsonUtil;
import com.sobot.network.apiUtils.SobotBaseCode;
import com.sobot.network.apiUtils.SobotHttpUtils;
import com.sobot.network.http.HttpBaseUtils;
......@@ -26,7 +27,6 @@ import com.sobot.utils.SobotSharedPreferencesUtil;
import com.sobot.utils.SobotStringUtils;
import org.json.JSONArray;
import org.w3c.dom.Text;
import java.util.ArrayList;
import java.util.HashMap;
......@@ -741,7 +741,7 @@ public class SobotLoginTools {
@Override
public void onResponse(String result) {
if (!SobotStringUtils.isEmpty(result)) {
final SobotBaseCode<OnlineUserEntity> baseModel = SobotGsonUtil.jsonToBeans(result, new com.sobot.gson.reflect.TypeToken<SobotBaseCode<OnlineUserEntity>>() {
final SobotBaseCode<OnlineUserEntity> baseModel = SobotGsonUtil.jsonToBeans(result, new TypeToken<SobotBaseCode<OnlineUserEntity>>() {
}.getType());
if (baseModel != null) {
//登录接口和获取坐席信息权限接口都成功才算真正登录成功
......
sobot_common/src/main/java/com/sobot/common/login/db/ServiceInfoManager.java
......@@ -6,10 +6,10 @@ import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import com.sobot.chat.gson.SobotGsonUtil;
import com.sobot.chat.gson.reflect.TypeToken;
import com.sobot.common.login.model.SobotServiceInfoModel;
import com.sobot.common.utils.SobotGlobalContext;
import com.sobot.gson.SobotGsonUtil;
import com.sobot.gson.reflect.TypeToken;
import com.sobot.utils.SobotStringUtils;
import java.util.List;
......
sobot_common/src/main/java/com/sobot/common/login/model/OnlineUserEntity.java
package com.sobot.common.login.model;
import com.sobot.gson.annotations.Expose;
import com.sobot.gson.annotations.SerializedName;
import com.sobot.chat.gson.annotations.Expose;
import com.sobot.chat.gson.annotations.SerializedName;
import java.io.Serializable;
import java.util.List;
......
sobot_common/src/main/java/com/sobot/common/login/model/SobotServiceInfoModel.java
package com.sobot.common.login.model;
import com.sobot.gson.annotations.Expose;
import com.sobot.gson.annotations.SerializedName;
import com.sobot.chat.gson.annotations.Expose;
import com.sobot.chat.gson.annotations.SerializedName;
import java.io.Serializable;
import java.util.List;
......
sobot_gson/README.md
......@@ -11,7 +11,7 @@
api 'com.sobot.library:gson:xxx'
例如
api 'com.sobot.library:gson:1.1.2'
api 'com.sobot.library:gson:1.2.0'
```
......
sobot_gson/build.gradle
......@@ -12,7 +12,7 @@ android {
//这里就是打jar包
task makeJar(type: Copy) {
//删除旧的jar包
delete 'build/libs/sobot_gson_1.1.2.jar'
delete 'build/libs/sobot_gson_1.2.0.jar'
//原地址
from('build/intermediates/packaged-classes/release/')
//导出jar包的地址
......@@ -20,7 +20,7 @@ android {
//包含的jar包
include('classes.jar')
//重命名jar包为mysdk
rename ('classes.jar', 'sobot_gson_1.1.2.jar')
rename ('classes.jar', 'sobot_gson_1.2.0.jar')
}
makeJar.dependsOn(build)
}
......
sobot_gson/sobot-gson-publish-mavencentral.gradle
......@@ -12,7 +12,7 @@ task androidSourcesJar(type: Jar) {
ext {
PUBLISH_GROUP_ID = "com.sobot.library" //项目包名
PUBLISH_ARTIFACT_ID = 'gson' //项目名
PUBLISH_VERSION = '1.1.2' //版本号 1.2 已经被使用了，需要跳过它
PUBLISH_VERSION = '1.2.0' //版本号 1.2 已经被使用了，需要跳过它
}
......
sobot_network/README.md
......@@ -9,7 +9,7 @@
api 'com.sobot.library:net:XXX'
例如
api 'com.sobot.library:net:1.1.1'
api 'com.sobot.library:net:1.2.9.3'
```
......
sobot_pictureframe/README.md
......@@ -13,10 +13,10 @@ api 'com.sobot.library:模块名字:版本号'
例如
//support版
api 'com.sobot.library:picture:1.1'
api 'com.sobot.library:picture:1.2.5'
//androidx版
api 'com.sobot.library:picture_x:1.1'
api 'com.sobot.library:picture_x:1.2.5'
```
......
sobot_pictureframe/build.gradle
......@@ -13,7 +13,7 @@ android {
//这里就是打jar包
task makeJar(type: Copy) {
//删除旧的jar包
delete 'build/libs/sobot_picture_1.2.3.jar'
delete 'build/libs/sobot_picture_1.2.5.jar'
//原地址
from('build/intermediates/packaged-classes/release/')
//导出jar包的地址
......@@ -21,7 +21,7 @@ android {
//包含的jar包
include('classes.jar')
//重命名jar包为mysdk
rename ('classes.jar', 'sobot_picture_1.2.3.jar')
rename ('classes.jar', 'sobot_picture_1.2.5.jar')
}
makeJar.dependsOn(build)
......
sobot_pictureframe/sobot-picture-publish-mavencentral.gradle
......@@ -12,7 +12,7 @@ task androidSourcesJar(type: Jar) {
ext {
PUBLISH_GROUP_ID = "com.sobot.library" //项目包名
PUBLISH_ARTIFACT_ID = 'picture_x' //项目名
PUBLISH_VERSION = '1.2.4.1' //版本号
PUBLISH_VERSION = '1.2.5' //版本号
}
......
sobot_pictureframe/src/main/java/com/sobot/pictureframe/SobotBitmapUtil.java
......@@ -5,6 +5,7 @@ import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.Build;
import android.util.Log;
import android.view.WindowManager;
import android.widget.ImageView;
......@@ -31,7 +32,7 @@ public class SobotBitmapUtil {
} else if (isClassExists("com.facebook.drawee.backends.pipeline.Fresco")) {
sImageLoader = new SobotFrescoImageLoader();
} else {
throw new RuntimeException("必须在(Glide、Picasso、universal-image-loader、Fresco)中选择一个图片加载库添加依赖,或者检查是否添加了相应的混淆配置");
Log.d("SobotBitmapUtil", "getImageLoader()为空: 必须在(Glide、Picasso、universal-image-loader、Fresco)中选择一个图片加载库添加依赖,或者检查是否添加了相应的混淆配置");
}
}
}
......@@ -65,7 +66,7 @@ public class SobotBitmapUtil {
*/
public static void display(Context context, String url,
ImageView imageView, int defaultPic, int error) {
if (context != null && imageView != null) {
if (context != null && imageView != null && getImageLoader() != null) {
getImageLoader().displayImage(context, imageView, url, defaultPic, error, imageView.getWidth(), imageView.getHeight(), null);
}
}
......@@ -84,7 +85,7 @@ public class SobotBitmapUtil {
*/
public static void display(Context context, String url,
ImageView imageView, int defaultPic, int error, int imageWidth, int imageHeight, SobotImageLoader.SobotDisplayImageListener listener) {
if (context != null && imageView != null) {
if (context != null && imageView != null&& getImageLoader() != null) {
getImageLoader().displayImage(context, imageView, url, defaultPic, error, imageWidth, imageHeight, listener);
}
}
......@@ -98,7 +99,7 @@ public class SobotBitmapUtil {
*/
public static void display(Context context, String url,
ImageView imageView) {
if (context != null && imageView != null) {
if (context != null && imageView != null&& getImageLoader() != null) {
getImageLoader().displayImage(context, imageView, url, 0, 0, imageView.getWidth(), imageView.getHeight(), null);
}
}
......@@ -111,7 +112,7 @@ public class SobotBitmapUtil {
* @param imageView 图片控件
*/
public static void display(Context context, int resourceId, ImageView imageView) {
if (context != null && imageView != null) {
if (context != null && imageView != null&& getImageLoader() != null) {
getImageLoader().displayImage(context, imageView, resourceId, 0, 0, imageView.getWidth(), imageView.getHeight(), null);
}
}
......@@ -124,7 +125,7 @@ public class SobotBitmapUtil {
* @param imageView 图片控件
*/
public static void display(Context context, Uri uri, ImageView imageView) {
if (context != null && imageView != null) {
if (context != null && imageView != null&& getImageLoader() != null) {
getImageLoader().displayImage(context, imageView, uri, 0, 0, imageView.getWidth(), imageView.getHeight(), null);
}
}
......
sobot_utils/README.md
......@@ -10,7 +10,7 @@
api 'com.sobot.library:utils:xxx'
例如
api 'com.sobot.library:utils:1.1.1'
api 'com.sobot.library:utils:1.1.3'
```
......
sobot_widget/build.gradle
......@@ -28,7 +28,7 @@ dependencies {
compileOnly 'androidx.appcompat:appcompat:1.0.0'
compileOnly 'androidx.recyclerview:recyclerview:1.0.0'
api 'com.sobot.library:utils:1.1.3'
api 'com.sobot.library:picture_x:1.2.4'
api 'com.sobot.library:picture_x:1.2.5'
// api project(':sobot_pictureframe')
// 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