#449 运动超过五分钟提示运动量小，无法记录

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
index a1fa043..2e88ece 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
@@ -249,7 +249,8 @@ namespace OHOS
         int CalculateFilteredHeartRate(int newHeartRate);                      /*显示心率计算*/
         int Averageheartrate(int newHeartRate);                                /*平均心率窗口数*/
         void SetSportdata(SportData *data);                                    /*设置训练数据[为训练记录准备]*/
-        int GetCal();                                                          /*获取运动卡路里*/
+        int GetCal();      /*获取运动卡路里*/
+        int GetDuration(); //获取运动时长
 
         // 训练状态相关配置
         void SetEntryType(ENTEYTYPE type);          /*设置进入训练方式*/

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
index 9a80503..9725a9b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -1029,6 +1029,8 @@ namespace OHOS
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Not set Sport_Tag!");
         return 0; // 添加默认返回值
     }
+    //获取运动时长
+    int TraingModel::GetDuration() { return sportdata->duration; }
     /*获取训练类型Id*/
     UIResourceTextId TraingModel::GetSportTypeId(Exercisetype type)
     {
@@ -1228,8 +1230,8 @@ namespace OHOS
     }
 
     /*获取训练量是否达标*/
-    bool TraingModel::GetMomentum()
-    {
+    bool TraingModel::GetMomentum() {
+#if 0
         int caldata = TraingModel::GetInstance()->GetCal();
         /*判断是否产生至少1Kcald的运动量*/
         if (caldata >= 1)
@@ -1240,7 +1242,15 @@ namespace OHOS
         {
             MomentumFlag = false;
         }
-        return MomentumFlag;
+#endif
+      int duration = sportdata->duration;
+      //判断运动时间是否大于1分钟
+      if (duration >= 60) {
+        MomentumFlag = true;
+      } else {
+        MomentumFlag = false;
+      }
+      return MomentumFlag;
     }
     /*发送实时数据*/
     void TraingModel::SendLiveData()