From: snickersun <snickersun@qq.com>
Date: Sun, 2 Jul 2023 03:19:15 +0000 (+0800)
Subject: release ICProtocol8.1_V966_2307021109_release.apk
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=refs%2Fheads%2Fsl8541_common;p=protocol_srv.git

release ICProtocol8.1_V966_2307021109_release.apk
添加上传 心率，血氧，体温 记录 ，供launcher显示。
---

diff --git a/app/release/ICProtocol81_V966_2307021109_release.apk b/app/release/ICProtocol81_V966_2307021109_release.apk
new file mode 100644
index 00000000..19d0d63e
Binary files /dev/null and b/app/release/ICProtocol81_V966_2307021109_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 272ad26f..c45b96fb 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":965,"versionName":"2306132258","enabled":true,"outputFile":"ICProtocol81_V965_2306132258_release.apk","fullName":"release","baseName":"release"},"path":"ICProtocol81_V965_2306132258_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":966,"versionName":"2307021109","enabled":true,"outputFile":"ICProtocol81_V966_2307021109_release.apk","fullName":"release","baseName":"release"},"path":"ICProtocol81_V966_2307021109_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fed0ad5e..e5fc90a5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -208,7 +208,7 @@
 
         <provider
             android:name=".provider.ICGlobalSettingsProvider"
-            android:authorities="com.ic.fzd.settings"
+            android:authorities="com.ic.protocolSrv.settings"
             android:exported="true" />
 
         <provider
diff --git a/app/src/main/java/com/ic/protocolSrv/provider/ICGlobalSettingsProvider.java b/app/src/main/java/com/ic/protocolSrv/provider/ICGlobalSettingsProvider.java
index 7a2b4e8f..11ebacf5 100644
--- a/app/src/main/java/com/ic/protocolSrv/provider/ICGlobalSettingsProvider.java
+++ b/app/src/main/java/com/ic/protocolSrv/provider/ICGlobalSettingsProvider.java
@@ -22,10 +22,16 @@ public class ICGlobalSettingsProvider extends ContentProvider {
 
     public static final String PATH = "settings";
     //public static final String AUTHORITY = "com.ic.protocolSrv.settings";
-    public static final String AUTHORITY = "com.ic.fzd.settings";
+    public static final String AUTHORITY = "com.ic.protocolSrv.settings";
     public static final String SETTINGS = "content://" + AUTHORITY + "/" + PATH;
     private ICDatabaseHelper mDatabase;
 
+    public static final String KEY_OXYGEN = "oxygen";
+    public static final String KEY_HEART_RATE = "heart_rate";
+    public static final String KEY_ENV_TEMP = "env_temperature";
+    public static final String KEY_TEMP = "body_temperature";
+    public static final String KEY_STEP_COUNT = "sport_step_count";
+
     private static final UriMatcher sUriMatcher;
 
     private static final int MATH_CODE_TABLE = 0x1;
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 6d829047..b5e637df 100644
--- a/app/src/main/java/com/ic/protocols/protocol_beehome.java
+++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java
@@ -28,6 +28,7 @@ import com.ic.protocolSrv.bean.VoiceContent;
 import com.ic.protocolSrv.bean.voicePacket;
 import com.ic.protocolSrv.provider.ICAlarmProvider;
 import com.ic.protocolSrv.provider.ICDatabaseHelper;
+import com.ic.protocolSrv.provider.ICGlobalSettingsProvider;
 import com.ic.protocolSrv.provider.ICMembersProvider;
 import com.ic.protocolSrv.provider.WeTalkMessageProvider;
 import com.ic.protocolSrv.service.HeartRateManager;
@@ -757,6 +758,14 @@ public class protocol_beehome {
         //30: 翻滚次数
         //定位模式
         //定位周期cycle 单位秒
+
+        ContentResolver resolver = ds.getContextProxy().getResolver();
+        ContentValues tempValues = new ContentValues();
+        tempValues.put(ICDatabaseHelper.sKey, ICGlobalSettingsProvider.KEY_STEP_COUNT);
+        tempValues.put(ICDatabaseHelper.sValue, ds.getTotalStepCount());
+        ICLogger.d(" setting values ==> "+tempValues);
+        resolver.insert(Uri.parse(ICGlobalSettingsProvider.SETTINGS), tempValues);
+
         return genStringMessage(cmdStrMap.get(CMD_TYPE.AP03), new StringBuffer(CMDHEADER).append(cmdStrMap.get(CMD_TYPE.AP03)).append(CMDSPLIT).append(String.format("%03d", abs(ds.getSignalStrength())))
                 .append(ds.getGPSLocationStarNums()).append(ds.getBattery()).append("0")
                 .append(ds.getProtection()).append(ds.getWorkModeStr()).append(CMDSPLIT)
@@ -2366,20 +2375,39 @@ public class protocol_beehome {
         //添加时间
         sb.append(TimeUtil.getUTCTimeForCameraMark()).append(CMDSPLIT);
         sb.append(type).append(CMDSPLIT);
+
+        ContentResolver resolver = runtime.getContextProxy().getResolver();
+        ContentValues tempValues = new ContentValues();
+
         if (type == 1) {
             //血压
             sb.append(runtime.getHRS().getBPL()).append("|").append(runtime.getHRS().getBPH());
+
         } else if (type == 2) {
             //心率
             sb.append(runtime.getHRS().getPPG());
+
+            tempValues.put(ICDatabaseHelper.sKey, ICGlobalSettingsProvider.KEY_HEART_RATE);
+            tempValues.put(ICDatabaseHelper.sValue, runtime.getHRS().getPPG());
+
         } else if (type == 3) {
             sb.append(String.format("%1$.2f", runtime.tempInfo.currentBodyTemp));
+
+            tempValues.put(ICDatabaseHelper.sKey, ICGlobalSettingsProvider.KEY_TEMP);
+            tempValues.put(ICDatabaseHelper.sValue, String.format("%1$.2f", runtime.tempInfo.currentBodyTemp));
+
         } else if (type == 4) {
             sb.append(runtime.getHRS().getSpo2());
+
+            tempValues.put(ICDatabaseHelper.sKey, ICGlobalSettingsProvider.KEY_OXYGEN);
+            tempValues.put(ICDatabaseHelper.sValue, runtime.getHRS().getSpo2());
+
         }
         sb.append(CMDEND);
         String s = sb.toString();
         ICLogger.d("apjk ==>  " + s);
+        ICLogger.d(" setting values ==> "+tempValues);
+        resolver.insert(Uri.parse(ICGlobalSettingsProvider.SETTINGS), tempValues);
         return genStringMessage(cmdStrMap.get(CMD_TYPE.APTP), s);
     }
 
diff --git a/app/version_code.properties b/app/version_code.properties
index f0e097a9..c314a91e 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Jun 13 22:58:31 GMT+08:00 2023
-VERSION_CODE=965
+#Sun Jul 02 11:09:53 CST 2023
+VERSION_CODE=966
diff --git a/local.properties b/local.properties
index 25e69e94..4a187171 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Thu May 18 23:48:30 GMT+08:00 2023
-sdk.dir=C\:\\Users\\Administrator\\AppData\\Local\\Android\\Sdk
+#Sat Jul 01 17:08:28 CST 2023
+sdk.dir=D\:\\Android\\Sdk