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

屏蔽部分printf打印

* refs/changes/1339/head: (5 commits squashed)

  - 屏蔽部分printf打印

  - 表盘：修改所有表盘电池组件

  - 表盘：修改默认表盘

  - 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/1339

diff --git a/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp
index 7c409c4..4e8174b 100644 (file)
--- a/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp
+++ b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp
@@ -320,14 +320,14 @@ std::string UpdateLabelText(UILabelExt *&label, const std::string &newText,
   labelext->SetTextId(id);
   std::string text = labelext->GetText();
 
-  printf("UpdateLabel:%s->%s\r\n", text.c_str(), newText.c_str());
+  // printf("UpdateLabel:%s->%s\r\n", text.c_str(), newText.c_str());
 
   // 找到标志"XX"在字符串中的位置
   size_t pos = text.find("XX");
   if (pos != std::string::npos) {
     // 替换标志"XX"为更新字符串
     text.replace(pos, 2, newText); // 2 是标志"XX"的长度
-    printf("newText:%s\r\n", text.c_str());
+    // printf("newText:%s\r\n", text.c_str());
     label->SetText(text.c_str());
   } else {
     printf("找不到变量标志位XX,请注意是否已经被修改！\r\n");
@@ -370,7 +370,7 @@ void SetLabelId(UILabel *&label, UIResourceTextId id) {
 
   const std::string text = labelext->GetText();
   if (!text.empty()) {
-    printf("SetLabelId:%s\r\n", text.c_str());
+    // printf("SetLabelId:%s\r\n", text.c_str());
     label->SetText(text.c_str());
   }
 
@@ -827,8 +827,7 @@ void updata_char(char *str_, char *str, uint32_t max_len) {
     UIFont *fontEngine = UIFont::GetInstance();
     GlyphPathData path;
     if (!fontEngine->GetGlyphPathData(letter, 0, path)) {
-      printf("********************* letter%d %d %d not exist\r\n", i, j,
-             letter);
+      // printf("********************* letter%d %d %d not exist\r\n", i, j,letter);
       char *buf = "□";
       uint16_t buf_len = strlen(buf);
       uint16_t offset = 0;
@@ -846,7 +845,7 @@ void updata_char(char *str_, char *str, uint32_t max_len) {
       }
     }
   }
-  printf("%s\r\n", str_);
+  // printf("%s\r\n", str_);
 }
 
 /*创建文件夹*/

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp
index d20f91d..93168bb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp
@@ -22,13 +22,13 @@ void uapi_dev_runtime_set_bloodoxygen_storage_status(uint8_t status);
 void uapi_dev_runtime_set_heartrate_storage_status(uint8_t status);
 
 void save_heart_data() {
-  printf("save_heart_data\r\n");
+  // printf("save_heart_data\r\n");
   OHOS::HealthService::GetInstance()->SaveDailyHeartRate();
   return;
 }
 
 void save_heart_maxmin() {
-  printf("save_heart_maxmin\r\n");
+  // printf("save_heart_maxmin\r\n");
   uint16_t max_heart_data =
       OHOS::HeartModel::GetInstance()->GetShowMaxHeartdata();
   uint16_t min_heart_data =
@@ -44,11 +44,11 @@ void save_blood_oxygen_data() {
   data.timestamp = OHOS::BloodOxygenModel::GetInstance()->GetCheckTime();
   // 进行血氧存储 如果处于读取
   if (uapi_dev_runtime_get_bloodoxygen_storage_status()) {
-    printf("save_blood_oxygen_data is reading\n");
+    // printf("save_blood_oxygen_data is reading\n");
     //进行延迟
     LOS_Msleep(100);
     if (uapi_dev_runtime_get_bloodoxygen_storage_status()) {
-      printf("save_blood_oxygen_data is reading again\n");
+      // printf("save_blood_oxygen_data is reading again\n");
       //重新发送该消息
       do_custom_fileoperate_service_check_msg(
           CUSTOM_FILEOPERATE_MSG_TYPE_BLOODXYGEN_SAVE, nullptr, 0);
@@ -56,7 +56,7 @@ void save_blood_oxygen_data() {
     }
   }
   HealthService::GetInstance()->UpdateHealthData(data);
-  printf("save_blood_oxygen_data success\n");
+  // printf("save_blood_oxygen_data success\n");
   return;
 }
 
@@ -66,11 +66,11 @@ void save_heart_rate_data() {
   data.timestamp = OHOS::HeartModel::GetInstance()->GetCheckTime();
   // 进行心率存储 如果处于读取
   if (uapi_dev_runtime_get_heartrate_storage_status()) {
-    printf("save_heart_rate_data is reading\n");
+    // printf("save_heart_rate_data is reading\n");
     //进行延迟
     LOS_Msleep(100);
     if (uapi_dev_runtime_get_heartrate_storage_status()) {
-      printf("save_heart_rate_data is reading again\n");
+      // printf("save_heart_rate_data is reading again\n");
       //重新发送该消息
       do_custom_fileoperate_service_check_msg(
           CUSTOM_FILEOPERATE_MSG_TYPE_HEARTRATE_SAVE, nullptr, 0);
@@ -78,7 +78,7 @@ void save_heart_rate_data() {
     }
   }
   HealthService::GetInstance()->UpdateHealthData(data);
-  printf("save_heart_rate_data success\n");
+  // printf("save_heart_rate_data success\n");
   return;
 }
 //进行心率列表保存
@@ -101,7 +101,7 @@ std::string GetCurrentDate() {
 // static char *JSON_F_buf=NULL;
 
 HealthService::HealthService() {
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HealthService::HealthService");
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HealthService::HealthService");
   g_pHealthService = this;
 }
 HealthService::~HealthService() { g_pHealthService = nullptr; }
@@ -189,7 +189,7 @@ BloodOxygenData *HealthService::ReadBloodOxygenData() {
   buffer << inFile.rdbuf();
   std::string jsonDataString = buffer.str();
   const char *jsonData = jsonDataString.c_str();
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "jsonData: %s", jsonData);
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "jsonData: %s", jsonData);
 
   // 关闭文件
   inFile.close();
@@ -281,13 +281,13 @@ HeartRateData *HealthService::ReadHeartRateData() {
   buffer << inFile.rdbuf();
   std::string jsonDataString = buffer.str();
   const char *jsonData = jsonDataString.c_str();
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "jsonData: %s", jsonData);
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "jsonData: %s", jsonData);
 
   // 关闭文件
   inFile.close();
 
   if (jsonDataString.empty()) {
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "jsonDataString is empty");
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "jsonDataString is empty");
     return nullptr;
   }
 
@@ -447,12 +447,12 @@ bool HealthService::UpdateHealthData(const HeartRateData &data) {
   cJSON_Delete(heart_root);
   free(jsonData);
   outFile.close();
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdateHealthData Heart JSON is ok");
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UpdateHealthData Heart JSON is ok");
 
   // 写入文件到当天历史数据
   UpdateHourlyHeartRate(data.timestamp, data.Heart);
 
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdateHourlyHeartRate is ok");
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UpdateHourlyHeartRate is ok");
 
   if (!SaveDailyHeartRate()) // 进行心率历史数据文件存储
   {
@@ -497,7 +497,7 @@ bool HealthService::CleanHealthData() {
 
   HeartModel::GetInstance()->ClearDisplayData();
   // BloodOxygenModel::GetInstance()->ClearDisplayData();
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CleanHealthData  is ok");
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CleanHealthData  is ok");
   return true;
 }
 
@@ -556,7 +556,7 @@ bool HealthService::LoadDailyHeartRate() {
     return true; // 成功读取
   }
 
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadDailyHeartRate is not today");
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "LoadDailyHeartRate is not today");
   return false; // 不是今日
 }
 
@@ -583,7 +583,7 @@ bool HealthService::SaveDailyHeartRate() {
     }
   }
 
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SaveDailyHeartRate is ok");
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SaveDailyHeartRate is ok");
   return true; // 成功保存
 }
 
