Merge pull request #104 from CatVodTVOfficial/dev

剧集列表页增加倒序

app/src/main/java/com/github/tvbox/osc/bean/VodInfo.java

@@ -8,6 +8,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Set;
 
 /**
  * @author pj567
@@ -48,6 +49,7 @@ public class VodInfo implements Serializable {
     public int playIndex = 0;
     public String sourceKey;
     public String playerCfg = "";
+    public boolean reverseSort = false;
 
     public void setVideo(Movie.Video video) {
         last = video.last;
@@ -101,6 +103,13 @@ public class VodInfo implements Serializable {
         }
     }
 
+    public void reverse() {
+        Set<String> flags = seriesMap.keySet();
+        for (String flag : flags) {
+            Collections.reverse(seriesMap.get(flag));
+        }
+    }
+
     public static class VodSeriesFlag implements Serializable {
 
         public String name;

app/src/main/java/com/github/tvbox/osc/ui/activity/DetailActivity.java

@@ -71,6 +71,7 @@ public class DetailActivity extends BaseActivity {
     private TextView tvDirector;
     private TextView tvDes;
     private TextView tvPlay;
+    private TextView tvSort;
     private TextView tvQuickSearch;
     private TextView tvCollect;
     private TvRecyclerView mGridViewFlag;
@@ -112,6 +113,7 @@ public class DetailActivity extends BaseActivity {
         tvDirector = findViewById(R.id.tvDirector);
         tvDes = findViewById(R.id.tvDes);
         tvPlay = findViewById(R.id.tvPlay);
+        tvSort = findViewById(R.id.tvSort);
         tvCollect = findViewById(R.id.tvCollect);
         tvQuickSearch = findViewById(R.id.tvQuickSearch);
         mEmptyPlayList = findViewById(R.id.mEmptyPlaylist);
@@ -125,6 +127,17 @@ public class DetailActivity extends BaseActivity {
         mGridViewFlag.setLayoutManager(new V7LinearLayoutManager(this.mContext, 0, false));
         seriesFlagAdapter = new SeriesFlagAdapter();
         mGridViewFlag.setAdapter(seriesFlagAdapter);
+        tvSort.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (vodInfo != null && vodInfo.seriesMap.size() > 0) {
+                    vodInfo.reverseSort = !vodInfo.reverseSort;
+                    vodInfo.reverse();
+                    insertVod(sourceKey, vodInfo);
+                    seriesAdapter.notifyDataSetChanged();
+                }
+            }
+        });
         tvPlay.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -313,10 +326,16 @@ public class DetailActivity extends BaseActivity {
                             vodInfo.playIndex = Math.max(vodInfoRecord.playIndex, 0);
                             vodInfo.playFlag = vodInfoRecord.playFlag;
                             vodInfo.playerCfg = vodInfoRecord.playerCfg;
+                            vodInfo.reverseSort = vodInfoRecord.reverseSort;
                         } else {
                             vodInfo.playIndex = 0;
                             vodInfo.playFlag = null;
                             vodInfo.playerCfg = "";
+                            vodInfo.reverseSort = false;
+                        }
+
+                        if (vodInfo.reverseSort) {
+                            vodInfo.reverse();
                         }
 
                         if (vodInfo.playFlag == null || !vodInfo.seriesMap.containsKey(vodInfo.playFlag))

app/src/main/res/drawable/button_detail_sort.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true">
+        <shape>
+            <corners android:radius="@dimen/vs_20" />
+            <solid android:color="@color/color_FF90CA09" />
+            <stroke android:width="2mm" android:color="@android:color/white" />
+        </shape>
+    </item>
+    <item android:state_focused="false">
+        <shape>
+            <corners android:radius="@dimen/vs_20" />
+            <solid android:color="@color/color_FF90CA09" />
+        </shape>
+    </item>
+</selector>

app/src/main/res/layout/activity_detail.xml

@@ -137,7 +137,7 @@
                     <TextView
                         android:id="@+id/tvPlay"
                         android:layout_width="@dimen/vs_120"
-                        android:layout_height="@dimen/vs_45"
+                        android:layout_height="@dimen/vs_40"
                         android:layout_marginEnd="@dimen/vs_10"
                         android:layout_marginRight="@dimen/vs_10"
                         android:background="@drawable/button_detail_play"
@@ -150,7 +150,7 @@
                     <TextView
                         android:id="@+id/tvQuickSearch"
                         android:layout_width="@dimen/vs_120"
-                        android:layout_height="@dimen/vs_45"
+                        android:layout_height="@dimen/vs_40"
                         android:layout_marginEnd="@dimen/vs_10"
                         android:layout_marginRight="@dimen/vs_10"
                         android:background="@drawable/button_detail_quick_search"
@@ -160,10 +160,23 @@
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/vs_20" />
 
+                    <TextView
+                        android:id="@+id/tvSort"
+                        android:layout_width="@dimen/vs_120"
+                        android:layout_height="@dimen/vs_40"
+                        android:layout_marginEnd="@dimen/vs_10"
+                        android:layout_marginRight="@dimen/vs_10"
+                        android:background="@drawable/button_detail_sort"
+                        android:focusable="true"
+                        android:gravity="center"
+                        android:text="倒序"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/vs_20" />
+
                     <TextView
                         android:id="@+id/tvCollect"
                         android:layout_width="@dimen/vs_120"
-                        android:layout_height="@dimen/vs_45"
+                        android:layout_height="@dimen/vs_40"
                         android:background="@drawable/button_detail_collect"
                         android:focusable="true"
                         android:gravity="center"

app/src/main/res/values/colors.xml

@@ -7,6 +7,7 @@
     <color name="color_FFB800">#FF6600</color>
     <color name="color_00FF0A">#00FF0A</color>
     <color name="color_CBF46A">#CBF46A</color>
+    <color name="color_FF90CA09">#90CA09</color>
     <color name="color_BD0CADE2">#BD0CADE2</color>
     <color name="color_FF0057">#FF0057</color>
     <color name="color_FF5F00">#FF5F00</color>