登录，添加多因子登录

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.7.8.2'                    //版本号
+    PUBLISH_VERSION = '1.7.8.3'                    //版本号
 }
 
 

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

@@ -206,10 +206,11 @@ public class SobotLoginTools {
      * @param openApiHost
      * @param loginAcount        登录账号
      * @param loginPwd           登录密码
+     * @param factorVerifyCode    开启双认证后，邮箱验证码
      * @param paramsMap          单独执行在线登录逻辑 参数
      * @param resultBlock
      */
-    public void doLogin(final Object cancelTag, final Context mContext, final boolean isAppOrOnlineLogin, final String host, final String openApiHost, final String loginAcount, final String loginPwd, final Map<String, Object> paramsMap, final SobotResultBlock resultBlock) {
+    public void doLogin(final Object cancelTag, final Context mContext, final boolean isAppOrOnlineLogin, final String host, final String openApiHost, final String loginAcount, final String loginPwd,String factorVerifyCode, final Map<String, Object> paramsMap, final SobotResultBlock resultBlock) {
         if (SobotStringUtils.isEmpty(host)) {
             SobotLogUtils.i("host 域名不能为空");
             if (resultBlock != null) {
@@ -227,8 +228,12 @@ public class SobotLoginTools {
         Map<String, String> headerMap = new HashMap<>();
         headerMap.put("from", "2");
         Map<String, Object> params = new HashMap<>();
+        params.put("version", paramsMap.get("version"));
         params.put("loginUser", loginAcount);
         params.put("loginPwd", loginPwd);
+        if(SobotStringUtils.isNoEmpty(factorVerifyCode)) {
+            params.put("factorVerifyCode", factorVerifyCode);
+        }
         SobotHttpUtils.doPost(cancelTag, host + "/basic-login/serviceAppLogin/4", 8000, params, headerMap, new HttpBaseUtils.StringCallBack() {
             @Override
             public void onResponse(String response) {
@@ -312,7 +317,7 @@ public class SobotLoginTools {
                     });
                 } else {
                     if (resultBlock != null) {
-                        resultBlock.resultBolok(SobotResultCode.CODE_FAILED, (result != null && SobotStringUtils.isNoEmpty(result.getRetMsg())) ? result.getRetMsg() : "登录失败", "");
+                        resultBlock.resultBolok(SobotResultCode.CODE_FAILED, (result != null && SobotStringUtils.isNoEmpty(result.getRetMsg())) ? result.getRetMsg() : "登录失败", result.getRetCode());
                     }
                 }
             }
@@ -320,7 +325,7 @@ public class SobotLoginTools {
             @Override
             public void onError(Exception e, String msg, int responseCode) {
                 if (resultBlock != null) {
-                    resultBlock.resultBolok(SobotResultCode.CODE_FAILED, msg, null);
+                    resultBlock.resultBolok(SobotResultCode.CODE_FAILED, msg, responseCode);
                 }
             }
 

sobot_common/src/main/java/com/sobot/common/model/SobotCusFieldConfig.java

@@ -31,7 +31,7 @@ public class SobotCusFieldConfig extends SobotBaseItemCode<SobotCusFieldConfig>
     private int displayFlag;
     private String fieldVariable;
     private String limitChar;
-    private String limitOptions;
+    private List<String> limitOptions;
     private int numericalFlag;
     private int operateType;
     private int optionFlag;
@@ -110,11 +110,10 @@ public class SobotCusFieldConfig extends SobotBaseItemCode<SobotCusFieldConfig>
         this.isOpenFlag = isOpenFlag;
     }
 
-    public String getLimitOptions() {
+    public List<String> getLimitOptions() {
         return limitOptions;
     }
-
-    public void setLimitOptions(String limitOptions) {
+    public void setLimitOptions(List<String> limitOptions) {
         this.limitOptions = limitOptions;
     }
     public String getFieldText() {