@@ -657,7 +657,7 @@ bool HealthService::SaveHeartMaxMin(uint16_t max, uint16_t min) {
     return false;
   }
 
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SaveHeartMaxMin is ok max %d, min %d",
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SaveHeartMaxMin is ok max %d, min %d",
                 max, min);
   return true;
 }
@@ -682,7 +682,7 @@ void HealthService::LoadHeartMaxMin(uint16_t &max, uint16_t &min) {
     return;
   }
 
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LoadHeartMaxMin is ok max %d, min %d",
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "LoadHeartMaxMin is ok max %d, min %d",
                 max, min);
 }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
index 557cf76..603e8b8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
@@ -145,7 +145,7 @@ static void ProcessHeartRateUpdate(Request *request) {
   uint16_t index_ = HeartModel::GetInstance()->GetIndex();\r
   HeartDatas *heartInfo = (HeartDatas *)malloc(sizeof(HeartDatas));\r
   if (heartInfo == NULL) {\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[Notify] malloc fail");\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[Notify] malloc fail");\r
     return;\r
   }\r
 \r
@@ -407,7 +407,7 @@ void HeartModel::Heart_Control(HeartState state, HeartCheck check) {
   }\r
 \r
   if (state == HeartState::End && heartstate == true) {\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartState End");\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartState End");\r
     //状态数全部清空\r
     valid_counter_ = 0;\r
     disvalid_counter_ = 0;\r
@@ -430,7 +430,7 @@ void HeartModel::Heart_Control(HeartState state, HeartCheck check) {
       WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "充电不能检测");\r
       return;\r
     }\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartState Start");\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartState Start");\r
     uint8_t md = PPG_SERVICE_CMD_TYPE_DO_PPG_TEST;\r
     send_ppg_cmd_msg(md);\r
     heartstate = true;\r
@@ -438,7 +438,7 @@ void HeartModel::Heart_Control(HeartState state, HeartCheck check) {
     //被动\r
     if (checkstate == HeartCheck::PASSIVITY) {\r
       uapi_dev_runtime_set_hrs_passivity(1);\r
-      WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,\r
+      WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,\r
                     "uapi_dev_runtime_set_hrs_passivity(1)");\r
     }\r
   }\r
@@ -451,7 +451,7 @@ void HeartModel::Heart_Start(HeartCheck check) {
     Heart_Control(HeartState::Start, check);\r
     // ScreenTurnOn(60 * 1000); // 亮屏操作 600000ms 60秒关闭\r
     sensorstate = true;\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "开始心率检测");\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "开始心率检测");\r
     // 设置runtime\r
     if (uapi_dev_runtime_get_heartrate_detect_status() == 0) {\r
       uapi_dev_runtime_set_heartrate_detect_status(1);\r
@@ -498,7 +498,7 @@ void HeartModel::Heart_Stop() {
       //重置传感器状态\r
       sensorstate = false;\r
     }\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "本次心率检测结束");\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "本次心率检测结束");\r
   }\r
 }\r
 // 保存检测数据\r
