Merge pull request CatVodTVOfficial#133 from CatVodTVOfficial/dev

Dev
longxinglxl · Jul 4, 2022 · b7c47f9 · b7c47f9
2 parents 31486fc + d0430df
commit b7c47f9
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 1 deletion.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,6 +14,7 @@
     <application
         android:name=".base.App"
         android:allowBackup="true"
+        android:banner="@drawable/app_banner"
         android:configChanges="orientation|keyboardHidden|screenSize"
         android:hardwareAccelerated="true"
         android:icon="@drawable/app_icon"
@@ -31,6 +32,7 @@
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
         </activity>
 

diff --git a/app/src/main/java/com/github/tvbox/osc/bean/ParseBean.java b/app/src/main/java/com/github/tvbox/osc/bean/ParseBean.java
@@ -2,6 +2,8 @@
 
 import android.util.Base64;
 
+import com.github.tvbox.osc.util.DefaultConfig;
+
 /**
  * @author pj567
  * @date :2021/3/8
@@ -25,7 +27,7 @@ public void setName(String name) {
     }
 
     public String getUrl() {
-        return url;
+        return DefaultConfig.checkReplaceProxy(url);
     }
 
     public void setUrl(String url) {

diff --git a/app/src/main/res/drawable-hdpi/app_icon.png b/app/src/main/res/drawable-hdpi/app_icon.png
diff --git a/app/src/main/res/drawable-xhdpi/app_icon.png b/app/src/main/res/drawable-xhdpi/app_icon.png
diff --git a/app/src/main/res/drawable-xxhdpi/app_icon.png b/app/src/main/res/drawable-xxhdpi/app_icon.png
diff --git a/app/src/main/res/drawable-xxxhdpi/app_icon.png b/app/src/main/res/drawable-xxxhdpi/app_icon.png
diff --git a/app/src/main/res/drawable/app_banner.png b/app/src/main/res/drawable/app_banner.png
diff --git a/app/src/main/res/drawable/app_icon.png b/app/src/main/res/drawable/app_icon.png