Merge remote-tracking branch 'origin/sobot_module_x' into sobot_module_x

app/src/main/java/com/sobot/moduletest/MainActivity.java

@@ -206,7 +206,7 @@ public class MainActivity extends SobotBaseActivity {
 //        }
 
         Map<String, Object> map1 = new HashMap<>();
-        map1.put("email", "zhengnw@sobot.com");
+        map1.put("email", "zhengnw@zhichi.com");
         map1.put("passwd", "znw123456");
         map1.put("loginStatus", "1");
         map1.put("from", 2 + "");

sobot_common/build.gradle

@@ -11,7 +11,7 @@ android {
     //这里就是打jar包
     task makeJar(type: Copy) {
         //删除旧的jar包
-        delete 'build/libs/sobot_common_x_1.6.3.jar'
+        delete 'build/libs/sobot_common_x_1.6.5.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.3.jar')
+        rename ('classes.jar', 'sobot_common_x_1.6.5.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.3'                    //版本号
+    PUBLISH_VERSION = '1.6.5'                    //版本号
 }
 
 

sobot_common/src/main/java/com/sobot/common/login/db/LoginUserManager.java

@@ -90,6 +90,7 @@ public class LoginUserManager extends SobotCommonDao<LoginUserEntity> {
         model.setLogin_time(cursor.getLong(cursor.getColumnIndex(LoginUserEntity.LOGIN_TIME)));
         model.setLoginAccount(cursor.getString(cursor.getColumnIndex("login_account")));
         model.setLoginPwd(cursor.getString(cursor.getColumnIndex("login_pwd")));
+        model.setWslinkDefault(cursor.getString(cursor.getColumnIndex("wslinkDefault")));
         return model;
     }
 
@@ -137,6 +138,7 @@ public class LoginUserManager extends SobotCommonDao<LoginUserEntity> {
         contentValues.put(LoginUserEntity.LOGIN_TIME, userAccount.getLogin_time());
         contentValues.put("login_account",userAccount.getLoginAccount());
         contentValues.put("login_pwd",userAccount.getLoginPwd());
+        contentValues.put("wslinkDefault",userAccount.getWslinkDefault());
         return contentValues;
     }
 

sobot_common/src/main/java/com/sobot/common/login/db/SobotCommonDBHelper.java

@@ -17,7 +17,7 @@ class SobotCommonDBHelper extends SQLiteOpenHelper {
 
     private static final String DB_CACHE_NAME = "sobot_common.db";
     //    private static final int DB_CACHE_VERSION = 1;
-    private static final int DB_CACHE_VERSION = 4;
+    private static final int DB_CACHE_VERSION = 5;
     static final String TABLE_LOGIN_USER = "login_user";
     static final String TABLE_SOBOT_HOST = "sobot_host";
     static final String TABLE_SERVICE_INFO = "sobot_service";
@@ -152,6 +152,11 @@ class SobotCommonDBHelper extends SQLiteOpenHelper {
                         + " ADD COLUMN login_pwd VARCHAR(40)";
                 db.execSQL(sql5);  // 登录表添加登录密码
                 break;
+            case 4:
+                String sql6 = "ALTER TABLE " + TABLE_LOGIN_USER
+                        + " ADD COLUMN wslinkDefault VARCHAR(40)";
+                db.execSQL(sql6);  // 登录表添加通道信息2
+                break;
             default:
                 break;
         }

sobot_common/src/main/java/com/sobot/common/login/model/LoginUserEntity.java

@@ -352,4 +352,46 @@ public class LoginUserEntity implements Serializable {
     public void setLoginPwd(String loginPwd) {
         this.loginPwd = loginPwd;
     }
+
+    @Override
+    public String toString() {
+        return "LoginUserEntity{" +
+                "loginAccount='" + loginAccount + '\'' +
+                ", loginPwd='" + loginPwd + '\'' +
+                ", tempId='" + tempId + '\'' +
+                ", nickName='" + nickName + '\'' +
+                ", staffName='" + staffName + '\'' +
+                ", maxServiceCount=" + maxServiceCount +
+                ", blackFunction=" + blackFunction +
+                ", transferFunction=" + transferFunction +
+                ", face='" + face + '\'' +
+                ", status=" + status +
+                ", companyId='" + companyId + '\'' +
+                ", appKey='" + appKey + '\'' +
+                ", sid='" + sid + '\'' +
+                ", pu='" + pu + '\'' +
+                ", puid='" + puid + '\'' +
+                ", token='" + token + '\'' +
+                ", imFlag=" + imFlag +
+                ", cusRoleId=" + cusRoleId +
+                ", cusRoleName='" + cusRoleName + '\'' +
+                ", aid='" + aid + '\'' +
+                ", topFlag=" + topFlag +
+                ", sortFlag=" + sortFlag +
+                ", centerNumber='" + centerNumber + '\'' +
+                ", fuseWork=" + fuseWork +
+                ", callV6Flag=" + callV6Flag +
+                ", callV1Flag=" + callV1Flag +
+                ", ticketFunction=" + ticketFunction +
+                ", transferAuditFlag=" + transferAuditFlag +
+                ", companyName='" + companyName + '\'' +
+                ", accountStatus='" + accountStatus + '\'' +
+                ", kbVersion='" + kbVersion + '\'' +
+                ", language='" + language + '\'' +
+                ", access_token='" + access_token + '\'' +
+                ", login_time=" + login_time +
+                ", wslinkBak=" + wslinkBak +
+                ", wslinkDefault='" + wslinkDefault + '\'' +
+                '}';
+    }
 }

sobot_common/src/main/java/com/sobot/common/login/model/SobotServiceInfoModel.java

@@ -210,4 +210,26 @@ public class SobotServiceInfoModel implements Serializable {
     public void setTimezoneId(String timezoneId) {
         this.timezoneId = timezoneId;
     }
+
+    @Override
+    public String toString() {
+        return "SobotServiceInfoModel{" +
+                "serviceId='" + serviceId + '\'' +
+                ", serviceName='" + serviceName + '\'' +
+                ", cusRoleId='" + cusRoleId + '\'' +
+                ", cusRoleName='" + cusRoleName + '\'' +
+                ", newBossSwitch=" + newBossSwitch +
+                ", functionStr=" + functionStr +
+                ", serviceLanguage='" + serviceLanguage + '\'' +
+                ", region=" + region +
+                ", companyId='" + companyId + '\'' +
+                ", callV6Flag=" + callV6Flag +
+                ", language='" + language + '\'' +
+                ", timezone='" + timezone + '\'' +
+                ", timezoneId='" + timezoneId + '\'' +
+                ", phoneNo='" + phoneNo + '\'' +
+                ", globalPermissions=" + globalPermissions +
+                ", hideFlag=" + hideFlag +
+                '}';
+    }
 }