@@ -514,7 +514,7 @@ void HeartModel::Heart_Save() {
 #else\r
   HealthService::GetInstance()->send_heart_save();\r
 #endif\r
-  // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "保存的心率数据：%d%ld",\r
+  // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "保存的心率数据：%d%ld",\r
   // currentheart,data.timestamp);\r
 }\r
 \r
@@ -534,13 +534,13 @@ void HeartModel::Heart_Result() {
       if (thresholdState == 0 && currentheart < thresholdValue) {\r
         // 当前心率低于阈值\r
         heartresult_ = HeartResult::LOW_RESULT;\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,\r
                       "检测结果:低结果情况,currentheart=%d,ThresholdValue=%d",\r
                       currentheart, thresholdValue);\r
       } else if (thresholdState == 1 && currentheart > thresholdValue) {\r
         // 当前心率高于阈值\r
         heartresult_ = HeartResult::HIGH_RESULT;\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,\r
                       "检测结果:高结果情况,currentheart=%d,ThresholdValue=%d",\r
                       currentheart, thresholdValue);\r
       }\r
@@ -554,7 +554,7 @@ void HeartModel::Heart_Result() {
 void HeartModel::handleHeartResult() {\r
   switch (heartresult_) {\r
   case HeartResult::SUCCESS:\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:成功");\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "检测结果:成功");\r
     Heart_Save();\r
     // 更新曲线\r
     GraphicService::GetInstance()->PostGraphicEvent(\r
@@ -576,7 +576,7 @@ void HeartModel::handleHeartResult() {
     break;\r
 \r
   default:\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:未知状态");\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "检测结果:未知状态");\r
     break;\r
   }\r
 }\r
@@ -586,19 +586,19 @@ void HeartModel::logAndChangeSlice(HeartResult result) {
       (result == HeartResult::NOT_WORN)\r
           ? "未佩戴状态"\r
           : (result == HeartResult::TIMEOUT) ? "超时" : "无效数据";\r
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:%s情况", resultMsg);\r
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "检测结果:%s情况", resultMsg);\r
   NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_ABNORMAL);\r
 }\r
 // 处理低心率情况\r
 void HeartModel::handleLowHeartRate() {\r
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:低结果情况");\r
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "检测结果:低结果情况");\r
   HealthState lowHealthState = {BLOOD_CHECK, LOW, thresholdValue};\r
   HealthService::GetInstance()->SetHealthCurrent(lowHealthState);\r
   NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_INVALID);\r
 }\r
 // 处理高心率情况\r
 void HeartModel::handleHighHeartRate() {\r
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:高结果情况");\r
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "检测结果:高结果情况");\r
   HealthState highHealthState = {BLOOD_CHECK, HIGH, thresholdValue};\r
   HealthService::GetInstance()->SetHealthCurrent(highHealthState);\r
   NativeAbility::GetInstance().ChangeSlice(VIEW_CHECK_INVALID);\r
@@ -606,7 +606,7 @@ void HeartModel::handleHighHeartRate() {
 // 设置佩戴状态\r
 void HeartModel::SetWearStatus() {\r
 \r
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "佩戴状态 %d %d",\r
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "佩戴状态 %d %d",\r
                 uapi_dev_runtime_get_heartrate_detect_status(),\r
                 unwear_counter_);\r
 \r
@@ -684,7 +684,7 @@ void HeartModel::UpHeartdata(uint16_t heart) {
     max_valid_count = MAX_DISVALID_HRS_COUNT;\r
 \r
   if (disvalid_counter_ >= max_valid_count) {\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,\r
                   "检测结果:无效数达标 disvalid_counter:%d", disvalid_counter_);\r
     SetResult(HeartResult::INVALID_DATA); // 标记为无效数据\r
     Heart_Stop();\r
@@ -693,7 +693,7 @@ void HeartModel::UpHeartdata(uint16_t heart) {
 \r
   // 检查有效计数器是否达标\r
   if (valid_counter_ >= MAX_VALID_HRS_COUNT) {\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,\r
                   "检测结果:成功 valid_counter:%d currentheart:%d",\r
                   valid_counter_, currentheart);\r
     SetResult(HeartResult::SUCCESS); // 标记为成功检测\r
@@ -702,7 +702,7 @@ void HeartModel::UpHeartdata(uint16_t heart) {
   }\r
 \r
   // 刷新心率显示\r
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,\r
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,\r
                 "[heart data update displayheart%d displayheart_max%d "\r
                 "displayheart_min%d]",\r
                 displayheart, displayheart_max, displayheart_min);\r
@@ -714,27 +714,27 @@ void HeartModel::UpHeartdata(uint16_t heart) {
 }\r
 \r
 void HeartModel::Heart_Update_View(void) {\r
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "更新心率界面");\r
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "更新心率界面");\r
   int hour = HealthService::GetInstance()->GetCurrentHour();\r
   if (HeartRateView::GetInstance() != nullptr) {\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "更新主界面卡片");\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "更新主界面卡片");\r
     HeartRateView::GetInstance()->Update_data_Chart(hour);\r
   }\r
   if (HeartChartView::GetInstance() != nullptr) {\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "更新测量心率卡片");\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "更新测量心率卡片");\r
     HeartChartView::GetInstance()->Update_data_Chart(hour);\r
   }\r
 }\r
 \r
 void HeartModel::CleanAllData(void) {\r
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Nextday!");\r
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Nextday!");\r
   if (MainViewSample::GetInstance() != nullptr &&\r
       HeartRateView::GetInstance() != nullptr) {\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "更新主界面心率卡片");\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "更新主界面心率卡片");\r
     HeartRateView::GetInstance()->CleanAllDataView();\r
   }\r
   if (HeartChartView::GetInstance() != nullptr) {\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "更新测量心率卡片");\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "更新测量心率卡片");\r
     HeartChartView::GetInstance()->CleanAllDataView();\r
   }\r
 }\r
