修复运动开始，APP不计时的bug

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp
index 73d7219..aeb0a85 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp
@@ -479,18 +479,14 @@
      if ((currentState == ExerciseState::General)) {\r
        if (TraingCardView::GetInstance() == nullptr) {\r
          WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ble 开启运动");\r
-         uapi_set_screen_on_api(); // 亮屏\r
-         NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCRAD);\r
          // 设置目标类型和项目有且只有一次\r
          switch (cmd->sportType) {\r
          case 0:\r
-           TraingModel::GetInstance()->SetSportEvent(\r
-               STR_EXERCISE_OUTDOORWALKING);\r
+           TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORWALKING);\r
            OpenSensor(ExerciseClass::OUTDOOR);\r
            break;\r
          case 1:\r
-           TraingModel::GetInstance()->SetSportEvent(\r
-               STR_EXERCISE_OUTDOORRUNNING);\r
+           TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORRUNNING);\r
            OpenSensor(ExerciseClass::OUTDOOR);\r
            break;\r
          case 2:\r
@@ -509,6 +505,8 @@
        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"sportTag:%d",cmd->sportTag);\r
        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"*******************************");\r
        handleStartState();\r
+       uapi_set_screen_on_api(); // 亮屏\r
+       NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCRAD);\r
        return true;\r
      } else {\r
  \r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp
index 73d7219..aeb0a85 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp
@@ -479,18 +479,14 @@
      if ((currentState == ExerciseState::General)) {\r
        if (TraingCardView::GetInstance() == nullptr) {\r
          WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ble 开启运动");\r
-         uapi_set_screen_on_api(); // 亮屏\r
-         NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCRAD);\r
          // 设置目标类型和项目有且只有一次\r
          switch (cmd->sportType) {\r
          case 0:\r
-           TraingModel::GetInstance()->SetSportEvent(\r
-               STR_EXERCISE_OUTDOORWALKING);\r
+           TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORWALKING);\r
            OpenSensor(ExerciseClass::OUTDOOR);\r
            break;\r
          case 1:\r
-           TraingModel::GetInstance()->SetSportEvent(\r
-               STR_EXERCISE_OUTDOORRUNNING);\r
+           TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORRUNNING);\r
            OpenSensor(ExerciseClass::OUTDOOR);\r
            break;\r
          case 2:\r
@@ -509,6 +505,8 @@
        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"sportTag:%d",cmd->sportTag);\r
        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"*******************************");\r
        handleStartState();\r
+       uapi_set_screen_on_api(); // 亮屏\r
+       NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCRAD);\r
        return true;\r
      } else {\r
  \r

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingModel.cpp
index 699bd39..b471579 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/src/TraingModel.cpp
@@ -477,10 +477,11 @@
  }
  /*设置运动状态*/
  void TraingModel::SetSportState(ExerciseState state) {
-   WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " SetSportState %d", state);
+   WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " SetSportState %d", state);
    if (state != ExerciseState::General) {
      /*app发起的运动*/
      if (Openingway == true) {
+      WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"APP发起的运动");
        if (state == ExerciseState::Start) {
          sportdata->duration = 0;
        }

diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp
index 3d65e36..2b155b7 100644 (file)
--- a/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp
+++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/traing/training_card/src/TraingCardPresenter.cpp
@@ -479,18 +479,14 @@ bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) {
     if ((currentState == ExerciseState::General)) {\r
       if (TraingCardView::GetInstance() == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ble 开启运动");\r
-        uapi_set_screen_on_api(); // 亮屏\r
-        NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCRAD);\r
         // 设置目标类型和项目有且只有一次\r
         switch (cmd->sportType) {\r
         case 0:\r
-          TraingModel::GetInstance()->SetSportEvent(\r
-              STR_EXERCISE_OUTDOORWALKING);\r
+          TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORWALKING);\r
           OpenSensor(ExerciseClass::OUTDOOR);\r
           break;\r
         case 1:\r
-          TraingModel::GetInstance()->SetSportEvent(\r
-              STR_EXERCISE_OUTDOORRUNNING);\r
+          TraingModel::GetInstance()->SetSportEvent(STR_EXERCISE_OUTDOORRUNNING);\r
           OpenSensor(ExerciseClass::OUTDOOR);\r
           break;\r
         case 2:\r
@@ -509,6 +505,8 @@ bool TraingCardPresenter::send_sport_cmd(training_ble *cmd) {
       WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"sportTag:%d",cmd->sportTag);\r
       WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"*******************************");\r
       handleStartState();\r
+      uapi_set_screen_on_api(); // 亮屏\r
+      NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCRAD);\r
       return true;\r
     } else {\r
 \r