Merge #1011 into sdk602patch0626 from refs/changes/1011/head

Code review from 罗正

* refs/changes/1011/head: (4 commits squashed)

  - 关闭开机根据ConfigModel中震动强度震动一次

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - #734，解决，手表恢复出厂设置，本地音乐不会清空bug

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1011

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index c63df94..95304b4 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -365,7 +365,7 @@ void startup_post_init_task(void)
     cm_initScreenBrightness();
     cm_initializeScreenDuration();
     cm_initializeRaiseToWake();
-    cm_initializeVibrationModel();
+    // cm_initializeVibrationModel();
     cm_initializeSilentModel();
     // cm_initializeVoLTECall();
     //initialize4GCapability();
@@ -1120,7 +1120,9 @@ void mmi_screen_on_off_by_flip_wrist(bool value)
 void uapi_setScreenBrightness(int value)
 {
     const power_display_svr_api_t *display_api = power_display_svr_get_api();
-    display_api->set_brightness(value);
+    if(display_api) {
+        display_api->set_brightness(value);
+    }
 }
 
 /*
@@ -1129,7 +1131,9 @@ void uapi_setScreenBrightness(int value)
 void uapi_setScreenDuration(int32_t time)
 {
     const power_display_svr_api_t *display_api = power_display_svr_get_api();
-    errcode_t ret = display_api->set_screen_auto_off_timeout(time);
+    if(display_api) {
+        errcode_t ret = display_api->set_screen_auto_off_timeout(time);
+    }
 }
 
 /*获取屏幕状态: return 0 screen on  ,  1 screen off*/
@@ -1800,7 +1804,7 @@ int removeFilesInFolder(const char *folderPath)
     {
         if (strcmp(entry->d_name, ".") != 0 && strcmp(entry->d_name, "..") != 0) 
         {
-            char filePath[64];
+            char filePath[256];
             snprintf(filePath, sizeof(filePath), "%s/%s", folderPath, entry->d_name);
             stat(filePath,&s_buf);
             if(S_ISDIR(s_buf.st_mode))