@@ -775,7 +775,7 @@ void HeartModel::SetArrayData() {
 \r
   // 打印动态心率数据\r
   for (int i = 0; i < 5; i++) {\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dynamic_heartrate[%d]=%d", i,\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "dynamic_heartrate[%d]=%d", i,\r
                   dynamic_heartrate[i]);\r
   }\r
 }\r
@@ -791,7 +791,7 @@ std::string HeartModel::GetCheckString() {
   // 获取检测数据\r
   if (currentheart == 0) {\r
     check_string = "暂无检测数据";\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测数据:%s",\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "检测数据:%s",\r
                   check_string.c_str()); // 打印无检测数据信息\r
     return check_string;                 // 直接返回，无需继续处理\r
   }\r
@@ -800,7 +800,7 @@ std::string HeartModel::GetCheckString() {
   uint32_t currentTime;\r
   if (uapi_get_timestampe_ss(&currentTime) != ERRCODE_SUCC) {\r
     check_string = "获取当前时间戳失败"; // 如果获取时间戳失败，返回相应的信息\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,\r
                   "获取当前时间戳失败"); // 打印错误信息\r
     return check_string; // 直接返回，无法进行后续计算\r
   }\r
@@ -808,7 +808,7 @@ std::string HeartModel::GetCheckString() {
   // 检查时间戳是否有效\r
   if (timestamp_ms == 0) {\r
     check_string = std::to_string(currentheart) + " " + "时间戳无效，无法检测";\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "时间戳无效，无法检测:%s",\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "时间戳无效，无法检测:%s",\r
                   check_string.c_str());\r
     return check_string; // 直接返回，无需继续处理\r
   }\r
@@ -818,9 +818,9 @@ std::string HeartModel::GetCheckString() {
   uint32_t diff_min = diff / 60;      // 计算分钟差\r
   uint32_t diff_hour = diff_min / 60; // 计算小时差\r
 \r
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "当前时间:%d,上次检测时间:%d",\r
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "当前时间:%d,上次检测时间:%d",\r
                 currentTime, timestamp_ms); // 打印时间信息\r
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,\r
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,\r
                 "时间差(秒):%d,时间差(分钟):%d,时间差(小时):%d", diff, diff_min,\r
                 diff_hour); // 打印时间差信息\r
 \r
@@ -834,7 +834,7 @@ std::string HeartModel::GetCheckString() {
     check_string = std::to_string(currentheart) + "次/分 " + "超过一个小时前";\r
   }\r
 \r
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果:%s",\r
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "检测结果:%s",\r
                 check_string.c_str()); // 打印最终检测结果\r
   return check_string;\r
 }\r
