From: TrillGates Date: Wed, 16 Jun 2021 13:12:03 +0000 (+0800) Subject: skip to alarm page of ic. X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=ae1c8f20a5896a864b6a003b84c71a7b7b1c36b1;p=protocol_srv.git skip to alarm page of ic. --- diff --git a/app/release/ICSer_V791_2106111704_release.apk b/app/release/ICSer_V792_2106162110_release.apk similarity index 78% rename from app/release/ICSer_V791_2106111704_release.apk rename to app/release/ICSer_V792_2106162110_release.apk index ec4a50ae..b8ec9c06 100644 Binary files a/app/release/ICSer_V791_2106111704_release.apk and b/app/release/ICSer_V792_2106162110_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 2227567e..b4c0741d 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":791,"versionName":"2106111704","enabled":true,"outputFile":"ICSer_V791_2106111704_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V791_2106111704_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":792,"versionName":"2106162110","enabled":true,"outputFile":"ICSer_V792_2106162110_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V792_2106162110_release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java index 2001eaee..28e349c2 100644 --- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java +++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java @@ -851,7 +851,8 @@ public class SilentManager extends AbstractInvokeHandlerService { if (this.isIdle(this.mContext)) { try { - Intent targetIntent = new Intent("com.enqualcomm.icare.ALARM", Uri.parse(alarmTime)); + Intent targetIntent = new Intent("com.ic.alarm.action.ALARM_RING", + Uri.parse(alarmTime)); targetIntent.putExtra("closeAlarm", 0); targetIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); this.mContext.startActivity(targetIntent); diff --git a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java index ff098206..316e7173 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java +++ b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java @@ -1054,9 +1054,9 @@ public class DBHelper { return raw_contactID; } - public void updateCMDRecordForUD2(int flag,StringMessage msg) { + public void updateCMDRecordForUD2(int flag, StringMessage msg) { String WhereClause = null; - if(msg!=null) { + if (msg != null) { int id = msg.getIndex(); String topic = msg.cmd(); if (id >= 0 && topic.equals("UD")) { @@ -1074,12 +1074,13 @@ public class DBHelper { ICLogger.e("genMissedUD2Msg failed, skip gen UD2 msg"); } } else { - ICLogger.e("not UD("+topic+") or id("+id+") <0 , skip gen UD2 msg "); + ICLogger.e("not UD(" + topic + ") or id(" + id + ") <0 , skip gen UD2 msg "); } - }else{ + } else { ICLogger.e("msg is null , skip gen UD2 msg"); } } + public void updateCMDRecord(int id, int flag) { String WhereClause = null; if (id >= 0) { @@ -1111,7 +1112,7 @@ public class DBHelper { Uri table = ICContentProvider.PROTOCOL_CMD_RECORDS_URI; StringBuilder where = new StringBuilder(); where.append("FLAG=0 and ( TOPIC='AL' or TOPIC='AP10' ) "); - ICLogger.i("Query1 cmdRecords "+where); + ICLogger.i("Query1 cmdRecords " + where); Cursor cmdrecords = pcr.query(table, null, where.toString(), null, null); StringMessage msg = null; if (cmdrecords != null) { @@ -1134,11 +1135,11 @@ public class DBHelper { } cmdrecords.close(); - }else{ //没有警报，就查询 UD 消息发送 //当前数据优先于 UD2数据 + } else { //没有警报，就查询 UD 消息发送 //当前数据优先于 UD2数据 cmdrecords.close(); - where = new StringBuilder("FLAG=0 and TOPIC='UD' "); + where = new StringBuilder("FLAG=0 and TOPIC='UD' "); cmdrecords = pcr.query(table, null, where.toString(), null, null); - ICLogger.i("Query2 cmdRecords "+where); + ICLogger.i("Query2 cmdRecords " + where); msg = null; if (cmdrecords != null) { score = 0; @@ -1159,11 +1160,11 @@ public class DBHelper { } cmdrecords.close(); - }else{ //最后轮到 除了 AL,AP10,UD 以外的其他缓存数据 + } else { //最后轮到 除了 AL,AP10,UD 以外的其他缓存数据 cmdrecords.close(); - where = new StringBuilder("FLAG=0"); + where = new StringBuilder("FLAG=0"); cmdrecords = pcr.query(table, null, where.toString(), null, null); - ICLogger.i("Query3 cmdRecords "+where); + ICLogger.i("Query3 cmdRecords " + where); msg = null; if (cmdrecords != null) { score = 0; diff --git a/app/version_code.properties b/app/version_code.properties index 474ff2b0..974bfc34 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Fri Jun 11 17:04:07 CST 2021 -VERSION_CODE=791 \ No newline at end of file +#Wed Jun 16 21:10:23 CST 2021 +VERSION_CODE=792 diff --git a/local.properties b/local.properties index 2bff0670..310b4c84 100644 --- a/local.properties +++ b/local.properties @@ -4,5 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Fri Jun 11 20:26:03 CST 2021 -sdk.dir=C\:\\Users\\incar\\AppData\\Local\\Android\\Sdk +#Wed Jun 16 20:35:12 CST 2021 +sdk.dir=E\:\\Android\\Sdk