登录页面添加版本号

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库架构

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();

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);

app/src/main/java/com/unionmed/unionmedtv/base/BaseActivity.java

@@ -40,6 +40,7 @@ public abstract class BaseActivity extends AppCompatActivity {
                                 public void confirm() {
                                     isShow = false;
                                     CacheUtil.setToken(null);
+                                    MyApplication.getInstance().remoAllActivity();
                                     LoginActivity.StartActivity(BaseActivity.this);
                                 }
                             })).show();

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();

app/src/main/java/com/unionmed/unionmedtv/login/activity/fragment/LoginPhoneFragment.java

@@ -16,6 +16,7 @@ import android.widget.TextView;
 
 import androidx.fragment.app.Fragment;
 
+import com.blankj.utilcode.util.AppUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.example.yideng.loaddialoglibrary.LmiotDialog;
 import com.google.gson.Gson;
@@ -64,6 +65,7 @@ public class LoginPhoneFragment extends Fragment implements View.OnClickListener
     private LinearLayout lin_code;
     private ProgressBar progress;
     private TextView tv_code_msg;
+    private TextView tv_version;
 
     public LoginPhoneFragment() {
         // Required empty public constructor
@@ -114,6 +116,8 @@ public class LoginPhoneFragment extends Fragment implements View.OnClickListener
         lin_code.setOnClickListener(this);
         progress = view.findViewById(R.id.progress);
         tv_code_msg = view.findViewById(R.id.tv_code_msg);
+        tv_version = view.findViewById(R.id.tv_version);
+        tv_version.setText("V "+AppUtils.getAppVersionName());
     }
 
     @Override

app/src/main/res/layout/activity_home.xml

@@ -10,7 +10,6 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-
         <com.unionmed.unionmedtv.widgets.ScaleConstraintLayout
             android:id="@+id/cl_login"
             android:layout_width="wrap_content"

app/src/main/res/layout/fragment_phone_login.xml

@@ -152,5 +152,15 @@
             android:text="账号密码登录"
             android:textColor="@color/lb_tv_white"
             android:textSize="19sp" />
+        <TextView
+            android:id="@+id/tv_version"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:textColor="@color/white"
+            android:layout_marginRight="20dp"
+            android:textSize="20dp"
+            tools:text="111111"/>
     </RelativeLayout>
 </androidx.core.widget.NestedScrollView>