Merge #1422 into sdk602patch0911 from refs/changes/1422/head

Code review from 袁清梦

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

  - 省电模式:优化提醒界面

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

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

  - 系统：增加恢复出厂删除离线日志

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1422

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
index 9bc3b28..042ad84 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -1647,7 +1647,7 @@ void TraingModel::SendLiveDataIfNecessary() {
   // 检查自动获取的配置 app发起
   if (user_autoget && Openingway) {
     // 发送实时数据
-    if (g_motionTimes % 1 == 0) {
+    if (g_motionTimes % user_freq == 0) {
       WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SendLiveData is OK\r\n");
       SendLiveData(); // 发送实时数据
     }

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index 2f64b0a..b931a38 100644 (file)
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -2214,6 +2214,7 @@ int uapi_save_exc(void)
     return uapi_tar_file("/user/exc",EXC_TAR_PATH,str);
 }
 
+//恢复出厂接口
 void uapi_restore_factory_setting(void)
 {
     //恢复存储
@@ -2229,6 +2230,7 @@ void uapi_restore_factory_setting(void)
                         "/user/dial/custom_dial/", //自定义表盘
                         "/user/dial/offline_dial/",//离线表盘
                         EXC_TAR_PATH,        //死机文件
+                        "/user/log/",//离线日志
                     };
 
 #else
@@ -2236,6 +2238,7 @@ void uapi_restore_factory_setting(void)
                     "/user/userdata",
                     "/system/kvstore",
                     EXC_TAR_PATH,//死机文件
+                    "/user/log/",//离线日志
                     };
 #endif
     for(int i = 0; i < (sizeof(filebuf)/sizeof(filebuf[0])); i++)