From b9c14e728e0f33cebde0687e249b4dc22eb09e38 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 19 Jun 2024 13:24:21 +0800
Subject: [PATCH] Fix bug

---
 app/src/main/java/com/fongmi/android/tv/event/ErrorEvent.java | 2 +-
 app/src/main/java/com/fongmi/android/tv/player/Players.java   | 3 +++
 app/src/main/res/values-zh-rCN/strings.xml                    | 2 +-
 app/src/main/res/values-zh-rTW/strings.xml                    | 2 +-
 app/src/main/res/values/strings.xml                           | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/fongmi/android/tv/event/ErrorEvent.java b/app/src/main/java/com/fongmi/android/tv/event/ErrorEvent.java
index e8ba268fb..18c221f79 100644
--- a/app/src/main/java/com/fongmi/android/tv/event/ErrorEvent.java
+++ b/app/src/main/java/com/fongmi/android/tv/event/ErrorEvent.java
@@ -54,7 +54,7 @@ public class ErrorEvent {
     }
 
     public String getMsg() {
-        if (type == Type.URL) return ResUtil.getString(R.string.error_play_url);
+        if (type == Type.URL) return ResUtil.getString(R.string.error_play_url, code);
         if (type == Type.FLAG) return ResUtil.getString(R.string.error_play_flag);
         if (type == Type.PARSE) return ResUtil.getString(R.string.error_play_parse);
         if (type == Type.TIMEOUT) return ResUtil.getString(R.string.error_play_timeout);
diff --git a/app/src/main/java/com/fongmi/android/tv/player/Players.java b/app/src/main/java/com/fongmi/android/tv/player/Players.java
index 5afd60a98..6116d4d2d 100644
--- a/app/src/main/java/com/fongmi/android/tv/player/Players.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/Players.java
@@ -13,6 +13,7 @@ import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 import androidx.media3.common.AudioAttributes;
+import androidx.media3.common.C;
 import androidx.media3.common.PlaybackException;
 import androidx.media3.common.Player;
 import androidx.media3.exoplayer.ExoPlayer;
@@ -92,6 +93,7 @@ public class Players implements Player.Listener, ParseCallback {
         builder = new StringBuilder();
         runnable = ErrorEvent::timeout;
         formatter = new Formatter(builder, Locale.getDefault());
+        position = C.TIME_UNSET;
         createSession(activity);
     }
 
@@ -145,6 +147,7 @@ public class Players implements Player.Listener, ParseCallback {
     }
 
     public void reset() {
+        position = C.TIME_UNSET;
         removeTimeoutCheck();
         stopParse();
         error = 0;
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index f15ee4333..2cf57eff0 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -109,7 +109,7 @@
     <string name="error_play_next">已经是最后一集了！</string>
     <string name="error_play_prev">已经是第一集了！</string>
     <string name="error_play_parse">播放地址解析失败</string>
-    <string name="error_play_url">播放地址加载失败</string>
+    <string name="error_play_url">播放地址加载失败\n错误代码：<xliff:g name="name">%s</xliff:g></string>
     <string name="error_play_flag">暂无线路数据</string>
     <string name="error_play_timeout">连接超时</string>
     <string name="error_detail">暂无播放数据</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 30a463c3a..c18fb4ca2 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -109,7 +109,7 @@
     <string name="error_play_next">已經是最後一集了！</string>
     <string name="error_play_prev">已經是第一集了！</string>
     <string name="error_play_parse">播放網址解析失敗</string>
-    <string name="error_play_url">播放網址載入失敗</string>
+    <string name="error_play_url">播放網址載入失敗\n錯誤代碼 <xliff:g name="name">%s</xliff:g></string>
     <string name="error_play_flag">暫無線路資料</string>
     <string name="error_play_timeout">連線逾時</string>
     <string name="error_detail">暫無播放資料</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5fe37b356..7ea401953 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -109,7 +109,7 @@
     <string name="error_play_next">It\'s the last episode!</string>
     <string name="error_play_prev">It\'s the first episode!</string>
     <string name="error_play_parse">Unable to parse url</string>
-    <string name="error_play_url">Unable to load url</string>
+    <string name="error_play_url">Unable to load url\nError code: <xliff:g name="name">%s</xliff:g></string>
     <string name="error_play_flag">No flag data</string>
     <string name="error_play_timeout">Timed out</string>
     <string name="error_detail">No play data</string>