common 1.6.0 登录失败添加返回block

sobot_common/build.gradle

@@ -11,7 +11,7 @@ android {
     //这里就是打jar包
     task makeJar(type: Copy) {
         //删除旧的jar包
-        delete 'build/libs/sobot_common_x_1.6.0.jar'
+        delete 'build/libs/sobot_common_x_1.6.1.jar'
         //原地址
         from('build/intermediates/packaged-classes/release/')
         //导出jar包的地址
@@ -19,7 +19,7 @@ android {
         //包含的jar包
         include('classes.jar')
         //重命名jar包为mysdk
-        rename ('classes.jar', 'sobot_common_x_1.6.0.jar')
+        rename ('classes.jar', 'sobot_common_x_1.6.1.jar')
     }
     makeJar.dependsOn(build)
 }

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_x'            //项目名
-    PUBLISH_VERSION = '1.6.0'                    //版本号
+    PUBLISH_VERSION = '1.6.1'                    //版本号
 }
 
 

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

@@ -255,6 +255,10 @@ public class SobotLoginTools {
                                             }
 
                                         }
+                                    } else {
+                                        if (resultBlock != null) {
+                                            resultBlock.resultBolok(SobotResultCode.CODE_FAILED, SobotStringUtils.isNoEmpty(msg) ? msg : "登录失败", "");
+                                        }
                                     }
                                 }
                             });
@@ -361,12 +365,16 @@ public class SobotLoginTools {
                                         }
 
                                     }
+                                } else {
+                                    if (resultBlock != null) {
+                                        resultBlock.resultBolok(SobotResultCode.CODE_FAILED, SobotStringUtils.isNoEmpty(msg) ? msg : "登录失败", "");
+                                    }
                                 }
                             }
                         });
                     } else {
                         if (resultBlock != null) {
-                            resultBlock.resultBolok(SobotResultCode.CODE_FAILED, "登录失败", null);
+                            resultBlock.resultBolok(SobotResultCode.CODE_FAILED, (result != null && SobotStringUtils.isNoEmpty(result.getRetMsg())) ? result.getRetMsg() : "登录失败", "");
                         }
                     }
                 }
@@ -450,6 +458,10 @@ public class SobotLoginTools {
                             }
 
                         }
+                    } else {
+                        if (resultBlock != null) {
+                            resultBlock.resultBolok(SobotResultCode.CODE_FAILED, SobotStringUtils.isNoEmpty(msg) ? msg : "登录失败", "");
+                        }
                     }
                 }
             });