From: TrillGates <williamtrillgates@gmail.com>
Date: Thu, 24 Jun 2021 02:51:32 +0000 (+0800)
Subject: add delete condition for members remove.
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=16731003e452cd674fd0beee8dd74238f1d895e4;p=icsupport.git

add delete condition for members remove.
---

diff --git a/app/release/ICSer_V837_2106222350_release.apk b/app/release/ICSer_V838_2106231710_release.apk
similarity index 78%
rename from app/release/ICSer_V837_2106222350_release.apk
rename to app/release/ICSer_V838_2106231710_release.apk
index 5dad8ab5..d3b229f4 100644
Binary files a/app/release/ICSer_V837_2106222350_release.apk and b/app/release/ICSer_V838_2106231710_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index f6743eb0..6ee9ad43 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":837,"versionName":"2106222350","enabled":true,"outputFile":"ICSer_V837_2106222350_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V837_2106222350_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":838,"versionName":"2106231710","enabled":true,"outputFile":"ICSer_V838_2106231710_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V838_2106231710_release.apk","properties":{}}]
\ No newline at end of file
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 316e7173..d1835654 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
@@ -673,6 +673,7 @@ public class DBHelper {
     public void saveAlarm(ArrayList<Alarm> paramArrayList) {
         this.cr.delete(ICContentProvider.ALARM_URI, null, null);
         int i = paramArrayList.size();
+        ICLogger.d("alarm size == > " + i);
         if (i != 0) {
             ContentValues[] arrayOfContentValues = new ContentValues[i];
             for (byte b = 0; b < i; b++) {
diff --git a/app/src/main/java/com/ic/protocols/protocol_fzd.java b/app/src/main/java/com/ic/protocols/protocol_fzd.java
index 921c4f35..2168f50a 100644
--- a/app/src/main/java/com/ic/protocols/protocol_fzd.java
+++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java
@@ -1433,14 +1433,16 @@ public class protocol_fzd {
      * 终端回复：[IC*334588000000156*0003*PHL]
      */
     public void handlePHL(Connection connection, Runtime runtime, String cmd, String data) {
-        String list[] = data.split(CMD_SPLIT);
+        String[] list = data.split(CMD_SPLIT);
         int listLen = list.length;
-        boolean isPared = ((listLen >= 0) && (listLen % 2 == 0));
+        boolean isPared = listLen % 2 == 0;
         if (isPared) {
             ArrayList<Contact> contactArray = new ArrayList<>();
             ContentValues contentValues = new ContentValues();
             ContentResolver resolver = runtime.getContextProxy().getResolver();
-            resolver.delete(Uri.parse(FZDMembersProvider.MEMBERS), null, null);
+            resolver.delete(Uri.parse(FZDMembersProvider.MEMBERS), "type=?", new String[]{
+                    FZDDatabaseHelper.MemberType.WHITE_LIST + ""
+            });
             for (int i = 0; i < listLen; i += 2) {
                 String phoneNum = list[i];
                 String name = Util.decodeUnicode2Utf8(list[i + 1]);
diff --git a/app/src/main/java/com/ic/protocols/protocol_ic.java b/app/src/main/java/com/ic/protocols/protocol_ic.java
index 7290fa6d..8dd6de0e 100644
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -188,6 +188,8 @@ public class protocol_ic {
         BP47,//设置震动
         BPCM,//照相禁用开关
         BPMK,//关闭麦克风
+        APGJ,//关机前的确定
+        APFX,//飞行模式开关
         UNKNOWN_CMD,
     }
 
@@ -223,6 +225,7 @@ public class protocol_ic {
         cmdMap.put(CMD_TYPE.BPCH, "BPCH");
         cmdMap.put(CMD_TYPE.APBR, "APBR");
         cmdMap.put(CMD_TYPE.BPBR, "BPBR");
+        cmdMap.put(CMD_TYPE.APGJ, "APGJ");
         /* 服务器发起*/
         cmdMap.put(CMD_TYPE.AP12, "AP12");
         cmdMap.put(CMD_TYPE.BP12, "BP12");
@@ -308,6 +311,7 @@ public class protocol_ic {
         cmdMap.put(CMD_TYPE.BP47, "BP47");
         cmdMap.put(CMD_TYPE.BPCM, "BPCM");
         cmdMap.put(CMD_TYPE.BPMK, "BPMK");
+        cmdMap.put(CMD_TYPE.APFX, "APFX");
     }
 
 
@@ -3253,6 +3257,7 @@ public class protocol_ic {
 
     }
 
+
     /**
      * 处理麦克风的指令
      *
diff --git a/app/version_code.properties b/app/version_code.properties
index 710ffd2b..6d4187df 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,5 +1,5 @@
-#Tue Jun 22 23:50:33 CST 2021
+#Thu Jun 24 10:47:50 CST 2021
 >>>>>>>=b405d1184f3616d4e894d199cee0eb91613a68db
-VERSION_CODE=837
+VERSION_CODE=839
 =\=\=\=\=\=\=
 <<<<<<<=HEAD