From: TrillGates <williamtrillgates@gmail.com>
Date: Wed, 20 Oct 2021 09:02:26 +0000 (+0800)
Subject: 处理原来的数据
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=a1f4a8ea425fa627c49496a96b59caa55a947dd7;p=icsupport.git

处理原来的数据
---

diff --git a/app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java b/app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java
index 1a52163e..dbac12a7 100644
--- a/app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java
@@ -15,7 +15,7 @@ public class ICDatabaseHelper extends SQLiteOpenHelper {
     private final static int VERSION_2 = 2;
     private final static int VERSION_3 = 3;
     public static final String DB_NAME = "fzd_db";
-    private static final int DEFAULT_VERSION = VERSION_2;//2021-9-6
+    private static final int DEFAULT_VERSION = VERSION_3;//2021-10-20
 
 
     public ICDatabaseHelper(@Nullable Context context) {
diff --git a/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java b/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java
index 7a7de213..b894bbda 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ICLogger.java
@@ -105,7 +105,7 @@ public class ICLogger {
                 logConfigurator.setUseLogCatAppender(true);
                 logConfigurator.setLogCatPattern("%m%n");
                 logConfigurator.configure();// 设置提交
-                android.util.Log.d("CATCH", android.util.Log.getStackTraceString(new ThreadDeath()));
+//                android.util.Log.d("CATCH", android.util.Log.getStackTraceString(new ThreadDeath()));
                 //Log 和log目前是同一个配置
                 Log = Logger.getLogger("log");
                 Log.info("init Logger " + Log.getName());
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 a4d5b024..7f63202c 100644
--- a/app/src/main/java/com/ic/protocols/protocol_s123.java
+++ b/app/src/main/java/com/ic/protocols/protocol_s123.java
@@ -1274,9 +1274,13 @@ public class protocol_s123 {
             }
             ContentResolver resolver = runtime.getContextProxy().getResolver();
             //添加之前先删除白名单的内容
-            resolver.delete(Uri.parse(ICMembersProvider.MEMBERS), "type=?", new String[]{
+            //删除第0组
+            resolver.delete(Uri.parse(ICMembersProvider.MEMBERS), "type=? and group_type is null", new String[]{
                     ICDatabaseHelper.MemberType.WHITE_LIST + ""
             });
+            resolver.delete(Uri.parse(ICMembersProvider.MEMBERS), "type=? and (group_type=? or group_type is null)", new String[]{
+                    ICDatabaseHelper.MemberType.WHITE_LIST + "", "0"
+            });
             //从记录上看，
             for (int i = 0; i < phnums.length; i++) {
                 String[] tmp = phnums[i].split("\\|");
@@ -1289,6 +1293,8 @@ public class protocol_s123 {
                     contentValues.put(ICDatabaseHelper.fType, ICDatabaseHelper.MemberType.WHITE_LIST);
                     contentValues.put(ICDatabaseHelper.fPhoneNum, phonem);
                     contentValues.put(ICDatabaseHelper.fUserName, name);
+                    //这个是第0组
+                    contentValues.put(ICDatabaseHelper.fGroup, 0);
                     contentValues.put(ICDatabaseHelper.fCreateTime, System.currentTimeMillis());
                     contentValues.put(ICDatabaseHelper.fUpdateTime, System.currentTimeMillis());
                     //TODO:保存到fzd的联系人列表，类型为白名单