修正部分电视盒子选集焦点丢失问题

pull/70/head
于俊 3 years ago
parent 19e8d20fda
commit 85a77cd5d4
  1. 2
      app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java
  2. 16
      app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java
  3. 6
      app/src/main/res/layout/item_series.xml
  4. 4
      app/src/main/res/layout/item_series_group.xml

@ -454,7 +454,7 @@ public class ApiConfig {
ijkCodes = new ArrayList<>(); ijkCodes = new ArrayList<>();
boolean foundOldSelect = false; boolean foundOldSelect = false;
String ijkCodec = Hawk.get(HawkConfig.IJK_CODEC, ""); String ijkCodec = Hawk.get(HawkConfig.IJK_CODEC, "");
JsonArray ijkJsonArray = infoJson.has("ads")?infoJson.get("ijk").getAsJsonArray():defaultJson.get("ijk").getAsJsonArray(); JsonArray ijkJsonArray = infoJson.has("ijk")?infoJson.get("ijk").getAsJsonArray():defaultJson.get("ijk").getAsJsonArray();
for (JsonElement opt : ijkJsonArray) { for (JsonElement opt : ijkJsonArray) {
JsonObject obj = (JsonObject) opt; JsonObject obj = (JsonObject) opt;
String name = obj.get("group").getAsString(); String name = obj.get("group").getAsString();

@ -199,7 +199,7 @@ public class DetailActivity extends BaseActivity {
seriesGroupAdapter = new BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_series_group, seriesGroupOptions) { seriesGroupAdapter = new BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_series_group, seriesGroupOptions) {
@Override @Override
protected void convert(BaseViewHolder helper, String item) { protected void convert(BaseViewHolder helper, String item) {
TextView tvSeries = helper.getView(R.id.tvSeriesFlag); TextView tvSeries = helper.getView(R.id.tvSeriesGroup);
tvSeries.setText(item); tvSeries.setText(item);
} }
}; };
@ -391,18 +391,18 @@ public class DetailActivity extends BaseActivity {
mSeriesGroupView.setOnItemListener(new TvRecyclerView.OnItemListener() { mSeriesGroupView.setOnItemListener(new TvRecyclerView.OnItemListener() {
@Override @Override
public void onItemPreSelected(TvRecyclerView parent, View itemView, int position) { public void onItemPreSelected(TvRecyclerView parent, View itemView, int position) {
TextView txtView = itemView.findViewById(R.id.tvSeriesFlag); TextView txtView = itemView.findViewById(R.id.tvSeriesGroup);
txtView.setTextColor(Color.WHITE); txtView.setTextColor(Color.WHITE);
currentSeriesGroupView = null; currentSeriesGroupView = null;
} }
@Override @Override
public void onItemSelected(TvRecyclerView parent, View itemView, int position) { public void onItemSelected(TvRecyclerView parent, View itemView, int position) {
TextView txtView = itemView.findViewById(R.id.tvSeriesFlag); TextView txtView = itemView.findViewById(R.id.tvSeriesGroup);
txtView.setTextColor(mContext.getResources().getColor(R.color.color_02F8E1)); txtView.setTextColor(mContext.getResources().getColor(R.color.color_02F8E1));
if (vodInfo != null && vodInfo.seriesMap.get(vodInfo.playFlag).size() > 0) { if (vodInfo != null && vodInfo.seriesMap.get(vodInfo.playFlag).size() > 0) {
int targetPos = position * GroupCount; int targetPos = position * GroupCount;
mGridView.smoothScrollToPosition(targetPos); mGridView.scrollToPosition(targetPos);
} }
currentSeriesGroupView = itemView; currentSeriesGroupView = itemView;
currentSeriesGroupView.isSelected(); currentSeriesGroupView.isSelected();
@ -416,14 +416,14 @@ public class DetailActivity extends BaseActivity {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
FastClickCheckUtil.check(view); FastClickCheckUtil.check(view);
if(currentSeriesGroupView != null) { if(currentSeriesGroupView != null) {
TextView txtView = currentSeriesGroupView.findViewById(R.id.tvSeriesFlag); TextView txtView = currentSeriesGroupView.findViewById(R.id.tvSeriesGroup);
txtView.setTextColor(Color.WHITE); txtView.setTextColor(Color.WHITE);
} }
TextView newTxtView = view.findViewById(R.id.tvSeriesFlag); TextView newTxtView = view.findViewById(R.id.tvSeriesGroup);
newTxtView.setTextColor(mContext.getResources().getColor(R.color.color_02F8E1)); newTxtView.setTextColor(mContext.getResources().getColor(R.color.color_02F8E1));
if (vodInfo != null && vodInfo.seriesMap.get(vodInfo.playFlag).size() > 0) { if (vodInfo != null && vodInfo.seriesMap.get(vodInfo.playFlag).size() > 0) {
int targetPos = position * GroupCount; int targetPos = position * GroupCount;
mGridView.smoothScrollToPosition(targetPos); mGridView.scrollToPosition(targetPos);
} }
currentSeriesGroupView = view; currentSeriesGroupView = view;
currentSeriesGroupView.isSelected(); currentSeriesGroupView.isSelected();
@ -652,8 +652,8 @@ public class DetailActivity extends BaseActivity {
// startQuickSearch(); // startQuickSearch();
} else { } else {
mGridViewFlag.setVisibility(View.GONE); mGridViewFlag.setVisibility(View.GONE);
mSeriesGroupView.setVisibility(View.GONE);
mGridView.setVisibility(View.GONE); mGridView.setVisibility(View.GONE);
mSeriesGroupView.setVisibility(View.GONE);
tvPlay.setVisibility(View.GONE); tvPlay.setVisibility(View.GONE);
mEmptyPlayList.setVisibility(View.VISIBLE); mEmptyPlayList.setVisibility(View.VISIBLE);
} }

@ -11,13 +11,11 @@
android:id="@+id/tvSeries" android:id="@+id/tvSeries"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/vs_50" android:layout_height="@dimen/vs_50"
android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:gravity="center" android:gravity="center"
android:marqueeRepeatLimit="marquee_forever"
android:padding="@dimen/vs_10" android:padding="@dimen/vs_10"
android:singleLine="true"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="@dimen/ts_20" /> android:textSize="@dimen/ts_20" />
</LinearLayout> </LinearLayout>

@ -13,13 +13,13 @@
android:paddingBottom="@dimen/vs_1"> android:paddingBottom="@dimen/vs_1">
<TextView <TextView
android:id="@+id/tvSeriesFlag" android:id="@+id/tvSeriesGroup"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/vs_30" android:layout_height="@dimen/vs_30"
android:ellipsize="end" android:ellipsize="end"
android:gravity="center" android:gravity="center"
android:singleLine="true" android:singleLine="true"
android:text="11111111111" android:text=""
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="@dimen/ts_20" /> android:textSize="@dimen/ts_20" />
</LinearLayout> </LinearLayout>
Loading…
Cancel
Save