From: TrillGates <williamtrillgates@gmail.com>
Date: Tue, 11 May 2021 12:46:50 +0000 (+0800)
Subject: update member provider uri.
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=720dce188c6bafe47e2aca5a20a56ba2e9c84752;p=protocol_srv.git

update member provider uri.
---

diff --git a/app/build.gradle b/app/build.gradle
index 10dc605e..658d8725 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -118,7 +118,6 @@ def getVersionCode() {
             properties['VERSION_CODE'] = (++versionCode).toString()
             properties.store(versionCodeFile.newWriter(), null)
         }
-
         return versionCode
     } else {
         throw new GradleException("无法读取version_code.properties文件！")
diff --git a/app/release/ICSer_V780_2104281128_release.apk b/app/release/ICSer_V782_2105112023_release.apk
similarity index 77%
rename from app/release/ICSer_V780_2104281128_release.apk
rename to app/release/ICSer_V782_2105112023_release.apk
index dd0c6d96..83a46e69 100644
Binary files a/app/release/ICSer_V780_2104281128_release.apk and b/app/release/ICSer_V782_2105112023_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 2c81d25a..0eca809e 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":780,"versionName":"2104281128","enabled":true,"outputFile":"ICSer_V780_2104281128_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V780_2104281128_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":782,"versionName":"2105112023","enabled":true,"outputFile":"ICSer_V782_2105112023_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V782_2105112023_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 227a675d..817e2d0a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -168,7 +168,7 @@
 
         <provider
             android:name=".provider.FZDMembersProvider"
-            android:authorities="com.ic.fzd.video-call"
+            android:authorities="com.ic.provider.member"
             android:exported="true" />
 
         <provider
diff --git a/app/src/main/java/com/enqualcomm/support/provider/FZDMembersProvider.java b/app/src/main/java/com/enqualcomm/support/provider/FZDMembersProvider.java
index a9641853..9d6bf765 100644
--- a/app/src/main/java/com/enqualcomm/support/provider/FZDMembersProvider.java
+++ b/app/src/main/java/com/enqualcomm/support/provider/FZDMembersProvider.java
@@ -15,8 +15,8 @@ public class FZDMembersProvider extends ContentProvider {
     private static final int MATH_CODE_TABLE = 1;
 
     public static final String PATH = "members";
-//    public static final String AUTHORITY = "com.ic.fzd.members";
-    public static final String AUTHORITY = "com.ic.fzd.video-call";
+    //public static final String AUTHORITY = "com.ic.fzd.members";
+    public static final String AUTHORITY = "com.ic.provider.member";
     public static final String MEMBERS = "content://" + AUTHORITY + "/" + PATH;
 
     static {
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 eccd87ad..d949779b 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/Util.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/Util.java
@@ -322,7 +322,6 @@ public class Util {
     }
 
     public static String getSystemProperties(String prop) {
-
         String str = "";
         Class clazz;
         try {
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 06eb352c..2ea826a3 100644
--- a/app/src/main/java/com/ic/protocols/protocol_anan.java
+++ b/app/src/main/java/com/ic/protocols/protocol_anan.java
@@ -28,6 +28,7 @@ import com.enqualcomm.support.bean.StringMessage;
 import com.enqualcomm.support.bean.VoiceContent;
 import com.enqualcomm.support.bean.voicePacket;
 import com.enqualcomm.support.provider.FZDDatabaseHelper;
+import com.enqualcomm.support.provider.FZDMembersProvider;
 import com.enqualcomm.support.provider.FZDSettingsProvider;
 import com.enqualcomm.support.service.HeartRateManager;
 import com.enqualcomm.support.utils.Connection;
@@ -1465,16 +1466,23 @@ public class protocol_anan {
 //            contactArray.add(new Contact(Contact.CATEGORY_PARTNER,"PARTNER","666"));
 //            contactArray.add(new Contact(Contact.CATEGORY_CARE,"CARE","666"));
 //            contactArray.add(new Contact(Contact.CATEGORY_VOLTE,"VOLTE","666"));
-
+            //保存一份到新的member数据库时
+            for (Contact contact : contactArray) {
+                ContentValues values = new ContentValues();
+                ICLogger.d("contact == > " + contact);
+                values.put(FZDDatabaseHelper.fID, contact.number);
+                values.put(FZDDatabaseHelper.fPhoneNum, contact.number);
+                values.put(FZDDatabaseHelper.fUserName, contact.name);
+                runtime.getContextProxy().getResolver().insert(
+                        Uri.parse(FZDMembersProvider.MEMBERS), values);
+            }
             runtime.getDbHelper().saveContacts(contactArray, false, false, true, false, false, false);
 
         } else {
             ICLogger.i(" BP14 format error!");
         }
-
     }
 
-
     public static StringMessage AP14(String index, String[] phnumbs) {
         return genStringMessage("AP14", new StringBuffer(CMDHEADER).append(
                 cmdMap.get(CMD_TYPE.AP14))
diff --git a/app/src/main/java/com/ic/protocols/protocol_beehome.java b/app/src/main/java/com/ic/protocols/protocol_beehome.java
index 52039478..625e1e9b 100644
--- a/app/src/main/java/com/ic/protocols/protocol_beehome.java
+++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java
@@ -372,10 +372,10 @@ public class protocol_beehome {
                 int timezone = Integer.parseInt(msg[2]);
                 if (datetime != null) {
                     ICLogger.i("===" + TimeUtil.getDefaultTimeZone());
-                    TimeUtil.setTimeZone(runtime.getContextProxy().context,timezone);
+                    TimeUtil.setTimeZone(runtime.getContextProxy().context, timezone);
 
                     ICLogger.i("===" + TimeUtil.getDefaultTimeZone());
-                    TimeUtil.setSysDateTime(runtime.getContextProxy().context, datetime, timezone,true);
+                    TimeUtil.setSysDateTime(runtime.getContextProxy().context, datetime, timezone, true);
                     ICLogger.i("===" + TimeUtil.getDefaultTimeZone());
 
                 }
@@ -1279,9 +1279,7 @@ public class protocol_beehome {
         //返回时间，格式为：yyyyMMddHHmmss ，为UTC0 时间
         //经纬度保留六位小数，若没取到则返回 0
         String[] list = cmd.split(CMDSPLIT);
-
         if (list.length == 4) {
-
             String time = list[1];
             String lat = list[2];
             String lon = list[3];
diff --git a/app/version_code.properties b/app/version_code.properties
index b2373522..5d48c0fb 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Apr 28 11:28:45 CST 2021
-VERSION_CODE=780
+#Tue May 11 20:23:28 CST 2021
+VERSION_CODE=782