修复训练记录不显示时间

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 498658c..8f9d70b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -1110,7 +1110,7 @@ namespace OHOS
         // 关闭文件
         file.close();
 
-        //WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CheckDataJson is ok");
+        // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CheckDataJson is ok");
         return true;
     }
 
@@ -1160,8 +1160,8 @@ namespace OHOS
         cJSON_AddNumberToObject(sportData, "sportTypeId", int(data->sportType));     // 训练项目类 Id
         cJSON_AddNumberToObject(sportData, "sportId", data->sportId);                // 训练项目 Id
         cJSON_AddStringToObject(sportData, "startDate", (data->start_date).c_str()); // 训练开始日期字符串
-        cJSON_AddNumberToObject(sportData, "startTime", data->starttime);            // 训练开始时间戳
-        cJSON_AddNumberToObject(sportData, "endTime", data->endtime);                // 训练结束时间戳
+        cJSON_AddStringToObject(sportData, "startTime", (data->start_time).c_str()); // 训练开始时间
+        cJSON_AddStringToObject(sportData, "endTime", (data->end_time).c_str());     // 训练结束时间
         cJSON_AddNumberToObject(sportData, "goalDegree", data->goaldegree);          // 训练目标完成度
         cJSON_AddNumberToObject(sportData, "duration", data->duration);              // 训练时长（秒）
         cJSON_AddNumberToObject(sportData, "distance", data->distance);              // 训练距离
@@ -1217,8 +1217,8 @@ namespace OHOS
             sportData.sportType = (Exercisetype)cJSON_GetObjectItem(item, "sportTypeId")->valueint;
             sportData.sportId = (UIResourceTextId)cJSON_GetObjectItem(item, "sportId")->valueint;
             sportData.start_date = cJSON_GetObjectItem(item, "startDate")->valuestring;
-            sportData.starttime = cJSON_GetObjectItem(item, "startTime")->valueint;
-            sportData.endtime = cJSON_GetObjectItem(item, "endTime")->valueint;
+            sportData.start_time = cJSON_GetObjectItem(item, "startTime")->valuestring;
+            sportData.end_time = cJSON_GetObjectItem(item, "endTime")->valuestring;
             sportData.goaldegree = cJSON_GetObjectItem(item, "goalDegree")->valueint;
             sportData.duration = cJSON_GetObjectItem(item, "duration")->valueint;
             sportData.distance = cJSON_GetObjectItem(item, "distance")->valueint;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
index e318c43..70a09ba 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
@@ -67,7 +67,8 @@ namespace OHOS
         UNUSED(view);
         if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)
         {
-            NativeAbility::GetInstance().Back();
+            // NativeAbility::GetInstance().Back();
+            NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);
         }
         return true;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordPresenter.h
index 3933d19..1330b25 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordPresenter.h
@@ -1,3 +1,9 @@
+/*** 
+ * @Date: 2024-05-20 19:40:41
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-06-08 10:11:44
+ * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traingrecord/include/TraingRecordPresenter.h
+ */
 #ifndef _TraingRecord_PRESENTER_H
 #define _TraingRecord_PRESENTER_H
 
@@ -27,6 +33,7 @@ namespace OHOS
         // 因为继承了OnClickListener，所以有OnClick属性，至于参数,原函数也这样直接继承;
         bool OnClick(UIView &view, const ClickEvent &event) override;
         bool OnDrag(UIView &view, const DragEvent &event) override;
+        bool OnDragEnd(UIView &view, const DragEvent &event) override;
 
         TraingRecordModel *p_TraingRecordModel{nullptr};
     };

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordItemView.cpp
index 6bd638e..6621a0e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordItemView.cpp
@@ -62,17 +62,18 @@ namespace OHOS
         sicon.SetSrc(ICON_IMAGE);
         sicon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
 
-        sLabeldata.SetPosition(50, 0, 300, 80);
+        sLabeldata.SetPosition(50, 5, 300, 80);
         sLabeldata.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
         sLabeldata.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         sLabeldata.SetRollSpeed(0);
-        sLabeldata.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 20);
+        sLabeldata.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 28);
 
-        sLabeltime.SetPosition(50, 50, 300, 80);
+        sLabeltime.SetPosition(52, 40, 300, 80);
         sLabeltime.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
         sLabeltime.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
         sLabeltime.SetRollSpeed(0);
-        sLabeltime.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 20);
+        sLabeltime.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 23);
+        sLabeltime.SetTextColor(Color::Gray()); // 设置文本颜色
     }
 
     /// @brief 获取list的中每个组件的在list的下标

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordModel.cpp
index f4cd050..b496b89 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordModel.cpp
@@ -52,13 +52,14 @@ namespace OHOS
                 std::string imageicon = TraingModel::GetInstance()->GetSportIcon(sportData.sportType);
                 // 3.获取日期
                 // 4.获取时间
-                TraingRecords[i] = {i, imageicon.c_str(), sportData.start_date, sportData.start_time};
-#if 1
+                std::string Time = sportData.start_time + std::string("-") + sportData.end_time;
+                TraingRecords[i] = {i, imageicon.c_str(), sportData.start_date, Time};
+#if 0
                 // 使用 printf 输出每条训练记录的信息 [测试]
                 printf("Training Record %d:\n", i + 1);
                 printf("Sport Type: %s\n", imageicon.c_str());
                 printf("Start Date: %s\n", sportData.start_date.c_str());
-                printf("Start Time: %s\n", sportData.start_time.c_str());
+                printf("Start Time: %s\n", Time.c_str());
 #endif
             }
         }
@@ -68,7 +69,7 @@ namespace OHOS
     {
         return TraingRecords;
     }
-    uint8_t TraingRecordModel::GetTraingRecordListNum() 
+    uint8_t TraingRecordModel::GetTraingRecordListNum()
     {
         return ArrayNum;
     }

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 b62523d..76c4725 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp
@@ -1,3 +1,9 @@
+/***
+ * @Date: 2024-05-20 19:40:41
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-06-08 10:11:18
+ * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp
+ */
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
 #include "language/font/ui_resource_string.h"
@@ -65,6 +71,10 @@ namespace OHOS
     }
 
     bool TraingRecordPresenter::OnDrag(UIView &view, const DragEvent &event)
+    {
+        return true;
+    }
+    bool TraingRecordPresenter::OnDragEnd(UIView &view, const DragEvent &event)
     {
         if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)
         {