From da756bd6db6c7be84b497af49cd0665ea37de87c Mon Sep 17 00:00:00 2001 From: gaozl Date: Tue, 30 Sep 2025 18:38:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9A=90=E8=97=8F=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 2 ++ .../qianmu/container/activity/H5/WebViewActivity.java | 3 +++ .../main/java/qianmu/container/app/MyApplication.java | 10 ++++++++++ .../main/java/qianmu/container/util/SignWayUtil.java | 2 ++ app/src/main/res/values/styles.xml | 3 +++ 6 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 6cf8981..e5f50b2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { minSdkVersion 22 targetSdkVersion 30 versionCode 6 - versionName "V2.0.7.30" + versionName "V2.0.7.33" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 00f1873..557e8d0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -42,6 +42,7 @@ android:sharedUserId="android.uid.system" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" + android:hardwareAccelerated="true" android:usesCleartextTraffic="true" android:requestLegacyExternalStorage="true" android:theme="@style/AppTheme"> @@ -79,6 +80,7 @@ diff --git a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java index c2084a7..caec11d 100644 --- a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java +++ b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java @@ -4,6 +4,8 @@ import android.annotation.SuppressLint; import android.app.ActivityManager; import android.content.Context; import android.content.Intent; +import android.graphics.Bitmap; +import android.media.MediaMetadataRetriever; import android.media.MediaPlayer; import android.net.Uri; import android.os.Build; @@ -49,6 +51,7 @@ import org.java_websocket.enums.ReadyState; import java.io.File; import java.net.URI; import java.text.SimpleDateFormat; +import java.util.HashMap; import java.util.List; import java.util.Scanner; import java.util.concurrent.Executors; diff --git a/app/src/main/java/qianmu/container/app/MyApplication.java b/app/src/main/java/qianmu/container/app/MyApplication.java index 4b03470..1b568f5 100644 --- a/app/src/main/java/qianmu/container/app/MyApplication.java +++ b/app/src/main/java/qianmu/container/app/MyApplication.java @@ -39,8 +39,11 @@ import qianmu.container.socket.manager.SocketServerManager; import qianmu.container.util.DeviceUtil; import qianmu.container.util.LoggerUtil; import qianmu.container.util.SSLSocketClient; +import qianmu.container.util.SignWayUtil; import qianmu.container.util.StringUtil; +import static qianmu.container.util.LoggerUtil.SAVE_LOG_DIR_PATH; + @SuppressWarnings("All") public class MyApplication extends Application { @@ -168,6 +171,12 @@ public class MyApplication extends Application { MyApplication.getInstance().dateTimeFormat.format(new Date(timeMillis)), ":\n", throwable.getMessage(), "\n", sw.toString()); LoggerUtil.e("errorLog", errorLog); + //上传日志 + String deviceCode = DeviceData.getDeviceInfo(DeviceData.HINT_DEVICE_CODE); + String fileName = new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()); + String path= StringUtil.strSplice(SAVE_LOG_DIR_PATH, "/", fileName, ".txt"); + LoggerUtil.uploadLogFile(path,deviceCode,"","1"); + restartApp(); Intent intent = new Intent(Constant.ACTION_APP_CRASH); intent.putExtra(Constant.PACKAGE_NAME, DeviceUtil.getPackageName()); @@ -204,6 +213,7 @@ public class MyApplication extends Application { } catch (InterruptedException e) { e.printStackTrace(); } + // SignWayUtil.reboot(); //重启设备 ProcessPhoenix.triggerRebirth(this); } diff --git a/app/src/main/java/qianmu/container/util/SignWayUtil.java b/app/src/main/java/qianmu/container/util/SignWayUtil.java index 262ff79..f03f766 100644 --- a/app/src/main/java/qianmu/container/util/SignWayUtil.java +++ b/app/src/main/java/qianmu/container/util/SignWayUtil.java @@ -371,6 +371,8 @@ public class SignWayUtil { }else if(Constant.androidBoardType.equals("smt")){ MyApplication.getInstance().getSmdt().disp_setStatusBar(type); MyApplication.getInstance().getSmdt().disp_setNavigationBar(type); + MyApplication.getInstance().getSmdt().disp_setStatusBarDrag(type); + MyApplication.getInstance().getSmdt().disp_setGestureBar(type); }else if(Constant.androidBoardType.equals("sx")){ Intent intent = new Intent("rk.android.remove_navigationbar"); MyApplication.getInstance().sendBroadcast(intent); diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 81802dc..50b385f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -6,6 +6,9 @@ @color/colorPrimary @color/colorPrimaryDark @color/colorAccent + false + true + true