handle white list for public version.

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 f3c38a5..70d8ac7 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
@@ -85,7 +85,6 @@ public class DBHelper {
             contentvalues.put("data2", 2);
             resolver.insert(Data.CONTENT_URI, contentvalues);
             contentvalues.clear();
-
         }
         ICLogger.i("addAllContact done");
 
@@ -754,10 +753,8 @@ public class DBHelper {
         this.context.sendBroadcast(new Intent(ACTION_ANTIOFF_ALARM_CHANGE));
     }
 
-    public void saveContacts(final ArrayList<Contact> contactArray, boolean admin, boolean care, boolean call, boolean partner, boolean video, boolean sos) {
-        synchronized (this) {
-        }
-
+    public void saveContacts(final ArrayList<Contact> contactArray, boolean admin, boolean care, boolean call,
+                             boolean partner, boolean video, boolean sos) {
         try {
             long currentTime = SystemClock.elapsedRealtime();
             if (currentTime - lastUpdateTime > 1000L) {

diff --git a/app/src/main/java/com/ic/protocols/protocol_anan.java b/app/src/main/java/com/ic/protocols/protocol_anan.java
index 570a938..970f92e 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_anan.java
+++ b/app/src/main/java/com/ic/protocols/protocol_anan.java
@@ -85,7 +85,7 @@ public class protocol_anan {
         registerWearStateReceiver();
     }
 
-    public void unregister(){
+    public void unregister() {
         unregisterWearStateReceiver();
     }
 
@@ -169,8 +169,8 @@ public class protocol_anan {
         mRuntime.getContextProxy().context.registerReceiver(wearStateReceiver, intentFilter);
     }
 
-    private void unregisterWearStateReceiver(){
-        if(wearStateReceiver != null){
+    private void unregisterWearStateReceiver() {
+        if (wearStateReceiver != null) {
             mRuntime.getContextProxy().context.unregisterReceiver(wearStateReceiver);
         }
     }
@@ -1692,12 +1692,13 @@ public class protocol_anan {
 //            contactArray.add(new Contact(Contact.CATEGORY_VOLTE,"VOLTE","666"));
             //保存一份到新的member数据库时
             runtime.getContextProxy().getResolver().delete(Uri.parse(ICMembersProvider.MEMBERS),
-                    null, null);
+                    "type=?", new String[]{ICDatabaseHelper.MemberType.WHITE_LIST + ""});
             for (Contact contact : contactArray) {
                 ContentValues values = new ContentValues();
                 ICLogger.d("contact == > " + contact);
                 values.put(ICDatabaseHelper.fID, contact.number);
                 values.put(ICDatabaseHelper.fPhoneNum, contact.number);
+                values.put(ICDatabaseHelper.fType, ICDatabaseHelper.MemberType.WHITE_LIST);
                 values.put(ICDatabaseHelper.fUserName, contact.name);
                 runtime.getContextProxy().getResolver().insert(
                         Uri.parse(ICMembersProvider.MEMBERS), values);
@@ -1968,7 +1969,7 @@ public class protocol_anan {
     }
 
 
-    public static StringMessage APTP(double body_temp,double tempout) {
+    public static StringMessage APTP(double body_temp, double tempout) {
         //体温上行
         //IWAPTP,34.3,27.3#
         //设备：    IWAPTP,36.3,33,132#

diff --git a/app/src/main/java/com/ic/protocols/protocol_gator.java b/app/src/main/java/com/ic/protocols/protocol_gator.java
index 73c5b97..803cbb7 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_gator.java
+++ b/app/src/main/java/com/ic/protocols/protocol_gator.java
@@ -514,6 +514,9 @@ public class protocol_gator {
 
     private void appendSOS(Runtime runtime, ArrayList<String> numbers, ArrayList<String> names, ArrayList<String> types) {
         ArrayList<Contact> contactArray = new ArrayList<>();
+        //先删除掉SOS的号码
+        runtime.getContextProxy().getResolver().delete(Uri.parse(ICMembersProvider.MEMBERS),
+                "type=?", new String[]{"4"});
         ContentValues contentValues = new ContentValues();
         contentValues.put(ICDatabaseHelper.fType, ICDatabaseHelper.MemberType.SOS);
         for (int i = 0; i < numbers.size(); i++) {
@@ -522,7 +525,9 @@ public class protocol_gator {
                 ICLogger.i("find SOS " + names.get(i) + " number " + numbers.get(i));
                 contentValues.put(ICDatabaseHelper.fUserName, names.get(i));
                 contentValues.put(ICDatabaseHelper.fPhoneNum, numbers.get(i));
-                //runtime.getContextProxy().getResolver().insert(Uri.parse(FZDMembersProvider.MEMBERS), contentValues);
+                //再添加到数据库里
+                runtime.getContextProxy().getResolver().insert(Uri.parse(ICMembersProvider.MEMBERS),
+                        contentValues);
             }
         }
         runtime.getDbHelper().saveContacts(contactArray, false, false, false, false, false, true);

diff --git a/app/src/main/java/com/ic/protocols/protocol_jiai.java b/app/src/main/java/com/ic/protocols/protocol_jiai.java
index ab09b1d..67319c5 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_jiai.java
+++ b/app/src/main/java/com/ic/protocols/protocol_jiai.java
@@ -704,17 +704,14 @@ public class protocol_jiai {
             String phNum3 = (cmdlist.length > 4) ? (cmdlist.length == 5 ? "" : cmdlist[5]) : "";
             ICLogger.i(new StringBuffer().append("get Emegency Numbs " + phNum1 + "," + phNum2 + "," + phNum3).toString());
             connection.send(AP12(index, phNum1, phNum2, phNum3));
-
-            ArrayList<Contact> contactArray = new ArrayList<Contact>();
+            ArrayList<Contact> contactArray = new ArrayList<>();
             if (!phNum1.isEmpty())
                 contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos1", phNum1));
             if (!phNum2.isEmpty())
                 contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos2", phNum2));
             if (!phNum3.isEmpty())
                 contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos3", phNum3));
-
             runtime.getDbHelper().saveContacts(contactArray, false, false, false, false, false, true);
-
         } else {
             ICLogger.i(" BP12 format error!");
         }

diff --git a/app/src/main/java/com/ic/protocols/protocol_s123.java b/app/src/main/java/com/ic/protocols/protocol_s123.java
index cb9abf8..0938981 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_s123.java
+++ b/app/src/main/java/com/ic/protocols/protocol_s123.java
@@ -1118,31 +1118,24 @@ public class protocol_s123 {
     //设置SOS号码
     public void handleBP12(Connection connection, String cmd, Runtime runtime) {
         //    IWBP12,353456789012345,080835,135XXXXXXXX,135XXXXXXXX,135XXXXXXXX#
-        String[] cmdlist = cmd.split(CMDSPLIT);
-        if (cmdlist.length >= 3) {
-            String index = cmdlist[2];
-            String phNum1 = cmdlist.length == 3 ? "" : cmdlist[3];
-            String phNum2 = cmdlist.length > 3 ? (cmdlist.length == 4 ? "" : cmdlist[4]) : "";
-            String phNum3 = (cmdlist.length > 4) ? (cmdlist.length == 5 ? "" : cmdlist[5]) : "";
+        String[] cmdList = cmd.split(CMDSPLIT);
+        if (cmdList.length >= 3) {
+            String index = cmdList[2];
+            String phNum1 = cmdList.length == 3 ? "" : cmdList[3];
+            String phNum2 = cmdList.length > 3 ? (cmdList.length == 4 ? "" : cmdList[4]) : "";
+            String phNum3 = (cmdList.length > 4) ? (cmdList.length == 5 ? "" : cmdList[5]) : "";
             ICLogger.i(new StringBuffer().append("get Emegency Numbs " + phNum1 + "," + phNum2 + "," + phNum3).toString());
             connection.send(AP12(index, phNum1, phNum2, phNum3));
-
-            ArrayList<Contact> contactArray = new ArrayList<Contact>();
-//            if(Config.custom_branch_name.equals("AK")){
-//
-//                contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos1", "07522312120"));
-//                if (!phNum1.isEmpty())
-//                    contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos2", phNum1));
-//                if (!phNum2.isEmpty())
-//                    contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos3", phNum2));
-//            }else {
-            if (!phNum1.isEmpty())
+            ArrayList<Contact> contactArray = new ArrayList<>();
+            if (!phNum1.isEmpty()) {
                 contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos1", phNum1));
-            if (!phNum2.isEmpty())
+            }
+            if (!phNum2.isEmpty()) {
                 contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos2", phNum2));
-            if (!phNum3.isEmpty())
+            }
+            if (!phNum3.isEmpty()) {
                 contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos3", phNum3));
-//            }
+            }
             runtime.getDbHelper().saveContacts(contactArray, false, false, false, false, false, true);
         } else {
             ICLogger.i(" BP12 format error!");
@@ -2147,8 +2140,8 @@ public class protocol_s123 {
         //080835:指令流水号
         return genStringMessage("AP89",
                 new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP89))
-                .append(CMDSPLIT).append(index)
-                .append(CMDEND).toString());
+                        .append(CMDSPLIT).append(index)
+                        .append(CMDEND).toString());
     }
 
     public void handleBP89(String cmd, Connection connection) {