diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 7d7ec2e..245a82c 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7c7f635..3378229 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/app/src/main/java/qianmu/container/app/Constant.java b/app/src/main/java/qianmu/container/app/Constant.java
index d072e21..61efba6 100644
--- a/app/src/main/java/qianmu/container/app/Constant.java
+++ b/app/src/main/java/qianmu/container/app/Constant.java
@@ -28,8 +28,8 @@ public class Constant {
// public static String androidBoardType = "xwst2"; //设备板子型号 xwst2(欣威视通3588、T982、3576)
// public static String androidBoardType = "zc"; //设备板子型号 zc(卓策主板——王府井喜悦、杨浦中心医院)
// public static String androidBoardType = "sx"; //设备板子型号 sx(视想)
- public static String androidBoardType = "nova"; //设备板子型号 诺瓦盒子 华贸LED
- // public static String androidBoardType = "huidu"; //设备板子型号 huidu(灰度主板) 罗湖寻车机
+ // public static String androidBoardType = "nova"; //设备板子型号 诺瓦盒子 华贸LED
+ public static String androidBoardType = "huidu"; //设备板子型号 huidu(灰度主板) 罗湖寻车机
// public static String androidBoardType = "bv"; //设备板子型号 Bv-3588M
// public static String androidBoardType = "smt"; //设备板子型号 视美泰
diff --git a/app/src/main/java/qianmu/container/app/MyApplication.java b/app/src/main/java/qianmu/container/app/MyApplication.java
index 48c8dfa..297f03d 100644
--- a/app/src/main/java/qianmu/container/app/MyApplication.java
+++ b/app/src/main/java/qianmu/container/app/MyApplication.java
@@ -38,6 +38,7 @@ 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;
@SuppressWarnings("All")
@@ -209,7 +210,7 @@ public class MyApplication extends Application {
* 重启软件
*/
public void restartApp() {
- LoggerUtil.e("MyApplication", "重启软件");
+ LoggerUtil.e("MyApplication", "重启设备");
stopService(new Intent(this, ContainerService.class));
stopService(new Intent(this, MessengerService.class));
stopService(new Intent(this, CoreService.class));
@@ -221,6 +222,7 @@ public class MyApplication extends Application {
}
try {
Thread.sleep(1000);
+ SignWayUtil.reboot();
} catch (InterruptedException e) {
e.printStackTrace();
}
diff --git a/app/src/main/java/qianmu/container/handler/ContainerHandler.java b/app/src/main/java/qianmu/container/handler/ContainerHandler.java
index f573b3f..64b3157 100644
--- a/app/src/main/java/qianmu/container/handler/ContainerHandler.java
+++ b/app/src/main/java/qianmu/container/handler/ContainerHandler.java
@@ -3,6 +3,7 @@ package qianmu.container.handler;
import android.app.ActivityManager;
import android.content.Context;
import android.content.Intent;
+import android.hardware.display.DisplayManager;
import android.os.Build;
import android.os.Debug;
import android.os.Handler;
@@ -10,6 +11,7 @@ import android.os.Looper;
import android.os.Message;
import android.text.format.Formatter;
import android.util.Log;
+import android.view.Display;
import androidx.annotation.NonNull;
@@ -128,6 +130,7 @@ public class ContainerHandler extends Handler {
public void onSuccess() {
//检查,MQTT状态
mqttState();
+ printDisplayStatus();
sendEmptyMessageDelayed(MQTT_ALIVE,15000);
sendEmptyMessageDelayed(MQTT_ALIVE,35000);
sendEmptyMessageDelayed(MQTT_ALIVE,55000);
@@ -150,6 +153,25 @@ public class ContainerHandler extends Handler {
LoggerUtil.e("heartBeatDelayTime", StringUtil.getThrowableStr(t));
}
}
+ //获取屏幕状态
+ private static void printDisplayStatus() {
+ DisplayManager dm = (DisplayManager) MyApplication.getInstance().getSystemService(Context.DISPLAY_SERVICE);
+ Display[] displays = dm.getDisplays();
+ for (Display display : displays) {
+ LoggerUtil.e("显示器状态:", getDisplayStateString(display.getState()));
+ }
+ }
+
+ private static String getDisplayStateString(int state) {
+ switch (state) {
+ case Display.STATE_OFF: return "显示器关闭";
+ case Display.STATE_ON: return "显示器正常";
+ case Display.STATE_DOZE: return "显示器休眠";
+ case Display.STATE_DOZE_SUSPEND: return "设备休眠";
+ case Display.STATE_ON_SUSPEND: return "显示器正常,CPU休眠";
+ default: return "未知状态";
+ }
+ }
/***
* 看门狗功能(新版欣威视通)