From 6ab08c8d5a3f579fb540c59217e16cb3f1248d4c Mon Sep 17 00:00:00 2001 From: gaozl Date: Mon, 19 Jan 2026 14:28:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=A7=E5=93=81=E8=BF=AD=E4=BB=A3?= =?UTF-8?q?=E5=9B=BA=E4=BB=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 6 ++++++ .../main/java/qianmu/container/data/DeviceData.java | 2 +- .../main/java/qianmu/container/mqtt/MQTTService.java | 10 +++++++++- .../main/java/qianmu/container/util/SignWayUtil.java | 3 ++- 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4382ecf..e4ad6da 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { minSdkVersion 22 targetSdkVersion 30 versionCode 6 - versionName "V2.0.8.10" + versionName "V2.0.8.11" // 2.0.8.2 修改网络连接证书设置、定时开关机设置 // 2.0.8.3 获取mac修改 // V2.0.8.5 同屏优化 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 74b3446..e777bf0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -136,6 +136,12 @@ + + \ No newline at end of file diff --git a/app/src/main/java/qianmu/container/data/DeviceData.java b/app/src/main/java/qianmu/container/data/DeviceData.java index 8e60cf1..4b3e091 100644 --- a/app/src/main/java/qianmu/container/data/DeviceData.java +++ b/app/src/main/java/qianmu/container/data/DeviceData.java @@ -80,7 +80,7 @@ public class DeviceData extends BaseData { public static final String HINT_DEVICE_IP = "hint_device_ip"; public static final String HINT_DEVICE_MAC = "hint_device_mac"; public static final String HINT_DEVICE_TYPE = "hint_device_type"; - public static final String VOICE_CODE = "voice_code"; + public static final String VOICE_CODE = "voice_code"; //语音code public static final String HINT_DEVICE_TOUCH = "hint_device_touch";//触摸属性 // 0触摸 1非触摸 public static final String HINT_SYNC_TEST = "hint_sync_test"; public static final String HINT_DEVICE_ROTATION = "hint_device_rotation"; diff --git a/app/src/main/java/qianmu/container/mqtt/MQTTService.java b/app/src/main/java/qianmu/container/mqtt/MQTTService.java index 4b77d60..edca4f6 100644 --- a/app/src/main/java/qianmu/container/mqtt/MQTTService.java +++ b/app/src/main/java/qianmu/container/mqtt/MQTTService.java @@ -77,6 +77,7 @@ import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; +import cn.huidu.toolkit.HuiduTech; import cn.hutool.crypto.asymmetric.Sign; import okhttp3.MediaType; import okhttp3.MultipartBody; @@ -677,7 +678,13 @@ public class MQTTService extends Service { screenshotFuture = singleThreadExecutor.submit(() -> SignWayUtil.ysTakeScreenshot(path) ); - }else if("bv".equals(Constant.androidBoardType)){ + }else if("huidu".equals(Constant.androidBoardType)){ + screenshotFuture = singleThreadExecutor.submit(() -> { + HuiduTech helper = new HuiduTech(MyApplication.getInstance()); + helper.screenCapture(path); + return true; + }); + }else if("bv".equals(Constant.androidBoardType)){ screenshotFuture = singleThreadExecutor.submit(() ->{ try{ Bitmap screenBitmap = MyApplication.getInstance().getLztek().screenCapture(); @@ -787,6 +794,7 @@ public class MQTTService extends Service { final String localPath = StringUtil.strSplice(Constant.CACHE_PATH, "update/", appName); FileUtil.downloadFile(url, localPath, () -> { isDownloadFile = false; + LoggerUtil.e("uploadApp", "APP下载完成"); AppUtil.installApp(localPath, DeviceUtil.getPackageName(), DeviceUtil.getPackageName(), true); }); } diff --git a/app/src/main/java/qianmu/container/util/SignWayUtil.java b/app/src/main/java/qianmu/container/util/SignWayUtil.java index 72d9f23..9ddabe9 100644 --- a/app/src/main/java/qianmu/container/util/SignWayUtil.java +++ b/app/src/main/java/qianmu/container/util/SignWayUtil.java @@ -146,7 +146,8 @@ public class SignWayUtil { EventBus.getDefault().post(messageEvent); }else if(Constant.androidBoardType.equals("huidu")){ HuiduTech helper = new HuiduTech(MyApplication.getInstance()); - helper.installAndStart(path,"qianmu.container","qianmu.container.activity.H5.UpdateFileActivity"); + helper.install(path); + //helper.installAndStart(path,"qianmu.container","qianmu.container.activity.H5.UpdateFileActivity"); } } catch (Throwable t) { LoggerUtil.e("silentInstallApk", StringUtil.getThrowableStr(t));