修复训练记录icon不一致bug

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
index f77a5a4..af3b6d7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
@@ -287,13 +287,13 @@ namespace OHOS
     void TraingEnddataView::InitData()
     {
         SportData *enddata = TraingModel::GetInstance()->GetSportdata();
-
+        
         if (enddata == nullptr)
         {
             printf("Enddata is nullptr. Exiting InitData()...\r\n");
             return;
         }
-        printf("Initializing TraingEnddataView data...\r\n");
+
         // 训练图标Icon
         std::string imageStr = TraingModel::GetInstance()->GetSportType(enddata->sportType);
         if (!imageStr.empty())

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 fd9b46c..9583194 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -235,11 +235,15 @@ namespace OHOS
     /*获取运动类型图片*/
     std::string TraingModel::GetSportType(Exercisetype sporttype)
     {
-        return sportImages[static_cast<int>(sporttype)];
+        int index = static_cast<int>(sporttype);
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " GetSportType index %d", index);
+        return sportImages[index];
     }
     /*获取运动类型icon*/
     std::string TraingModel::GetSportIcon(Exercisetype sporttype)
     {
+        int index = static_cast<int>(sporttype);
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " GetSportIcon index %d", index);
         return sportIcons[static_cast<int>(sporttype)];
     }
     /*设置运动Id*/
@@ -384,7 +388,7 @@ namespace OHOS
     {
         if (data != nullptr && sportdata != nullptr)
         {
-            sportdata->sportTagType = data->sportTagType;
+            sportdata->sportType = data->sportType;
             sportdata->sportId = data->sportId;
             sportdata->start_date = data->start_date;
             sportdata->start_time = data->start_time;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp
index 952c073..788e0f4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp
@@ -100,7 +100,8 @@ namespace OHOS
         }
         else
         {
-            int index = TraingRecordItemView::GetInstance().GetTraingRecordIndex();
+            TraingRecordItemView *p_TraingRecordItemView = static_cast<TraingRecordItemView *>(&view);
+            int index = p_TraingRecordItemView->GetTraingRecordIndex();
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "the index is %d", index);
             // 读取json数据
             std::vector<SportData> sportDataVector = TraingModel::GetInstance()->LoadDataFormJson();