修复自由运动不会进行心率检测

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
index 4511839..fe7f656 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
@@ -47,7 +47,11 @@ namespace OHOS
 \r
     void TraingNomalPresenter::OnStart()\r
     {\r
-        TraingModel::GetInstance()->gnss_start_timer(1000);\r
+        //判断是否是需要GPS的运动\r
+        if(TraingModel::GetInstance()->IsNeedGPS(TraingModel::GetInstance()->GetSportEvent()) == true)\r
+        {\r
+            TraingModel::GetInstance()->gnss_start_timer(1000);\r
+        }\r
         Presenter<TraingNomalView>::OnStart();\r
     }\r
 \r
@@ -81,7 +85,7 @@ namespace OHOS
         // 关闭gps与心率\r
         TraingModel::GetInstance()->stop_heart_gps();\r
         // 关闭gps定时器\r
-        TraingModel::GetInstance()->gnss_start_timer();\r
+        TraingModel::GetInstance()->gnss_stop_timer();\r
         }\r
     }\r
     bool TraingNomalPresenter::OnDrag(UIView &view, const DragEvent &event)\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
index 4511839..d435d1d 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
@@ -47,7 +47,11 @@ namespace OHOS
 \r
     void TraingNomalPresenter::OnStart()\r
     {\r
-        TraingModel::GetInstance()->gnss_start_timer(1000);\r
+        //判断是否是需要GPS的运动\r
+        if(TraingModel::GetInstance()->IsNeedGPS(TraingModel::GetInstance()->GetSportEvent()) == true)\r
+        {\r
+            TraingModel::GetInstance()->gnss_start_timer(1000);\r
+        }   \r
         Presenter<TraingNomalView>::OnStart();\r
     }\r
 \r
@@ -81,7 +85,7 @@ namespace OHOS
         // 关闭gps与心率\r
         TraingModel::GetInstance()->stop_heart_gps();\r
         // 关闭gps定时器\r
-        TraingModel::GetInstance()->gnss_start_timer();\r
+        TraingModel::GetInstance()->gnss_stop_timer();\r
         }\r
     }\r
     bool TraingNomalPresenter::OnDrag(UIView &view, const DragEvent &event)\r

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
index 4511839..fe7f656 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
@@ -47,7 +47,11 @@ namespace OHOS
 \r
     void TraingNomalPresenter::OnStart()\r
     {\r
-        TraingModel::GetInstance()->gnss_start_timer(1000);\r
+        //判断是否是需要GPS的运动\r
+        if(TraingModel::GetInstance()->IsNeedGPS(TraingModel::GetInstance()->GetSportEvent()) == true)\r
+        {\r
+            TraingModel::GetInstance()->gnss_start_timer(1000);\r
+        }\r
         Presenter<TraingNomalView>::OnStart();\r
     }\r
 \r
@@ -81,7 +85,7 @@ namespace OHOS
         // 关闭gps与心率\r
         TraingModel::GetInstance()->stop_heart_gps();\r
         // 关闭gps定时器\r
-        TraingModel::GetInstance()->gnss_start_timer();\r
+        TraingModel::GetInstance()->gnss_stop_timer();\r
         }\r
     }\r
     bool TraingNomalPresenter::OnDrag(UIView &view, const DragEvent &event)\r