common 1.5.0 有电销功能也可以获取accesstoken

sobot_common/build.gradle

@@ -11,7 +11,7 @@ android {
     //这里就是打jar包
     task makeJar(type: Copy) {
         //删除旧的jar包
-        delete 'build/libs/sobot_common_1.4.9.jar'
+        delete 'build/libs/sobot_common_1.5.0.jar'
         //原地址
         from('build/intermediates/packaged-classes/release/')
         //导出jar包的地址
@@ -19,7 +19,7 @@ android {
         //包含的jar包
         include('classes.jar')
         //重命名jar包为mysdk
-        rename ('classes.jar', 'sobot_common_1.4.9.jar')
+        rename ('classes.jar', 'sobot_common_1.5.0.jar')
     }
     makeJar.dependsOn(build)
 }
@@ -34,12 +34,12 @@ dependencies {
 
     api 'com.sobot.library:utils:1.1.3'
     api 'com.sobot.library:picture:1.1.5'
-    api 'com.sobot.library:net:1.2.0'
+    api 'com.sobot.library:net:1.2.2'
     api 'com.sobot.library:gson:1.1.1'
 
 //    api 'com.sobot.library:utils:1.1.3'
 //    api 'com.sobot.library:picture_x:1.1.5'
-//    api 'com.sobot.library:net:1.2.0'
+//    api 'com.sobot.library:net:1.2.2'
 //    api 'com.sobot.library:gson:1.1.1'
 }
 

sobot_common/sobot-common-publish-mavencentral.gradle

@@ -12,7 +12,7 @@ task androidSourcesJar(type: Jar) {
 ext {
     PUBLISH_GROUP_ID = "com.sobot.library"        //项目包名
     PUBLISH_ARTIFACT_ID = 'sobotcommon'            //项目名
-    PUBLISH_VERSION = '1.4.9'                    //版本号
+    PUBLISH_VERSION = '1.5.0'                    //版本号
 }
 
 

sobot_common/src/main/java/com/sobot/common/login/SobotLoginTools.java

@@ -10,6 +10,7 @@ import com.sobot.common.login.model.LoginUserEntity;
 import com.sobot.common.login.model.ServiceFunctionVoModel;
 import com.sobot.common.login.model.SobotCallBaseCode;
 import com.sobot.common.login.model.SobotServiceInfoModel;
+import com.sobot.common.login.permission.SobotPermissionManager;
 import com.sobot.gson.SobotGsonUtil;
 import com.sobot.network.apiUtils.SobotBaseCode;
 import com.sobot.network.apiUtils.SobotHttpUtils;
@@ -143,7 +144,7 @@ public class SobotLoginTools {
                                     if (code == SobotResultCode.CODE_SUCCEEDED) {
                                         SobotServiceInfoModel serviceInfoModel = (SobotServiceInfoModel) obj;
                                         if (serviceInfoModel != null) {
-                                            if (serviceInfoModel.getCallV6Flag() == 1 && !SobotStringUtils.isEmpty(openApiHost)) {
+                                            if ((serviceInfoModel.getCallV6Flag() == 1 || SobotPermissionManager.isHasNewPermission(SobotPermissionManager.SCC)) && !SobotStringUtils.isEmpty(openApiHost)) {
                                                 if (userEntity != null && !SobotStringUtils.isEmpty(userEntity.getToken())) {
                                                     //如果是v6呼叫
                                                     String tempHost = openApiHost;
@@ -221,7 +222,7 @@ public class SobotLoginTools {
                                 if (code == SobotResultCode.CODE_SUCCEEDED) {
                                     SobotServiceInfoModel serviceInfoModel = (SobotServiceInfoModel) obj;
                                     if (serviceInfoModel != null) {
-                                        if (serviceInfoModel.getCallV6Flag() == 1 && !SobotStringUtils.isEmpty(openApiHost)) {
+                                        if ((serviceInfoModel.getCallV6Flag() == 1 || SobotPermissionManager.isHasNewPermission(SobotPermissionManager.SCC)) && !SobotStringUtils.isEmpty(openApiHost)) {
                                             if (userEntity != null && !SobotStringUtils.isEmpty(userEntity.getToken())) {
                                                 //如果是v6呼叫
                                                 String tempHost = openApiHost;
@@ -284,7 +285,7 @@ public class SobotLoginTools {
                     if (code == SobotResultCode.CODE_SUCCEEDED) {
                         SobotServiceInfoModel serviceInfoModel = (SobotServiceInfoModel) obj;
                         if (serviceInfoModel != null) {
-                            if (serviceInfoModel.getCallV6Flag() == 1) {
+                            if ((serviceInfoModel.getCallV6Flag() == 1 || SobotPermissionManager.isHasNewPermission(SobotPermissionManager.SCC))) {
                                 if (userEntity != null && !SobotStringUtils.isEmpty(userEntity.getToken())) {
                                     //如果是v6呼叫
                                     String tempHost = host;