From: luozheng <1732036298@qq.com>
Date: Wed, 20 Mar 2024 01:40:42 +0000 (+0800)
Subject: 1.将录音数据保存到userdata中
X-Git-Tag: release_V1.2.70_20241020_135402~1250^2~19^2~5
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=e09dc15db443aca0b2e7489eb919d65d2ce73020;p=mirrors%2FFD230.git

1.将录音数据保存到userdata中
2.打开主界面天气视图
3.删除一张1.7M的无用图片
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
index 27540aaf6..c7ea33f59 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
@@ -32,7 +32,7 @@ namespace OHOS
         {BloodOxygen, &MainViewSample::InitBloodOxygenPage},
         {TRAINING, &MainViewSample::InitTrainingPage},
         {COMPASS, &MainViewSample::InitCompassPage},
-        //{WEATHER, &MainViewSample::InitWeatherPage},
+        {WEATHER, &MainViewSample::InitWeatherPage},
         {MUSIC_PLAYER, &MainViewSample::InitMusicPlayerPage},
 #if 0
         {APPLIST,&MainViewSample::InitApplistPage}
diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingModel.h b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingModel.h
index 1b29cbeae..96c691022 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingModel.h
@@ -104,15 +104,15 @@ namespace OHOS
         bool isStopAndReset{false};                // 判断是否是停止还是重置状态
         bool audioInitStatus{false};
         /* -------------------------------------------------------------------------- */
-        std::vector<std::string> fileNames;                          // 文件名
-        int RecordingMp3FileCount = 0;                               // 录音MP3数量
-        const std::string directory = "/user/res/record/recording/"; // 录音目录
-        std::vector<RecordingListItem> Recordings;                   // 存放录音信息的动态数组
-        std::string recordDuration;                                  // 录音时长
-        int index;                                                   // 保存被点击录音的下标
-        std::string yyyymmhhh_date;                                  // 保存年月日时间
-        std::string TotalRecordDuration;                             // 保存录音的总时长
-        std::string RecordingTimeAndDuration;                        // 录音日期和录音时长
+        std::vector<std::string> fileNames;                        // 文件名
+        int RecordingMp3FileCount = 0;                             // 录音MP3数量
+        const std::string directory = "/user/userdata/recording/"; // 录音目录
+        std::vector<RecordingListItem> Recordings;                 // 存放录音信息的动态数组
+        std::string recordDuration;                                // 录音时长
+        int index;                                                 // 保存被点击录音的下标
+        std::string yyyymmhhh_date;                                // 保存年月日时间
+        std::string TotalRecordDuration;                           // 保存录音的总时长
+        std::string RecordingTimeAndDuration;                      // 录音日期和录音时长
     };
 }
 
diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp
index bb1d8e943..d8025a0b3 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp
@@ -186,7 +186,7 @@ namespace OHOS
             if (convertNumericDateTime(numericDateTime, formattedDateTime))
             {
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Formatted DateTime: %s\n", formattedDateTime);
-                sprintf(args[5], "/user/res/record/recording/%s.mp3", formattedDateTime);
+                sprintf(args[5], "/user/userdata/recording/%s.mp3", formattedDateTime);
             }
             else
             {
diff --git a/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h b/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h
index ccb600aca..b91515d43 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h
@@ -21,7 +21,7 @@ namespace OHOS
         TRAINING,
         BloodOxygen,
         COMPASS,
-        // WEATHER,
+        WEATHER,
         MUSIC_PLAYER,
         // APPLIST,
         MAX_CARD,
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/backGround.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/backGround.bin
deleted file mode 100644
index d17f2ab13..000000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/backGround.bin and /dev/null differ
diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/recording/recordingtest.txt b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/recording/recordingtest.txt
new file mode 100644
index 000000000..56529f294
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/recording/recordingtest.txt
@@ -0,0 +1 @@
+recording test
\ No newline at end of file