本地X5逻辑修复

Eanya-Tonic · Oct 5, 2024 · 37d3003 · 37d3003
1 parent dba677b
commit 37d3003
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -39,7 +39,7 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     implementation 'androidx.appcompat:appcompat:1.3.0'
     // api 'com.tencent.tbs:tbssdk:44286'
-    implementation files('libs/tbs_sdk_thirdapp_v4.3.0.386_44286_sharewithdownloadwithfile_withoutGame_obfs_20230210_114429.jar')
+    implementation files('libs/tbs_sdk_thirdapp_v4.3.0.253_44153_sharewithdownloadwithfile_withoutGame_obfs_20220117_105333.jar')
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.preference:preference:1.2.1'
     implementation 'androidx.multidex:multidex:2.0.1'

diff --git a/..._thirdapp_v4.3.0.253_44153_sharewithdownloadwithfile_withoutGame_obfs_20220117_105333.jar b/..._thirdapp_v4.3.0.253_44153_sharewithdownloadwithfile_withoutGame_obfs_20220117_105333.jar
diff --git a/app/src/main/java/com/eanyatonic/cctvViewer/LoadingActivity.java b/app/src/main/java/com/eanyatonic/cctvViewer/LoadingActivity.java
@@ -16,10 +16,14 @@ public class LoadingActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_loading);
+
+        FileUtils.copyAssets(getApplicationContext(), "045738_x5.tbs.apk",
+                FileUtils.getTBSFileDir(getApplicationContext()).getPath() + "/045738_x5.tbs.apk");
+
         // 安装TBS内核
-        QbSdk.reset(MainActivity.get());
-        QbSdk.installLocalTbsCore(MainActivity.get(), 45738,
-                FileUtils.getTBSFileDir(MainActivity.get()).getPath() + "/045738_x5.tbs.apk");
+        QbSdk.reset(getApplicationContext());
+        QbSdk.installLocalTbsCore(getApplicationContext(), 45738,
+                FileUtils.getTBSFileDir(getApplicationContext()).getPath() + "/045738_x5.tbs.apk");
         QbSdk.setTbsListener(new TbsListener() {
             @Override
             public void onDownloadFinish(int i) {
@@ -34,6 +38,9 @@ public void onDownloadProgress(int i) {
             @Override
             public void onInstallFinish(int i) {
                 Log.e("TAG", "进行了tbs:onInstallFinish " + i);
+                boolean canLoadX5 = QbSdk.canLoadX5(getApplicationContext());
+                Log.d("canLoadX5", String.valueOf(canLoadX5));
+                Log.d("versionX5",String.valueOf(QbSdk.getTbsVersion(getApplicationContext())));
                 Intent intent = new Intent(LoadingActivity.this, MainActivity.class);
                 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
                 startActivity(intent);

diff --git a/app/src/main/java/com/eanyatonic/cctvViewer/MainActivity.java b/app/src/main/java/com/eanyatonic/cctvViewer/MainActivity.java
@@ -1,5 +1,7 @@
 package com.eanyatonic.cctvViewer;
 
+import static androidx.constraintlayout.motion.utils.Oscillator.TAG;
+
 import com.eanyatonic.cctvViewer.FileUtils;
 
 import android.Manifest;
@@ -52,8 +54,6 @@ public class MainActivity extends AppCompatActivity {
 
     private AudioManager audioManager;
 
-    private static MainActivity instance;
-
     private WebView webView0; // 导入 WebView
     private WebView webView1; // 导入备用 WebView
     private boolean canLoadX5 = false;
@@ -138,8 +138,6 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        instance = this; // 将当前实例赋值给静态变量
-
         // 加载设置
         // 获取 SharedPreferences
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
@@ -297,9 +295,8 @@ protected void onCreate(Bundle savedInstanceState) {
         // X5内核代码
         if (!forceSysWebView) {
             requestPermission();
-            FileUtils.copyAssets(getApplicationContext(), "045738_x5.tbs.apk",
-                    FileUtils.getTBSFileDir(getApplicationContext()).getPath() + "/045738_x5.tbs.apk");
 
+            Log.d("versionX5",String.valueOf(QbSdk.getTbsVersion(getApplicationContext())));
             canLoadX5 = QbSdk.canLoadX5(getApplicationContext());
             Log.d("canLoadX5", String.valueOf(canLoadX5));
             if (canLoadX5) {
@@ -660,10 +657,6 @@ function AutoFullscreen(){
 
     }
 
-    public static MainActivity get() {
-        return instance;
-    }
-
     // 启动自动播放定时任务
     private void startPeriodicTask() {
         // 使用 postDelayed 方法设置定时任务