Merge pull request #433 from okcaptain/dev

Dev

app/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdk 21
         targetSdk 28
         versionCode 233
-        versionName "0512"
+        versionName "0516"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]

app/src/main/java/com/fongmi/android/tv/utils/Tbs.java

@@ -28,6 +28,8 @@ public class Tbs {
     }
 
     public static String getUrl() {
+        File file = new File(Path.tv(), "x5.tbs.apk");
+        if (file.exists()) return Server.get().getAddress("/file/TV/x5.tbs.apk");
         return Server.get().getAddress("x5.tbs.apk");
     }
 

app/src/mobile/java/com/fongmi/android/tv/ui/dialog/InfoDialog.java

@@ -47,6 +47,7 @@ public class InfoDialog {
     }
 
     public InfoDialog url(String url) {
+        if (TextUtils.isEmpty(url)) url = "";
         this.url = url.startsWith("data") ? url.substring(0, Math.min(url.length(), 128)).concat("...") : url;
         return this;
     }
@@ -89,6 +90,7 @@ public class InfoDialog {
     }
 
     private String convert(String url) {
+        if (TextUtils.isEmpty(url)) url = "";
         return url.startsWith("http://127.0.0.1:7777") ? Uri.parse(url).getQueryParameter("url") : url;
     }