退出不了问题修改,升级顶号问题处理

dev
李桢 6 months ago
parent 5aa42de9d1
commit 1f2ccd198b
  1. 4
      app/build.gradle
  2. 6
      app/src/main/java/com/unionmed/unionmedtv/activity/HomeActivity.java
  3. 9
      app/src/main/java/com/unionmed/unionmedtv/application/MyApplication.java
  4. 1
      app/src/main/java/com/unionmed/unionmedtv/base/BaseActivity.java
  5. 3
      app/src/main/java/com/unionmed/unionmedtv/login/activity/LoginActivity.java

@ -22,8 +22,8 @@ android {
applicationId "com.unionmed.unionmedtv" applicationId "com.unionmed.unionmedtv"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode 1 versionCode 101
versionName "1.0.0" versionName "1.0.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk { ndk {
// SO库架构 // SO库架构

@ -32,6 +32,7 @@ import com.hjq.permissions.XXPermissions;
import com.lxj.xpopup.XPopup; import com.lxj.xpopup.XPopup;
import com.unionmed.unionmedtv.R; import com.unionmed.unionmedtv.R;
import com.unionmed.unionmedtv.api.VersionUpLoadApi; import com.unionmed.unionmedtv.api.VersionUpLoadApi;
import com.unionmed.unionmedtv.application.MyApplication;
import com.unionmed.unionmedtv.base.BaseActivity; import com.unionmed.unionmedtv.base.BaseActivity;
import com.unionmed.unionmedtv.dialog.TipDialog; import com.unionmed.unionmedtv.dialog.TipDialog;
import com.unionmed.unionmedtv.fragment.MyDoctorFragment; import com.unionmed.unionmedtv.fragment.MyDoctorFragment;
@ -95,6 +96,9 @@ public class HomeActivity extends BaseActivity implements View.OnFocusChangeList
if (versionInfo.isRequestSucceed()) { if (versionInfo.isRequestSucceed()) {
if (versionInfo.getData().isInnerRequestSucceed()) { if (versionInfo.getData().isInnerRequestSucceed()) {
VersionUpLoadApi.VersionInfoBean versionInfoBean = versionInfo.getData().getData().getVersionInfo(); VersionUpLoadApi.VersionInfoBean versionInfoBean = versionInfo.getData().getData().getVersionInfo();
if(versionInfoBean==null){
return;
}
if (versionInfoBean.getIfNeedUpdate().equals("1")) { if (versionInfoBean.getIfNeedUpdate().equals("1")) {
// 更新配置 // 更新配置
UpdateConfig updateConfig = new UpdateConfig(); UpdateConfig updateConfig = new UpdateConfig();
@ -348,7 +352,7 @@ public class HomeActivity extends BaseActivity implements View.OnFocusChangeList
@Override @Override
public void confirm() { public void confirm() {
finish(); MyApplication.getInstance().remoAllActivity();
System.exit(0); System.exit(0);
} }
})).show(); })).show();

@ -94,7 +94,7 @@ public class MyApplication extends Application {
.setServer(new RequestServer()) .setServer(new RequestServer())
// 设置请求处理策略 // 设置请求处理策略
.setHandler(new RequestHandler(this)) .setHandler(new RequestHandler(this))
.addHeader("client", "iptv") .addHeader("client", "IPTV")
.addHeader("cur_version", AppUtils.getAppVersionName()) .addHeader("cur_version", AppUtils.getAppVersionName())
// 添加全局请求参数 // 添加全局请求参数
//.addParam("token", "6666666") //.addParam("token", "6666666")
@ -290,6 +290,13 @@ public class MyApplication extends Application {
public ArrayList<Activity> getActivityList() { public ArrayList<Activity> getActivityList() {
return activityList; return activityList;
} }
public void remoAllActivity(){
if (activityList.size() > 0) {
for (Activity activity:activityList) {
activity.finish();
}
}
}
public boolean addActivity(Activity activity) { public boolean addActivity(Activity activity) {
return activityList.add(activity); return activityList.add(activity);

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

@ -37,6 +37,7 @@ import com.unionmed.unionmedtv.R;
import com.unionmed.unionmedtv.activity.HomeActivity; import com.unionmed.unionmedtv.activity.HomeActivity;
import com.unionmed.unionmedtv.activity.MainActivity; import com.unionmed.unionmedtv.activity.MainActivity;
import com.unionmed.unionmedtv.api.LocationApi; import com.unionmed.unionmedtv.api.LocationApi;
import com.unionmed.unionmedtv.application.MyApplication;
import com.unionmed.unionmedtv.dialog.TipDialog; import com.unionmed.unionmedtv.dialog.TipDialog;
import com.unionmed.unionmedtv.login.activity.fragment.LoginPhoneFragment; import com.unionmed.unionmedtv.login.activity.fragment.LoginPhoneFragment;
import com.unionmed.unionmedtv.network.ApiResponse; import com.unionmed.unionmedtv.network.ApiResponse;
@ -131,7 +132,7 @@ public class LoginActivity extends FragmentActivity {
@Override @Override
public void confirm() { public void confirm() {
finish(); MyApplication.getInstance().remoAllActivity();
System.exit(0); System.exit(0);
} }
})).show(); })).show();

Loading…
Cancel
Save