修复训练数据文件名@hcj

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
index b531f35..d56ad2d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
@@ -99,7 +99,7 @@ extern "C"
         // 最高海拔高度
         uint32_t alt;
     };
-    Trainingdata *read_Trainingdata_data(uint32_t timedata, uint16_t offset);
+    Trainingdata *read_Trainingdata_data(char* timedata, uint16_t offset);
 
     int write_Trainingdata_data(Trainingdata data);
 

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 96de04c..2561688 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -976,10 +976,10 @@ namespace OHOS
     {
 #endif
         // 处理数据头
-        static void write_Trainingdata_hard_data(uint32_t data)
+        static void write_Trainingdata_hard_data(char *data)
         {
             char file_path[128] = {0};
-            sprintf(file_path, "%shard_%d.bin", TRAINING_PATH, data);
+            sprintf(file_path, "%shard_%s.bin", TRAINING_PATH, data);
 
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s", file_path);
             FILE *fp = fopen(file_path, "rb+");
@@ -1005,11 +1005,11 @@ namespace OHOS
             fclose(fp);
         }
         // 获得数据个数
-        static int get_Trainingdata_data_num(uint32_t data)
+        static int get_Trainingdata_data_num(char *data)
         {
 
             char file_path[128] = {0};
-            sprintf(file_path, "%shard_%d.bin", TRAINING_PATH, data);
+            sprintf(file_path, "%shard_%s.bin", TRAINING_PATH, data);
 
             FILE *fp = fopen(file_path, "ab");
             if (fp == NULL)
@@ -1027,11 +1027,11 @@ namespace OHOS
         // 写数据
         int write_Trainingdata_data(Trainingdata data)
         {
-            uint64_t time;
-            uapi_get_timestampe_ms(&time);
-            uint32_t timeday = time / 1000 / 60 / 60 / 24;
             char file_path[128] = {0};
-            sprintf(file_path, "%s%d.bin", TRAINING_PATH, timeday);
+            char timeday[12] = {0};
+            uapi_get_YYMMDD_Time(timeday, '_');
+            sprintf(file_path, "%s%s.bin", TRAINING_PATH, timeday);
+
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s", file_path);
             write_Trainingdata_hard_data(timeday);
             FILE *fp = fopen(file_path, "ab");
@@ -1045,7 +1045,7 @@ namespace OHOS
             ret = fwrite((void *)&data, sizeof(Trainingdata), 1, fp);
             if (ret != 1)
             {
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "2 fwrite_data %d", ret);
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "fwrite_data is error! %d", ret);
             }
 #else
         if (fp == NULL)
@@ -1107,10 +1107,10 @@ namespace OHOS
             return 1;
         }
         // 读数据
-        Trainingdata *read_Trainingdata_data(uint32_t timedata, uint16_t offset)
+        Trainingdata *read_Trainingdata_data(char *timedata, uint16_t offset)
         {
             char file_path[128] = {0};
-            sprintf(file_path, "%s%d.bin", TRAINING_PATH, timedata);
+            sprintf(file_path, "%s%s.bin", TRAINING_PATH, timedata);
 
             FILE *fp = fopen(file_path, "rb+");
             Trainingdata *data = (Trainingdata *)malloc(sizeof(Trainingdata));