Merge branch 'dev' into release

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.fongmi.android.tv"
         minSdk 21
         targetSdk 28
-        versionCode 215
-        versionName "0103#4"
+        versionCode 216
+        versionName "2.1.6"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]

app/src/main/java/com/fongmi/android/tv/api/LiveParser.java

@@ -2,7 +2,6 @@ package com.fongmi.android.tv.api;
 
 import android.util.Base64;
 
-import com.fongmi.android.tv.R;
 import com.fongmi.android.tv.bean.Channel;
 import com.fongmi.android.tv.bean.ClearKey;
 import com.fongmi.android.tv.bean.Drm;
@@ -84,13 +83,13 @@ public class LiveParser {
     private static void txt(Live live, String text) {
         Setting setting = Setting.create();
         for (String line : text.split("\n")) {
-            setting.check(line);
-            String[] split = line.split(",");
-            if (split.length < 2) continue;
             if (Thread.interrupted()) break;
+            String[] split = line.split(",");
+            if (setting.find(line)) setting.check(line);
+            if (line.contains("#genre#")) setting.clear();
             if (line.contains("#genre#")) live.getGroups().add(Group.create(split[0], live.isPass()));
-            if (live.getGroups().isEmpty()) live.getGroups().add(Group.create(R.string.live_group));
-            if (split[1].contains("://")) {
+            if (split.length > 1 && live.getGroups().isEmpty()) live.getGroups().add(Group.create());
+            if (split.length > 1 && split[1].contains("://")) {
                 Group group = live.getGroups().get(live.getGroups().size() - 1);
                 Channel channel = group.find(Channel.create(split[0]));
                 channel.addUrls(split[1].split("#"));
@@ -140,8 +139,7 @@ public class LiveParser {
         }
 
         public void check(String line) {
-            if (line.contains("#genre#")) clear();
-            else if (line.startsWith("ua")) ua(line);
+            if (line.startsWith("ua")) ua(line);
             else if (line.startsWith("parse")) parse(line);
             else if (line.startsWith("click")) click(line);
             else if (line.startsWith("player")) player(line);

app/src/main/java/com/fongmi/android/tv/bean/Group.java

@@ -33,6 +33,10 @@ public class Group {
         return items == null ? Collections.emptyList() : items;
     }
 
+    public static Group create() {
+        return create("");
+    }
+
     public static Group create(@StringRes int resId) {
         return new Group(ResUtil.getString(resId));
     }

app/src/main/res/values-zh-rCN/strings.xml

@@ -9,7 +9,6 @@
 
     <!-- Live -->
     <string name="live_pass">密码</string>
-    <string name="live_group">未分类</string>
     <string name="live_line">线路 <xliff:g name="name">%s</xliff:g></string>
 
     <!-- Detail -->

app/src/main/res/values-zh-rTW/strings.xml

@@ -9,7 +9,6 @@
 
     <!-- Live -->
     <string name="live_pass">密碼</string>
-    <string name="live_group">未分類</string>
     <string name="live_line">來源 <xliff:g name="name">%s</xliff:g></string>
 
     <!-- Detail -->

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

@@ -9,7 +9,6 @@
 
     <!-- Live -->
     <string name="live_pass">Pass</string>
-    <string name="live_group">Group</string>
     <string name="live_line">Line <xliff:g name="name">%s</xliff:g></string>
 
     <!-- Detail -->