diff --git a/.idea/misc.xml b/.idea/misc.xml index 176b0877..7766c59b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,12 +9,16 @@ - - + + + + + + diff --git a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java index 2b85bc03..83753eb0 100644 --- a/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java +++ b/app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java @@ -297,10 +297,11 @@ public class VodController extends BaseController { updatePlayerCfgView(); listener.updatePlayerCfg(); listener.replay(false); - hideBottom(); +// hideBottom(); } catch (JSONException e) { e.printStackTrace(); } + mPlayerBtn.requestFocus(); } }); mPlayerIJKBtn.setOnClickListener(new OnClickListener() { @@ -325,10 +326,11 @@ public class VodController extends BaseController { updatePlayerCfgView(); listener.updatePlayerCfg(); listener.replay(false); - hideBottom(); +// hideBottom(); } catch (JSONException e) { e.printStackTrace(); } + mPlayerIJKBtn.requestFocus(); } }); // 增加播放页面片头片尾时间重置 diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java index ba3d5188..cd73fb05 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java @@ -216,7 +216,7 @@ public class HomeActivity extends BaseActivity { if (home != null && home.getName() != null && !home.getName().isEmpty()) tvName.setText(home.getName()); if (dataInitOk && jarInitOk) { -// showLoading(); + showLoading(); sourceViewModel.getSort(ApiConfig.get().getHomeSourceBean().getKey()); if (hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)) { LOG.e("有"); @@ -404,6 +404,11 @@ public class HomeActivity extends BaseActivity { private void exit() { if (System.currentTimeMillis() - mExitTime < 2000) { + //这一段借鉴来自 q群老哥 IDCardWeb + EventBus.getDefault().unregister(this); + AppManager.getInstance().appExit(0); + ControlManager.get().stopServer(); + finish(); super.onBackPressed(); } else { mExitTime = System.currentTimeMillis(); @@ -583,8 +588,8 @@ public class HomeActivity extends BaseActivity { bundle.putBoolean("useCache", true); intent.putExtras(bundle); HomeActivity.this.startActivity(intent); - android.os.Process.killProcess(android.os.Process.myPid()); - System.exit(0); +// android.os.Process.killProcess(android.os.Process.myPid()); +// System.exit(0); } } diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java index c7890194..74c0e5bc 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java @@ -85,7 +85,6 @@ public class SearchActivity extends BaseActivity { initView(); initViewModel(); initData(); - enableKeyboard(this); } /* @@ -190,6 +189,12 @@ public class SearchActivity extends BaseActivity { etSearch.setText(""); } }); + etSearch.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + enableKeyboard(SearchActivity.this); + } + }); keyboard.setOnSearchKeyListener(new SearchKeyboard.OnSearchKeyListener() { @Override public void onSearchKey(int pos, String key) {