加宽频道列表

jjm2473
leezn · Feb 7, 2024 · 55749f8 · 55749f8
1 parent ff5a5f8
commit 55749f8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/schemas/com.github.tvbox.osc.data.AppDataBase/.gitignore b/app/schemas/com.github.tvbox.osc.data.AppDataBase/.gitignore
@@ -0,0 +1 @@
+*.json
diff --git a/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java b/app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java
@@ -512,8 +512,8 @@ private void parseJson(String apiUrl, String jsonStr) {
                         hosts.add(host.getAsString());
                     }
                 } else continue;
-                if (obj.has("rule")) {
-                    JsonArray ruleJsonArr = obj.getAsJsonArray("rule");
+                if (obj.has("rule") || obj.has("regex")) {
+                    JsonArray ruleJsonArr = obj.has("regex")?obj.getAsJsonArray("regex"):obj.getAsJsonArray("rule");
                     ArrayList<String> rule = new ArrayList<>();
                     for (JsonElement one : ruleJsonArr) {
                         String oneRule = one.getAsString();

diff --git a/app/src/main/res/layout/activity_live_play.xml b/app/src/main/res/layout/activity_live_play.xml
@@ -119,7 +119,7 @@
 
         <com.owen.tvrecyclerview.widget.TvRecyclerView
             android:id="@+id/mChannelGridView"
-            android:layout_width="@dimen/vs_280"
+            android:layout_width="@dimen/vs_340"
             android:layout_height="match_parent"
             android:divider="@null"
             android:fadeScrollbars="false"