v1.0.2 修改心率计算问题

entry/src/main/config.json

@@ -2,8 +2,8 @@
   "app": {
     "bundleName": "com.company.fit",
     "version": {
-      "code": 5,
-      "name": "1.0.1"
+      "code": 10,
+      "name": "1.0.2"
     },
     "apiVersion": {
       "compatible": 3,

entry/src/main/js/default/pages/index/index.js

@@ -17,6 +17,7 @@ export default {
         isLast: "", //是否第一个动作 "0":真 "1":假
         isFirst: "", // 是否最后一个动作 "0":真 "1":假
         fitDuration: "00:00", //训练持续时长
+        heartRateList: [], //心率数组
         newHeartRate: "--", //当前心率
         isStop: false, //是否是手表端暂停
         sendFlg: false, // 是否在发送消息
@@ -224,8 +225,8 @@ export default {
                 uri: "pages/end/end",
                 params: {
                     endTotalTime: model.fitTotalDuration, //训练时间
-                    endAverHeartRate: model.averHeartRate, //平均心率
-                    endMaxHeartRate: model.maxHeartRate, //最高心率
+                    endAverHeartRate: _this.getAverHeartRate(_this.heartRateList), //平均心率
+                    endMaxHeartRate: _this.getMaxHeartRate(_this.heartRateList), //最高心率
                     endCalorie: model.acCalorie, //消耗心率
                 }
             });
@@ -366,6 +367,7 @@ export default {
             success: function (data) {
                 if (data.heartRate != 255) {
                     _this.newHeartRate = data.heartRate;
+                    _this.heartRateList.push(data.heartRate);
                 } else {
                     _this.newHeartRate = "--";
                 }
@@ -460,6 +462,44 @@ export default {
         });
     },
 
+
+/**
+  *计算平均心率
+   */
+    getAverHeartRate(arr) {
+        if (arr.length > 0) {
+            //将array的长度赋给len
+            let len = arr.length;
+            let sum = 0;
+            //利用for循环遍历数组的内容，利用sum累加求和
+            for (let i = 0; i < len; i++) {
+                sum += arr[i];
+            }
+            //返回数组的和与长度求平均值
+            return parseInt(sum / len);
+        } else {
+            return "--"
+        }
+    }
+
+,
+/**
+  *获取最大心率
+   */
+    getMaxHeartRate(arr) {
+        if (arr.length > 0) {
+            let max = arr[0];
+            for (let i = 0; i < arr.length; i++) {
+                if (arr[i] > max) {
+                    max = arr[i];
+                }
+            }
+            return parseInt(max)
+        } else {
+            return "--"
+        }
+    },
+
 /**
     *数据重置
     */
@@ -475,6 +515,7 @@ export default {
         this.fitDuration = "00:00";
         this.progress = "", //进度条
         this.countdownT = "", // 倒计时
+        this.heartRateList = [];
         //取消接收手机侧第三方应用发过来的消息
         FeatureAbility.unsubscribeMsg();
         sensor.unsubscribeHeartRate() //取消监听心率
@@ -506,6 +547,7 @@ export default {
         this.progress = "", //进度条
         this.countdownT = "", // 倒计时
         this.newHeartRate = "--", //当前心率
+        this.heartRateList = [];
         sensor.unsubscribeHeartRate() //取消监听心率
         if (timer != null) {
             clearInterval(timer);