恢复修改

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index ec75c43..5721adf 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -37,6 +37,7 @@
 #include "time.h"
 
 #include "custom_utils.h"
+#include "cywee_service.h"
 
 errcode_t uapi_create_osThread_custom(app_task_definition_t *task_cfg)
 {
@@ -127,6 +128,8 @@ void uapi_reboot_device(void)
 
 void shutdown_reboot_prejobs_task(void)
 {
+    addressbookTowrite();
+    
     uapi_calendar_store_date();
     sync_all_config_to_disk();
 }
@@ -138,7 +141,7 @@ void shutdown_reboot_prejobs(void)
     taskcfg.create_queue_handle = NULL;
     taskcfg.attr.name="shutdown_reboot_prejobs";
     taskcfg.attr.priority = osPriorityNormal;
-    taskcfg.attr.stack_size = 0x1000;
+    taskcfg.attr.stack_size = 0x1000*2;
     taskcfg.func = shutdown_reboot_prejobs_task;
     taskcfg.use_mem = USE_EXTEND_MEM;
     
@@ -172,7 +175,7 @@ bool stop_custom_ble_service(void)
 {
 #ifdef SUPPORT_BLE_SERVICE
         PRINT("start custom protocol classic bt ble service !\r\n");
-        ble_unregist_server();
+        // ble_unregist_server();
         closeBle();
         // bool ret = disable_bt_stack();
 #endif 
@@ -181,28 +184,29 @@ bool stop_custom_ble_service(void)
 
 bool start_alipay_ble_service(void)
 {
-    if(get_ble_status())
-    {
-        PRINT("stop custom protocol classic bt ble service first !\r\n");
-        stop_custom_ble_service();
-        uapi_systick_delay_ms(20);
-    }
-    PRINT("start_alipay_ble_service !\r\n");
-    svr_alipay_bluetooth_init();
+    // ble_avd_mode_change(1);
+    // if(get_ble_status())
+    // {
+    //     PRINT("stop custom protocol classic bt ble service first !\r\n");
+    //     stop_custom_ble_service();
+    //     uapi_systick_delay_ms(20);
+    // }
+    // PRINT("start_alipay_ble_service !\r\n");
+    // svr_alipay_bluetooth_init();
     return true;
 }
 bool stop_alipay_ble_service(void)
 {
-    
-    PRINT("stop_alipay_ble_service !\r\n");
-    alipay_unregist_server();
-    disable_bt_stack();
-    if(custom_ble_service_on_flag())
-    {
-        PRINT("start_custom_ble_service !\r\n");
-        uapi_systick_delay_ms(20);
-        start_custom_ble_service();
-    }
+    ble_avd_mode_change(0);
+    // PRINT("stop_alipay_ble_service !\r\n");
+    // alipay_unregist_server();
+    // disable_bt_stack();
+    // if(custom_ble_service_on_flag())
+    // {
+    //     PRINT("start_custom_ble_service !\r\n");
+    //     uapi_systick_delay_ms(20);
+    //     start_custom_ble_service();
+    // }
     return true;
 }
 void startup_post_init_task(void)
@@ -211,9 +215,9 @@ void startup_post_init_task(void)
     PRINT("startup_post_init_task !\r\n");
     uapi_calendar_recover_date();
 
-    if(custom_ble_service_on_flag())
+    if(!custom_ble_service_on_flag())
     {
-        start_custom_ble_service();
+        stop_custom_ble_service();
     }
 
     initScreenBrightness();
@@ -221,6 +225,7 @@ void startup_post_init_task(void)
     initializeRaiseToWake();
 
     LOS_Msleep(5000);
+    addressbookToRead();
     if ( poweron_cat1_on_bootup_flag() )
     {
         PRINT("PowerOn Cat1 !\r\n");
@@ -553,21 +558,6 @@ errcode_t uapi_get_WeekStr(char *p_week)
     return ERRCODE_SUCC; // 假设成功获取星期信息
 }
 
-/**
- * @brief 亮屏函数
- */
-void uapi_set_screen_on_api(void)
-{
-    const power_display_svr_api_t *display_api = power_display_svr_get_api();
-    display_api->set_screen_set_keepon_timeout(0);
-    if (display_api->get_screen_state() != SCREEN_ON)
-    {
-        display_api->turn_on_screen();
-    }
-    // 设置屏幕亮5000
-    display_api->set_screen_set_keepon_timeout(5000);
-}
-
 /// @brief 控制屏幕是否常亮
 /// @param turnOnFlag 1:常亮屏幕 
 /// @param turnOnFlag 0:取消常亮 
@@ -576,7 +566,6 @@ void ScreenAlwaysOnCtr(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();
         display_api->set_screen_set_keepon_timeout(0);
         if (display_api->get_screen_state() != SCREEN_ON)
         {
@@ -618,6 +607,21 @@ int32_t uapi_get_screen_state(void)
     return display_api->get_screen_state();
 }
 
+/**
+ * @brief 亮屏函数
+ */
+void uapi_set_screen_on_api(void)
+{
+    const power_display_svr_api_t *display_api = power_display_svr_get_api();
+    display_api->set_screen_set_keepon_timeout(0);
+    if (display_api->get_screen_state() != SCREEN_ON)
+    {
+        display_api->turn_on_screen();
+    }
+    // 设置屏幕亮5000
+    display_api->set_screen_set_keepon_timeout(5000);
+}
+
 /*系统声音设置*/
 void uapi_systemVolumeSet(int16_t sounding)
 {
@@ -923,52 +927,15 @@ void vibrator_cyclicity(uint16_t duty , uint16_t cycle_time_ms,uint16_t duration
     g_VibratorFunc(duty,cycle_time_ms,duration_time_ms);
 }
 
-void uapi_set_vibrator_level(int level)
-{
-    uint16_t duty =20;
-    uint16_t cycle_time_ms = 200;
-    uint16_t duration_time_ms = 0;
-    switch(level)
-    {
-        case 1:
-            duration_time_ms = 200;
-            break;
-        case 2:
-            duration_time_ms = 500;
-            break;
-        case 3:
-            duration_time_ms = 1000;
-            break;
-        default:
-            break;
-    }
-    g_VibratorFunc(duty,cycle_time_ms,duration_time_ms);
-}
 
 void uapi_take_to_wake(int cmd)
 {
-    #if defined(SUPPORT_POWER_MANAGER)
-    const power_display_svr_api_t *display_api = power_display_svr_get_api();
-    #endif
-    if (cmd == 2)
-    {
-    #if defined(SUPPORT_POWER_MANAGER)
-        display_api->set_screen_set_keepon_timeout(0);
-        PRINT("[cwyee] turn_off_screen");
-    #endif
-    }else if (cmd == 1)
-    {
-    #if defined(SUPPORT_POWER_MANAGER)
-        if (display_api->get_screen_state() != SCREEN_ON) {
-            PRINT("[cwyee] turn_on_screen");
-            display_api->turn_on_screen();
-        }
-        display_api->set_screen_set_keepon_timeout(5000);
-    #endif
-    }
+    if(cmd == 1)
+        do_cywee_service_check_msg(CYWEE_SERVICE_CMD_OPEN_HAND_UPDOWN,NULL);
+    else 
+        do_cywee_service_check_msg(CYWEE_SERVICE_CMD_CLOSE_HAND_UPDOWN,NULL);
 }
 
-
 #include "lcd_common.h"
 
 void lcd_getid(uint32_t *id)