From: kfl_614 <kfl_614@163.com>
Date: Wed, 6 Jan 2021 07:31:13 +0000 (+0800)
Subject: fiter data as heart rate is zero
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=0511fe0c32451ec47bd21f4aa8b45f6e0fb2c53c;p=protocol_srv.git

fiter data as heart rate is zero
---

diff --git a/app/release/ICSer_V740_2012291044_release.apk b/app/release/ICSer_V746_2101051435_release.apk
similarity index 78%
rename from app/release/ICSer_V740_2012291044_release.apk
rename to app/release/ICSer_V746_2101051435_release.apk
index 786da5f0..ebfdd712 100644
Binary files a/app/release/ICSer_V740_2012291044_release.apk and b/app/release/ICSer_V746_2101051435_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 89bbb913..eeff5778 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":742,"versionName":"2012291656","enabled":true,"outputFile":"ICSer_V742_2012291656_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V742_2012291656_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":746,"versionName":"2101051435","enabled":true,"outputFile":"ICSer_V746_2101051435_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V746_2101051435_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 063fc011..12727f6d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -83,11 +83,10 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:supportsRtl="true"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-        >
-        <activity android:name=".toolActivity"></activity>
-        <activity android:name=".GPSActivity"></activity>
-        <activity android:name=".DeviceInfoActivity"></activity>
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+        <activity android:name=".toolActivity"/>
+        <activity android:name=".GPSActivity"/>
+        <activity android:name=".DeviceInfoActivity"/>
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -120,7 +119,6 @@
             android:name=".ICContentProvider"
             android:authorities="com.enqualcomm.support"
             android:exported="true" />
-
 <!--        <receiver-->
 <!--            android:name=".ICSmsManager"-->
 <!--            android:exported="true">-->
diff --git a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
index d315803c..b55b290d 100644
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -154,6 +154,11 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
         public void onHeartRateGet(HeartRate heartRate) {
             //处理心率结果
             ICLogger.d("心率测试结果来了..." + heartRate);
+            //如果为0，那么就不上传了
+            if (heartRate.getHeartRate() == 0) {
+                ICLogger.d("result invalidate...");
+                return;
+            }
             runtime.getHRS().setHeartrateStat(heartRateStatus.HEARTRATE_WORKINGSTAT.HEARTRATE_TEST_SUCCESS);
             runtime.getHRS().setLastHeartrate(heartRate.getHeartRate(), heartRate.getBloodHeight(), heartRate.getBloodLow(), heartRate.getOxygen());
             uploadResult();
diff --git a/app/src/main/java/com/enqualcomm/support/service/base/AbstractConnectionService.java b/app/src/main/java/com/enqualcomm/support/service/base/AbstractConnectionService.java
index 4f1c0f00..c6236dca 100644
--- a/app/src/main/java/com/enqualcomm/support/service/base/AbstractConnectionService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/base/AbstractConnectionService.java
@@ -5,51 +5,51 @@ import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.bean.Runtime;
 
 public abstract class AbstractConnectionService implements ConnectionService {
-  protected AbstractConnectionService nextService;
-  private boolean isDetach;
-  
-  public final void processAlarmClock(Connection paramConnection, Runtime paramRuntime) {
-    onAlarmClock(paramConnection, paramRuntime);
-    if (this.nextService != null)
-      this.nextService.processAlarmClock(paramConnection, paramRuntime); 
-  }
-  
-  public final void processAttach(Connection paramConnection, Runtime paramRuntime) {
-    this.isDetach = false;
-    onAttach(paramConnection, paramRuntime);
-    if (this.nextService != null)
-      this.nextService.processAttach(paramConnection, paramRuntime); 
-  }
-  
-  public final void processConnectionClose(Connection paramConnection, Runtime paramRuntime,String ErrorMsg) {
-    if (this.isDetach)
-      return; 
-    if (!onConnectionClose(paramConnection, paramRuntime,ErrorMsg) && this.nextService != null)
-      this.nextService.processConnectionClose(paramConnection, paramRuntime,ErrorMsg);
-  }
-  
-  public final void processConnectionOpen(Connection paramConnection, Runtime paramRuntime) {
-    if (this.isDetach)
-      return; 
-    if (!onConnectionOpen(paramConnection, paramRuntime) && this.nextService != null)
-      this.nextService.processConnectionOpen(paramConnection, paramRuntime); 
-  }
-  
-  public final void processDetach(Connection paramConnection, Runtime paramRuntime) {
-    this.isDetach = true;
-    onDetach(paramConnection, paramRuntime);
-    if (this.nextService != null)
-      this.nextService.processDetach(paramConnection, paramRuntime); 
-  }
-  
-  public final void processServerResponse(StringMessage paramStringMessage, Connection paramConnection, Runtime paramRuntime) {
-    if (this.isDetach)
-      return; 
-    if (!onReceive(paramStringMessage, paramConnection, paramRuntime) && this.nextService != null)
-      this.nextService.processServerResponse(paramStringMessage, paramConnection, paramRuntime); 
-  }
-  
-  public final void setNext(AbstractConnectionService paramAbstractConnectionService) { this.nextService = paramAbstractConnectionService; }
-}
+    protected AbstractConnectionService nextService;
+    private boolean isDetach;
 
+    public final void processAlarmClock(Connection paramConnection, Runtime paramRuntime) {
+        onAlarmClock(paramConnection, paramRuntime);
+        if (this.nextService != null)
+            this.nextService.processAlarmClock(paramConnection, paramRuntime);
+    }
 
+    public final void processAttach(Connection paramConnection, Runtime paramRuntime) {
+        this.isDetach = false;
+        onAttach(paramConnection, paramRuntime);
+        if (this.nextService != null)
+            this.nextService.processAttach(paramConnection, paramRuntime);
+    }
+
+    public final void processConnectionClose(Connection paramConnection, Runtime paramRuntime, String ErrorMsg) {
+        if (this.isDetach)
+            return;
+        if (!onConnectionClose(paramConnection, paramRuntime, ErrorMsg) && this.nextService != null)
+            this.nextService.processConnectionClose(paramConnection, paramRuntime, ErrorMsg);
+    }
+
+    public final void processConnectionOpen(Connection paramConnection, Runtime paramRuntime) {
+        if (this.isDetach)
+            return;
+        if (!onConnectionOpen(paramConnection, paramRuntime) && this.nextService != null)
+            this.nextService.processConnectionOpen(paramConnection, paramRuntime);
+    }
+
+    public final void processDetach(Connection paramConnection, Runtime paramRuntime) {
+        this.isDetach = true;
+        onDetach(paramConnection, paramRuntime);
+        if (this.nextService != null)
+            this.nextService.processDetach(paramConnection, paramRuntime);
+    }
+
+    public final void processServerResponse(StringMessage paramStringMessage, Connection paramConnection, Runtime paramRuntime) {
+        if (this.isDetach)
+            return;
+        if (!onReceive(paramStringMessage, paramConnection, paramRuntime) && this.nextService != null)
+            this.nextService.processServerResponse(paramStringMessage, paramConnection, paramRuntime);
+    }
+
+    public final void setNext(AbstractConnectionService paramAbstractConnectionService) {
+        this.nextService = paramAbstractConnectionService;
+    }
+}
\ No newline at end of file
diff --git a/app/version_code.properties b/app/version_code.properties
index 4a128228..5f56ddfa 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Dec 29 16:56:28 CST 2020
-VERSION_CODE=742
+#Tue Jan 05 14:35:31 CST 2021
+VERSION_CODE=746