Ver código fonte

修改token过期后跳转登录页面崩溃问题

LAPTOP-AMA5TPO8\zhongyi 4 anos atrás
pai
commit
78ea05c4aa
20 arquivos alterados com 18 adições e 19 exclusões
  1. 2 2
      app/build.gradle
  2. 1 0
      app/src/main/java/com/zy/bvvm/app/MyApplication.java
  3. 7 6
      app/src/main/java/com/zy/bvvm/common/MyDataObsever.java
  4. 0 3
      app/src/main/java/com/zy/bvvm/ui/login/login/LoginModel.java
  5. BIN
      base/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar
  6. BIN
      base/build/intermediates/compile_only_not_namespaced_r_class_jar/release/R.jar
  7. 1 1
      base/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
  8. 1 1
      base/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
  9. BIN
      dialog/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar
  10. BIN
      dialog/build/intermediates/compile_only_not_namespaced_r_class_jar/release/R.jar
  11. 1 1
      dialog/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
  12. 1 1
      dialog/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
  13. BIN
      image/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar
  14. BIN
      image/build/intermediates/compile_only_not_namespaced_r_class_jar/release/R.jar
  15. 1 1
      image/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
  16. 1 1
      image/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
  17. BIN
      widget/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar
  18. BIN
      widget/build/intermediates/compile_only_not_namespaced_r_class_jar/release/R.jar
  19. 1 1
      widget/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
  20. 1 1
      widget/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

+ 2 - 2
app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.zy.bvvm"
         minSdkVersion 21
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 107
-        versionName "1.0.7"
+        versionCode 108
+        versionName "1.0.8"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         multiDexEnabled true

+ 1 - 0
app/src/main/java/com/zy/bvvm/app/MyApplication.java

@@ -53,6 +53,7 @@ public class MyApplication extends Application {
         setTGBugly();
     }
 
