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/app/Constant.java b/app/src/main/java/qianmu/container/app/Constant.java index 96b84eb..c596e6a 100644 --- a/app/src/main/java/qianmu/container/app/Constant.java +++ b/app/src/main/java/qianmu/container/app/Constant.java @@ -23,8 +23,8 @@ public class Constant { public static String mqttState = ""; // 屏幕连接方式 public static String TTSHome="sbc"; // sbc-思必驰 kdxf-科大讯飞 (有语音的项目需要配置) // 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 = "zc"; //设备板子型号 zc(卓策主板——王府井喜悦、杨浦中心医院) // public static String androidBoardType = "sx"; //设备板子型号 sx(视想) diff --git a/app/src/main/java/qianmu/container/util/SignWayUtil.java b/app/src/main/java/qianmu/container/util/SignWayUtil.java index abc8a43..52636a0 100644 --- a/app/src/main/java/qianmu/container/util/SignWayUtil.java +++ b/app/src/main/java/qianmu/container/util/SignWayUtil.java @@ -22,6 +22,7 @@ import com.sdkapi.common.ResultInfo; import com.tclsy.extmanager.device.TDeviceManager; import com.tclsy.extmanager.installer.TInstallerManager; import com.tclsy.extmanager.installer.callback.PackageStatusListener; +import com.tclsy.extmanager.power.AlarmInfo; import com.tclsy.extmanager.power.TPowerManager; import com.ys.rkapi.MyManager; import com.zcapi; @@ -35,6 +36,7 @@ import java.io.FileReader; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; import cn.huidu.toolkit.HuiduTech; import qianmu.container.app.Constant; @@ -312,10 +314,13 @@ public class SignWayUtil { MyApplication.getInstance().sendBroadcast(intent1); MyApplication.getInstance().sendBroadcast(intent2); }else if(Constant.androidBoardType.equals("tcl")){ - boolean isAlarmEnable = TPowerManager.getInstance().isAlarmEnable(); - if(isAlarmEnable && Constant.powOnId != -1){ - TPowerManager.getInstance().deleteAlarm(Constant.powOnId); - TPowerManager.getInstance().deleteAlarm(Constant.powOffId); + List alarms = TPowerManager.getInstance().getAllAlarmList(); + if (alarms != null && !alarms.isEmpty()) { + for (AlarmInfo alarm : alarms) { + TPowerManager.getInstance().deleteAlarm(alarm.getId()); + } + } else { + LoggerUtil.e("Alarm", "alarms 为空"); } }else if(Constant.androidBoardType.equals("zc")){ int[] timeoffArray = {1970, 1, 1, 0, 0};