录音界面修改

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 8eda2b7..4d95a1d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingModel.h
@@ -69,11 +69,13 @@ namespace OHOS
         uint8_t GetRecordingListNum() const;
         std::string GetCleanFileName(const std::string &filePath);
         void SearchFiles(const std::string &directory, std::vector<std::string> &fileNames, int &mp3FileCount);
+
     private:
         RecordingModel();
         RecordingModel(const RecordingModel &) = delete;
         RecordingModel &operator=(const RecordingModel &) = delete;
         virtual ~RecordingModel();
+
     private:
         int64_t DurationTime{0};                                                                       // 播放时长，单位ms
         bool PlayButtonState{false};                                                                   // 播放按钮状态

diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordGoingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordGoingPresenter.cpp
index 3620773..3c198c3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordGoingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordGoingPresenter.cpp
@@ -2,7 +2,7 @@
 #include "NativeAbility.h"\r
 #include "string.h"\r
 #include "record/include/RecordGoingPresenter.h"\r
-\r
+#include "custom_utils.h"\r
 namespace OHOS\r
 {\r
 \r
@@ -29,7 +29,6 @@ namespace OHOS
 \r
     void RecordGoingPresenter::OnStart()\r
     {\r
-\r
         Presenter<RecordGoingView>::OnStart();\r
     }\r
 \r

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 ff460be..919ea0e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp
@@ -5,6 +5,7 @@
 #include "record/include/RecordingPresenter.h"\r
 #include "record/include/RecordingModel.h"\r
 #include <wearable_log.h>\r
+#include "custom_utils.h"\r
 namespace OHOS\r
 {\r
 \r
@@ -33,6 +34,7 @@ namespace OHOS
         // 初始化录音信息\r
         RecordingModel::GetInstance()->InitRecordingListItem();\r
         Presenter<RecordingView>::OnStart();\r
+        ScreenControl(1);\r
     }\r
 \r
     void RecordingPresenter::OnPause(void)\r
@@ -48,8 +50,8 @@ namespace OHOS
 \r
     void RecordingPresenter::OnStop(void)\r
     {\r
-\r
         Presenter<RecordingView>::OnStop();\r
+        ScreenControl(0);\r
     }\r
 \r
     bool RecordingPresenter::OnDrag(UIView &view, const DragEvent &event)\r
@@ -106,16 +108,36 @@ namespace OHOS
     bool RecordingPresenter::OnClick(UIView &view, const ClickEvent &event)\r
     {\r
 \r
-        // 将参数保存到数组中\r
-        const char *args[] = {"01", "mp3", "16000", "1", "16", "/user/res/record/recording/record.mp3"};\r
-        int argc = sizeof(args) / sizeof(args[0]);\r
-\r
         // 根据控件id查找是哪个控件触发了点击回调\r
         if (strcmp(view.GetViewId(), RECORD_BUTTON) == 0)\r
         {\r
+            // 将参数保存到数组中\r
+            char *args[6] = {0}; //{"01", "mp3", "16000", "1", "16", "/user/res/record/recording/recordyyyymmddhhmmss.mp3"};\r
+            int argc = 6;\r
+            args[0] = (char *)malloc(25);\r
+            args[1] = (char *)malloc(25);\r
+            args[2] = (char *)malloc(25);\r
+            args[3] = (char *)malloc(25);\r
+            args[4] = (char *)malloc(25);\r
+            args[5] = (char *)malloc(100);\r
+\r
+            sprintf(args[0], "01");\r
+            sprintf(args[1], "mp3");\r
+            sprintf(args[2], "16000");\r
+            sprintf(args[3], "1");\r
+            sprintf(args[4], "16");\r
+            uapi_get_recordfilename(args[5]);\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Recording....");\r
-            AudioCaptureSample(argc, args);\r
+            AudioCaptureSample(argc, (const char **)args);\r
             NativeAbility::GetInstance().ChangeSlice(VIEW_RECORD_GOING);\r
+\r
+            free(args[0]);\r
+            free(args[1]);\r
+            free(args[2]);\r
+            free(args[3]);\r
+            free(args[4]);\r
+            free(args[5]);\r
+\r
             return true;\r
         }\r
         return true;\r

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index 6424c1d..210913a 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -21,7 +21,7 @@
 #include "pwm_porting.h"
 #include "pinctrl.h"
 #include "errcode.h"
-
+#include "power_display_service.h"
 
 #define SUPPORT_NV
 
@@ -283,6 +283,48 @@ errcode_t uapi_set_time_from_cat1(char* cat1time)
 
     return ERRCODE_SUCC;
 }       
+
+errcode_t uapi_get_recordfilename(char *date)
+{
+    if(date != NULL)
+    {
+        time_t rawtime;
+        struct tm* timeinfo;
+        time(&rawtime);
+        timeinfo = localtime(&rawtime);
+
+        sprintf(date,"/user/res/record/recording/recording%04d%02d%02d%02d%02d%02d.mp3",
+        timeinfo->tm_year + 1900,
+        timeinfo->tm_mon + 1,
+        timeinfo->tm_mday,
+        timeinfo->tm_hour,
+        timeinfo->tm_min,
+        timeinfo->tm_sec);
+    }
+    return ERRCODE_SUCC;
+}
+
+void ScreenControl(uint8_t turnOnFlag)
+{
+    const power_display_svr_api_t *display_api = power_display_svr_get_api();
+    if(turnOnFlag)
+    {
+        const power_display_svr_api_t *display_api = power_display_svr_get_api();
+        if (display_api->get_screen_state() != SCREEN_ON)
+        {
+            display_api->turn_on_screen();
+        }
+        //当设置的值是-1 的时候，设置屏幕常亮
+        display_api->set_screen_set_keepon_timeout(-1);
+    }
+    else
+    {
+        display_api->set_screen_set_keepon_timeout(0);
+    }
+}
+
+
+
 #include "bts_le_gap.h"
 
 errcode_t uapi_get_btaddr(uint8_t *buf_btaddr, uint32_t *len_btaddr)

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.h b/code/sdk/drivers/peripheral/utils/custom_utils.h
index 8f7fa5a..4b45e55 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.h
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.h
@@ -30,6 +30,10 @@ errcode_t uapi_get_timestampe_ms(uint64_t *tm);
 /**根据cat1获取的时间字串设置时间*/
 errcode_t uapi_set_time_from_cat1(char* cat1time);
 
+/**获取日期*/
+errcode_t uapi_get_recordfilename(char *date);
+
+void ScreenControl(uint8_t turnOnFlag);
 
 errcode_t uapi_get_btaddr(uint8_t *buf_btaddr, uint32_t *len_btaddr);
 /**