修复蓝牙设置训练目标bug

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 f8b5cd1..d9eec53 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -721,12 +721,11 @@ namespace OHOS
         int hour = g_motionTimes / NUM_TIME_HOUR;
         int min = (g_motionTimes % NUM_TIME_HOUR) / NUM_TIME_MIN;
         int sec = (g_motionTimes % NUM_TIME_HOUR) % NUM_TIME_MIN;
-        // PRINT("ostringstream is end!\r\n");
+
         std::ostringstream oss;
         oss << std::setfill('0') << std::setw(2) << hour << ":" << std::setw(2) << min << ":" << std::setw(2) << sec;
-        // PRINT("motionDuration is end!\r\n");
+
         motionDuration = oss.str();
-        // PRINT("DisplayMotionDuration is end!\r\n");
         return motionDuration;
     }
 #ifdef __cplusplus

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 5c38158..e78cc37 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,6 +216,8 @@ namespace OHOS
     /*刷新time和data*/\r
     void TraingCardPresenter::Notify(void)\r
     {\r
+        if (TraingModel::GetInstance()->GetSportState() == ExerciseState::General)\r
+            return;\r
         TrainingDataView::GetInstance()->UpdataTime();\r
         RefreshData();\r
     }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp
index 5f69b5c..f0fad36 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TrainingDataView.cpp
@@ -151,6 +151,9 @@ namespace OHOS
     /*更新当前时间*/
     void TrainingDataView::UpdataTime()
     {
+        if (curtimelabel == nullptr) // 防止刷新空组件
+            return;
+
         // 获取当前时间
         struct tm pTM;
         time_t seconds;
@@ -164,5 +167,6 @@ namespace OHOS
         // 将时间和日期转换为字符串
         std::string stringtime = (hour < 10 ? "0" : "") + std::to_string(hour) + ":" + (minute < 10 ? "0" : "") + std::to_string(minute);
         curtimelabel->SetText(stringtime.c_str());
+        PRINT("curtimelabel!\r\n");
     }
 }