From 39e2238f417e64c80cd8362c0909ecaec8cfde40 Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 3 Jan 2024 23:17:44 +0800 Subject: [PATCH 1/4] Update build.gradle --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 1f78bffce..5f2d17b7a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 21 targetSdk 28 versionCode 215 - versionName "0103#4" + versionName "final" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString()] From 6868b556e1d8dd39dc14c28c9da152c003be010a Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 5 Jan 2024 09:25:09 +0800 Subject: [PATCH 2/4] Fix bug --- .../java/com/fongmi/android/tv/api/LiveParser.java | 14 ++++++-------- .../java/com/fongmi/android/tv/bean/Group.java | 4 ++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java b/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java index 32d334075..da63228c3 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java +++ b/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); diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Group.java b/app/src/main/java/com/fongmi/android/tv/bean/Group.java index 53168682d..10463c976 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Group.java +++ b/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)); } From 7e640bb2bc78d5b52d472503a5d020016a994cd2 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 5 Jan 2024 09:25:46 +0800 Subject: [PATCH 3/4] Clean code --- app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - 3 files changed, 3 deletions(-) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 5953c963b..cf10f2388 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -9,7 +9,6 @@ 密码 - 未分类 线路 %s diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 9c53bfa29..e8dd7f7e1 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -9,7 +9,6 @@ 密碼 - 未分類 來源 %s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 53ff02929..231a1b93c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,7 +9,6 @@ Pass - Group Line %s From a60217df8319714eec17c9443f8bc56851f09830 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 5 Jan 2024 09:26:34 +0800 Subject: [PATCH 4/4] Update build.gradle --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5f2d17b7a..6b1bdbe98 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.fongmi.android.tv" minSdk 21 targetSdk 28 - versionCode 215 - versionName "final" + versionCode 216 + versionName "2.1.6" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]