From 19ca225b7d3a7c8985fe3eb4953a939dcc29465a Mon Sep 17 00:00:00 2001 From: penglei <1624952103@qq.com> Date: Sat, 8 Jun 2024 17:30:41 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E9=BA=A6=E5=85=8B=E9=A3=8E?= =?utf8?q?=E8=93=9D=E7=89=99=E4=BA=A7=E6=B5=8B=EF=BC=8C=E4=BC=98=E5=8C=96t?= =?utf8?q?ar=E4=BF=9D=E5=AD=98=E6=AD=BB=E6=9C=BA=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../application/brandy/brandy_standard/main.c | 3 +++ .../brandy/brandy_standard/thread_pri_init.c | 2 -- .../nativeui/alarm/src/AlarmClockModel.cpp | 2 +- .../producttest/include/testmicrophoneC.h | 4 ++-- .../producttest/src/testmicrophone.cpp | 18 +++++++++++------- .../factorytest_service/factorytest_protocol.c | 14 +++++++++++++- .../drivers/peripheral/utils/custom_utils.c | 14 ++++++++++---- .../drivers/peripheral/utils/custom_utils.h | 2 +- 8 files changed, 41 insertions(+), 18 deletions(-) diff --git a/code/sdk/application/brandy/brandy_standard/main.c b/code/sdk/application/brandy/brandy_standard/main.c index 53f6f289c..c51fe1227 100755 --- 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 1a2375845..a2a7353e9 100755 --- 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); unused(unused); - //reburn_second_dev(); - rc_calibration_func_notify(); bt_acore_btc_ipc_receive_init(); uapi_pm_control(PM_BT_POWER_UP_AND_RUN); 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 d01e843ed..b3a92fff1 100644 --- 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(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 797630689..d7bf6e0ea 100644 --- 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 a4659b6c4..494b2cc5d 100644 --- 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 3413eb5b9..af5956d18 100644 --- 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 uint8_t send_data = 0; - uapi_check_spk(); + uapi_check_spk(1); factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, BLE_TEST_CMD_SOFT_TEST_SUB_MODE_SPEAKER, 0x03, &send_data, 1); + } else if(testitem == 0x04) + { + + uint8_t send_data = 0; + + uapi_check_spk(0); + + factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, + BLE_TEST_CMD_SOFT_TEST_SUB_MODE_SPEAKER, + 0x04, + &send_data, + 1); } break; diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c index 0a007d816..7bc3292cf 100644 --- 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 2ded4d4b5..625f34e58 100644 --- 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" -- 2.17.1