common 1.3.1

sobot_common/build.gradle

@@ -11,7 +11,7 @@ android {
     //这里就是打jar包
     task makeJar(type: Copy) {
         //删除旧的jar包
-        delete 'build/libs/sobot_common_1.3.0.jar'
+        delete 'build/libs/sobot_common_1.3.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_1.3.0.jar')
+        rename ('classes.jar', 'sobot_common_1.3.1.jar')
     }
     makeJar.dependsOn(build)
 }

sobot_common/sobot-common-publish-mavencentral.gradle

@@ -13,7 +13,7 @@ ext {
     PUBLISH_GROUP_ID = "com.sobot.library"        //项目包名
     PUBLISH_ARTIFACT_ID = 'sobotcommon'            //项目名
 //    PUBLISH_ARTIFACT_ID = 'sobotcommon_x'            //项目名
-    PUBLISH_VERSION = '1.3.0'                    //版本号
+    PUBLISH_VERSION = '1.3.1'                    //版本号
 }
 
 

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

@@ -54,13 +54,22 @@ public class ServiceInfoManager extends SobotCommonDao<SobotServiceInfoModel> {
         model.setServiceName(cursor.getString(cursor.getColumnIndex("serviceName")));
         model.setCusRoleId(cursor.getString(cursor.getColumnIndex("cusRoleId")));
         model.setCusRoleName(cursor.getString(cursor.getColumnIndex("cusRoleName")));
-        model.setServiceLanguage(cursor.getString(cursor.getColumnIndex("language")));
+        model.setServiceLanguage(cursor.getString(cursor.getColumnIndex("serviceLanguage")));
         model.setNewBossSwitch(cursor.getInt(cursor.getColumnIndex("newBossSwitch")));
         model.setRegion(cursor.getInt(cursor.getColumnIndex("region")));
         String functionStr = cursor.getString(cursor.getColumnIndex("functionStr"));
         List<ServiceFunctionVoModel> list = SobotGsonUtil.jsonToBeans(functionStr, new TypeToken<List<ServiceFunctionVoModel>>() {
         }.getType());
         model.setFunctionStr(list);
+
+        model.setCompanyId(cursor.getString(cursor.getColumnIndex("companyId")));
+        model.setCallV6Flag(cursor.getInt(cursor.getColumnIndex("callV6Flag")));
+        model.setLanguage(cursor.getString(cursor.getColumnIndex("language")));
+        model.setPhoneNo(cursor.getString(cursor.getColumnIndex("phoneNo")));
+        String globalPermissions = cursor.getString(cursor.getColumnIndex("globalPermissions"));
+        List<String> globalPermissionslist = SobotGsonUtil.jsonToBeans(globalPermissions, new TypeToken<List<String>>() {
+        }.getType());
+        model.setGlobalPermissions(globalPermissionslist);
         return model;
     }
 
@@ -71,10 +80,15 @@ public class ServiceInfoManager extends SobotCommonDao<SobotServiceInfoModel> {
         contentValues.put("serviceName", infoModel.getServiceName());
         contentValues.put("cusRoleId", infoModel.getCusRoleId());
         contentValues.put("cusRoleName", infoModel.getCusRoleName());
-        contentValues.put("language", infoModel.getServiceLanguage());
+        contentValues.put("serviceLanguage", infoModel.getServiceLanguage());
         contentValues.put("newBossSwitch", infoModel.getNewBossSwitch());
         contentValues.put("region", infoModel.getRegion());
         contentValues.put("functionStr", SobotGsonUtil.beanToJson(infoModel.getFunctionStr()));
+        contentValues.put("companyId", infoModel.getCompanyId());
+        contentValues.put("callV6Flag",infoModel.getCallV6Flag());
+        contentValues.put("language", infoModel.getLanguage());
+        contentValues.put("phoneNo", infoModel.getPhoneNo());
+        contentValues.put("globalPermissions", SobotGsonUtil.beanToJson(infoModel.getGlobalPermissions()));
         return contentValues;
     }
 

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

@@ -97,6 +97,11 @@ class SobotCommonDBHelper extends SQLiteOpenHelper {
                 "functionStr varchar(1000)," +
                 "newBossSwitch INTEGER," +
                 "region INTEGER," +
+                "serviceLanguage varchar(12)," +
+                "companyId varchar(40)," +
+                "callV6Flag INTEGER," +
+                "phoneNo varchar(20)," +
+                "globalPermissions varchar(300)," +
                 "language varchar(10))";
         db.execSQL(sql_service);
 

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

@@ -80,10 +80,6 @@ public class SobotServiceInfoModel implements Serializable {
         return false;
     }
 
-    public void setHideFlag(boolean hideFlag) {
-        this.hideFlag = hideFlag;
-    }
-
     public String getCompanyId() {
         return companyId;
     }