diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index 156037655..dc9ae0ba9 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -173,14 +173,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis return mBinding.ijk; } - private boolean isVisible(View view) { - return view.getVisibility() == View.VISIBLE; - } - - private boolean isGone(View view) { - return view.getVisibility() == View.GONE; - } - private boolean isReplay() { return Prefers.getReset() == 1; } 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 44d09c1fe..62eb90323 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 @@ -44,7 +44,6 @@ import com.fongmi.android.tv.utils.Clock; import com.fongmi.android.tv.utils.Notify; import com.fongmi.android.tv.utils.ResUtil; import com.fongmi.android.tv.utils.Utils; -import com.google.android.exoplayer2.util.Log; import com.google.common.collect.Lists; import org.greenrobot.eventbus.Subscribe; @@ -273,6 +272,10 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen getVideo(); } + @Override + public void onChanged() { + } + @Subscribe(threadMode = ThreadMode.MAIN) public void onRefreshEvent(RefreshEvent event) { super.onRefreshEvent(event); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 711e55397..2ccb4425d 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -112,14 +112,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick return getHome().getPlayerType() != -1 ? getHome().getPlayerType() : Prefers.getLivePlayer(); } - private boolean isVisible(View view) { - return view.getVisibility() == View.VISIBLE; - } - - private boolean isGone(View view) { - return view.getVisibility() == View.GONE; - } - @Override protected ViewBinding getBinding() { return mBinding = ActivityLiveBinding.inflate(getLayoutInflater()); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SearchActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SearchActivity.java index 325340651..22d2b2a02 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SearchActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SearchActivity.java @@ -18,7 +18,7 @@ import com.fongmi.android.tv.bean.Suggest; import com.fongmi.android.tv.databinding.ActivitySearchBinding; import com.fongmi.android.tv.net.Callback; import com.fongmi.android.tv.net.OkHttp; -import com.fongmi.android.tv.ui.adapter.HistoryAdapter; +import com.fongmi.android.tv.ui.adapter.RecordAdapter; import com.fongmi.android.tv.ui.adapter.WordAdapter; import com.fongmi.android.tv.ui.custom.CustomKeyboard; import com.fongmi.android.tv.ui.custom.CustomListener; @@ -32,10 +32,10 @@ import java.util.List; import okhttp3.Call; import okhttp3.Response; -public class SearchActivity extends BaseActivity implements WordAdapter.OnClickListener, HistoryAdapter.OnClickListener, CustomKeyboard.Callback { +public class SearchActivity extends BaseActivity implements WordAdapter.OnClickListener, RecordAdapter.OnClickListener, CustomKeyboard.Callback { private ActivitySearchBinding mBinding; - private HistoryAdapter mHistoryAdapter; + private RecordAdapter mRecordAdapter; private WordAdapter mWordAdapter; public static void start(Activity activity) { @@ -85,9 +85,9 @@ public class SearchActivity extends BaseActivity implements WordAdapter.OnClickL mBinding.wordRecycler.setHasFixedSize(true); mBinding.wordRecycler.addItemDecoration(new SpaceItemDecoration(1, 16)); mBinding.wordRecycler.setAdapter(mWordAdapter = new WordAdapter(this)); - mBinding.historyRecycler.setHasFixedSize(true); - mBinding.historyRecycler.addItemDecoration(new SpaceItemDecoration(1, 16)); - mBinding.historyRecycler.setAdapter(mHistoryAdapter = new HistoryAdapter(this)); + mBinding.recordRecycler.setHasFixedSize(true); + mBinding.recordRecycler.addItemDecoration(new SpaceItemDecoration(1, 16)); + mBinding.recordRecycler.setAdapter(mRecordAdapter = new RecordAdapter(this)); } private void getHot() { @@ -120,7 +120,7 @@ public class SearchActivity extends BaseActivity implements WordAdapter.OnClickL @Override public void onDataChanged(int size) { - mBinding.historyLayout.setVisibility(size == 0 ? View.GONE : View.VISIBLE); + mBinding.recordLayout.setVisibility(size == 0 ? View.GONE : View.VISIBLE); } @Override @@ -130,7 +130,7 @@ public class SearchActivity extends BaseActivity implements WordAdapter.OnClickL Utils.hideKeyboard(mBinding.keyword); if (TextUtils.isEmpty(keyword)) return; CollectActivity.start(this, keyword); - App.post(() -> mHistoryAdapter.add(keyword), 250); + App.post(() -> mRecordAdapter.add(keyword), 250); } @Override 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 9e20955c8..8c2a8891f 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 @@ -153,6 +153,10 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit RefreshEvent.video(); } + @Override + public void onChanged() { + } + @Override public void setLive(Live item) { LiveConfig.get().setHome(item); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/HistoryAdapter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/RecordAdapter.java similarity index 83% rename from app/src/leanback/java/com/fongmi/android/tv/ui/adapter/HistoryAdapter.java rename to app/src/leanback/java/com/fongmi/android/tv/ui/adapter/RecordAdapter.java index 31606fb64..1218a2ed7 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/HistoryAdapter.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/RecordAdapter.java @@ -7,7 +7,7 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.fongmi.android.tv.databinding.AdapterSearchHistoryBinding; +import com.fongmi.android.tv.databinding.AdapterSearchRecordBinding; import com.fongmi.android.tv.utils.Prefers; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -15,13 +15,13 @@ import com.google.gson.reflect.TypeToken; import java.util.ArrayList; import java.util.List; -public class HistoryAdapter extends RecyclerView.Adapter { +public class RecordAdapter extends RecyclerView.Adapter { private final OnClickListener mListener; private final List mItems; private final Gson mGson; - public HistoryAdapter(OnClickListener listener) { + public RecordAdapter(OnClickListener listener) { this.mListener = listener; this.mGson = new Gson(); this.mItems = getItems(); @@ -70,19 +70,19 @@ public class HistoryAdapter extends RecyclerView.Adapter + tools:listitem="@layout/adapter_search_record" /> @@ -52,7 +52,7 @@ android:layout_marginEnd="12dp" android:focusable="true" android:focusableInTouchMode="true" - android:nextFocusLeft="@id/history" + android:nextFocusLeft="@id/record" android:scaleType="fitCenter" android:src="@drawable/ic_search_mic" /> diff --git a/app/src/leanback/res/layout/adapter_search_history.xml b/app/src/leanback/res/layout/adapter_search_record.xml similarity index 89% rename from app/src/leanback/res/layout/adapter_search_history.xml rename to app/src/leanback/res/layout/adapter_search_record.xml index 5116149b1..cdd7b41f3 100644 --- a/app/src/leanback/res/layout/adapter_search_history.xml +++ b/app/src/leanback/res/layout/adapter_search_record.xml @@ -1,7 +1,7 @@