From 1f2ccd198bcc5db2a23adb292559d167e7a5326d Mon Sep 17 00:00:00 2001
From: linminjie <1004644107@qq.com>
Date: Fri, 22 Mar 2024 14:21:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=87=BA=E4=B8=8D=E4=BA=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8D=87=E7=BA=A7=E9=A1=B6?=
 =?UTF-8?q?=E5=8F=B7=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                                 | 4 ++--
 .../main/java/com/unionmed/unionmedtv/activity/HomeActivity.java | 6 +++++-
 .../java/com/unionmed/unionmedtv/application/MyApplication.java  | 9 ++++++++-
 app/src/main/java/com/unionmed/unionmedtv/base/BaseActivity.java | 3 ++-
 .../com/unionmed/unionmedtv/login/activity/LoginActivity.java    | 3 ++-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 60803b0..575f42f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,8 +22,8 @@ android {
         applicationId "com.unionmed.unionmedtv"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 101
+        versionName "1.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             // 设置支持的SO库架构
diff --git a/app/src/main/java/com/unionmed/unionmedtv/activity/HomeActivity.java b/app/src/main/java/com/unionmed/unionmedtv/activity/HomeActivity.java
index 40beaa3..e1f14b3 100644
--- a/app/src/main/java/com/unionmed/unionmedtv/activity/HomeActivity.java
+++ b/app/src/main/java/com/unionmed/unionmedtv/activity/HomeActivity.java
@@ -32,6 +32,7 @@ import com.hjq.permissions.XXPermissions;
 import com.lxj.xpopup.XPopup;
 import com.unionmed.unionmedtv.R;
 import com.unionmed.unionmedtv.api.VersionUpLoadApi;
+import com.unionmed.unionmedtv.application.MyApplication;
 import com.unionmed.unionmedtv.base.BaseActivity;
 import com.unionmed.unionmedtv.dialog.TipDialog;
 import com.unionmed.unionmedtv.fragment.MyDoctorFragment;
@@ -95,6 +96,9 @@ public class HomeActivity extends BaseActivity implements View.OnFocusChangeList
                         if (versionInfo.isRequestSucceed()) {
                             if (versionInfo.getData().isInnerRequestSucceed()) {
                                 VersionUpLoadApi.VersionInfoBean versionInfoBean =  versionInfo.getData().getData().getVersionInfo();
+                                if(versionInfoBean==null){
+                                    return;
+                                }
                                 if (versionInfoBean.getIfNeedUpdate().equals("1")) {
                                     // 更新配置
                                     UpdateConfig updateConfig = new UpdateConfig();
@@ -348,7 +352,7 @@ public class HomeActivity extends BaseActivity implements View.OnFocusChangeList
 
                 @Override
                 public void confirm() {
-                    finish();
+                    MyApplication.getInstance().remoAllActivity();
                     System.exit(0);
                 }
             })).show();
diff --git a/app/src/main/java/com/unionmed/unionmedtv/application/MyApplication.java b/app/src/main/java/com/unionmed/unionmedtv/application/MyApplication.java
index 2ff6c73..1f7bc59 100644
--- a/app/src/main/java/com/unionmed/unionmedtv/application/MyApplication.java
+++ b/app/src/main/java/com/unionmed/unionmedtv/application/MyApplication.java
@@ -94,7 +94,7 @@ public class MyApplication extends Application {
                 .setServer(new RequestServer())
                 // 设置请求处理策略
                 .setHandler(new RequestHandler(this))
-                .addHeader("client", "iptv")
+                .addHeader("client", "IPTV")
                 .addHeader("cur_version", AppUtils.getAppVersionName())
                 // 添加全局请求参数
                 //.addParam("token", "6666666")
@@ -290,6 +290,13 @@ public class MyApplication extends Application {
     public ArrayList<Activity> getActivityList() {
         return activityList;
     }
+    public void remoAllActivity(){
+        if (activityList.size() > 0) {
+            for (Activity activity:activityList) {
+               activity.finish();
+            }
+        }
+    }
 
     public boolean addActivity(Activity activity) {
         return activityList.add(activity);
diff --git a/app/src/main/java/com/unionmed/unionmedtv/base/BaseActivity.java b/app/src/main/java/com/unionmed/unionmedtv/base/BaseActivity.java
index 7c7a616..6d5bf53 100644
--- a/app/src/main/java/com/unionmed/unionmedtv/base/BaseActivity.java
+++ b/app/src/main/java/com/unionmed/unionmedtv/base/BaseActivity.java
@@ -38,8 +38,9 @@ public abstract class BaseActivity extends AppCompatActivity {
 
                                 @Override
                                 public void confirm() {
-                                    isShow=false;
+                                    isShow = false;
                                     CacheUtil.setToken(null);
+                                    MyApplication.getInstance().remoAllActivity();
                                     LoginActivity.StartActivity(BaseActivity.this);
                                 }
                             })).show();
diff --git a/app/src/main/java/com/unionmed/unionmedtv/login/activity/LoginActivity.java b/app/src/main/java/com/unionmed/unionmedtv/login/activity/LoginActivity.java
index 73730c8..cc92360 100644
--- a/app/src/main/java/com/unionmed/unionmedtv/login/activity/LoginActivity.java
+++ b/app/src/main/java/com/unionmed/unionmedtv/login/activity/LoginActivity.java
@@ -37,6 +37,7 @@ import com.unionmed.unionmedtv.R;
 import com.unionmed.unionmedtv.activity.HomeActivity;
 import com.unionmed.unionmedtv.activity.MainActivity;
 import com.unionmed.unionmedtv.api.LocationApi;
+import com.unionmed.unionmedtv.application.MyApplication;
 import com.unionmed.unionmedtv.dialog.TipDialog;
 import com.unionmed.unionmedtv.login.activity.fragment.LoginPhoneFragment;
 import com.unionmed.unionmedtv.network.ApiResponse;
@@ -131,7 +132,7 @@ public class LoginActivity extends FragmentActivity {
 
                 @Override
                 public void confirm() {
-                    finish();
+                    MyApplication.getInstance().remoAllActivity();
                     System.exit(0);
                 }
             })).show();