common 1.5.4 登录改造（登录前判断是否已经登录： 登录对象，客户对象不为空，登录账号和登录对象里边账号一样，token 不为空，token 没过期…

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'            //项目名
-    PUBLISH_VERSION = '1.5.3'                    //版本号
+    PUBLISH_VERSION = '1.5.4'                    //版本号
 }
 
 

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

@@ -88,6 +88,8 @@ public class LoginUserManager extends SobotCommonDao<LoginUserEntity> {
         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)));
+        model.setLoginAccount(cursor.getString(cursor.getColumnIndex("login_account")));
+        model.setLoginPwd(cursor.getString(cursor.getColumnIndex("login_pwd")));
         return model;
     }
 
@@ -133,6 +135,8 @@ public class LoginUserManager extends SobotCommonDao<LoginUserEntity> {
         contentValues.put("local_language", userAccount.getLanguage());
         contentValues.put(LoginUserEntity.ACCESS_TOKEN, userAccount.getAccess_token());
         contentValues.put(LoginUserEntity.LOGIN_TIME, userAccount.getLogin_time());
+        contentValues.put("login_account",userAccount.getLoginAccount());
+        contentValues.put("login_pwd",userAccount.getLoginPwd());
         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 = 3;
+    private static final int DB_CACHE_VERSION = 4;
     static final String TABLE_LOGIN_USER = "login_user";
     static final String TABLE_SOBOT_HOST = "sobot_host";
     static final String TABLE_SERVICE_INFO = "sobot_service";
@@ -131,10 +131,10 @@ class SobotCommonDBHelper extends SQLiteOpenHelper {
             case 1:
                 String sql = "ALTER TABLE " + TABLE_LOGIN_USER
                         + " ADD COLUMN " + LoginUserEntity.ACCESS_TOKEN + " VARCHAR(700)";
-                db.execSQL(sql);  // 执行修改表，添加字段的逻辑。
+                db.execSQL(sql);  // 登录表添加ACCESS_TOKEN
                 String sql1 = "ALTER TABLE " + TABLE_LOGIN_USER
                         + " ADD COLUMN " + LoginUserEntity.LOGIN_TIME + " INTEGER";
-                db.execSQL(sql1);  // 执行修改表，添加字段的逻辑。
+                db.execSQL(sql1);  // 登录表添加登录时间
                 break;
             case 2:
                 String sql2 = "ALTER TABLE " + TABLE_SERVICE_INFO
@@ -144,6 +144,14 @@ class SobotCommonDBHelper extends SQLiteOpenHelper {
                         + " ADD COLUMN " + SobotServiceInfoModel.TIMEZONEID + " VARCHAR(30)";
                 db.execSQL(sql3);  // 执行修改表，添加字段的逻辑。
                 break;
+            case 3:
+                String sql4 = "ALTER TABLE " + TABLE_LOGIN_USER
+                        + " ADD COLUMN login_account VARCHAR(40)";
+                db.execSQL(sql4);  // 登录表添加登录账号
+                String sql5 = "ALTER TABLE " + TABLE_LOGIN_USER
+                        + " ADD COLUMN login_pwd VARCHAR(40)";
+                db.execSQL(sql5);  // 登录表添加登录密码
+                break;
             default:
                 break;
         }

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

@@ -10,7 +10,8 @@ import java.util.Map;
 public class LoginUserEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
+    private String loginAccount;    //登录账号
+    private String loginPwd;    //登录密码
     private String tempId;    //客服temp-id
     private String nickName;    //客服昵称
     private String staffName;    //客服名称
@@ -335,4 +336,20 @@ public class LoginUserEntity implements Serializable {
     public void setLogin_time(long login_time) {
         this.login_time = login_time;
     }
+
+    public String getLoginAccount() {
+        return loginAccount;
+    }
+
+    public void setLoginAccount(String loginAccount) {
+        this.loginAccount = loginAccount;
+    }
+
+    public String getLoginPwd() {
+        return loginPwd;
+    }
+
+    public void setLoginPwd(String loginPwd) {
+        this.loginPwd = loginPwd;
+    }
 }