Commit 8212b8a2 by zhengnw@sobot.com

common 1.6.4 登录信息保存wslinkDefault

parent d89fd9a5
...@@ -206,7 +206,7 @@ public class MainActivity extends SobotBaseActivity { ...@@ -206,7 +206,7 @@ public class MainActivity extends SobotBaseActivity {
// } // }
Map<String, Object> map1 = new HashMap<>(); Map<String, Object> map1 = new HashMap<>();
map1.put("email", "zhengnw@sobot.com"); map1.put("email", "zhengnw@zhichi.com");
map1.put("passwd", "znw123456"); map1.put("passwd", "znw123456");
map1.put("loginStatus", "1"); map1.put("loginStatus", "1");
map1.put("from", 2 + ""); map1.put("from", 2 + "");
......
...@@ -11,7 +11,7 @@ android { ...@@ -11,7 +11,7 @@ android {
//这里就是打jar包 //这里就是打jar包
task makeJar(type: Copy) { task makeJar(type: Copy) {
//删除旧的jar包 //删除旧的jar包
delete 'build/libs/sobot_common_x_1.6.3.jar' delete 'build/libs/sobot_common_x_1.6.4.jar'
//原地址 //原地址
from('build/intermediates/packaged-classes/release/') from('build/intermediates/packaged-classes/release/')
//导出jar包的地址 //导出jar包的地址
...@@ -19,7 +19,7 @@ android { ...@@ -19,7 +19,7 @@ android {
//包含的jar包 //包含的jar包
include('classes.jar') include('classes.jar')
//重命名jar包为mysdk //重命名jar包为mysdk
rename ('classes.jar', 'sobot_common_x_1.6.3.jar') rename ('classes.jar', 'sobot_common_x_1.6.4.jar')
} }
makeJar.dependsOn(build) makeJar.dependsOn(build)
} }
......
...@@ -12,7 +12,7 @@ task androidSourcesJar(type: Jar) { ...@@ -12,7 +12,7 @@ task androidSourcesJar(type: Jar) {
ext { ext {
PUBLISH_GROUP_ID = "com.sobot.library" //项目包名 PUBLISH_GROUP_ID = "com.sobot.library" //项目包名
PUBLISH_ARTIFACT_ID = 'sobotcommon_x' //项目名 PUBLISH_ARTIFACT_ID = 'sobotcommon_x' //项目名
PUBLISH_VERSION = '1.6.3' //版本号 PUBLISH_VERSION = '1.6.4' //版本号
} }
......
...@@ -90,6 +90,7 @@ public class LoginUserManager extends SobotCommonDao<LoginUserEntity> { ...@@ -90,6 +90,7 @@ public class LoginUserManager extends SobotCommonDao<LoginUserEntity> {
model.setLogin_time(cursor.getLong(cursor.getColumnIndex(LoginUserEntity.LOGIN_TIME))); model.setLogin_time(cursor.getLong(cursor.getColumnIndex(LoginUserEntity.LOGIN_TIME)));
model.setLoginAccount(cursor.getString(cursor.getColumnIndex("login_account"))); model.setLoginAccount(cursor.getString(cursor.getColumnIndex("login_account")));
model.setLoginPwd(cursor.getString(cursor.getColumnIndex("login_pwd"))); model.setLoginPwd(cursor.getString(cursor.getColumnIndex("login_pwd")));
model.setWslinkDefault(cursor.getString(cursor.getColumnIndex("wslinkDefault")));
return model; return model;
} }
...@@ -137,6 +138,7 @@ public class LoginUserManager extends SobotCommonDao<LoginUserEntity> { ...@@ -137,6 +138,7 @@ public class LoginUserManager extends SobotCommonDao<LoginUserEntity> {
contentValues.put(LoginUserEntity.LOGIN_TIME, userAccount.getLogin_time()); contentValues.put(LoginUserEntity.LOGIN_TIME, userAccount.getLogin_time());
contentValues.put("login_account",userAccount.getLoginAccount()); contentValues.put("login_account",userAccount.getLoginAccount());
contentValues.put("login_pwd",userAccount.getLoginPwd()); contentValues.put("login_pwd",userAccount.getLoginPwd());
contentValues.put("wslinkDefault",userAccount.getWslinkDefault());
return contentValues; return contentValues;
} }
......
...@@ -17,7 +17,7 @@ class SobotCommonDBHelper extends SQLiteOpenHelper { ...@@ -17,7 +17,7 @@ class SobotCommonDBHelper extends SQLiteOpenHelper {
private static final String DB_CACHE_NAME = "sobot_common.db"; 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 = 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_LOGIN_USER = "login_user";
static final String TABLE_SOBOT_HOST = "sobot_host"; static final String TABLE_SOBOT_HOST = "sobot_host";
static final String TABLE_SERVICE_INFO = "sobot_service"; static final String TABLE_SERVICE_INFO = "sobot_service";
...@@ -152,6 +152,11 @@ class SobotCommonDBHelper extends SQLiteOpenHelper { ...@@ -152,6 +152,11 @@ class SobotCommonDBHelper extends SQLiteOpenHelper {
+ " ADD COLUMN login_pwd VARCHAR(40)"; + " ADD COLUMN login_pwd VARCHAR(40)";
db.execSQL(sql5); // 登录表添加登录密码 db.execSQL(sql5); // 登录表添加登录密码
break; break;
case 4:
String sql6 = "ALTER TABLE " + TABLE_LOGIN_USER
+ " ADD COLUMN wslinkDefault VARCHAR(40)";
db.execSQL(sql6); // 登录表添加通道信息2
break;
default: default:
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment