优化麦克风蓝牙产测，优化tar保存死机文件

diff --git a/code/sdk/application/brandy/brandy_standard/main.c b/code/sdk/application/brandy/brandy_standard/main.c
index 53f6f28..c51fe12 100755 (executable)
--- a/code/sdk/application/brandy/brandy_standard/main.c
+++ b/code/sdk/application/brandy/brandy_standard/main.c
@@ -36,6 +36,9 @@ void app_main(const void *startup_details_table, const uint32_t density)
 
     board_init(ssb_to_app_table.ssb_to_application_flash_id, ssb_to_app_table.ssb_to_application_flash_unique_id);
 
+    //cywee 烧写密钥
+    //reburn_second_dev();
+    
     service_init();
 
     thread_pri_init();

diff --git a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
index 1a23758..a2a7353 100755 (executable)
--- a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
+++ b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c
@@ -345,8 +345,6 @@ static void thread_main(const void *unused)
     PRINT("thread_main start "NEWLINE);\r
     unused(unused);\r
 \r
-    //reburn_second_dev();\r
-\r
     rc_calibration_func_notify();\r
     bt_acore_btc_ipc_receive_init();\r
     uapi_pm_control(PM_BT_POWER_UP_AND_RUN);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp
index d01e843..b3a92ff 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp
@@ -714,7 +714,7 @@ int AlarmClockModel::AlarmPlayerStat()
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::AlarmPlayerStat playerCtr nullptr");
         return OHOS_FAILURE;
     }
-    playerCtr->SetPlayerCallback(playerCallback);
+    //playerCtr->SetPlayerCallback(playerCallback);
     // 申请资源
     source = std::make_shared<Source>(uri, header);
     if (source.get() == nullptr) {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testmicrophoneC.h b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testmicrophoneC.h
index 7976306..d7bf6e0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testmicrophoneC.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testmicrophoneC.h
@@ -2,7 +2,7 @@
  * @Author: penglei 1624952103@qq.com
  * @Date: 2024-06-07 11:18:25
  * @LastEditors: penglei 1624952103@qq.com
- * @LastEditTime: 2024-06-07 19:57:20
+ * @LastEditTime: 2024-06-08 17:28:26
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/producttest/include/testmicrophoneC.h
  * @Description: 
  * 
@@ -18,7 +18,7 @@ extern "C"
 #endif
 #endif
     void microhone_switch(bool isopen);
-    void check_spk(void);
+    void check_spk(bool isopen);
 #ifdef __cplusplus
 #if __cplusplus
 }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmicrophone.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmicrophone.cpp
index a4659b6..494b2cc 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmicrophone.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testmicrophone.cpp
@@ -50,6 +50,7 @@ namespace OHOS
                 delete Title;
                 Title=nullptr;
             }
+            AlarmClockModel::GetInstance()->AlarmPlayerStop();
             delete testmakephoneScrollView;
             testmakephoneScrollView=nullptr;
         }
@@ -88,7 +89,7 @@ namespace OHOS
 
 
     uint8_t makphone_falg=0;