@@ -844,12 +844,12 @@ static osTimerId_t g_screen60s_timer = nullptr;
 static uint16_t SCREEN_60S_TIME = 60;\r
 \r
 static void heart_start_screen60s_timer_callbackProc(int data) {\r
-  WEARABLE_LOGE(\r
+  WEARABLE_LOGD(\r
       WEARABLE_LOG_MODULE_APP,\r
       "HeartModel::heart_start_screen60s_timer_callbackProc,time = %d",\r
       SCREEN_60S_TIME);\r
   SCREEN_60S_TIME -= 30;\r
-  WEARABLE_LOGE(\r
+  WEARABLE_LOGD(\r
       WEARABLE_LOG_MODULE_APP,\r
       "HeartModel::heart_start_screen60s_timer_callbackProc,time = %d",\r
       SCREEN_60S_TIME);\r
@@ -858,7 +858,7 @@ static void heart_start_screen60s_timer_callbackProc(int data) {
     HeartModel::GetInstance()->heart_stop_screen60s_timer();\r
     // 取消常亮屏\r
     ScreenAlwaysOnCtr(CANCEL_SCREEN_ALWAYS_ON);\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heart_stop_screen60s_timer");\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "heart_stop_screen60s_timer");\r
   }\r
 }\r
 static void heart_start_screen60s_timer_callback(int data) {\r
@@ -866,12 +866,12 @@ static void heart_start_screen60s_timer_callback(int data) {
       std::bind(heart_start_screen60s_timer_callbackProc, data));\r
 }\r
 void HeartModel::heart_start_screen60s_timer(uint32_t interval) {\r
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,\r
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,\r
                 "HeartModel::heart_start_screen60s_timer");\r
   /* -------------------------- 1.检查定时器是否已经存在，如果存在则返回\r
    * ------------------------- */\r
   if (g_screen60s_timer != nullptr) {\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Timer already exists!!");\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Timer already exists!!");\r
     return;\r
   }\r
   /* --------------------------------- 2.创建定时器\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
index cabf75e..17acaad 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
@@ -269,7 +269,7 @@ namespace OHOS
         {
             // 回到表盘
             SwitchToClockPage();
-            printf("密码锁\r\n");
+            // printf("密码锁\r\n");
             mainClockView->SetIntercept(true);
             mainSwipeGroup->SetDraggable(false);
             mainSwipeGroup->SetOnSwipeListener(nullptr);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHourMin.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHourMin.cpp
index 2207304..4a56525 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHourMin.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHourMin.cpp
@@ -32,7 +32,7 @@ namespace OHOS
 
         out[0] = static_cast<float>(local_time.tm_hour);
         out[1] = static_cast<float>(local_time.tm_min);
-        printf("GetDialFloatData %f %f\r\n", out[0], out[1]);
+        // printf("GetDialFloatData %f %f\r\n", out[0], out[1]);
         len = 2;
         return true;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp
index fe1c1dd..a09ec44 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageItemView.cpp
@@ -46,7 +46,7 @@ namespace OHOS
         sItemInfo = itemInfo;
 #if SELF_ADAPTION
         // 根据 labeldetails 的大小设置矩形和标签的长度
-        printf("itemInfo.labeldetails.size():%d\r\n", itemInfo.labeldetails.size());
+        // printf("itemInfo.labeldetails.size():%d\r\n", itemInfo.labeldetails.size());
 
         if (itemInfo.labeldetails.size() <= 30) // 一行
         {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp
index 22a0891..07d077e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageModel.cpp
@@ -202,7 +202,7 @@ static void Notify(void *args, const Topic topic, Request *request) {
   }
 }
 void saveancsdata() {
-  printf("saveancs\r\n");
+  // printf("saveancs\r\n");
   OHOS::MessageModel::GetInstance().SaveMessagesToStorage();
   return;
 }
@@ -382,7 +382,7 @@ void MessageModel::InitMessageListItems() {
   bool unread_state = false;            // 初始化未读状态
   numberOfItems = MessageVector.size(); // 获取 MessageVector 的大小
 
-  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "当前的项数是 %d", numberOfItems);
+  WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "当前的项数是 %d", numberOfItems);
   if (numberOfItems == 0) {
     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MessageVector is empty");
     return;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp
index 5a3b373..83ac5e3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageShowView.cpp
@@ -129,7 +129,7 @@ namespace OHOS
         // 计算行数
         int totalChars = messageStr.size();
         int lines = (totalChars / maxCharsPerLine) + (totalChars % maxCharsPerLine ? 1 : 0);
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdateShowConfig lines %d", lines);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UpdateShowConfig lines %d", lines);
 
         // 小于等于2行时，无需更新
         if (lines <= 2)
@@ -145,12 +145,12 @@ namespace OHOS
         deleteButton->SetPosition(43, 157 + updatedRectWidth + 20, 380, 100);
 
         /*加载空白*/
-        CreateLine(background, 43, 157 + updatedRectWidth + 20 + 50, 380, 100,
+        CreateLine(background, 43, deleteButton->GetY() + deleteButton->GetHeight() + 40, 380, 100,
                    "line");
         background->SetVisible(false);
         container_->Add(background);
 
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "updatedRectWidth %d updatedLabelWidth %d lines %d \r\n", updatedRectWidth, updatedLabelWidth, lines);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "updatedRectWidth %d updatedLabelWidth %d lines %d \r\n", updatedRectWidth, updatedLabelWidth, lines);
     }
     void MessageShowView::InitView()
     {
@@ -158,7 +158,7 @@ namespace OHOS
         title = new UILabel();
         if (title == nullptr)
         {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "title:: new UILabel fail");
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "title:: new UILabel fail");
             return; // 内存分配失败,返回
         }
         title->SetPosition(83, 60, 300, 35);
@@ -173,7 +173,7 @@ namespace OHOS
         time = new UILabel();
         if (time == nullptr)
         {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "time:: new UILabel fail");
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "time:: new UILabel fail");
             return; // 内存分配失败,返回
         }
         time->SetPosition(73, 104, 320, 33);
@@ -210,18 +210,18 @@ namespace OHOS
         container_->Add(messageButton);
         container_->Add(deleteButton);
         /* -------------------------------------------------------------------------- */
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitView is ok!");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "InitView is ok!");
 
         // UpdateMessage();
     }
 
     void MessageShowView::UpdateMessage()
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdateMessage");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UpdateMessage");
         MessageData *data = MessageModel::GetInstance().GetCurrentMessageData();
         if (data == nullptr)
         {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdateMessage is error");
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UpdateMessage is error");
             return;
         }
         titleStr = data->labelTitle;
@@ -246,7 +246,7 @@ namespace OHOS
         container_ = new UIScrollView();
         if (container_ == nullptr)
         {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "container_ new fail");
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "container_ new fail");
             return;
         }
         container_->SetPosition(0, 0);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp
