[leanback] fix build

pull/123/head
FongMi 3 years ago
parent 30a9f9581e
commit ce7aa82646
  1. 8
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java
  2. 5
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
  3. 8
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  4. 16
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/SearchActivity.java
  5. 4
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
  6. 14
      app/src/leanback/java/com/fongmi/android/tv/ui/adapter/RecordAdapter.java
  7. 10
      app/src/leanback/res/layout/activity_search.xml
  8. 2
      app/src/leanback/res/layout/adapter_search_record.xml

@ -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;
}

@ -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);

@ -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());

@ -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

@ -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);

@ -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<HistoryAdapter.ViewHolder> {
public class RecordAdapter extends RecyclerView.Adapter<RecordAdapter.ViewHolder> {
private final OnClickListener mListener;
private final List<String> 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<HistoryAdapter.ViewHold
@NonNull
@Override
public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
return new ViewHolder(AdapterSearchHistoryBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
return new ViewHolder(AdapterSearchRecordBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
}
@Override
public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
holder.binding.history.setText(mItems.get(position));
holder.binding.record.setText(mItems.get(position));
}
public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
private final AdapterSearchHistoryBinding binding;
private final AdapterSearchRecordBinding binding;
public ViewHolder(@NonNull AdapterSearchHistoryBinding binding) {
public ViewHolder(@NonNull AdapterSearchRecordBinding binding) {
super(binding.getRoot());
this.binding = binding;
itemView.setOnClickListener(this);

@ -12,7 +12,7 @@
android:paddingEnd="24dp">
<LinearLayout
android:id="@+id/historyLayout"
android:id="@+id/recordLayout"
android:layout_width="128dp"
android:layout_height="match_parent"
android:layout_marginEnd="36dp"
@ -22,12 +22,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:text="@string/search_history"
android:text="@string/search_record"
android:textColor="@color/white"
android:textSize="24sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/historyRecycler"
android:id="@+id/recordRecycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"
@ -35,7 +35,7 @@
android:paddingBottom="24dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:itemCount="10"
tools:listitem="@layout/adapter_search_history" />
tools:listitem="@layout/adapter_search_record" />
</LinearLayout>
@ -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" />

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/history"
android:id="@+id/record"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/selector_item_round"
Loading…
Cancel
Save