-    static char *Path= "/user/music/microphone.mp3";
+    static char *Path= "/user/userdata/microphone.mp3";
     void testmicrohoneView::buttoncallback()
     {
         if(button!=NULL)
@@ -97,7 +98,7 @@ namespace OHOS
             if(makphone_falg==0)
             {
                 char *args[6] = {0};
-                const char *defaultArgs[6] = {"01", "mp3", "16000", "1", "16","/user/music/microphone.mp3"}; // 默认参数数组
+                const char *defaultArgs[6] = {"01", "mp3", "16000", "1", "16","/user/userdata/microphone.mp3"}; // 默认参数数组
 
                 for (int i = 0; i < 6; ++i)
                 {
@@ -117,7 +118,7 @@ namespace OHOS
                 button->SetText("play");
                 makphone_falg++;
 
-                FILE *file =fopen("/user/music/microphone.mp3","rb");
+                FILE *file =fopen("/user/userdata/microphone.mp3","rb");
                 if(file==NULL)
                 {
                     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ffffffffffffffffsssssss");
@@ -216,7 +217,7 @@ extern "C"
     void microhone_switch(bool isopen)
     {
         char *args[6] = {0};
-        const char *defaultArgs[6] = {"01", "mp3", "16000", "1", "16","/user/music/microphone.mp3"}; // 默认参数数组
+        const char *defaultArgs[6] = {"01", "mp3", "16000", "1", "16","/user/userdata/microphone.mp3"}; // 默认参数数组
 
         int32_t argc = 1;
         uint8_t *argv = (uint8_t*)"stop";
@@ -233,7 +234,7 @@ extern "C"
         else
         {
             AudioCaptureSample(argc, (const char **)&argv);
-            FILE *file =fopen("/user/music/microphone.mp3","rb");
+            FILE *file =fopen("/user/userdata/microphone.mp3","rb");
             if(file==NULL)
             {
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ffffffffffffffffsssssss");
@@ -242,9 +243,12 @@ extern "C"
         }
     }
 
-    void check_spk(void)
+    void check_spk(bool isopen)
     {
-        AlarmClockModel::GetInstance()->testPlayerStart("/user/music/microphone.mp3");
+        if(isopen)
+            AlarmClockModel::GetInstance()->testPlayerStart("/user/userdata/microphone.mp3");
+        else
+            AlarmClockModel::GetInstance()->AlarmPlayerStop();
     }
 
 #ifdef __cplusplus

diff --git a/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c b/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
index 3413eb5..af5956d 100644 (file)
--- a/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
+++ b/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
@@ -1492,13 +1492,25 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint
 \r
                 uint8_t send_data = 0;\r
 \r
-                uapi_check_spk();\r
+                uapi_check_spk(1);\r
                 \r
                 factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
                         BLE_TEST_CMD_SOFT_TEST_SUB_MODE_SPEAKER,\r
                         0x03,\r
                         &send_data,\r
                         1);\r
+            } else if(testitem == 0x04)\r
+            {\r
+\r
+                uint8_t send_data = 0;\r
+\r
+                uapi_check_spk(0);\r
+                \r
+                factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST,\r
+                        BLE_TEST_CMD_SOFT_TEST_SUB_MODE_SPEAKER,\r
+                        0x04,\r
+                        &send_data,\r
+                        1);\r
             }\r
             break;\r
 \r

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index 0a007d8..7bc3292 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -295,7 +295,7 @@ bool stop_alipay_ble_service(void)
 void startup_post_init_task(void)
 {
     PRINT("startup_post_init_task !\r\n");
-    //reburn_second_dev();
+
     uapi_calendar_recover_date();
 
     int ret = uapi_save_exc();
@@ -344,7 +344,7 @@ void startup_post_init(void)
     taskcfg.create_queue_handle = NULL;
     taskcfg.attr.name="startup_post_init_task";
     taskcfg.attr.priority = osPriorityNormal;
-    taskcfg.attr.stack_size = 0x1000;
+    taskcfg.attr.stack_size = 0x1100;
     taskcfg.func = startup_post_init_task;
     taskcfg.use_mem = USE_EXTEND_MEM;
     
@@ -1517,6 +1517,12 @@ int removeFilesInFolder(const char *folderPath)
     struct stat s_buf;
     int ret = 0;
 
+    if(access(folderPath, F_OK) == -1)
+    {
+        PRINT("%s does not exist!!!\r\n", folderPath);
+        return -1;
+    }
+
     dir = opendir(folderPath);
     if (dir == NULL) 
     {
@@ -2105,9 +2111,9 @@ void uapi_microhone_switch(bool isopen)
     #endif
 }
 
-void uapi_check_spk(void)
+void uapi_check_spk(bool isopen)
 {
     #ifdef FD230
-        check_spk();
+        check_spk(isopen);
     #endif
 }
\ No newline at end of file

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.h b/code/sdk/drivers/peripheral/utils/custom_utils.h
index 2ded4d4..625f34e 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.h
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.h
@@ -193,7 +193,7 @@ void uapi_ppg_get_id(uint8_t *chip_id);
 
 
 void uapi_microhone_switch(bool isopen);
-void uapi_check_spk(void);
+void uapi_check_spk(bool isopen);
 
 #include "custom_utilscpp.h"