Merge branch 'dev' into release

2 years ago · ff111749e7
parent 4238ba67ab
commit ff111749e7
19 changed files with 1 additions and 1 deletions
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java
@ -227,4 +227,4 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt
        Source.get().exit();
        Server.get().stop();
    }
-}
+}
--- a/other/jniLibs/libjpa_arm64_v8a.so
+++ b/other/jniLibs/libjpa_arm64_v8a.so
--- a/other/jniLibs/libjpa_armeabi_v7a.so
+++ b/other/jniLibs/libjpa_armeabi_v7a.so
--- a/other/jniLibs/libmitv.so
+++ b/other/jniLibs/libmitv.so
--- a/other/jniLibs/libp2p-jp-arm64_v8a.so
+++ b/other/jniLibs/libp2p-jp-arm64_v8a.so
--- a/other/jniLibs/libp2p-jp-armeabi_v7a.so
+++ b/other/jniLibs/libp2p-jp-armeabi_v7a.so
--- a/other/jniLibs/libp2p.so
+++ b/other/jniLibs/libp2p.so
--- a/other/jniLibs/libp3p.so
+++ b/other/jniLibs/libp3p.so
--- a/other/jniLibs/libp4p.so
+++ b/other/jniLibs/libp4p.so
--- a/other/jniLibs/libp5p.so
+++ b/other/jniLibs/libp5p.so
--- a/other/jniLibs/libp6p.so
+++ b/other/jniLibs/libp6p.so
--- a/other/jniLibs/libp7p.so
+++ b/other/jniLibs/libp7p.so
--- a/other/jniLibs/libp8p.so
+++ b/other/jniLibs/libp8p.so
--- a/other/jniLibs/libp9p.so
+++ b/other/jniLibs/libp9p.so
--- a/other/jniLibs/libtvcore.so
+++ b/other/jniLibs/libtvcore.so
--- a/other/jniLibs/libxl_stat_arm64_v8a.so
+++ b/other/jniLibs/libxl_stat_arm64_v8a.so
--- a/other/jniLibs/libxl_stat_armeabi_v7a.so
+++ b/other/jniLibs/libxl_stat_armeabi_v7a.so
--- a/other/jniLibs/libxl_thunder_sdk_arm64_v8a.so
+++ b/other/jniLibs/libxl_thunder_sdk_arm64_v8a.so
--- a/other/jniLibs/libxl_thunder_sdk_armeabi_v7a.so
+++ b/other/jniLibs/libxl_thunder_sdk_armeabi_v7a.so