diff --git a/app/build.gradle b/app/build.gradle index 771101b03..7f2778eb6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 21 targetSdk 28 versionCode 229 - versionName "2.2.9" + versionName "0305" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString()] diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java index 0bb13247b..b85129250 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java @@ -256,7 +256,8 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen @Override public void onRefresh(Class item) { - getFragment().onRefresh(); + if (mBinding.pager.getCurrentItem() == 0) mBinding.title.requestFocus(); + else getFragment().onRefresh(); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java index 29f343da5..da51cb8a4 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java @@ -164,8 +164,8 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit case 0: setCacheText(); Notify.dismiss(); - RefreshEvent.video(); RefreshEvent.history(); + RefreshEvent.video(); mBinding.vodUrl.setText(VodConfig.getDesc()); mBinding.liveUrl.setText(LiveConfig.getDesc()); mBinding.wallUrl.setText(WallConfig.getDesc()); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java index 6b34d5701..d2992725c 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java @@ -33,7 +33,6 @@ import com.fongmi.android.tv.ui.activity.PushActivity; import com.fongmi.android.tv.ui.activity.SearchActivity; import com.fongmi.android.tv.ui.activity.SettingActivity; import com.fongmi.android.tv.ui.activity.VideoActivity; -import com.fongmi.android.tv.ui.activity.VodActivity; import com.fongmi.android.tv.ui.base.BaseFragment; import com.fongmi.android.tv.ui.custom.CustomRowPresenter; import com.fongmi.android.tv.ui.custom.CustomSelector; @@ -67,7 +66,6 @@ public class HomeFragment extends BaseFragment implements VodPresenter.OnClickLi @Override protected void initView() { - mBinding.progressLayout.showProgress(); setRecyclerView(); setAdapter(); initEvent(); @@ -123,7 +121,6 @@ public class HomeFragment extends BaseFragment implements VodPresenter.OnClickLi adapter.setItems(items, null); mAdapter.add(new ListRow(adapter)); } - mBinding.progressLayout.showContent(); } private ListRow getFuncRow() { diff --git a/app/src/leanback/res/layout/activity_home.xml b/app/src/leanback/res/layout/activity_home.xml index e65b8c1fc..e82e1887b 100644 --- a/app/src/leanback/res/layout/activity_home.xml +++ b/app/src/leanback/res/layout/activity_home.xml @@ -66,7 +66,6 @@