wuhb 2 years ago
parent
commit
83c9809197

+ 2 - 2
app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.rms.agv"
         minSdk 27
         targetSdk 31
-        versionCode 6
-        versionName "1.1.6"
+        versionCode 7
+        versionName "1.1.7"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

+ 13 - 0
app/src/main/java/com/qy/agv/activity/MainActivity.java

@@ -105,6 +105,7 @@ public class MainActivity extends BaseActivity {
         ProjectUtils.init();
         registerReceiver();
         initCommonTop2();
+        initLogin();
         initView();
         initData();
         Permission.checkPermission(this);
@@ -151,6 +152,15 @@ public class MainActivity extends BaseActivity {
         }, 10000);
     }
 
+    private void initLogin(){
+        String userStr = CacheService.getInstance(context).getCache(CACHE_LOGIN_KEY, "user");
+        if(!StringUtils.isEmpty(userStr)){
+            user = new Gson().fromJson(userStr, UserModel.class);
+            checkToken(user.getLoginName(), user.getLoginPwd());
+        }
+    }
+
+
     private void initData(){
         mList = new ArrayList<>();
         listViewAdapter = new MainListViewAdapter(mList, context);
@@ -224,8 +234,11 @@ public class MainActivity extends BaseActivity {
                         ToastUtils.showToast(context, object.getString("error_description"));
                     } else {
                         user = new Gson().fromJson(arg0, UserModel.class);
+                        user.setLoginName(loginName);
+                        user.setLoginPwd(loginPwd);
                         Constant.ACCESS_TOKEN = user.getAccess_token();
                         Constant.REFRESH_TOKEN = user.getAccess_token();
+                        arg0 = new Gson().toJson(user);
                         CacheService.getInstance(context).saveCache(CACHE_LOGIN_KEY, "user", arg0);
                         if (user.getUser_id() != null) {
                             if(popupWindow2 !=null) {

+ 18 - 0
app/src/main/java/com/qy/agv/activity/model/UserModel.java

@@ -12,6 +12,8 @@ public class UserModel {
     private String tenant_id;
     private String token_type;
     private LinkedTreeMap<String, Object> detail;
+    private String loginName;
+    private String loginPwd;
 
     public UserModel(String user_name){
         this.user_name= user_name;
@@ -89,4 +91,20 @@ public class UserModel {
     public void setReal_name(String real_name) {
         this.real_name = real_name;
     }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public String getLoginPwd() {
+        return loginPwd;
+    }
+
+    public void setLoginPwd(String loginPwd) {
+        this.loginPwd = loginPwd;
+    }
 }