Merge branch 'dev' into release

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.fongmi.android.tv"
         minSdk 21
         targetSdk 28
-        versionCode 212
+        versionCode 213
-        versionName "20231222#3"
+        versionName "2.1.3"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]

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

@@ -24,8 +24,8 @@ public class Decoder {
         String key = url.contains(";") ? url.split(";")[2] : "";
         url = url.contains(";") ? url.split(";")[0] : url;
         String data = getData(url);
-        if (Json.valid(data)) return fix(url, data);
         if (data.isEmpty()) throw new Exception();
+        if (Json.valid(data)) return fix(url, data);
         if (data.contains("**")) data = base64(data);
         if (data.startsWith("2423")) data = cbc(data);
         if (key.length() > 0) data = ecb(data, key);

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

@@ -13,6 +13,7 @@ import com.fongmi.android.tv.utils.FileUtil;
 import com.fongmi.android.tv.utils.ImgUtil;
 import com.fongmi.android.tv.utils.Notify;
 import com.github.catvod.net.OkHttp;
+import com.github.catvod.utils.Asset;
 import com.github.catvod.utils.Path;
 
 import java.io.File;
@@ -94,6 +95,7 @@ public class WallConfig {
 
     private File write(File file) throws IOException {
         if (getUrl().startsWith("file")) Path.copy(Path.local(getUrl()), file);
+        else if (getUrl().startsWith("assets")) Path.copy(Asset.open(getUrl()), file);
         else if (getUrl().startsWith("http")) Path.write(file, ImgUtil.resize(OkHttp.newCall(getUrl()).execute().body().bytes()));
         else file.delete();
         return file;

app/src/mobile/res/layout/fragment_setting.xml

@@ -8,7 +8,10 @@
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/transparent">
+        android:background="@color/transparent"
+        android:elevation="0dp"
+        app:elevation="0dp"
+        app:liftOnScrollColor="@color/transparent">
 
         <TextView
             android:layout_width="wrap_content"

app/src/mobile/res/layout/fragment_setting_player.xml

@@ -8,7 +8,10 @@
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/transparent">
+        android:background="@color/transparent"
+        android:elevation="0dp"
+        app:elevation="0dp"
+        app:liftOnScrollColor="@color/transparent">
 
         <TextView
             android:layout_width="wrap_content"

app/src/mobile/res/layout/fragment_vod.xml

@@ -10,7 +10,8 @@
         android:layout_height="wrap_content"
         android:background="@color/transparent"
         android:elevation="0dp"
-        app:elevation="0dp">
+        app:elevation="0dp"
+        app:liftOnScrollColor="@color/transparent">
 
         <LinearLayout
             android:layout_width="match_parent"