From aea1e3069b8b1e1ba6b4c1d4cbfb82eb9ff5b3e4 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 20 Sep 2023 23:24:53 +0800
Subject: [PATCH] Fix bug

---
 .../com/fongmi/android/tv/ui/activity/VideoActivity.java  | 1 +
 app/src/main/java/com/fongmi/android/tv/bean/Site.java    | 8 +++++++-
 .../com/fongmi/android/tv/ui/activity/VideoActivity.java  | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
index bbd057753..d5113b780 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
@@ -370,6 +370,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
         HashMap<Integer, Integer> maxLines = new HashMap<>();
         maxLines.put(BaseDanmaku.TYPE_FIX_TOP, 3);
         maxLines.put(BaseDanmaku.TYPE_SCROLL_RL, 3);
+        maxLines.put(BaseDanmaku.TYPE_SCROLL_LR, 3);
         maxLines.put(BaseDanmaku.TYPE_FIX_BOTTOM, 1);
         mDanmakuContext.setDanmakuStyle(IDisplay.DANMAKU_STYLE_STROKEN, 3).setMaximumLines(maxLines).setDanmakuMargin(12).setScaleTextSize(0.8f);
         mBinding.control.danmu.setActivated(Setting.isDanmu());
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Site.java b/app/src/main/java/com/fongmi/android/tv/bean/Site.java
index 09eaaaabd..fe4e98e83 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Site.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Site.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 import okhttp3.Headers;
 
-@Entity(ignoredColumns = {"type", "api", "playUrl", "timeout", "playerType", "ext", "jar", "style", "categories", "header"})
+@Entity(ignoredColumns = {"type", "api", "playUrl", "timeout", "playerType", "ext", "jar", "style", "categories", "header", "proxy"})
 public class Site implements Parcelable {
 
     @NonNull
@@ -60,6 +60,8 @@ public class Site implements Parcelable {
     private List<String> categories;
     @SerializedName("header")
     private JsonElement header;
+    @SerializedName("proxy")
+    private boolean proxy;
 
     private boolean activated;
 
@@ -187,6 +189,10 @@ public class Site implements Parcelable {
         return header;
     }
 
+    public boolean isProxy() {
+        return proxy;
+    }
+
     public boolean isActivated() {
         return activated;
     }
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
index 1dff9af69..359cf81c3 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
@@ -397,6 +397,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
         HashMap<Integer, Integer> maxLines = new HashMap<>();
         maxLines.put(BaseDanmaku.TYPE_FIX_TOP, 2);
         maxLines.put(BaseDanmaku.TYPE_SCROLL_RL, 2);
+        maxLines.put(BaseDanmaku.TYPE_SCROLL_LR, 2);
         maxLines.put(BaseDanmaku.TYPE_FIX_BOTTOM, 1);
         mDanmakuContext.setDanmakuStyle(IDisplay.DANMAKU_STYLE_STROKEN, 3).setMaximumLines(maxLines).setDanmakuMargin(8).setScaleTextSize(0.8f);
         checkDanmuImg();