fix 退出应用

main
21561 8 months ago
parent c4f1885a9a
commit b42ca30de7
  1. 12
      app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java
  2. 2
      app/src/main/java/com/github/tvbox/osc/util/M3u8.java

@ -476,8 +476,8 @@ public class HomeActivity extends BaseActivity {
@SuppressLint("NotifyDataSetChanged")
@Override
public void onBackPressed() {
//打断加载
if(isLoading()){
// 打断加载
if (isLoading()) {
refreshEmpty();
return;
}
@ -504,34 +504,30 @@ public class HomeActivity extends BaseActivity {
// 如果 sortFocusView 存在且没有获取焦点,则请求焦点
if (this.sortFocusView != null && !this.sortFocusView.isFocused()) {
this.sortFocusView.requestFocus();
return;
}
// 如果当前不是第一个界面,则将列表设置到第一项
else if (this.sortFocused != 0) {
this.mGridView.setSelection(0);
return;
} else {
doExit();
return;
}
} else if (baseLazyFragment instanceof UserFragment && UserFragment.tvHotList.canScrollVertically(-1)) {
// 如果 UserFragment 列表可以向上滚动,则滚动到顶部
UserFragment.tvHotList.scrollToPosition(0);
this.mGridView.setSelection(0);
return;
} else {
doExit();
return;
}
}
private void doExit() {
// 如果两次返回间隔小于 2000 毫秒,则退出应用
if (System.currentTimeMillis() - mExitTime < 2000) {
AppManager.getInstance().finishAllActivity();
EventBus.getDefault().unregister(this);
AppManager.getInstance().appExit(0);
ControlManager.get().stopServer();
finish();
android.os.Process.killProcess(android.os.Process.myPid());
System.exit(0);
} else {
// 否则仅提示用户,再按一次退出应用

@ -53,7 +53,7 @@ public class M3u8 {
* <a href="https://github.com/asdfgh"> asdfgh </a>
*/
private static int timesNoAd = 10; //出现超过多少次的域名不认为是广告
private static int timesNoAd = 15; //出现超过多少次的域名不认为是广告
private static String removeMinorityUrl(String tsUrlPre, String m3u8content) {
String linesplit = "\n";
if (m3u8content.contains("\r\n"))

Loading…
Cancel
Save