common 1.5.2 域名 登录信息还是存到数据库里边

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

@@ -204,21 +204,21 @@ public class MainActivity extends SobotBaseActivity {
 //            });
 //        }
 
-        Map<String, Object> map1 = new HashMap<>();
-        map1.put("email", "zhengnw@sobot.com");
-        map1.put("passwd", "znw123456");
-        map1.put("loginStatus", "1");
-        map1.put("from", 2 + "");
-        map1.put("way", "10");
-        map1.put("ack", "1");
-        Map<String, String> headers1 = new HashMap<>();
-        headers1.put("language", "zh");
+//        Map<String, Object> map1 = new HashMap<>();
+//        map1.put("email", "zhengnw@sobot.com");
+//        map1.put("passwd", "znw123456");
+//        map1.put("loginStatus", "1");
+//        map1.put("from", 2 + "");
+//        map1.put("way", "10");
+//        map1.put("ack", "1");
+//        Map<String, String> headers1 = new HashMap<>();
+//        headers1.put("language", "zh");
 //        HostModel hostModel=null;
-//        hostModel=  SobotLoginTools.getInstance().getHostInfo(MainActivity.this);
+//        hostModel=  SobotLoginTools.getInstance().getHostModel();
 //        if(hostModel==null){
 //            hostModel=new HostModel();
 //            hostModel.setHost("https://api-c.sobot.com");
-//            SobotLoginTools.getInstance().setHostInfo(MainActivity.this,hostModel);
+//            SobotLoginTools.getInstance().setHostModel(hostModel);
 //        }
 //
 //        SobotLoginTools.getInstance().doAppLogin(MainActivity.this, MainActivity.this, hostModel.getHost(),"https://api-c.soboten.com/text", 8000, map1, headers1, new SobotResultBlock() {

sobot_common/build.gradle

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

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

@@ -5,6 +5,9 @@ import android.text.TextUtils;
 
 import com.sobot.common.login.callback.SobotResultBlock;
 import com.sobot.common.login.callback.SobotResultCode;
+import com.sobot.common.login.db.HostManager;
+import com.sobot.common.login.db.LoginUserManager;
+import com.sobot.common.login.db.ServiceInfoManager;
 import com.sobot.common.login.model.HostModel;
 import com.sobot.common.login.model.LoginUserEntity;
 import com.sobot.common.login.model.ServiceFunctionVoModel;
@@ -31,7 +34,6 @@ import java.util.Map;
  */
 public class SobotLoginTools {
 
-
     //内部类单例
     private SobotLoginTools() {
     }
@@ -48,40 +50,58 @@ public class SobotLoginTools {
     private LoginUserEntity user;
 
     public LoginUserEntity getLoginUser() {
+        if (user == null || user.getAid() == null) {
+            user = LoginUserManager.getInstance().getCurUser();
+        }
         return user;
     }
 
     public void setLoginUser(LoginUserEntity newUser) {
-        if (newUser != null) {
-            newUser.setLogin_time(System.currentTimeMillis());
-        }
+        LoginUserManager.getInstance().deleteAll();
         user = newUser;
+        if (user != null) {
+            user.setLogin_time(System.currentTimeMillis());
+            LoginUserManager.getInstance().insert(user);
+        } else {
+            HostManager.getInstance().deleteAll();
+            ServiceInfoManager.getInstance().deleteAll();
+        }
     }
 
 
     private SobotServiceInfoModel mServiceInfoModel;
 
     public SobotServiceInfoModel getServiceInfo() {
+        if (mServiceInfoModel == null) {
+            mServiceInfoModel = ServiceInfoManager.getInstance().getInfo();
+        }
         return mServiceInfoModel;
     }
 
     public void setServiceInfo(SobotServiceInfoModel newServiceInfo) {
+        ServiceInfoManager.getInstance().deleteAll();
         mServiceInfoModel = newServiceInfo;
+        if (mServiceInfoModel != null) {
+            ServiceInfoManager.getInstance().insert(mServiceInfoModel);
+        } else {
+            ServiceInfoManager.getInstance().deleteAll();
+        }
     }
 
 
     private HostModel mHostModel;
 
     //获取域名
-    public HostModel getHostInfo(Context context) {
-        if (context != null && mHostModel == null) {
-            mHostModel = SobotSharedPreferencesUtil.getInstance(context).get("app_login_host", HostModel.class);
+    public HostModel getHostModel() {
+        if (mHostModel == null) {
+            mHostModel = HostManager.getInstance().getHost();
         }
         return mHostModel;
     }
 
-    public void setHostInfo(Context context, HostModel newHostModel) {
-        if (context != null && newHostModel != null) {
+    public void setHostModel(HostModel newHostModel) {
+        HostManager.getInstance().deleteAll();
+        if (newHostModel != null) {
             if ((newHostModel.getHost().contains("test-branche1")) || (newHostModel.getHost().contains("api-c.sobot.com") || newHostModel.getHost().contains("api-c.soboten.com")) && (!newHostModel.getHost().contains("api-c.sobot.com/text") && !newHostModel.getHost().contains("api-c.soboten.com/text"))) {
                 if (!newHostModel.getHost().endsWith("/")) {
                     newHostModel.setHost(newHostModel.getHost() + "/text/");
@@ -89,8 +109,12 @@ public class SobotLoginTools {
                     newHostModel.setHost(newHostModel.getHost() + "text/");
                 }
             }
+        }
         mHostModel = newHostModel;
-            SobotSharedPreferencesUtil.getInstance(context).put("app_login_host", newHostModel);
+        if (mHostModel != null) {
+            HostManager.getInstance().insert(mHostModel);
+        } else {
+            HostManager.getInstance().deleteAll();
         }
     }
 

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

+package com.sobot.common.login.db;
+
+import android.annotation.SuppressLint;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+
+import com.sobot.common.login.model.HostModel;
+import com.sobot.common.utils.SobotGlobalContext;
+
+import java.util.List;
+
+
+/**
+ * 域名 操作类
+ */
+public class HostManager extends SobotCommonDao<HostModel> {
+    private HostManager(Context context) {
+        super(new SobotCommonDBHelper(context));
+    }
+
+    //volatile关键字确保多线程下正确处理
+    private volatile static HostManager mInstance;
+
+    public static HostManager getInstance() {
+        //第一次判空
+        if (mInstance == null) {
+            //进入同步区域
+            synchronized (HostManager.class) {
+                //第二次判空
+                if (mInstance == null) {
+                    mInstance = new HostManager(SobotGlobalContext.getAppContext());
+                }
+            }
+        }
+        return mInstance;
+    }
+
+    @Override
+    public String getTableName() {
+        return SobotCommonDBHelper.TABLE_SOBOT_HOST;
+    }
+
+    @Override
+    public void unInit() {
+
+    }
+
+    @SuppressLint("Range")
+    @Override
+    public HostModel parseCursorToBean(Cursor cursor) {
+        HostModel model = new HostModel();
+        model.setDesc(cursor.getString(cursor.getColumnIndex("hostDesc")));
+        model.setHost(cursor.getString(cursor.getColumnIndex("host")));
+        model.setJanussipProxy(cursor.getString(cursor.getColumnIndex("janussipProxy")));
+        model.setJanusSocket(cursor.getString(cursor.getColumnIndex("janusSocket")));
+        model.setOpenApiHost(cursor.getString(cursor.getColumnIndex("openApiHost")));
+        model.setStompSocket(cursor.getString(cursor.getColumnIndex("stompSocket")));
+        return model;
+    }
+
+    @Override
+    public ContentValues getContentValues(HostModel hostModel) {
+        ContentValues contentValues = new ContentValues();
+        contentValues.put("hostDesc", hostModel.getDesc());
+        contentValues.put("host", hostModel.getHost());
+        contentValues.put("janussipProxy", hostModel.getJanussipProxy());
+        contentValues.put("janusSocket", hostModel.getJanusSocket());
+        contentValues.put("openApiHost", hostModel.getOpenApiHost());
+        contentValues.put("stompSocket", hostModel.getStompSocket());
+        return contentValues;
+    }
+
+    public void saveHost(HostModel host) {
+        deleteAll();
+        insert(host);
+    }
+
+    /**
+     * 获取最近用户记录 按日期倒序
+     */
+    public HostModel getHost() {
+        List<HostModel> list = query(null, null, null, null, null, null, null);
+        return list.size() > 0 ? list.get(0) : null;
+    }
+}

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

+package com.sobot.common.login.db;
+
+import android.annotation.SuppressLint;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+
+import com.sobot.common.login.model.LoginUserEntity;
+import com.sobot.common.utils.SobotGlobalContext;
+import com.sobot.gson.SobotGsonUtil;
+import com.sobot.utils.SobotStringUtils;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 登录用户信息 操作类
+ */
+public class LoginUserManager extends SobotCommonDao<LoginUserEntity> {
+    private LoginUserManager(Context context) {
+        super(new SobotCommonDBHelper(context));
+    }
+
+    //volatile关键字确保多线程下正确处理
+    private volatile static LoginUserManager mInstance;
+
+    public static LoginUserManager getInstance() {
+        //第一次判空
+        if (mInstance == null) {
+            //进入同步区域
+            synchronized (LoginUserManager.class) {
+                //第二次判空
+                if (mInstance == null) {
+                    mInstance = new LoginUserManager(SobotGlobalContext.getAppContext());
+                }
+            }
+        }
+        return mInstance;
+    }
+
+    @Override
+    public String getTableName() {
+        return SobotCommonDBHelper.TABLE_LOGIN_USER;
+    }
+
+    @Override
+    public void unInit() {
+
+    }
+
+    @SuppressLint("Range")
+    @Override
+    public LoginUserEntity parseCursorToBean(Cursor cursor) {
+        LoginUserEntity model = new LoginUserEntity();
+        model.setTempId(cursor.getString(cursor.getColumnIndex("tempId")));
+        model.setNickName(cursor.getString(cursor.getColumnIndex("nickName")));
+        model.setStaffName(cursor.getString(cursor.getColumnIndex("staffName")));
+        model.setMaxServiceCount(cursor.getInt(cursor.getColumnIndex("maxServiceCount")));
+        model.setBlackFunction(cursor.getInt(cursor.getColumnIndex("blackFunction")));
+        model.setTransferFunction(cursor.getInt(cursor.getColumnIndex("transferFunction")));
+        String ticketFunction = cursor.getString(cursor.getColumnIndex("ticketFunction"));
+        if (!SobotStringUtils.isEmpty(ticketFunction)){
+            Map<String, Boolean> map = SobotGsonUtil.jsonToMaps(ticketFunction);
+            model.setTicketFunction(map);
+        }
+        model.setFace(cursor.getString(cursor.getColumnIndex("face")));
+        model.setCompanyName(cursor.getString(cursor.getColumnIndex("companyName")));
+        model.setAppKey(cursor.getString(cursor.getColumnIndex("appKey")));
+        model.setSid(cursor.getString(cursor.getColumnIndex("sid")));
+        model.setPu(cursor.getString(cursor.getColumnIndex("pu")));
+        model.setPuid(cursor.getString(cursor.getColumnIndex("puid")));
+        model.setToken(cursor.getString(cursor.getColumnIndex("token")));
+        model.setCusRoleName(cursor.getString(cursor.getColumnIndex("cusRoleName")));
+        model.setAid(cursor.getString(cursor.getColumnIndex("aid")));
+        model.setCenterNumber(cursor.getString(cursor.getColumnIndex("centerNumber")));
+        model.setAccountStatus(cursor.getString(cursor.getColumnIndex("accountStatus")));
+        model.setImFlag(cursor.getInt(cursor.getColumnIndex("imFlag")));
+        model.setCusRoleId(cursor.getInt(cursor.getColumnIndex("cusRoleId")));
+        model.setStatus(cursor.getInt(cursor.getColumnIndex("status")));
+        model.setTopFlag(cursor.getInt(cursor.getColumnIndex("topFlag")));
+        model.setSortFlag(cursor.getInt(cursor.getColumnIndex("sortFlag")));
+        model.setFuseWork(cursor.getInt(cursor.getColumnIndex("fuseWork")));
+        model.setCallV6Flag(cursor.getInt(cursor.getColumnIndex("callV6Flag")));
+        model.setCallV1Flag(cursor.getInt(cursor.getColumnIndex("callV1Flag")));
+        model.setTransferAuditFlag(cursor.getInt(cursor.getColumnIndex("transferAuditFlag")));
+        model.setKbVersion(cursor.getInt(cursor.getColumnIndex("kbVersion")) + "");
+        model.setCompanyId(cursor.getString(cursor.getColumnIndex("companyId")));
+        model.setLanguage(cursor.getString(cursor.getColumnIndex("local_language")));
+        model.setAccess_token(cursor.getString(cursor.getColumnIndex(LoginUserEntity.ACCESS_TOKEN)));
+        model.setLogin_time(cursor.getLong(cursor.getColumnIndex(LoginUserEntity.LOGIN_TIME)));
+        return model;
+    }
+
+    @Override
+    public ContentValues getContentValues(LoginUserEntity userAccount) {
+        ContentValues contentValues = new ContentValues();
+        contentValues.put("_id", 8888);
+        contentValues.put("tempId", userAccount.getTempId());
+        contentValues.put("nickName", userAccount.getNickName());
+        contentValues.put("staffName", userAccount.getStaffName());
+        contentValues.put("maxServiceCount", userAccount.getMaxServiceCount());
+        contentValues.put("blackFunction", userAccount.getBlackFunction());
+        contentValues.put("transferFunction", userAccount.getTransferFunction());
+        if (userAccount.getTicketFunction() != null) {
+            contentValues.put("ticketFunction", SobotGsonUtil.beanToJson(userAccount.getTicketFunction()));
+        }
+        contentValues.put("face", userAccount.getFace());
+        contentValues.put("companyName", userAccount.getCompanyName());
+        contentValues.put("appKey", userAccount.getAppKey());
+        contentValues.put("sid", userAccount.getSid());
+        contentValues.put("pu", userAccount.getPu());
+        contentValues.put("puid", userAccount.getPuid());
+        contentValues.put("token", userAccount.getToken());
+        contentValues.put("cusRoleName", userAccount.getCusRoleName());
+        contentValues.put("aid", userAccount.getAid());
+        contentValues.put("centerNumber", userAccount.getCenterNumber());
+        contentValues.put("accountStatus", userAccount.getAccountStatus());
+        contentValues.put("imFlag", userAccount.isImFlag());
+        contentValues.put("cusRoleId", userAccount.getCusRoleId());
+        contentValues.put("status", userAccount.getStatus());
+        contentValues.put("topFlag", userAccount.getTopFlag());
+        contentValues.put("sortFlag", userAccount.getSortFlag());
+        contentValues.put("fuseWork", userAccount.getFuseWork());
+        contentValues.put("callV6Flag", userAccount.getCallV6Flag());
+        contentValues.put("callV1Flag", userAccount.getCallV1Flag());
+        contentValues.put("transferAuditFlag", userAccount.getTransferAuditFlag());
+        int kbVersion = 1;
+        if ("6".contains(SobotStringUtils.checkStringIsNull(userAccount.getKbVersion()))) {
+            kbVersion = 6;
+        }
+        contentValues.put("kbVersion", kbVersion);
+        contentValues.put("companyId", userAccount.getCompanyId());
+        contentValues.put("local_language", userAccount.getLanguage());
+        contentValues.put(LoginUserEntity.ACCESS_TOKEN, userAccount.getAccess_token());
+        contentValues.put(LoginUserEntity.LOGIN_TIME, userAccount.getLogin_time());
+        return contentValues;
+    }
+
+    public void saveUser(LoginUserEntity user) {
+        insert(user);
+    }
+
+    /**
+     * 获取最近用户记录 按日期倒序
+     */
+    public LoginUserEntity getCurUser() {
+        List<LoginUserEntity> list = query(null, null, null, null, null, null, null);
+        return list.size() > 0 ? list.get(0) : null;
+    }
+}

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

+package com.sobot.common.login.db;
+
+
+import android.annotation.SuppressLint;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+
+import com.sobot.common.login.model.ServiceFunctionVoModel;
+import com.sobot.common.login.model.SobotServiceInfoModel;
+import com.sobot.common.utils.SobotGlobalContext;
+import com.sobot.gson.SobotGsonUtil;
+import com.sobot.gson.reflect.TypeToken;
+import com.sobot.utils.SobotStringUtils;
+
+import java.util.List;
+
+/**
+ * 坐席信息 操作类
+ */
+public class ServiceInfoManager extends SobotCommonDao<SobotServiceInfoModel> {
+    private ServiceInfoManager(Context context) {
+        super(new SobotCommonDBHelper(context));
+    }
+
+    //volatile关键字确保多线程下正确处理
+    private volatile static ServiceInfoManager mInstance;
+
+    public static ServiceInfoManager getInstance() {
+        //第一次判空
+        if (mInstance == null) {
+            //进入同步区域
+            synchronized (LoginUserManager.class) {
+                //第二次判空
+                if (mInstance == null) {
+                    mInstance = new ServiceInfoManager(SobotGlobalContext.getAppContext());
+                }
+            }
+        }
+        return mInstance;
+    }
+
+    @Override
+    public String getTableName() {
+        return SobotCommonDBHelper.TABLE_SERVICE_INFO;
+    }
+
+    @Override
+    public void unInit() {
+
+    }
+
+    @SuppressLint("Range")
+    @Override
+    public SobotServiceInfoModel parseCursorToBean(Cursor cursor) {
+        SobotServiceInfoModel model = new SobotServiceInfoModel();
+        model.setServiceId(cursor.getString(cursor.getColumnIndex("serviceId")));
+        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("serviceLanguage")));
+        model.setNewBossSwitch(cursor.getInt(cursor.getColumnIndex("newBossSwitch")));
+        model.setRegion(cursor.getInt(cursor.getColumnIndex("region")));
+        String functionStr = cursor.getString(cursor.getColumnIndex("functionStr"));
+        if (!SobotStringUtils.isEmpty(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.setTimezone(cursor.getString(cursor.getColumnIndex("timezone")));
+        model.setTimezoneId(cursor.getString(cursor.getColumnIndex("timezoneId")));
+        model.setPhoneNo(cursor.getString(cursor.getColumnIndex("phoneNo")));
+        String globalPermissions = cursor.getString(cursor.getColumnIndex("globalPermissions"));
+        if (!SobotStringUtils.isEmpty(globalPermissions)) {
+            List<String> globalPermissionslist = SobotGsonUtil.jsonToBeans(globalPermissions, new TypeToken<List<String>>() {
+            }.getType());
+            model.setGlobalPermissions(globalPermissionslist);
+        }
+        return model;
+    }
+
+    @Override
+    public ContentValues getContentValues(SobotServiceInfoModel infoModel) {
+        ContentValues contentValues = new ContentValues();
+        contentValues.put("serviceId", infoModel.getServiceId());
+        contentValues.put("serviceName", infoModel.getServiceName());
+        contentValues.put("cusRoleId", infoModel.getCusRoleId());
+        contentValues.put("cusRoleName", infoModel.getCusRoleName());
+        contentValues.put("serviceLanguage", infoModel.getServiceLanguage());
+        contentValues.put("newBossSwitch", infoModel.getNewBossSwitch());
+        contentValues.put("region", infoModel.getRegion());
+        if (!SobotStringUtils.isEmpty(infoModel.getFunctionStr())) {
+            contentValues.put("functionStr", SobotGsonUtil.beanToJson(infoModel.getFunctionStr()));
+        }
+        contentValues.put("companyId", infoModel.getCompanyId());
+        contentValues.put("callV6Flag", infoModel.getCallV6Flag());
+        contentValues.put("language", infoModel.getLanguage());
+        contentValues.put("timezone", infoModel.getTimezone());
+        contentValues.put("timezoneId", infoModel.getTimezoneId());
+        contentValues.put("phoneNo", infoModel.getPhoneNo());
+        if (!SobotStringUtils.isEmpty(infoModel.getGlobalPermissions())) {
+            contentValues.put("globalPermissions", SobotGsonUtil.beanToJson(infoModel.getGlobalPermissions()));
+        }
+        return contentValues;
+    }
+
+    public void saveInfo(SobotServiceInfoModel host) {
+        deleteAll();
+        insert(host);
+    }
+
+    /**
+     * 获取最近用户记录 按日期倒序
+     */
+    public SobotServiceInfoModel getInfo() {
+        List<SobotServiceInfoModel> list = query(null, null, null, null, null, null, null);
+        return list.size() > 0 ? list.get(0) : null;
+    }
+}