common 1.7.2

sobot_common/build.gradle

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

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

@@ -858,14 +858,12 @@ public class SobotLoginTools {
                                 tempServiceInfoModel.setKbVersion(SobotStringUtils.checkStringIsNull(userEntity.getKbVersion()));
                                 tempServiceInfoModel.setRobotVersion(SobotStringUtils.checkStringIsNull(userEntity.getRobotVersion()));
                                 tempServiceInfoModel.setOnlineVersion(SobotStringUtils.checkStringIsNull(userEntity.getOnlineVersion()));
-                                tempServiceInfoModel.setBlackFunction(userEntity.getBlackFunction());
                                 tempServiceInfoModel.setStatus(userEntity.getStatus());
                                 tempServiceInfoModel.setFuseWork(userEntity.getFuseWork());
                                 tempServiceInfoModel.setWslinkBak(userEntity.getWslinkBak());
                                 tempServiceInfoModel.setTopFlag(userEntity.getTopFlag());
                                 tempServiceInfoModel.setTransferAuditFlag(userEntity.getTransferAuditFlag());
                                 tempServiceInfoModel.setSortFlag(userEntity.getSortFlag());
-                                tempServiceInfoModel.setTransferFunction(userEntity.getTransferFunction());
                                 setServiceInfo(tempServiceInfoModel);
                                 SobotSharedPreferencesUtil.getInstance(context).put(SobotLoginConstant.SOBOT_LOGIN_USER_INFO, tempServiceInfoModel);
                                 if (resultBlock != null) {

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

@@ -56,8 +56,6 @@ public class ServiceInfoManager extends SobotCommonDao<SobotServiceInfoModel> {
         model.setTempId(cursor.getString(cursor.getColumnIndex("tempId")));
         model.setServiceNick(cursor.getString(cursor.getColumnIndex("nickName")));
         model.setMaxAccept(cursor.getInt(cursor.getColumnIndex("maxAccept")));
-        model.setBlackFunction(cursor.getInt(cursor.getColumnIndex("blackFunction")));
-        model.setTransferFunction(cursor.getInt(cursor.getColumnIndex("transferFunction")));
         model.setCompanyName(cursor.getString(cursor.getColumnIndex("companyName")));
         model.setPu(cursor.getString(cursor.getColumnIndex("pu")));
         model.setPuid(cursor.getString(cursor.getColumnIndex("puid")));
@@ -109,8 +107,6 @@ public class ServiceInfoManager extends SobotCommonDao<SobotServiceInfoModel> {
         contentValues.put("tempId", infoModel.getTempId());
         contentValues.put("serviceNick", infoModel.getServiceNick());
         contentValues.put("maxAccept", infoModel.getMaxAccept());
-        contentValues.put("blackFunction", infoModel.getBlackFunction());
-        contentValues.put("transferFunction", infoModel.getTransferFunction());
         contentValues.put("faceImg", infoModel.getFaceImg());
         contentValues.put("companyName", infoModel.getCompanyName());
         contentValues.put("pu", infoModel.getPu());

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

@@ -11,8 +11,6 @@ public class OnlineUserEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
     private String tempId;    //客服temp-id
-    private int blackFunction = 1;    //是否有拉黑权限   0 没有  1  有
-    private int transferFunction = 1;    //是否有转接权限   0 没有  1  有
     private int status; //账号状态 1正常0登录邮箱或密码不正确 2用户已在pc端登录
     private String pu;
     private String puid;
@@ -43,22 +41,6 @@ public class OnlineUserEntity implements Serializable {
         this.tempId = tempId;
     }
 
-    public int getBlackFunction() {
-        return blackFunction;
-    }
-
-    public void setBlackFunction(int blackFunction) {
-        this.blackFunction = blackFunction;
-    }
-
-    public int getTransferFunction() {
-        return transferFunction;
-    }
-
-    public void setTransferFunction(int transferFunction) {
-        this.transferFunction = transferFunction;
-    }
-
     public int getStatus() {
         return status;
     }

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

@@ -92,8 +92,6 @@ public class SobotServiceInfoModel implements Serializable {
     private String loginPwd;    //登录密码
     private String tempId;    //客服temp-id
     private int maxAccept;    //最大接待量
-    private int blackFunction = 1;    //是否有拉黑权限   0 没有  1  有
-    private int transferFunction = 1;    //是否有转接权限   0 没有  1  有
 
     private int status; //账号状态 1正常0登录邮箱或密码不正确 2用户已在pc端登录
     private String pu;
@@ -147,22 +145,6 @@ public class SobotServiceInfoModel implements Serializable {
     @SerializedName("wslink.default")
     private String wslinkDefault;//通道默认地址
 
-    public int getBlackFunction() {
-        return blackFunction;
-    }
-
-    public void setBlackFunction(int blackFunction) {
-        this.blackFunction = blackFunction;
-    }
-
-    public int getTransferFunction() {
-        return transferFunction;
-    }
-
-    public void setTransferFunction(int transferFunction) {
-        this.transferFunction = transferFunction;
-    }
-
     public List<String> getWslinkBak() {
         return wslinkBak;
     }

sobot_common/src/main/java/com/sobot/common/login/permission/SobotPermissionManager.java

@@ -339,6 +339,7 @@ public class SobotPermissionManager {
         SobotServiceInfoModel serviceInfoModel = SobotLoginTools.getInstance().getServiceInfo();
         if (serviceInfoModel != null) {
             if (serviceInfoModel.getNewBossSwitch() > 0) {
+                //新console
                 List<ServiceFunctionVoModel> functionVoModelList = FunctionManager.getInstance().getFunctionVos();
                 if (!TextUtils.isEmpty(type) && functionVoModelList != null ) {
                     for (int i = 0; i < functionVoModelList.size(); i++) {
@@ -353,7 +354,7 @@ public class SobotPermissionManager {
                 if (!TextUtils.isEmpty(type) && functionVoModelList != null) {
                     for (int i = 0; i < functionVoModelList.size(); i++) {
                         ServiceFunctionVoModel cusFunctionVoModel = functionVoModelList.get(i);
-                        if (getCodeByType(type).equals(cusFunctionVoModel.getId())) {
+                        if (type.equals(cusFunctionVoModel.getId())) {
                             //1开启了 0 没有开启
                             return cusFunctionVoModel.getCheckedCode() == 1 ? true : false;
                         }