Browse Source

fix: ci

master
高志龙 9 months ago
parent
commit
7ff174adb1
  1. 2
      .idea/compiler.xml
  2. 2
      .idea/misc.xml
  3. 4
      app/src/main/java/qianmu/container/app/Constant.java
  4. 4
      app/src/main/java/qianmu/container/app/MyApplication.java
  5. 22
      app/src/main/java/qianmu/container/handler/ContainerHandler.java

2
.idea/compiler.xml

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" />
<bytecodeTargetLevel target="1.8" />
</component> </component>
</project> </project>

2
.idea/misc.xml

@ -5,7 +5,7 @@
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" /> <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
</configurations> </configurations>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

4
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 = "xwst2"; //设备板子型号 xwst2(欣威视通3588、T982、3576)
// public static String androidBoardType = "zc"; //设备板子型号 zc(卓策主板——王府井喜悦、杨浦中心医院) // public static String androidBoardType = "zc"; //设备板子型号 zc(卓策主板——王府井喜悦、杨浦中心医院)
// public static String androidBoardType = "sx"; //设备板子型号 sx(视想) // 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 = "bv"; //设备板子型号 Bv-3588M
// public static String androidBoardType = "smt"; //设备板子型号 视美泰 // public static String androidBoardType = "smt"; //设备板子型号 视美泰

4
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.DeviceUtil;
import qianmu.container.util.LoggerUtil; import qianmu.container.util.LoggerUtil;
import qianmu.container.util.SSLSocketClient; import qianmu.container.util.SSLSocketClient;
import qianmu.container.util.SignWayUtil;
import qianmu.container.util.StringUtil; import qianmu.container.util.StringUtil;
@SuppressWarnings("All") @SuppressWarnings("All")
@ -209,7 +210,7 @@ public class MyApplication extends Application {
* 重启软件 * 重启软件
*/ */
public void restartApp() { public void restartApp() {
LoggerUtil.e("MyApplication", "重启软件");
LoggerUtil.e("MyApplication", "重启设备");
stopService(new Intent(this, ContainerService.class)); stopService(new Intent(this, ContainerService.class));
stopService(new Intent(this, MessengerService.class)); stopService(new Intent(this, MessengerService.class));
stopService(new Intent(this, CoreService.class)); stopService(new Intent(this, CoreService.class));
@ -221,6 +222,7 @@ public class MyApplication extends Application {
} }
try { try {
Thread.sleep(1000); Thread.sleep(1000);
SignWayUtil.reboot();
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }

22
app/src/main/java/qianmu/container/handler/ContainerHandler.java

@ -3,6 +3,7 @@ package qianmu.container.handler;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.hardware.display.DisplayManager;
import android.os.Build; import android.os.Build;
import android.os.Debug; import android.os.Debug;
import android.os.Handler; import android.os.Handler;
@ -10,6 +11,7 @@ import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.text.format.Formatter; import android.text.format.Formatter;
import android.util.Log; import android.util.Log;
import android.view.Display;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -128,6 +130,7 @@ public class ContainerHandler extends Handler {
public void onSuccess() { public void onSuccess() {
//检查,MQTT状态 //检查,MQTT状态
mqttState(); mqttState();
printDisplayStatus();
sendEmptyMessageDelayed(MQTT_ALIVE,15000); sendEmptyMessageDelayed(MQTT_ALIVE,15000);
sendEmptyMessageDelayed(MQTT_ALIVE,35000); sendEmptyMessageDelayed(MQTT_ALIVE,35000);
sendEmptyMessageDelayed(MQTT_ALIVE,55000); sendEmptyMessageDelayed(MQTT_ALIVE,55000);
@ -150,6 +153,25 @@ public class ContainerHandler extends Handler {
LoggerUtil.e("heartBeatDelayTime", StringUtil.getThrowableStr(t)); 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 "未知状态";
}
}
/*** /***
* 看门狗功能(新版欣威视通) * 看门狗功能(新版欣威视通)

Loading…
Cancel
Save