+
     @Override
     public void onTerminate() {
         super.onTerminate();

+ 7 - 6
app/src/main/java/com/zy/bvvm/common/MyDataObsever.java

@@ -7,9 +7,11 @@ import android.text.TextUtils;
 import com.allen.library.base.BaseObserver;
 import com.allen.library.utils.ToastUtils;
 
+import com.zy.bvvm.app.MyApplication;
 import com.zy.bvvm.helper.ActivityStackManager;
 import com.zy.bvvm.helper.SPUtils;
 import com.zy.bvvm.ui.login.LoginActivity;
+
 import io.reactivex.disposables.Disposable;
 
 /**
@@ -57,17 +59,16 @@ public abstract class MyDataObsever<T> extends BaseObserver<T> {
 
         BaseDataBean baseDataBean = (BaseDataBean) t;
         if (baseDataBean.getCode() == 102) {  // 登录过期处理
-            Activity topActivity = ActivityStackManager.getInstance().getTopActivity();
-            Intent in = new Intent(topActivity, LoginActivity.class);
-            topActivity.startActivity(in);
+//            Activity topActivity = ActivityStackManager.getInstance().getTopActivity();
+            Intent in = new Intent(MyApplication.getAppContext(), LoginActivity.class);
+            in.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK );
+            MyApplication.getAppContext().startActivity(in);
 //            SPUtils.logout();
             // 进行内存优化,销毁掉所有的界面
             SPUtils.remove("USER_TOKEN");
             ActivityStackManager.getInstance().finishAllActivities(LoginActivity.class);
             com.hjq.toast.ToastUtils.show("您的账户已在另一台设备登录");
-
-        } else {
-
+        }else {
             onSuccess(t);
         }
 

+ 0 - 3
app/src/main/java/com/zy/bvvm/ui/login/login/LoginModel.java

@@ -158,8 +158,6 @@ public class LoginModel extends MvpModel<LoginOnListener> {
 
                     @Override
                     protected void onSuccess(LoginBean loginBean) {
-                        Log.e("LoginBean", loginBean.toString());
-                        if(loginBean != null) {
                             if (loginBean.getCode() == 200) {
                                 if (loginBean.getData() != null) {
                                     getListener().onRefreshTokenSucceed(loginBean);
@@ -169,7 +167,6 @@ public class LoginModel extends MvpModel<LoginOnListener> {
                             } else {
                                 getListener().onRefreshTokenFail(loginBean.getMsg());
                             }
-                        }
 
                     }
                 });

BIN
base/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar


BIN
base/build/intermediates/compile_only_not_namespaced_r_class_jar/release/R.jar


+ 1 - 1
base/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Thu Aug 19 10:37:10 CST 2021
+#Sun Sep 26 15:29:21 CST 2021
 F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_from_bottom.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\layout_animation_from_bottom.xml
 F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_right_in.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_right_in.xml
 F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_right_out.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\debug\\anim\\dialog_right_out.xml

+ 1 - 1
base/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Wed Aug 25 16:54:50 CST 2021
+#Sun Sep 26 15:52:44 CST 2021
 F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\layout_animation_from_bottom.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\layout_animation_from_bottom.xml
 F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_right_in.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_right_in.xml
 F\:\\zhongyicommit\\bvvm\\base\\src\\main\\res\\anim\\dialog_right_out.xml=F\:\\zhongyicommit\\bvvm\\base\\build\\intermediates\\packaged_res\\release\\anim\\dialog_right_out.xml

BIN
dialog/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar


BIN
dialog/build/intermediates/compile_only_not_namespaced_r_class_jar/release/R.jar


+ 1 - 1
dialog/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Thu Aug 19 10:37:10 CST 2021
+#Sun Sep 26 15:29:22 CST 2021
 F\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_finish.png=F\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_dialog_finish.png
 F\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_pay_password_item_del_selector.xml=F\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\drawable\\dialog_pay_password_item_del_selector.xml
 F\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\layout\\item_dialog_pay_password.xml=F\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\debug\\layout\\item_dialog_pay_password.xml

+ 1 - 1
dialog/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Wed Aug 25 16:54:51 CST 2021
+#Sun Sep 26 15:52:44 CST 2021
 F\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\mipmap-xxhdpi\\ic_dialog_finish.png=F\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\release\\mipmap-xxhdpi-v4\\ic_dialog_finish.png
 F\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\drawable\\dialog_pay_password_item_del_selector.xml=F\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\release\\drawable\\dialog_pay_password_item_del_selector.xml
 F\:\\zhongyicommit\\bvvm\\dialog\\src\\main\\res\\layout\\item_dialog_pay_password.xml=F\:\\zhongyicommit\\bvvm\\dialog\\build\\intermediates\\packaged_res\\release\\layout\\item_dialog_pay_password.xml

BIN
image/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar


BIN
image/build/intermediates/compile_only_not_namespaced_r_class_jar/release/R.jar


+ 1 - 1
image/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Thu Aug 19 10:37:10 CST 2021
+#Sun Sep 26 15:29:22 CST 2021
 F\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-xhdpi\\image_loading.png=F\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\image_loading.png
 F\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-xhdpi\\image_load_err.png=F\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\image_load_err.png
 F\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-hdpi\\image_loading.png=F\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\debug\\mipmap-hdpi-v4\\image_loading.png

+ 1 - 1
image/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Wed Aug 25 16:54:51 CST 2021
+#Sun Sep 26 15:52:44 CST 2021
 F\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-xhdpi\\image_loading.png=F\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\release\\mipmap-xhdpi-v4\\image_loading.png
 F\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-xhdpi\\image_load_err.png=F\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\release\\mipmap-xhdpi-v4\\image_load_err.png
 F\:\\zhongyicommit\\bvvm\\image\\src\\main\\res\\mipmap-hdpi\\image_loading.png=F\:\\zhongyicommit\\bvvm\\image\\build\\intermediates\\packaged_res\\release\\mipmap-hdpi-v4\\image_loading.png

BIN
widget/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/R.jar


BIN
widget/build/intermediates/compile_only_not_namespaced_r_class_jar/release/R.jar


+ 1 - 1
widget/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Thu Aug 19 10:37:10 CST 2021
+#Sun Sep 26 15:29:22 CST 2021
 F\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable-hdpi\\ic_stat_name.png=F\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\ic_stat_name.png
 F\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable-xxhdpi\\ic_stat_name.png=F\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\drawable-xxhdpi-v4\\ic_stat_name.png
 F\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\layout\\widget_hint_layout.xml=F\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\debug\\layout\\widget_hint_layout.xml

+ 1 - 1
widget/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

@@ -1,4 +1,4 @@
-#Wed Aug 25 16:54:51 CST 2021
+#Sun Sep 26 15:52:44 CST 2021
 F\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable-hdpi\\ic_stat_name.png=F\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\release\\drawable-hdpi-v4\\ic_stat_name.png
 F\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\drawable-xxhdpi\\ic_stat_name.png=F\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\release\\drawable-xxhdpi-v4\\ic_stat_name.png
 F\:\\zhongyicommit\\bvvm\\widget\\src\\main\\res\\layout\\widget_hint_layout.xml=F\:\\zhongyicommit\\bvvm\\widget\\build\\intermediates\\packaged_res\\release\\layout\\widget_hint_layout.xml