index 5510b04..340abcb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp
@@ -36,10 +36,10 @@ MessageView *MessageView::GetInstance() { return g_pMessageView; }
 void MessageView::InitView() {
   // 展示界面
   if (MessageModel::GetInstance().HasDataVector()) {
-    printf("存在数据！\r\n");
+    // printf("存在数据！\r\n");
     SetPopupViewStatus(PopupMessage::MessagePopup, true);
   } else {
-    printf("不存在数据！\r\n");
+    // printf("不存在数据！\r\n");
     SetPopupViewStatus(PopupMessage::LackPopup, true);
   }
 }

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 9254f4c..8421680 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -176,7 +176,7 @@ static void Training_Notify(void *args, const Topic topic, Request *request) {
 #endif
 
 void store_sport_data() {
-  printf("运动数据存储！\r\n");
+  // printf("运动数据存储！\r\n");
   OHOS::TraingModel::GetInstance()->RecordSportData();
   return;
 }
@@ -590,7 +590,7 @@ void TraingModel::SetTimestamp() {
 
     ResetSharedTrainingData(); // 重置共享训练数据
 
-    printf("SetTimestamp::time:%u  \r\n", time);
+    // printf("SetTimestamp::time:%u  \r\n", time);
     sportdata->starttime = time;
 
     sportdata->sportType = sportType_; // 训练类型
@@ -605,8 +605,8 @@ void TraingModel::SetTimestamp() {
       sportdata->tag = sportTag_;
     }
 
-    (Openingway == true) ? (printf("app发起运动\n"))
-                         : (printf("手表发起运动\n"));
+    // (Openingway == true) ? (printf("app发起运动\n"))
+    //                      : (printf("手表发起运动\n"));
 
     // 设置起始日期和时间
     SetStartDateTime();

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp
index ee92a51..d2302c4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp
@@ -48,10 +48,10 @@ void TraingRecordView ::InitView() {
   }
   // 展示界面
   if (TraingRecordModel::GetInstance().GetJsonStatus()) {
-    printf("存在训练数据！\r\n");
+    // printf("存在训练数据！\r\n");
     SetPopupViewStatus(PopupRecord::RecordPopup, true);
   } else {
-    printf("不存在训练数据！\r\n");
+    // printf("不存在训练数据！\r\n");
     SetPopupViewStatus(PopupRecord::LackPopup, true);
   }
 }
@@ -155,7 +155,7 @@ void TraingRecordView::ShowLackView() {
 
   // RootView::GetInstance()->lackView
   container_->Add(lackView);
-  printf("lackView Add\r\n");
+  // printf("lackView Add\r\n");
 
   lackView->SetDraggable(true);
   lackView->SetTouchable(true);
@@ -275,7 +275,7 @@ void TraingRecordView::OnSetUpView() {
     recordView->Add(TraingRecordList);
     recordView->SetStyle(STYLE_BACKGROUND_OPA, OPA_TRANSPARENT);
     container_->Add(recordView);
-    printf("recordView Add\r\n");
+    // printf("recordView Add\r\n");
     TraingRecordList->SetAdapter(p_TraingRecordAdapter);
   }
   Draw();

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/res_dial/birdie.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/res_dial/birdie.bin
index ba927c9..0f98229 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/res_dial/birdie.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/res_dial/birdie.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e33ef37d83f48fca4a1500e8a59b6b5d0f8b3ee708b813cc4ed6262c60f8a97b
+oid sha256:d956d730f94e57213326f1836e5ceb5385ea8724e8030b2637f3cdaf4003fa33
 size 1523474

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/res_dial/mirrorvoyager.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/res_dial/mirrorvoyager.bin
index 3b4fea9..6f29368 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/res_dial/mirrorvoyager.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/res_dial/mirrorvoyager.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a5d8bc107230504a162e406775632470502945c00416551650249b5342846a19
+oid sha256:21b21f7733f7fdf755190222c462c4f0292aaa861cd7bacb7c9e9d4240c153d0
 size 386125

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/res_dial/satellite.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/res_dial/satellite.bin
index 3007ad8..4378db3 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/res_dial/satellite.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/dial/res_dial/satellite.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5aa7ae09ae15f81dcb695f3e5ff627c2c5876893c7f8cee1590b7bd4acfd064f
+oid sha256:3a62dfc0af30a3ec696b947ba19f3ba5d14c8f86b8acd8d544d1ba937ca555d8
 size 1316038

diff --git a/tools/dial_converter_tool/dial_lzma/101/sport.lzma b/tools/dial_converter_tool/dial_lzma/101/sport.lzma
index 656fea0..bad8d85 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/101/sport.lzma and b/tools/dial_converter_tool/dial_lzma/101/sport.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma b/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma
index 2ea153e..f4a073e 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma and b/tools/dial_converter_tool/dial_lzma/103/jellyfish.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/104/dog.lzma b/tools/dial_converter_tool/dial_lzma/104/dog.lzma
index 3bd661a..e74695d 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/104/dog.lzma and b/tools/dial_converter_tool/dial_lzma/104/dog.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/1052/classic.lzma b/tools/dial_converter_tool/dial_lzma/1052/classic.lzma
index 59fd2e4..c8c1f85 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/1052/classic.lzma and b/tools/dial_converter_tool/dial_lzma/1052/classic.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma b/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma
index 5b4c111..debb01f 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma and b/tools/dial_converter_tool/dial_lzma/106/galaxy.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/107/geometry.lzma b/tools/dial_converter_tool/dial_lzma/107/geometry.lzma
index a69b26b..0b31122 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/107/geometry.lzma and b/tools/dial_converter_tool/dial_lzma/107/geometry.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/108/maomao.lzma b/tools/dial_converter_tool/dial_lzma/108/maomao.lzma
index cdae586..40c60f3 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/108/maomao.lzma and b/tools/dial_converter_tool/dial_lzma/108/maomao.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/109/succulents.lzma b/tools/dial_converter_tool/dial_lzma/109/succulents.lzma
index 630da34..77ec3dc 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/109/succulents.lzma and b/tools/dial_converter_tool/dial_lzma/109/succulents.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma b/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma
index d93b069..719c1eb 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma and b/tools/dial_converter_tool/dial_lzma/110/spaceman.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/111/satellite.lzma b/tools/dial_converter_tool/dial_lzma/111/satellite.lzma
index b1b072e..4db5529 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/111/satellite.lzma and b/tools/dial_converter_tool/dial_lzma/111/satellite.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/112/birdie.lzma b/tools/dial_converter_tool/dial_lzma/112/birdie.lzma
index fe6d3da..ca30ed2 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/112/birdie.lzma and b/tools/dial_converter_tool/dial_lzma/112/birdie.lzma differ

diff --git a/tools/dial_converter_tool/dial_lzma/115/mirrorvoyager.lzma b/tools/dial_converter_tool/dial_lzma/115/mirrorvoyager.lzma
index cbecb09..e8647b5 100644 (file)
Binary files a/tools/dial_converter_tool/dial_lzma/115/mirrorvoyager.lzma and b/tools/dial_converter_tool/dial_lzma/115/mirrorvoyager.lzma differ

diff --git a/tools/dial_converter_tool/instance/101/sport.xml b/tools/dial_converter_tool/instance/101/sport.xml
index 1353dc9..0d1d5a7 100644 (file)
--- a/tools/dial_converter_tool/instance/101/sport.xml
+++ b/tools/dial_converter_tool/instance/101/sport.xml
@@ -20,7 +20,7 @@
     <static_img id="progress" position="53 54" img_name="./instance/101/PROGRESS_IMAGE_PATH.png"></static_img>\r
 \r
     <!-- 电池电量显示标签，动态更新电池百分比 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="313 230 80 35" text="%.0f%%" font_size="25" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="313 230 80 35" text="%s" font_size="25" align="center" bind_data="20485" period="10"></label>\r
 \r
     <!-- 时针旋转图像，周期性更新 -->\r
     <rotate_img id="hour" position="202 16" rotate_center="25.0 211.0" rotate_start="0" rotate_end="360" img_name="./instance/101/HOURHAND.png" bind_data="9" period="10"></rotate_img>\r

diff --git a/tools/dial_converter_tool/instance/103/jellyfish.xml b/tools/dial_converter_tool/instance/103/jellyfish.xml
index 39bf61b..c2c5f85 100644 (file)
--- a/tools/dial_converter_tool/instance/103/jellyfish.xml
+++ b/tools/dial_converter_tool/instance/103/jellyfish.xml
@@ -14,7 +14,7 @@
     <!-- 电池图像 -->\r
     <option_img position="176 52" img_names="./instance/103/Battery/Battery.png,./instance/103/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
 \r
 \r
     <!-- 小时标签 -->\r

diff --git a/tools/dial_converter_tool/instance/104/dog.xml b/tools/dial_converter_tool/instance/104/dog.xml
index 382716c..b892d49 100644 (file)
--- a/tools/dial_converter_tool/instance/104/dog.xml
+++ b/tools/dial_converter_tool/instance/104/dog.xml
@@ -10,9 +10,11 @@
     <label id="week_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="194 348 100 30" text="%s" font_size="26" align="center" bind_data="20480" period="10"></label>\r
 \r
     <!-- 电池标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="335 246 100 60" text="%.0f%%" font_size="28" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="360 246 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+\r
+\r
     <!-- 心率标签 -->\r
-    <label id="heart_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="35 246 100 60" text="%.0f" font_size="28" align="center" bind_data="2" period="10"></label>\r
+    <label id="heart_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="38 246 100 60" text="%.0f" font_size="28" align="center" bind_data="2" period="10"></label>\r
 \r
     <!-- 时针图像 -->\r
     <rotate_img id="hour" position="221 87" rotate_center="12.0 146.0" rotate_start="0" rotate_end="360" img_name="./instance/104/HOURHAND.png" bind_data="9" period="10"></rotate_img>\r

diff --git a/tools/dial_converter_tool/instance/1052/classic.xml b/tools/dial_converter_tool/instance/1052/classic.xml
index b459278..6e38764 100644 (file)
--- a/tools/dial_converter_tool/instance/1052/classic.xml
+++ b/tools/dial_converter_tool/instance/1052/classic.xml
@@ -14,7 +14,7 @@
     <!-- 电池图像 -->\r
     <option_img position="173 52" img_names="./instance/1052/Battery/Battery.png,./instance/1052/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
 \r
     <!-- 时针 -->\r
     <rotate_img id="hour" position="221 87" rotate_center="12.0 146.0" rotate_start="0" rotate_end="360" img_name="./instance/1052/HOURHAND.png" bind_data="9" period="10"></rotate_img>\r

diff --git a/tools/dial_converter_tool/instance/106/galaxy.xml b/tools/dial_converter_tool/instance/106/galaxy.xml
index 0ab47cf..f29021a 100644 (file)
--- a/tools/dial_converter_tool/instance/106/galaxy.xml
+++ b/tools/dial_converter_tool/instance/106/galaxy.xml
@@ -28,7 +28,8 @@
     <!-- 电池图像 -->\r
     <option_img position="173 52" img_names="./instance/106/Battery/Battery.png,./instance/106/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+\r
 \r
     <!-- 小时显示 -->\r
     <!-- <label id="hour_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="59 160 77 104" text="%02.0f" font_size="120" align="center" bind_data="15" period="10"></label> -->\r

diff --git a/tools/dial_converter_tool/instance/107/geometry.xml b/tools/dial_converter_tool/instance/107/geometry.xml
index 2c2a2bb..f7c9024 100644 (file)
--- a/tools/dial_converter_tool/instance/107/geometry.xml
+++ b/tools/dial_converter_tool/instance/107/geometry.xml
@@ -15,7 +15,8 @@
     <!-- 电池图像 -->\r
     <option_img position="173 52" img_names="./instance/107/Battery/Battery.png,./instance/107/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+\r
 \r
     <!-- 小时显示 -->\r
     <label id="hour_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="adapt" rect="40 139 200 60" text="%02.0f" font_size="90" align="center" bind_data="15" period="10"></label>\r

diff --git a/tools/dial_converter_tool/instance/108/maomao.xml b/tools/dial_converter_tool/instance/108/maomao.xml
index 50ddad6..ea6048c 100644 (file)
--- a/tools/dial_converter_tool/instance/108/maomao.xml
+++ b/tools/dial_converter_tool/instance/108/maomao.xml
@@ -14,7 +14,8 @@
     <!-- 电池图像 -->\r
     <option_img position="173 52" img_names="./instance/108/Battery/Battery.png,./instance/108/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+\r
 \r
     <!-- 小时 -->\r
     <rotate_img id="hour" position="221 87" rotate_center="12.0 146.0" rotate_start="0" rotate_end="360" img_name="./instance/108/HOURHAND.png" bind_data="9" period="10"></rotate_img>\r

diff --git a/tools/dial_converter_tool/instance/109/succulents.xml b/tools/dial_converter_tool/instance/109/succulents.xml
index 5672354..3c2c948 100644 (file)
--- a/tools/dial_converter_tool/instance/109/succulents.xml
+++ b/tools/dial_converter_tool/instance/109/succulents.xml
@@ -13,7 +13,8 @@
     <!-- 电池图像 -->\r
     <option_img position="173 52" img_names="./instance/109/Battery/Battery.png,./instance/109/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+\r
 \r
     <!-- 小时标签 -->\r
     <!-- <label id="hour_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="adapt" rect="152 318 200 60" text="%02.0f" font_size="65" align="center" bind_data="15" period="10"></label> -->\r

diff --git a/tools/dial_converter_tool/instance/110/spaceman.xml b/tools/dial_converter_tool/instance/110/spaceman.xml
index 3a89a21..d238772 100644 (file)
--- a/tools/dial_converter_tool/instance/110/spaceman.xml
+++ b/tools/dial_converter_tool/instance/110/spaceman.xml
@@ -15,7 +15,8 @@
     <!-- 电池图像 -->\r
     <option_img position="173 52" img_names="./instance/110/Battery/Battery.png,./instance/110/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+\r
 \r
     <!-- 小时标签 -->\r
     <!-- <label id="hour_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="adapt" rect="152 318 200 60" text="%02.0f" font_size="65" align="center" bind_data="15" period="10"></label> -->\r

diff --git a/tools/dial_converter_tool/instance/111/satellite.xml b/tools/dial_converter_tool/instance/111/satellite.xml
index 8c4abba..f3a513c 100644 (file)
--- a/tools/dial_converter_tool/instance/111/satellite.xml
+++ b/tools/dial_converter_tool/instance/111/satellite.xml
@@ -15,7 +15,8 @@
     <!-- 电池图像 -->\r
     <option_img position="173 52" img_names="./instance/111/Battery/Battery.png,./instance/111/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+\r
 \r
     <!-- 小时标签 -->\r
     <!-- <label id="hour_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="adapt" rect="152 318 200 60" text="%02.0f" font_size="65" align="center" bind_data="15" period="10"></label> -->\r

diff --git a/tools/dial_converter_tool/instance/112/birdie.xml b/tools/dial_converter_tool/instance/112/birdie.xml
index c36096f..61e7f15 100644 (file)
--- a/tools/dial_converter_tool/instance/112/birdie.xml
+++ b/tools/dial_converter_tool/instance/112/birdie.xml
@@ -14,7 +14,8 @@
     <!-- 电池图像 -->\r
     <option_img position="173 52" img_names="./instance/112/Battery/Battery.png,./instance/112/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>\r
     <!-- 电池百分比标签 -->\r
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>\r
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="228 52 200 62" text="%s" font_size="26" align="center" bind_data="20485" period="10"></label>\r
+\r
 \r
     <!-- 小时标签 -->\r
     <!-- <label id="hour_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="adapt" rect="152 318 200 60" text="%02.0f" font_size="65" align="center" bind_data="15" period="10"></label> -->\r

diff --git a/tools/dial_converter_tool/instance/115/mirrorvoyager.xml b/tools/dial_converter_tool/instance/115/mirrorvoyager.xml
index ba13eb1..12ef967 100644 (file)
--- a/tools/dial_converter_tool/instance/115/mirrorvoyager.xml
+++ b/tools/dial_converter_tool/instance/115/mirrorvoyager.xml
@@ -24,8 +24,8 @@
         rect="29 340 200 60" text="%0.f" font_size="20" align="center" bind_data="3"></label>\r
     <!-- 电量显示 -->\r
     <label id="battery_label" color="0xFF000000" font="HarmonyOS_Sans_SC_Regular.ttf"\r
-        break_mode="ellipsis" rect="232 340 200 60" text="%2.0f%%" font_size="20" align="center"\r
-        bind_data="8" period="10"></label>\r
+        break_mode="ellipsis" rect="232 340 200 60" text="%s" font_size="20" align="center"\r
+        bind_data="20485" period="10"></label>\r
 \r
     <!-- 小时 -->\r
     <rotate_img id="hour" position="212 75" rotate_center="21.0 158.0" rotate_start="0"\r
@@ -35,7 +35,7 @@
         rotate_end="360" img_name="./instance/115/MINUTEHAND.png" bind_data="10" period="10"></rotate_img>\r
     <!-- 秒钟 -->\r
     <rotate_img id="second" position="220 17" rotate_center="13.0 216.0" rotate_start="0"\r
-        rotate_end="360" img_name="./instance/115/SECONDHAND.png" bind_data="12" period="60"></rotate_img>\r
+        rotate_end="360" img_name="./instance/115/SECONDHAND.png" bind_data="12" period="30"></rotate_img>\r
 \r
     <!-- 秒进度条-->\r
     <arc_progress id="second_progress" rect="0 0 466 466" color="0xAA191919" cap_type="none"\r