增加训练种类适配算法

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 d9c8030..71f876f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -317,20 +317,27 @@ namespace OHOS
         // 设置结构体里面的运动类型
         sportdata->sportId = sportId_;
         sportdata->sportType = sportType_;
+
         switch (sportId_)
         {
-            // 室外跑步
+            // 室外跑步 室外走路
         case UIResourceTextId::STR_EXERCISE_OUTDOORRUNNING:
+        case UIResourceTextId::STR_EXERCISE_OUTDOORWALKING:
             return ExerciseClass::OUTDOOR;
-            break;
-            // 室内跑步
+
+            // 室内跑步 室内走路
         case UIResourceTextId::STR_EXERCISE_INDOORRUNNING:
+        case UIResourceTextId::STR_EXERCISE_INDOORWALKING:
             return ExerciseClass::INDOOR;
-            break;
+
+            // 跑步机
+        case UIResourceTextId::STR_EXERCISE_TREADMILL:
+        case UIResourceTextId::STR_EXERCISE_STROLLMACHINE:
+            return ExerciseClass::TREADMILL;
+
             // 自由训练
         default:
             return ExerciseClass::FREE_TRAINING;
-            break;
         }
     }
     /*设置运动状态*/
@@ -445,7 +452,7 @@ namespace OHOS
         sportdata->apc = cyweeInfo->avg_pace;
         sportdata->fpc = cyweeInfo->max_pace;
     }
-    
+
     /*打印函数*/
     void TraingModel::printf_data(SportData *data)
     {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
index 2d0fdd5..b181f72 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
@@ -216,7 +216,7 @@ namespace OHOS
         TrainingDetailView::GetInstance()->GetMileLabel()->SetText(distanceStr.c_str());   // 距离\r
         TrainingDetailView::GetInstance()->GetStepLabel()->SetText(stepsStr.c_str());      // 步数\r
         // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[Calories: %s, Distance: %s, Steps: %s]", calorieStr.c_str(), distanceStr.c_str(), stepsStr.c_str());\r
-        //  释放sportdata内存\r
+        // 释放sportdata内存\r
     }\r
     /*刷新time和data*/\r
     void TraingCardPresenter::Notify(void)\r
@@ -293,14 +293,14 @@ namespace OHOS
             {\r
                 // 设置目标:在非运动情况下设置  [单指令，执行后退出]\r
                 TraingModel::GetInstance()->SetSportTag(static_cast<ExerciseTag>(cmd->sportTagType), cmd->sportTag);\r
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"SetSportTag is succeed!\r\n");\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetSportTag is succeed!\r\n");\r
                 return true;\r
             }\r
             break;\r
 \r
         case SENDDATA:\r
             TraingModel::GetInstance()->SendLiveData(); // 发送实时数据 [单指令，执行后退出]\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"SendLiveData is succeed!\r\n");\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SendLiveData is succeed!\r\n");\r
             return true;\r
         default:\r
             break;\r
@@ -316,23 +316,23 @@ namespace OHOS
             case 0:\r
                 TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORWALKING);\r
                 OpenSensor(ExerciseClass::FREE_TRAINING);\r
-            case 2:\r
-                TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORBIKING);\r
-                OpenSensor(ExerciseClass::FREE_TRAINING);\r
-                break;\r
             case 1:\r
                 TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORRUNNING);\r
                 OpenSensor(ExerciseClass::OUTDOOR);\r
                 break;\r
+            case 2:\r
+                TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORBIKING);\r
+                OpenSensor(ExerciseClass::FREE_TRAINING);\r
+                break;\r
             default:\r
                 break;\r
             }\r
         }\r
 \r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"cmd->sportType[%d],cmd->controlmd[%d],cmd->sportTagType[%d],cmd->sportTag[%d]\r\n", cmd->sportType, cmd->controlmd, cmd->sportTagType, cmd->sportTag);\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cmd->sportType[%d],cmd->controlmd[%d],cmd->sportTagType[%d],cmd->sportTag[%d]\r\n", cmd->sportType, cmd->controlmd, cmd->sportTagType, cmd->sportTag);\r
 \r
         ExerciseState cmdState = static_cast<ExerciseState>(cmd->controlmd);\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"ExerciseState::End   [%d]\r\n", cmdState);\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ExerciseState::End   [%d]\r\n", cmdState);\r
 \r
         switch (cmdState)\r
         {\r