From 30db47ffffc65b3cd445fb7a245de2fdf121c3fb Mon Sep 17 00:00:00 2001
From: TrillGates <williamtrillgates@gmail.com>
Date: Wed, 20 Oct 2021 16:06:18 +0800
Subject: [PATCH] =?utf8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E6=95=B0=E6=8D=AE?=
 =?utf8?q?=E5=BA=93=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=85=BC?=
 =?utf8?q?=E5=AE=B9=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../support/provider/ICDatabaseHelper.java       | 16 ++++++++++++++++
 .../java/com/enqualcomm/support/utils/Util.java  |  2 --
 2 files changed, 16 insertions(+), 2 deletions(-)

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 4744ce91..1a52163e 100644
--- a/app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/provider/ICDatabaseHelper.java
@@ -13,6 +13,7 @@ public class ICDatabaseHelper extends SQLiteOpenHelper {
 
     private final static int VERSION_1 = 1;
     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
 
@@ -28,6 +29,7 @@ public class ICDatabaseHelper extends SQLiteOpenHelper {
     public static final String fPhoneNum = "phone_num";
     //type类型表示朋友，还是联系人，联系人指的是手机，朋友指的是手表
     public static final String fType = "type";
+    public static final String fGroup = "group_type";//某些客户需要分组
     public static final String fCreateTime = "create_time";
     public static final String fUpdateTime = "update_time";
 
@@ -119,6 +121,8 @@ public class ICDatabaseHelper extends SQLiteOpenHelper {
                 " text, " +
                 fType +
                 " integer, " +
+                fGroup +
+                " integer, " +
                 fCreateTime +
                 " date, " +
                 fUpdateTime +
@@ -383,6 +387,18 @@ public class ICDatabaseHelper extends SQLiteOpenHelper {
         //升级数据库
         if (oldVersion == VERSION_1 && newVersion == VERSION_2) {
             createForbiddenTable(db);
+            ICLogger.d("createForbiddenTable...");
+        }
+
+        if (oldVersion == VERSION_1 || oldVersion == VERSION_2) {
+            //这两个版本升级上来的，联系人表需要添加多一个字段
+            addGroupTypeForMemberTb(db);
         }
     }
+
+    private void addGroupTypeForMemberTb(SQLiteDatabase db) {
+        ICLogger.d("addGroupTypeForMemberTb...");
+        String sql = "alter table " + tMembers + " add " + fGroup + " integer";
+        db.execSQL(sql);
+    }
 }
diff --git a/app/src/main/java/com/enqualcomm/support/utils/Util.java b/app/src/main/java/com/enqualcomm/support/utils/Util.java
index 76c33e49..1c994d28 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/Util.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/Util.java
@@ -93,9 +93,7 @@ public class Util {
         int currentRingmod = am.getRingerMode();
         am.setRingerMode(mod);
         ICLogger.i("Current OldRingMod=" + currentRingmod + ", Set To RingMod=" + mod + ", check RingMod=" + am.getRingerMode());
-
         int curretnVibmod = am.getVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER);
-
         if (vibmod) {
             Settings.System.putInt(context.getContentResolver(), Settings.System.VIBRATE_WHEN_RINGING, 1);
             am.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER, AudioManager.VIBRATE_SETTING_ON);
-- 
2.17.1