Browse Source

fix: ci

master
高志龙 6 days ago
parent
commit
1ba5ae8ed1
  1. 10
      .idea/deploymentTargetSelector.xml
  2. 2
      .idea/gradle.xml
  3. 4
      app/src/main/java/qianmu/container/app/Constant.java
  4. 2
      app/src/main/java/qianmu/container/data/PowerData.java

10
.idea/deploymentTargetSelector.xml

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetSelector">
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
</SelectionState>
</selectionStates>
</component>
</project>

2
.idea/gradle.xml

@ -5,7 +5,7 @@
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="gradleJvm" value="11" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />

4
app/src/main/java/qianmu/container/app/Constant.java

@ -23,8 +23,8 @@ public class Constant {
public static String mqttState = ""; // 屏幕连接方式 public static String mqttState = ""; // 屏幕连接方式
public static String TTSHome="sbc"; // sbc-思必驰 kdxf-科大讯飞 (有语音的项目需要配置) public static String TTSHome="sbc"; // sbc-思必驰 kdxf-科大讯飞 (有语音的项目需要配置)
// public static String androidBoardType = ""; //设备板子型号 无固定版 // public static String androidBoardType = ""; //设备板子型号 无固定版
// public static String androidBoardType = "ys"; // 设备板子型号 ys(亿晟) 北京颐堤港定制touch
public static String androidBoardType = "xwst"; //设备板子型号 xwst(欣威视通3399)
public static String androidBoardType = "ys"; // 设备板子型号 ys(亿晟) 北京颐堤港定制touch
// public static String androidBoardType = "xwst"; //设备板子型号 xwst(欣威视通3399)
// 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(视想)

2
app/src/main/java/qianmu/container/data/PowerData.java

@ -177,7 +177,7 @@ public class PowerData extends BaseData {
//亿晟重启2次设备避免黑屏 //亿晟重启2次设备避免黑屏
Calendar cal= Calendar.getInstance(); Calendar cal= Calendar.getInstance();
String format = new SimpleDateFormat("yyyy-MM-dd").format(cal.getTime()); String format = new SimpleDateFormat("yyyy-MM-dd").format(cal.getTime());
if(!DeviceData.getDeviceInfo(DeviceData.DEVICE_RESTART_TIME).equals(format) && !StringUtil.isEmpty(parameter) && Constant.androidBoardType.equals("ys")){
if(!DeviceData.getDeviceInfo(DeviceData.DEVICE_RESTART_TIME).equals(format) && Constant.androidBoardType.equals("ys")){
LoggerUtil.e("亿晟防止定时开机黑屏:", "当天开机,重启设备"); LoggerUtil.e("亿晟防止定时开机黑屏:", "当天开机,重启设备");
DeviceData.saveDeviceInfo((DeviceData.DEVICE_RESTART_TIME),format); DeviceData.saveDeviceInfo((DeviceData.DEVICE_RESTART_TIME),format);
SignWayUtil.reboot(); SignWayUtil.reboot();

Loading…
Cancel
Save