diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 245a82c..7d7ec2e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..b268ef3
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5e80d59..4f8dd3a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,8 @@
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..f8051a6
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3378229..a740c72 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 4574fd8..43ed7fb 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,6 +3,5 @@
-
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 47f0fbd..cc917ad 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,7 +12,7 @@ android {
minSdkVersion 24
targetSdkVersion 30
versionCode 6
- versionName "V2.0.8.27"
+ versionName "V2.0.8.28"
// 2.0.8.2 修改网络连接证书设置、定时开关机设置
// 2.0.8.3 获取mac修改
// V2.0.8.5 同屏优化
diff --git a/app/src/main/java/qianmu/container/handler/ContainerHandler.java b/app/src/main/java/qianmu/container/handler/ContainerHandler.java
index e9aa290..af2907e 100644
--- a/app/src/main/java/qianmu/container/handler/ContainerHandler.java
+++ b/app/src/main/java/qianmu/container/handler/ContainerHandler.java
@@ -75,7 +75,7 @@ public class ContainerHandler extends Handler {
public static final int INIT_NOVA = 9; //获取时间戳
public static final int INIT_JXB = 10; //设置机械臂
public static final int INIT_JXB2 = 11; //设置机械臂
- public long goNavTime =0;
+ public int goMemoryTime =0;
private WeakReference weakReference;
@@ -143,7 +143,11 @@ public class ContainerHandler extends Handler {
Constant.networkState = false;
}
} );
- getMemory();
+ if(goMemoryTime>5){
+ goMemoryTime = 0;
+ getMemory();
+ }
+ goMemoryTime++;
// watchDog();
getCoreServiceState();
// DeviceData.getPrimaryMachine(null, this::updateClientStateByIP);
@@ -215,15 +219,6 @@ public class ContainerHandler extends Handler {
// LoggerUtil.e("ContainerHandler","cpu使用率："+cpuUsage+"%");
// }
-// if(totalPss/1024>1400 && DeviceData.getDeviceInfo(DeviceData.HINT_DEVICE_TYPE).equals("导视") && !Constant.whoActivity.equals(Constant.ROUTE_WEB_VIEW)){
-// //内存超过了1G会出现卡顿
-// long currentTime = System.currentTimeMillis();
-// if(currentTime-goNavTime>360000){
-// LoggerUtil.e("getMemory()","内存超过1000 进入导视释放内存");
-// ARouter.getInstance().build(Constant.ROUTE_WEB_VIEW).withBoolean(Constant.KEY_LOAD_H5_URL, true).navigation();
-// goNavTime = currentTime;
-// }
-// }
if(totalPss/1024>1200){
//内存超过了1G会出现卡顿，内存溢出问题。重启设备。
LoggerUtil.e("getMemory()","内存溢出重启软件");
diff --git a/app/src/main/java/qianmu/container/mqtt/MQTTService.java b/app/src/main/java/qianmu/container/mqtt/MQTTService.java
index e490947..ad27dd4 100644
--- a/app/src/main/java/qianmu/container/mqtt/MQTTService.java
+++ b/app/src/main/java/qianmu/container/mqtt/MQTTService.java
@@ -278,6 +278,10 @@ public class MQTTService extends Service {
public void onSuccess(IMqttToken arg0) {
LoggerUtil.e(TAG, "连接成功 ");
isConnected = true;
+ try {
+ // 先取消旧订阅（防止重复累积）
+ client.unsubscribe(myTopic);
+ } catch (MqttException e) { /* ignore */ }
try {
// 订阅myTopic话题
client.subscribe(myTopic,2);
diff --git a/app/src/main/java/qianmu/container/service/ContainerService.java b/app/src/main/java/qianmu/container/service/ContainerService.java
index 6d39284..f139315 100644
--- a/app/src/main/java/qianmu/container/service/ContainerService.java
+++ b/app/src/main/java/qianmu/container/service/ContainerService.java
@@ -202,7 +202,7 @@ public class ContainerService extends Service {
|| "com.google.android.packageinstaller".equals(processName)
|| "com.frogshealth.qianmu".equals(processName)
|| "com.tencent.wmpf".equals(processName)) {
- if (info.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
+ if (info.importance <= ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE) {
return;
}
}
diff --git a/app/src/main/res/layout/activity_update_file.xml b/app/src/main/res/layout/activity_update_file.xml
index 94416d2..1c667e8 100644
--- a/app/src/main/res/layout/activity_update_file.xml
+++ b/app/src/main/res/layout/activity_update_file.xml
@@ -12,7 +12,7 @@