update zhangyu broadcast condication.

diff --git a/app/IcL02WorkService/release/IcL02WorkService_V57_202012211130_release.apk b/app/IcL02WorkService/release/IcL02WorkService_V57_202012211130_release.apk
deleted file mode 100644 (file)
index ba14970..0000000
Binary files a/app/IcL02WorkService/release/IcL02WorkService_V57_202012211130_release.apk and /dev/null differ

diff --git a/app/IcL02WorkService/release/IcL02WorkService_V57_202101042131_release.apk b/app/IcL02WorkService/release/IcL02WorkService_V57_202101042131_release.apk
new file mode 100644 (file)
index 0000000..e28dded
Binary files /dev/null and b/app/IcL02WorkService/release/IcL02WorkService_V57_202101042131_release.apk differ

diff --git a/app/IcL02WorkService/release/output.json b/app/IcL02WorkService/release/output.json
index 9d6109a..ae6d834 100644 (file)
--- a/app/IcL02WorkService/release/output.json
+++ b/app/IcL02WorkService/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.1","enabled":true,"outputFile":"IcL02WorkService_V57_202012211008_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V57_202012211008_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.1","enabled":true,"outputFile":"IcL02WorkService_V57_202101042131_release.apk","fullName":"IcL02WorkServiceRelease","baseName":"IcL02WorkService-release"},"path":"IcL02WorkService_V57_202101042131_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index d8ffe0b..ca4936c 100644 (file)
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -95,6 +95,41 @@
 public protected <methods>;
 }
 
+-keep public interface com.ic.work.IHeartRateSensorCallback
+-keep public abstract interface com.ic.work.IHeartRateSensorCallback{
+public protected <methods>;
+}
+
+-keep public interface com.ic.work.ITempSensorCallback
+-keep public abstract interface com.ic.work.ITempSensorCallback{
+public protected <methods>;
+}
+
+-keep public interface com.ic.work.ITempSensorService
+-keep public abstract interface com.ic.work.ITempSensorService{
+public protected <methods>;
+}
+
+-keep public interface com.ic.work.IHeartRateSensorService
+-keep public abstract interface com.ic.work.IHeartRateSensorService{
+public protected <methods>;
+}
+
+-keep public interface com.ic.work.domain.HeartRate
+-keep public abstract interface com.ic.work.domain.HeartRate{
+public protected <methods>;
+}
+
+-keep public interface com.ic.work.domain.Temperature
+-keep public abstract interface com.ic.work.domain.Temperature{
+public protected <methods>;
+}
+
+-keep public interface com.ic.work.ITempSensorCallback
+-keep public abstract interface com.ic.work.ITempSensorCallback{
+public protected <methods>;
+}
+
 -keep public interface com.ic.aidl.blood.IBloodRemoteService
 -keep public abstract interface com.ic.aidl.blood.IBloodRemoteService{
 public protected <methods>;

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 43b81ee..cecec34 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -69,6 +69,12 @@
                 <action android:name="com.ic.sensor.data.action.HEART_RATE" />
             </intent-filter>
         </service>
+
+        <receiver android:name=".BootBroadcastReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/work/SensorDataService.java b/app/src/main/java/com/ic/work/SensorDataService.java
index f8dc3ff..3e84414 100644 (file)
--- a/app/src/main/java/com/ic/work/SensorDataService.java
+++ b/app/src/main/java/com/ic/work/SensorDataService.java
@@ -131,7 +131,9 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp
         //分发出去
         dispatchTemperatureResult(temperature);
         //处理温度测量数据给掌育的
-        if (jxTempMode != -1) {
+        String isSupportTemperature = IcSystemProperty.getSystemProperties("jx.temperature", "false");
+        IcLog.d(TAG, "isSupportTemperature == > " + isSupportTemperature);
+        if (jxTempMode != -1 && "true".equals(isSupportTemperature)) {
             sendTemperatureBroadcast2Jx(true, wristTemp, bodyTemp);
             jxTempMode = -1;
         }
@@ -200,6 +202,7 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp
 
                 @Override
                 public void getHeartRateInfo(int from, String tag) {
+                    jxHeartRateMode = 2;
                     IcLog.d(TAG, "getHeartRateInfo..." + from);
                     createTask(from, TestTaskEvent.SensorType.HEART_RATE, tag);
                 }
@@ -233,6 +236,7 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp
         @Override
         public void getTemperatureInfo(int from, String tag) {
             IcLog.d(TAG, "getTemperatureInfo..." + from);
+            jxTempMode = 2;
             TestTaskEvent.SensorType censorType = TestTaskEvent.SensorType.TEMPERATURE;
             createTask(from, censorType, tag);
         }
@@ -261,6 +265,7 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp
         }
 
         if (taskEvent.equals(currentTask)) {
+            IcLog.d(TAG, "current task running...");
             //通知正在执行
             if (tag != null) {
                 dispatchTaskRunning(censorType, tag);
@@ -622,9 +627,13 @@ public class SensorDataService extends Service implements TemperatureHelper.Temp
         //处理心率测量数据给掌育的
         //发广播给掌育,如果不为-1，说明有掌育的份
         IcLog.d(TAG, "jxHeartRateMode..." + jxHeartRateMode);
-        if (jxHeartRateMode != -1) {
+        //获取一下是不是掌育设备
+        String isSupportHeartRate = IcSystemProperty.getSystemProperties("jx.heartrate", "false");
+        IcLog.d(TAG, "isSupportHeartRate == > " + isSupportHeartRate);
+        if (jxHeartRateMode != -1 && "true".equals(isSupportHeartRate)) {
             sendHeartRateBroadcast2Jx(true, high,
                     low, heart, oxygen);
+            jxHeartRateMode = -1;
         }
         //reset data.
         handleBloodResult(high, low, heart, oxygen);

diff --git a/app/src/main/java/com/ic/work/hardware/TemperatureHelper.java b/app/src/main/java/com/ic/work/hardware/TemperatureHelper.java
index 1d09748..e6750d1 100644 (file)
--- a/app/src/main/java/com/ic/work/hardware/TemperatureHelper.java
+++ b/app/src/main/java/com/ic/work/hardware/TemperatureHelper.java
@@ -61,6 +61,7 @@ public class TemperatureHelper {
                         } else {
                             lastBodyTemp = TemperatureUtil.getBodyTemp(lastWristTemp, 26.0f);
                         }
+                        IcLog.d(TAG, "testing..." + lastWristTemp + " " + lastBodyTemp + " " + lastTempOut);
                         //前10秒不更新内容，后10秒再更新数据
                         if (delayTimesInSeconds > 10 && mListener != null) {
                             IcLog.d(TAG, "update temperature info..thread name is ." + Thread.currentThread().getName());