From: 袁清梦 <3449750381@qq.com>
Date: Sat, 10 Aug 2024 01:52:34 +0000 (+0000)
Subject: Merge #667 into sdk602patch0626 from refs/changes/667/head
X-Git-Tag: release_V1.2.70_20241020_135402~686^2~1
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=989ee240f4757eb857a88bef02897957301dbb75;p=mirrors%2FFD230.git

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

Code review from 袁清梦

* refs/changes/667/head: (28 commits squashed)

  - 屏蔽血氧监测过程中的数值显示

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 增加表盘星期string类model

  - 增加血氧&amp;心率数据重启之后恢复

  - 筛选表盘血氧无效数据

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 修复星期显示

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 适配早安闹钟小睡功能

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 增加新的表盘数据类型

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 更新表盘配置 详情见dial_readme

  - 同步表盘lzma文件更新

  - 更新表盘原资源文件

  - 增加离线表盘开发指南

  - 优化组件初始化函数

  - 优化 UIViewGroup Add 函数 添加错误可以查看组件信息

  - 删除缓存文件

  - 增加Dial星期数据类型

  - 增加日期Dial数据类型

  - 增加时间的4个数据位数据类型

  - 设置表盘界面增加表盘控制：目前只有覆盖流生效

  - DialLabel关闭不必要的打印 增加新数据类型

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/667
---

diff --git a/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp
index 53429260b..bc3df8d6f 100644
--- a/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp
+++ b/code/sdk/application/wearable/CustomUIComponentTool/uicomponents/UIComponents.cpp
@@ -170,11 +170,14 @@ namespace OHOS
     bool InitButtonExt(UILabelButtonExt *&button, int left, int top, int width, int height, const char *viewId, UIResourceTextId id, int fontSize)
     {
         // 创建新按钮（如果当前按钮为空）
-        button = new UILabelButtonExt();
         if (button == nullptr)
         {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitButtonExt is error");
-            return false; // 内存分配失败，返回false
+            button = new UILabelButtonExt();
+            if (button == nullptr)
+            {
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "InitButtonExt is error");
+                return false; // 内存分配失败，返回false
+            }
         }
         button->SetPosition(left, top);
         button->Resize(width, height);
diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt
index be4708563..8f9b37a45 100644
--- a/code/sdk/application/wearable/fd230app/CMakeLists.txt
+++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt
@@ -164,6 +164,12 @@ set(SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelCalorie.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelWeekStr.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelWeather.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelDateStr.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelHourTens.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelHourUnits.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelMinTens.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelMinUnits.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/dial/DialModelHourMin.cpp
 
     #exception handling
     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/heart_blood/CheckAbnormalView.cpp
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialDataBase.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialDataBase.h
index 2a52f5b38..fbaa2175e 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialDataBase.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialDataBase.h
@@ -32,12 +32,18 @@ enum class DialDataType
     DATA_TYPE_DISTANCE,      // 运动距离
     DATA_TYPE_WEATHER,       // 天气
     DATA_TYPE_POWER_STANDBY, // 备用电量数据类型
-  
+    DATA_TYPE_HOUR_TENS,     // 小时(十位)
+    DATA_TYPE_HOUR_UNITS,    // 小时(单位)
+    DATA_TYPE_MINUTE_TENS,   // 分钟(十位)
+    DATA_TYPE_MINUTE_UNITS,  // 分钟(单位)
+
     DATA_TYPE_MULTI_FLOAT_BASE = 0x2fff, // 多个浮点数据类型基值
+    DATA_TYPE_HOUR_MIN,                  // 时分
 
-    DATA_TYPE_TEXT_BASE = 0x4fff,        // 文本数据类型基值
-    DATA_TYPE_WEEK_STR,                  // 星期(string)
+    DATA_TYPE_TEXT_BASE = 0x4fff, // 文本数据类型基值
+    DATA_TYPE_WEEK_STR,           // 星期(string)
+    DATA_TYPE_DATE_STR,           // 日期(string)
 
-    DATA_TYPE_MAX = 0x7fff,              // 数据类型的最大值
+    DATA_TYPE_MAX = 0x7fff, // 数据类型的最大值
 };
 #endif
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelDateStr.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelDateStr.h
new file mode 100644
index 000000000..c109ff972
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelDateStr.h
@@ -0,0 +1,30 @@
+
+
+#ifndef DIAL_MODEL_DateStr_H
+#define DIAL_MODEL_DateStr_H
+
+#include "DialBaseModel.h"
+#include <cstdint>
+#include <string>
+#include <vector>
+
+namespace OHOS
+{
+    class DialModelDateStr : public DialBaseModel
+    {
+    public:
+        DialModelDateStr() {}
+        virtual ~DialModelDateStr() {}
+        static DialModelDateStr *GetInstance()
+        {
+            static DialModelDateStr instance;
+            return &instance;
+        }
+        bool GetDialTextData(DialDataType &type, std::string *&out, int16_t &strNum) override;
+        void UpdateDateStr(const std::string *&dialDateStr);
+
+    private:
+        std::vector<std::string> datestr;
+    };
+}
+#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHourMin.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHourMin.h
new file mode 100644
index 000000000..d28ed1d1c
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHourMin.h
@@ -0,0 +1,29 @@
+
+#ifndef DIAL_MODEL_HourMin_H
+#define DIAL_MODEL_HourMin_H
+
+#include "DialBaseModel.h"
+#include <cstdint>
+#include <string>
+#include <vector>
+
+namespace OHOS
+{
+    class DialModelHourMin : public DialBaseModel
+    {
+    public:
+        DialModelHourMin() {}
+        virtual ~DialModelHourMin() {}
+        static DialModelHourMin *GetInstance()
+        {
+            static DialModelHourMin instance;
+            return &instance;
+        }
+        bool GetDialFloatData(DialDataType &type, float *&out, int16_t len) override;
+        void UpdateHourMin(const std::string *&dialHourMin);
+
+    private:
+        float dialhourmin{2};
+    };
+}
+#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHourTens.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHourTens.h
new file mode 100644
index 000000000..745f19df3
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHourTens.h
@@ -0,0 +1,27 @@
+
+#ifndef DIAL_MODEL_HourTens_H
+#define DIAL_MODEL_HourTens_H
+
+#include "DialBaseModel.h"
+
+namespace OHOS
+{
+    class DialModelHourTens : public DialBaseModel
+    {
+    public:
+        DialModelHourTens() {}
+        ~DialModelHourTens() override {}
+        static DialModelHourTens *GetInstance()
+        {
+            static DialModelHourTens instance;
+            return &instance;
+        }
+        bool GetDialFloatData(DialDataType &type, float &out) override;
+        void UpdateHourTens();
+
+    private:
+        struct tm tblock_;
+        uint8_t hour_tens;
+    };
+}
+#endif
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHourUnits.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHourUnits.h
new file mode 100644
index 000000000..b517dca23
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelHourUnits.h
@@ -0,0 +1,29 @@
+
+
+#ifndef DIAL_MODEL_HourUnits_H
+#define DIAL_MODEL_HourUnits_H
+
+#include "DialBaseModel.h"
+
+namespace OHOS
+{
+    class DialModelHourUnits : public DialBaseModel
+    {
+    public:
+        DialModelHourUnits() {}
+        ~DialModelHourUnits() override {}
+        static DialModelHourUnits *GetInstance()
+        {
+            static DialModelHourUnits instance;
+            return &instance;
+        }
+        bool GetDialFloatData(DialDataType &type, float &out) override;
+        void UpdateHourUnits();
+
+    private:
+        struct tm tblock_;
+        uint8_t hour_units;
+     
+    };
+}
+#endif
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelMinTens.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelMinTens.h
new file mode 100644
index 000000000..7f092b3b2
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelMinTens.h
@@ -0,0 +1,27 @@
+
+#ifndef DIAL_MODEL_MinTens_H
+#define DIAL_MODEL_MinTens_H
+
+#include "DialBaseModel.h"
+
+namespace OHOS
+{
+    class DialModelMinTens : public DialBaseModel
+    {
+    public:
+        DialModelMinTens() {}
+        ~DialModelMinTens() override {}
+        static DialModelMinTens *GetInstance()
+        {
+            static DialModelMinTens instance;
+            return &instance;
+        }
+        bool GetDialFloatData(DialDataType &type, float &out) override;
+        void UpdateMinTens();
+
+    private:
+        struct tm tblock_;
+        uint8_t min_tens;
+    };
+}
+#endif
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelMinUnits.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelMinUnits.h
new file mode 100644
index 000000000..86720f9cb
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelMinUnits.h
@@ -0,0 +1,28 @@
+
+
+#ifndef DIAL_MODEL_MinUnits_H
+#define DIAL_MODEL_MinUnits_H
+
+#include "DialBaseModel.h"
+
+namespace OHOS
+{
+    class DialModelMinUnits : public DialBaseModel
+    {
+    public:
+        DialModelMinUnits() {}
+        ~DialModelMinUnits() override {}
+        static DialModelMinUnits *GetInstance()
+        {
+            static DialModelMinUnits instance;
+            return &instance;
+        }
+        bool GetDialFloatData(DialDataType &type, float &out) override;
+        void UpdateMinUnits();
+
+    private:
+        struct tm tblock_;
+        uint8_t min_units;
+    };
+}
+#endif
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeekStr.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeekStr.h
index 7b7cffee4..d36d0a8e0 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeekStr.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeekStr.h
@@ -1,6 +1,12 @@
+/*** 
+ * @Date: 2024-08-03 17:35:36
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-08-07 11:50:10
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeekStr.h
+ */
 
-#ifndef DIAL_MODEL_PATH_H
-#define DIAL_MODEL_PATH_H
+#ifndef DIAL_MODEL_WeekStr_H
+#define DIAL_MODEL_WeekStr_H
 
 #include "DialBaseModel.h"
 #include <cstdint>
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialLabelView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialLabelView.cpp
index dc84cb26b..d69040315 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialLabelView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialLabelView.cpp
@@ -90,12 +90,7 @@ namespace OHOS
         // printf("HandleTextData called with num: %d, data[0]: %s\n", num, data[0].c_str());
 
         char tempBuf[MAX_BUF_SIZE] = {0};
-#if 0
-        for (uint16_t i = 0; i < num; ++i)
-        {
-            printf("data[%d]: %s\n", i, data[i].c_str());
-        }
-#endif
+
         int ret;
         switch (num)
         {
@@ -109,6 +104,10 @@ namespace OHOS
             ret = snprintf_s(tempBuf, MAX_BUF_SIZE, MAX_BUF_SIZE - 1, text_,
                              data[0].c_str(), "年", data[1].c_str(), "月", data[2].c_str(), "日");
             break;
+        case 4: /*8月7号  星期三*/
+            ret = snprintf_s(tempBuf, MAX_BUF_SIZE, MAX_BUF_SIZE - 1, text_,
+                             data[0].c_str(), data[1].c_str(), data[2].c_str());
+            break;
         default:
             GRAPHIC_LOGE("Invalid num: %d. Max size is 3.\n", num);
             return;
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelDateStr.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelDateStr.cpp
new file mode 100644
index 000000000..5be656d22
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelDateStr.cpp
@@ -0,0 +1,62 @@
+#include "RegisterDialModel.h"
+#include "DialModelDateStr.h"
+#include <string>
+#include <ctime>
+#include <time.h>
+#include "sys/time.h"
+#include "wearable_log.h"
+#include <vector>
+
+REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_DATE_STR, OHOS::DialModelDateStr::GetInstance());
+namespace OHOS
+{
+    //  CnDatedays 是一个包含星期字符串的数组
+    const std::string CnDatedays[] = {"星期天", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"};
+
+    /*继承的虚函数 不能修改*/
+    bool DialModelDateStr::GetDialTextData(DialDataType &type, std::string *&out, int16_t &strNum)
+    {
+        (void)type;
+
+        struct tm local_time = {0};
+        time_t seconds = time(nullptr);
+
+        if (localtime_r(&seconds, &local_time) == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "get localtime error!");
+            return false;
+        }
+
+        datestr.clear();                                          // 清空之前的数据
+        datestr.push_back(std::to_string(local_time.tm_mon + 1)); // 月份
+        datestr.push_back(std::to_string(local_time.tm_mday));    // 日期
+        datestr.push_back(CnDatedays[local_time.tm_wday]);        // 星期
+
+        strNum = 4; // 更新字符串数量类型
+
+        // 打印调试信息
+        for (size_t i = 0; i < datestr.size(); ++i)
+        {
+            WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "dialdateStr[%zu]: %s", i, datestr[i].c_str());
+        }
+        WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "Total strings: %d", strNum);
+
+        // 为输出分配内存
+        for (int16_t i = 0; i < datestr.size(); ++i)
+        {
+            out[i] = datestr[i]; // 将每个字符串复制到输出
+        }
+
+        return true;
+    }
+
+    void DialModelDateStr::UpdateDateStr(const std::string *&dialDateStr)
+    {
+        // dialdateStr_.clear();
+        // dialdateStr_ = *dialDateStr; // 更新字符串
+        // if (onChangeListener_ != nullptr)
+        // {
+        //     onChangeListener_->OnDialTextDataUpdate(DialDataType::DialModelMinUnits, &dialdateStr_, dialdateStr_.size());
+        // }
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..2207304c7
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHourMin.cpp
@@ -0,0 +1,49 @@
+/***
+ * @Date: 2024-08-08 16:15:49
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-08-08 16:28:43
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHourMin.cpp
+ */
+#include "RegisterDialModel.h"
+#include "DialModelHourMin.h"
+#include <string>
+#include <ctime>
+#include <time.h>
+#include "sys/time.h"
+#include "wearable_log.h"
+#include <vector>
+
+REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_HOUR_MIN, OHOS::DialModelHourMin::GetInstance());
+namespace OHOS
+{
+    /*继承的虚函数 不能修改*/
+    bool DialModelHourMin::GetDialFloatData(DialDataType &type, float *&out, int16_t len)
+    {
+        (void)type;
+
+        struct tm local_time = {0};
+        time_t seconds = time(nullptr);
+
+        if (localtime_r(&seconds, &local_time) == nullptr)
+        {
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "get localtime error!");
+            return false;
+        }
+
+        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]);
+        len = 2;
+        return true;
+    }
+
+    void DialModelHourMin::UpdateHourMin(const std::string *&dialHourMin)
+    {
+        // dialdateStr_.clear();
+        // dialdateStr_ = *dialHourMin; // 更新字符串
+        // if (onChangeListener_ != nullptr)
+        // {
+        //     onChangeListener_->OnDialTextDataUpdate(DialDataType::DialModelMinUnits, &dialdateStr_, dialdateStr_.size());
+        // }
+    }
+}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHourTens.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHourTens.cpp
new file mode 100644
index 000000000..25df34fe4
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHourTens.cpp
@@ -0,0 +1,32 @@
+/*** 
+ * @Date: 2024-08-08 15:01:28
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-08-08 15:13:46
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHourTens.cpp
+ */
+
+#include <sys/time.h>
+#include "RegisterDialModel.h"
+#include "DialModelHourTens.h"
+#include "custom_runtime.h"
+
+// 注册模块
+REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_HOUR_TENS, OHOS::DialModelHourTens::GetInstance());
+
+namespace OHOS
+{
+
+    bool DialModelHourTens::GetDialFloatData(DialDataType &type, float &out)
+    {
+        (void)type;
+        struct timeval tv;
+        gettimeofday(&tv, NULL); // 获取当前时间
+        localtime_r(&tv.tv_sec, &tblock_);
+        hour_tens = tblock_.tm_hour / 10; // 小时十位
+
+        out = static_cast<float>(hour_tens);
+
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHourUnits.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHourUnits.cpp
new file mode 100644
index 000000000..2cbf1baff
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHourUnits.cpp
@@ -0,0 +1,25 @@
+
+#include <sys/time.h>
+#include "RegisterDialModel.h"
+#include "DialModelHourUnits.h"
+#include "custom_runtime.h"
+
+// 注册模块
+REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_HOUR_UNITS, OHOS::DialModelHourUnits::GetInstance());
+
+namespace OHOS
+{
+
+    bool DialModelHourUnits::GetDialFloatData(DialDataType &type, float &out)
+    {
+        (void)type;
+        struct timeval tv;
+        gettimeofday(&tv, NULL); // 获取当前时间
+        localtime_r(&tv.tv_sec, &tblock_);
+        hour_units = tblock_.tm_hour % 10; // 小时十位
+
+        out = static_cast<float>(hour_units);
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelMinTens.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelMinTens.cpp
new file mode 100644
index 000000000..afff9b2f0
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelMinTens.cpp
@@ -0,0 +1,37 @@
+/*** 
+ * @Date: 2024-08-08 15:02:25
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-08-08 15:12:41
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelMinTens.cpp
+ */
+/***
+ * @Date: 2024-08-08 15:01:28
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-08-08 15:10:38
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelMinTens.cpp
+ */
+
+#include <sys/time.h>
+#include "RegisterDialModel.h"
+#include "DialModelMinTens.h"
+#include "custom_runtime.h"
+
+// 注册模块
+REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_MINUTE_TENS, OHOS::DialModelMinTens::GetInstance());
+
+namespace OHOS
+{
+
+    bool DialModelMinTens::GetDialFloatData(DialDataType &type, float &out)
+    {
+        (void)type;
+        struct timeval tv;
+        gettimeofday(&tv, NULL); // 获取当前时间
+        localtime_r(&tv.tv_sec, &tblock_);
+        min_tens = tblock_.tm_min / 10; // 分钟十位
+
+        out = static_cast<float>(min_tens);
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelMinUnits.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelMinUnits.cpp
new file mode 100644
index 000000000..7d8a50bba
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelMinUnits.cpp
@@ -0,0 +1,31 @@
+/***
+ * @Date: 2024-08-08 15:02:35
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-08-08 15:12:59
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelMinUnits.cpp
+ */
+
+#include <sys/time.h>
+#include "RegisterDialModel.h"
+#include "DialModelMinUnits.h"
+#include "custom_runtime.h"
+
+// 注册模块
+REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_MINUTE_UNITS, OHOS::DialModelMinUnits::GetInstance());
+
+namespace OHOS
+{
+
+    bool DialModelMinUnits::GetDialFloatData(DialDataType &type, float &out)
+    {
+        (void)type;
+        struct timeval tv;
+        gettimeofday(&tv, NULL); // 获取当前时间
+        localtime_r(&tv.tv_sec, &tblock_);
+        min_units = tblock_.tm_hour % 10; // 小时十位
+
+        out = static_cast<float>(min_units);
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialView.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialView.cpp
index 557861d27..1a20e52a9 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialView.cpp
@@ -76,6 +76,11 @@ namespace OHOS
         }
 
         label_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
+
+        // 增加表冠控制
+        coverflow_.SetRotateFactor(2);
+        coverflow_.RequestFocus();
+
         container_->Add(&coverflow_);
         container_->Add(&label_);
     }
@@ -86,6 +91,7 @@ namespace OHOS
         rollerView_.SetItemSize(150, 150); // 150: item size
         rollerView_.SetThrowDrag(true);
         rollerView_.SetItemPadding(80); // 80: item padding
+
         container_->Add(&rollerView_);
 
         std::vector<SetDialInfo> &dialInfo = presenter_->GetDialInfo();
@@ -105,6 +111,10 @@ namespace OHOS
         rollerView_.SetOnClickListener(presenter_);
         rollerView_.SetOnScrollListener(presenter_);
 
+        // 增加表冠控制
+        rollerView_.SetRotateFactor(2);
+        rollerView_.RequestFocus();
+
         label_.SetPosition(127, 50, 200, 50);
         label_.SetTextColor(Color::White());
         label_.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
diff --git a/code/sdk/middleware/services/gui/uikit/ui/frameworks/components/ui_view_group.cpp b/code/sdk/middleware/services/gui/uikit/ui/frameworks/components/ui_view_group.cpp
index 090a2bdd9..e8c7a0c40 100755
--- a/code/sdk/middleware/services/gui/uikit/ui/frameworks/components/ui_view_group.cpp
+++ b/code/sdk/middleware/services/gui/uikit/ui/frameworks/components/ui_view_group.cpp
@@ -44,7 +44,8 @@ void UIViewGroup::Add(UIView* view)
         return;
     }
     if (view->GetParent() != nullptr) {
-        GRAPHIC_LOGE("can not add view multi times");
+        UIViewType type = view->GetViewType();
+        GRAPHIC_LOGE("can not add view multi times %d",type);
         return;
     }
 
diff --git a/tools/dial_converter_tool/dial_lzma/101/sport.lzma b/tools/dial_converter_tool/dial_lzma/101/sport.lzma
index 18f4b376e..179a709db 100644
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 fba028ced..be0e63f23 100644
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 0de9f515c..55e24c950 100644
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/105/kitty.lzma b/tools/dial_converter_tool/dial_lzma/105/kitty.lzma
index b95242a7c..abb915d4c 100644
Binary files a/tools/dial_converter_tool/dial_lzma/105/kitty.lzma and b/tools/dial_converter_tool/dial_lzma/105/kitty.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 324fa5271..59fd2e497 100644
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 7b6e44942..e81723f11 100644
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 9f1149aa7..a69b26b5f 100644
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 dd12e746d..cdae586c2 100644
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 07a40dd03..266f2fea0 100644
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 611ca7c8f..fbbbc92e3 100644
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 00a2d3113..6756dfae6 100644
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 363a7f186..c73d4f1f1 100644
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/113/golden_ball.lzma b/tools/dial_converter_tool/dial_lzma/113/golden_ball.lzma
new file mode 100644
index 000000000..f2c264ebd
Binary files /dev/null and b/tools/dial_converter_tool/dial_lzma/113/golden_ball.lzma differ
diff --git a/tools/dial_converter_tool/instance/101/sport.xml b/tools/dial_converter_tool/instance/101/sport.xml
index e52ee4d12..d8ad6065b 100644
--- a/tools/dial_converter_tool/instance/101/sport.xml
+++ b/tools/dial_converter_tool/instance/101/sport.xml
@@ -12,7 +12,7 @@
     <static_img id="heart_rate" position="156 260" img_name="./instance/101/HEARTRATE_IMAGE_PATH.png"></static_img>
 
     <!-- 心率显示标签，动态更新心率 -->
-    <label id="heart_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="198 330 60 35" text="%3.0f" font_size="25" align="center" bind_data="2" period="10"></label>
+    <label id="heart_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="196 330 60 35" text="%3.0f" font_size="25" align="center" bind_data="2" period="10"></label>
 
     <!-- 进度条背景图 -->
     <static_img id="progress" position="53 54" img_name="./instance/101/PROGRESS_IMAGE_PATH.png"></static_img>
diff --git a/tools/dial_converter_tool/instance/103/Array_Num/0.png b/tools/dial_converter_tool/instance/103/Array_Num/0.png
new file mode 100644
index 000000000..4608d0b84
Binary files /dev/null and b/tools/dial_converter_tool/instance/103/Array_Num/0.png differ
diff --git a/tools/dial_converter_tool/instance/103/Array_Num/1.png b/tools/dial_converter_tool/instance/103/Array_Num/1.png
new file mode 100644
index 000000000..ac8840f01
Binary files /dev/null and b/tools/dial_converter_tool/instance/103/Array_Num/1.png differ
diff --git a/tools/dial_converter_tool/instance/103/Array_Num/2.png b/tools/dial_converter_tool/instance/103/Array_Num/2.png
new file mode 100644
index 000000000..edacf9361
Binary files /dev/null and b/tools/dial_converter_tool/instance/103/Array_Num/2.png differ
diff --git a/tools/dial_converter_tool/instance/103/Array_Num/3.png b/tools/dial_converter_tool/instance/103/Array_Num/3.png
new file mode 100644
index 000000000..fe0becde9
Binary files /dev/null and b/tools/dial_converter_tool/instance/103/Array_Num/3.png differ
diff --git a/tools/dial_converter_tool/instance/103/Array_Num/4.png b/tools/dial_converter_tool/instance/103/Array_Num/4.png
new file mode 100644
index 000000000..6261a315f
Binary files /dev/null and b/tools/dial_converter_tool/instance/103/Array_Num/4.png differ
diff --git a/tools/dial_converter_tool/instance/103/Array_Num/5.png b/tools/dial_converter_tool/instance/103/Array_Num/5.png
new file mode 100644
index 000000000..f9293dadf
Binary files /dev/null and b/tools/dial_converter_tool/instance/103/Array_Num/5.png differ
diff --git a/tools/dial_converter_tool/instance/103/Array_Num/6.png b/tools/dial_converter_tool/instance/103/Array_Num/6.png
new file mode 100644
index 000000000..dcb8646d9
Binary files /dev/null and b/tools/dial_converter_tool/instance/103/Array_Num/6.png differ
diff --git a/tools/dial_converter_tool/instance/103/Array_Num/7.png b/tools/dial_converter_tool/instance/103/Array_Num/7.png
new file mode 100644
index 000000000..e50d88995
Binary files /dev/null and b/tools/dial_converter_tool/instance/103/Array_Num/7.png differ
diff --git a/tools/dial_converter_tool/instance/103/Array_Num/8.png b/tools/dial_converter_tool/instance/103/Array_Num/8.png
new file mode 100644
index 000000000..dcf5ba4ef
Binary files /dev/null and b/tools/dial_converter_tool/instance/103/Array_Num/8.png differ
diff --git a/tools/dial_converter_tool/instance/103/Array_Num/9.png b/tools/dial_converter_tool/instance/103/Array_Num/9.png
new file mode 100644
index 000000000..183200e46
Binary files /dev/null and b/tools/dial_converter_tool/instance/103/Array_Num/9.png differ
diff --git a/tools/dial_converter_tool/instance/103/jellyfish.xml b/tools/dial_converter_tool/instance/103/jellyfish.xml
index 6055df057..5fa44a14a 100644
--- a/tools/dial_converter_tool/instance/103/jellyfish.xml
+++ b/tools/dial_converter_tool/instance/103/jellyfish.xml
@@ -1,24 +1,27 @@
 <dial title="jellyfish" description="水母" size="466 466" version="1.0" preview_img="./instance/103/jellyfish.png">
+
     <static_img id="back_ground" position="0 0" img_name="./instance/103/MAIN_FACE_IMAGE.png"></static_img>
 
     <!-- 月份标签 -->
-    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="142 390 60 30" text="%2.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
+    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="142 390 60 30" text="%02.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
     <!-- 日期标签 -->
-    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="185 390 60 30" text="%2.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
-    <!-- 星期选项图片 -->
-    <option_img position="262 390" img_names="./instance/103/week/7.png,./instance/103/week/1.png,./instance/103/week/2.png,./instance/103/week/3.png,./instance/103/week/4.png,./instance/103/week/5.png,./instance/103/week/6.png" bind_data="17" period="10"></option_img>
+    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="192 390 60 30" text="%02.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
+    <!-- 星期显示 -->
+    <label id="week_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="262 390 100 30" text="%s" font_size="26" align="center" bind_data="20480" period="10"></label>
+
+    <!-- 电池进度条 -->
+    <box_progress id="battery_progress" rect="180 58 30 18" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
+    <!-- 电池图像 -->
+    <option_img position="173 52" img_names="./instance/103/Battery/Battery.png,./instance/103/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
+    <!-- 电池百分比标签 -->
+    <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>
 
-    <!-- 电量进度条 -->
-    <box_progress id="battery_progress" rect="180 56 31 19" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
-    <!-- 电量选项图片 -->
-    <option_img position="174 49" img_names="./instance/103/Battery/Battery.png,./instance/103/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
-    <!-- 电量标签 -->
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="226 49 200 60" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>
 
     <!-- 小时标签 -->
     <label id="hour_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="101 295 200 60" text="%02.0f" font_size="90" align="center" bind_data="15" period="10"></label>
     <!-- 分钟标签 -->
     <label id="minute_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="259 295 200 60" text="%02.0f" font_size="90" align="center" bind_data="14" period="10"></label>
     <!-- 分隔符标签 -->
-    <label id="point_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="208 275 50 120" text=":" font_size="105" align="center" bind_data="15" period="10"></label>
+    <label id="point_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="208 275 50 120" text=":" font_size="105" align="center" ></label>
+
 </dial>
\ No newline at end of file
diff --git a/tools/dial_converter_tool/instance/103/week/1.png b/tools/dial_converter_tool/instance/103/week/1.png
deleted file mode 100644
index 6304005b1..000000000
Binary files a/tools/dial_converter_tool/instance/103/week/1.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/103/week/2.png b/tools/dial_converter_tool/instance/103/week/2.png
deleted file mode 100644
index 5454b1190..000000000
Binary files a/tools/dial_converter_tool/instance/103/week/2.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/103/week/3.png b/tools/dial_converter_tool/instance/103/week/3.png
deleted file mode 100644
index 110a03318..000000000
Binary files a/tools/dial_converter_tool/instance/103/week/3.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/103/week/4.png b/tools/dial_converter_tool/instance/103/week/4.png
deleted file mode 100644
index a8fbf5442..000000000
Binary files a/tools/dial_converter_tool/instance/103/week/4.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/103/week/5.png b/tools/dial_converter_tool/instance/103/week/5.png
deleted file mode 100644
index 8d7a3ee42..000000000
Binary files a/tools/dial_converter_tool/instance/103/week/5.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/103/week/6.png b/tools/dial_converter_tool/instance/103/week/6.png
deleted file mode 100644
index f49f8ef98..000000000
Binary files a/tools/dial_converter_tool/instance/103/week/6.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/103/week/7.png b/tools/dial_converter_tool/instance/103/week/7.png
deleted file mode 100644
index 45dff3434..000000000
Binary files a/tools/dial_converter_tool/instance/103/week/7.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/103/week/FIRDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/103/week/FIRDAY_IMAGE_PATH.png
deleted file mode 100644
index 9c3993262..000000000
Binary files a/tools/dial_converter_tool/instance/103/week/FIRDAY_IMAGE_PATH.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/103/week/MONDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/103/week/MONDAY_IMAGE_PATH.png
deleted file mode 100644
index 58d2cdd29..000000000
Binary files a/tools/dial_converter_tool/instance/103/week/MONDAY_IMAGE_PATH.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/103/week/SATURDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/103/week/SATURDAY_IMAGE_PATH.png
deleted file mode 100644
index 861ad16a8..000000000
Binary files a/tools/dial_converter_tool/instance/103/week/SATURDAY_IMAGE_PATH.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/103/week/SUNDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/103/week/SUNDAY_IMAGE_PATH.png
deleted file mode 100644
index 1a0947185..000000000
Binary files a/tools/dial_converter_tool/instance/103/week/SUNDAY_IMAGE_PATH.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/103/week/THURSDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/103/week/THURSDAY_IMAGE_PATH.png
deleted file mode 100644
index a2e27c6d8..000000000
Binary files a/tools/dial_converter_tool/instance/103/week/THURSDAY_IMAGE_PATH.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/103/week/TUESDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/103/week/TUESDAY_IMAGE_PATH.png
deleted file mode 100644
index c5b292dcb..000000000
Binary files a/tools/dial_converter_tool/instance/103/week/TUESDAY_IMAGE_PATH.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/103/week/WEDNESDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/103/week/WEDNESDAY_IMAGE_PATH.png
deleted file mode 100644
index e099b5661..000000000
Binary files a/tools/dial_converter_tool/instance/103/week/WEDNESDAY_IMAGE_PATH.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/104/dog.xml b/tools/dial_converter_tool/instance/104/dog.xml
index 0410875fe..296364d5f 100644
--- a/tools/dial_converter_tool/instance/104/dog.xml
+++ b/tools/dial_converter_tool/instance/104/dog.xml
@@ -2,17 +2,17 @@
     <!-- 背景图像 -->
     <static_img id="back_ground" position="0 0" img_name="./instance/104/MAIN_FACE_IMAGE.png"></static_img>
 
-    <!-- 月份标签 -->
-    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="177 300 60 30" text="%02.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
-    <!-- 日期标签 -->
-    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="229 300 60 30" text="%02.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
-    <!-- 星期图像选项 -->
-    <option_img position="209 338" img_names="./instance/104/week/7.png,./instance/104/week/1.png,./instance/104/week/2.png,./instance/104/week/3.png,./instance/104/week/4.png,./instance/104/week/5.png,./instance/104/week/6.png" bind_data="17" period="10"></option_img>
+    <!-- 月份显示 -->
+    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="177 311 60 30" text="%02.0f月" font_size="30" align="center" bind_data="18" period="10"></label>
+    <!-- 日期显示 -->
+    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="238 311 60 30" text="%02.0f号" font_size="30" align="center" bind_data="16" period="10"></label>
+    <!-- 星期显示 -->
+    <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>
 
     <!-- 电池标签 -->
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="335 246 200 60" text="%2.0f%%" font_size="28" align="center" bind_data="8" period="10"></label>
+    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="335 246 100 60" text="%2.0f%%" font_size="28" align="center" bind_data="8" period="10"></label>
     <!-- 心率标签 -->
-    <label id="heart_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="68 246 200 60" text="%2.0f" font_size="28" align="center" bind_data="2" period="10"></label>
+    <label id="heart_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="35 246 100 60" text="%2.0f" font_size="28" align="center" bind_data="2" period="10"></label>
 
     <!-- 时针图像 -->
     <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>
diff --git a/tools/dial_converter_tool/instance/105/kitty.xml b/tools/dial_converter_tool/instance/105/kitty.xml
index aefeb9258..7b191302c 100644
--- a/tools/dial_converter_tool/instance/105/kitty.xml
+++ b/tools/dial_converter_tool/instance/105/kitty.xml
@@ -1,12 +1,24 @@
 <dial title="kitty" description="小猫" size="466 466" version="1.0" preview_img="./instance/105/kitty.png">
+
     <sequence_img img_names="./instance/105/background/1.png,./instance/105/background/6.png,./instance/105/background/11.png,./instance/105/background/16.png,./instance/105/background/21.png,./instance/105/background/26.png,./instance/105/background/31.png,./instance/105/background/36.png,./instance/105/background/41.png,./instance/105/background/46.png,./instance/105/background/51.png,./instance/105/background/56.png,./instance/105/background/61.png,./instance/105/background/66.png,./instance/105/background/71.png,./instance/105/background/76.png,./instance/105/background/81.png,./instance/105/background/86.png,./instance/105/background/91.png,./instance/105/background/96.png,./instance/105/background/101.png,./instance/105/background/106.png,./instance/105/background/111.png,./instance/105/background/116.png,./instance/105/background/121.png,./instance/105/background/126.png,./instance/105/background/131.png,./instance/105/background/136.png,./instance/105/background/141.png,./instance/105/background/146.png,./instance/105/background/151.png,./instance/105/background/156.png,./instance/105/background/161.png,./instance/105/background/166.png,./instance/105/background/171.png,./instance/105/background/176.png,./instance/105/background/181.png,./instance/105/background/186.png,./instance/105/background/191.png,./instance/105/background/196.png,./instance/105/background/201.png" position="0 140" repeat="true" interval="100"></sequence_img>
-    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="142 390 60 30" text="%2.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
-    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="185 390 60 30" text="%2.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
-    <option_img position="262 390" img_names="./instance/105/week/7.png,./instance/105/week/1.png,./instance/105/week/2.png,./instance/105/week/3.png,./instance/105/week/4.png,./instance/105/week/5.png,./instance/105/week/6.png" bind_data="17" period="10"></option_img>
-    <box_progress id="battery_progress" rect="180 43 31 19" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
-    <option_img position="174 37" img_names="./instance/105/Battery/Battery.png,./instance/105/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="226 35 200 60" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>
+   
+    <!-- 月份标签 -->
+    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="142 390 60 30" text="%02.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
+    <!-- 日期标签 -->
+    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="192 390 60 30" text="%02.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
+    <!-- 星期显示 -->
+    <label id="week_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="262 390 100 30" text="%s" font_size="26" align="center" bind_data="20480" period="10"></label>
+    
+    <!-- 电池进度条 -->
+    <box_progress id="battery_progress" rect="180 58 30 18" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
+    <!-- 电池图像 -->
+    <option_img position="173 52" img_names="./instance/105/Battery/Battery.png,./instance/105/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
+    <!-- 电池百分比标签 -->
+    <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>
+
+
     <label id="hour_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="101 295 200 60" text="%02.0f" font_size="90" align="center" bind_data="15" period="10"></label>
     <label id="minute_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="259 295 200 60" text="%02.0f" font_size="90" align="center" bind_data="14" period="10"></label>
-    <label id="point_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="208 275 50 120" text=":" font_size="105" align="center" bind_data="15" period="10"></label>
+    <label id="point_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="208 275 50 120" text=":" font_size="105" align="center"></label>
+
 </dial>
\ No newline at end of file
diff --git a/tools/dial_converter_tool/instance/1052/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/1052/MAIN_FACE_IMAGE.png
index fc5c671a2..1dcdef3d4 100644
Binary files a/tools/dial_converter_tool/instance/1052/MAIN_FACE_IMAGE.png and b/tools/dial_converter_tool/instance/1052/MAIN_FACE_IMAGE.png differ
diff --git a/tools/dial_converter_tool/instance/1052/classic.xml b/tools/dial_converter_tool/instance/1052/classic.xml
index c54d8a2cf..b459278a2 100644
--- a/tools/dial_converter_tool/instance/1052/classic.xml
+++ b/tools/dial_converter_tool/instance/1052/classic.xml
@@ -1,18 +1,20 @@
 <dial title="classic" description="经典表盘" size="466 466" version="1.0" preview_img="./instance/1052/classic.png">
     <static_img id="back_ground" position="0 0" img_name="./instance/1052/MAIN_FACE_IMAGE.png"></static_img>
+    
     <!-- 月份显示 -->
-    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="185 365 60 30" text="%2.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
+    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="177 311 60 30" text="%02.0f月" font_size="30" align="center" bind_data="18" period="10"></label>
     <!-- 日期显示 -->
-    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="230 365 60 30" text="%2.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
+    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="238 311 60 30" text="%02.0f号" font_size="30" align="center" bind_data="16" period="10"></label>
     <!-- 星期显示 -->
-    <option_img position="207 400" img_names="./instance/1052/week/7.png,./instance/1052/week/1.png,./instance/1052/week/2.png,./instance/1052/week/3.png,./instance/1052/week/4.png,./instance/1052/week/5.png,./instance/1052/week/6.png" bind_data="17" period="10"></option_img>
+    <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>
+
 
     <!-- 电池进度条 -->
-    <box_progress id="battery_progress" rect="180 69 31 19" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
+    <box_progress id="battery_progress" rect="180 58 30 18" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
     <!-- 电池图像 -->
-    <option_img position="174 62" img_names="./instance/1052/Battery/Battery.png,./instance/1052/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
+    <option_img position="173 52" img_names="./instance/1052/Battery/Battery.png,./instance/1052/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
     <!-- 电池百分比标签 -->
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="226 60 200 62" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>
+    <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>
 
     <!-- 时针 -->
     <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>
diff --git a/tools/dial_converter_tool/instance/1052/week/1.png b/tools/dial_converter_tool/instance/1052/week/1.png
deleted file mode 100644
index 6304005b1..000000000
Binary files a/tools/dial_converter_tool/instance/1052/week/1.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/1052/week/2.png b/tools/dial_converter_tool/instance/1052/week/2.png
deleted file mode 100644
index 5454b1190..000000000
Binary files a/tools/dial_converter_tool/instance/1052/week/2.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/1052/week/3.png b/tools/dial_converter_tool/instance/1052/week/3.png
deleted file mode 100644
index 110a03318..000000000
Binary files a/tools/dial_converter_tool/instance/1052/week/3.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/1052/week/4.png b/tools/dial_converter_tool/instance/1052/week/4.png
deleted file mode 100644
index a8fbf5442..000000000
Binary files a/tools/dial_converter_tool/instance/1052/week/4.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/1052/week/5.png b/tools/dial_converter_tool/instance/1052/week/5.png
deleted file mode 100644
index 8d7a3ee42..000000000
Binary files a/tools/dial_converter_tool/instance/1052/week/5.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/1052/week/6.png b/tools/dial_converter_tool/instance/1052/week/6.png
deleted file mode 100644
index f49f8ef98..000000000
Binary files a/tools/dial_converter_tool/instance/1052/week/6.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/1052/week/7.png b/tools/dial_converter_tool/instance/1052/week/7.png
deleted file mode 100644
index 45dff3434..000000000
Binary files a/tools/dial_converter_tool/instance/1052/week/7.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/1052/week/FIRDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/1052/week/FIRDAY_IMAGE_PATH.png
deleted file mode 100644
index 9c3993262..000000000
Binary files a/tools/dial_converter_tool/instance/1052/week/FIRDAY_IMAGE_PATH.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/1052/week/MONDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/1052/week/MONDAY_IMAGE_PATH.png
deleted file mode 100644
index 58d2cdd29..000000000
Binary files a/tools/dial_converter_tool/instance/1052/week/MONDAY_IMAGE_PATH.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/1052/week/SATURDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/1052/week/SATURDAY_IMAGE_PATH.png
deleted file mode 100644
index 861ad16a8..000000000
Binary files a/tools/dial_converter_tool/instance/1052/week/SATURDAY_IMAGE_PATH.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/1052/week/SUNDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/1052/week/SUNDAY_IMAGE_PATH.png
deleted file mode 100644
index 1a0947185..000000000
Binary files a/tools/dial_converter_tool/instance/1052/week/SUNDAY_IMAGE_PATH.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/1052/week/THURSDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/1052/week/THURSDAY_IMAGE_PATH.png
deleted file mode 100644
index a2e27c6d8..000000000
Binary files a/tools/dial_converter_tool/instance/1052/week/THURSDAY_IMAGE_PATH.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/1052/week/TUESDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/1052/week/TUESDAY_IMAGE_PATH.png
deleted file mode 100644
index c5b292dcb..000000000
Binary files a/tools/dial_converter_tool/instance/1052/week/TUESDAY_IMAGE_PATH.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/1052/week/WEDNESDAY_IMAGE_PATH.png b/tools/dial_converter_tool/instance/1052/week/WEDNESDAY_IMAGE_PATH.png
deleted file mode 100644
index e099b5661..000000000
Binary files a/tools/dial_converter_tool/instance/1052/week/WEDNESDAY_IMAGE_PATH.png and /dev/null differ
diff --git a/tools/dial_converter_tool/instance/106/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/106/MAIN_FACE_IMAGE.png
index 19f2f2a2d..0ea475e8e 100644
Binary files a/tools/dial_converter_tool/instance/106/MAIN_FACE_IMAGE.png and b/tools/dial_converter_tool/instance/106/MAIN_FACE_IMAGE.png differ
diff --git a/tools/dial_converter_tool/instance/106/galaxy.xml b/tools/dial_converter_tool/instance/106/galaxy.xml
index 8b426530e..0d17f69e7 100644
--- a/tools/dial_converter_tool/instance/106/galaxy.xml
+++ b/tools/dial_converter_tool/instance/106/galaxy.xml
@@ -3,24 +3,32 @@
 
     <!-- 月份显示 -->
     <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="128 114 60 30" text="%02.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
-    <!-- 日期显示 -->
+
+    <!-- 日期显示  -->
     <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="180 114 60 30" text="%02.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
+
     <!-- 星期显示 -->
-    <option_img position="250 114" img_names="./instance/106/week/7.png,./instance/106/week/1.png,./instance/106/week/2.png,./instance/106/week/3.png,./instance/106/week/4.png,./instance/106/week/5.png,./instance/106/week/6.png" bind_data="17" period="10"></option_img>
+    <label id="week_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="250 114 100 30" text="%s" font_size="26" align="center" bind_data="20480" period="10"></label>
+
+<!-- 日期显示
+    <label id="date_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="83 114 300 60" text="%s月%s日  %s" font_size="26" align="center" bind_data="20481" period="10"></label>
+-->
 
     <!-- 距离显示 -->
-    <label id="distance_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="110 361 200 60" text="%3.1f" font_size="26" align="center" bind_data="23"></label>
+    <label id="distance_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="31 361 200 60" text="%3.1f" font_size="26" align="center" bind_data="23"></label>
+    
     <!-- 步数显示 -->
-    <label id="step_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="197 361 200 60" text="%5.0f" font_size="26" align="center" bind_data="1"></label>
+    <label id="step_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="121 361 200 60" text="%5.0f" font_size="26" align="center" bind_data="1"></label>
+   
     <!-- 心率显示 -->
-    <label id="heart_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="316 361 200 60" text="%3.0f" font_size="26" align="center" bind_data="2"></label>
-
-    <!-- 电量显示 -->
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="226 49 200 60" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="60"></label>
-    <!-- 电量进度条 -->
-    <box_progress id="battery_progress" rect="180 56 31 19" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="60"></box_progress>
-    <!-- 电量图标 -->
-    <option_img position="174 49" img_names="./instance/106/Battery/Battery.png,./instance/106/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
+    <label id="heart_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="230 361 200 60" text="%3.0f" font_size="26" align="center" bind_data="2"></label>
+   
+    <!-- 电池进度条 -->
+    <box_progress id="battery_progress" rect="180 58 30 18" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
+    <!-- 电池图像 -->
+    <option_img position="173 52" img_names="./instance/106/Battery/Battery.png,./instance/106/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
+    <!-- 电池百分比标签 -->
+    <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>
 
     <!-- 小时显示 -->
     <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>
diff --git a/tools/dial_converter_tool/instance/107/geometry.xml b/tools/dial_converter_tool/instance/107/geometry.xml
index 68e5a9c29..2c2a2bbe3 100644
--- a/tools/dial_converter_tool/instance/107/geometry.xml
+++ b/tools/dial_converter_tool/instance/107/geometry.xml
@@ -2,22 +2,24 @@
     <!-- 几何动画序列 -->
     <sequence_img img_names="./instance/107/geometry/1.png,./instance/107/geometry/2.png,./instance/107/geometry/3.png,./instance/107/geometry/4.png,./instance/107/geometry/5.png,./instance/107/geometry/6.png,./instance/107/geometry/7.png,./instance/107/geometry/8.png,./instance/107/geometry/9.png,./instance/107/geometry/10.png,./instance/107/geometry/11.png" position="138 132" repeat="true" interval="100"></sequence_img>
 
+
     <!-- 月份显示 -->
-    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="185 365 60 30" text="%2.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
+    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="177 365 60 30" text="%02.0f月" font_size="30" align="center" bind_data="18" period="10"></label>
     <!-- 日期显示 -->
-    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="230 365 60 30" text="%2.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
+    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="238 365 60 30" text="%02.0f号" font_size="30" align="center" bind_data="16" period="10"></label>
     <!-- 星期显示 -->
-    <option_img position="207 400" img_names="./instance/107/week/7.png,./instance/107/week/1.png,./instance/107/week/2.png,./instance/107/week/3.png,./instance/107/week/4.png,./instance/107/week/5.png,./instance/107/week/6.png" bind_data="17" period="10"></option_img>
+    <label id="week_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="194 404 100 30" text="%s" font_size="26" align="center" bind_data="20480" period="10"></label>
 
-    <!-- 电量进度条 -->
-    <box_progress id="battery_progress" rect="180 43 31 19" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
-    <!-- 电量图标 -->
-    <option_img position="174 37" img_names="./instance/107/Battery/Battery.png,./instance/107/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
-    <!-- 电量显示 -->
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="226 35 200 60" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>
+    <!-- 电池进度条 -->
+    <box_progress id="battery_progress" rect="180 58 30 18" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
+    <!-- 电池图像 -->
+    <option_img position="173 52" img_names="./instance/107/Battery/Battery.png,./instance/107/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
+    <!-- 电池百分比标签 -->
+    <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>
 
     <!-- 小时显示 -->
-    <label id="hour_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="40 139 200 60" text="%02.0f" font_size="90" align="center" bind_data="15" period="10"></label>
+    <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>
     <!-- 分钟显示 -->
-    <label id="minute_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="347 209 200 60" text="%02.0f" font_size="80" align="center" bind_data="14" period="10"></label>
+    <label id="minute_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="adapt" rect="347 209 200 60" text="%02.0f" font_size="80" align="center" bind_data="14" period="10"></label>
+
 </dial>
\ No newline at end of file
diff --git a/tools/dial_converter_tool/instance/108/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/108/MAIN_FACE_IMAGE.png
index 4bd514ed6..9ce4353b5 100644
Binary files a/tools/dial_converter_tool/instance/108/MAIN_FACE_IMAGE.png and b/tools/dial_converter_tool/instance/108/MAIN_FACE_IMAGE.png differ
diff --git a/tools/dial_converter_tool/instance/108/maomao.xml b/tools/dial_converter_tool/instance/108/maomao.xml
index 4d9da635c..50ddad66f 100644
--- a/tools/dial_converter_tool/instance/108/maomao.xml
+++ b/tools/dial_converter_tool/instance/108/maomao.xml
@@ -3,18 +3,18 @@
     <static_img id="back_ground" position="0 0" img_name="./instance/108/MAIN_FACE_IMAGE.png"></static_img>
 
     <!-- 月份显示 -->
-    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="185 365 60 30" text="%2.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
+    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="177 365 60 30" text="%02.0f月" font_size="30" align="center" bind_data="18" period="10"></label>
     <!-- 日期显示 -->
-    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="230 365 60 30" text="%2.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
+    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="238 365 60 30" text="%02.0f号" font_size="30" align="center" bind_data="16" period="10"></label>
     <!-- 星期显示 -->
-    <option_img position="207 400" img_names="./instance/108/week/7.png,./instance/108/week/1.png,./instance/108/week/2.png,./instance/108/week/3.png,./instance/108/week/4.png,./instance/108/week/5.png,./instance/108/week/6.png" bind_data="17" period="10"></option_img>
+    <label id="week_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="194 404 100 30" text="%s" font_size="26" align="center" bind_data="20480" period="10"></label>
 
-    <!-- 电量 -->
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="226 50 200 60" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="60"></label>
-    <!-- 电量进度条 -->
-    <box_progress id="battery_progress" rect="180 58 31 19" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
-    <!-- 电量框 -->
-    <option_img position="174 52" img_names="./instance/108/Battery/Battery.png,./instance/108/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
+    <!-- 电池进度条 -->
+    <box_progress id="battery_progress" rect="180 58 30 18" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
+    <!-- 电池图像 -->
+    <option_img position="173 52" img_names="./instance/108/Battery/Battery.png,./instance/108/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
+    <!-- 电池百分比标签 -->
+    <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>
 
     <!-- 小时 -->
     <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>
@@ -22,4 +22,5 @@
     <rotate_img id="minute" position="221 33" rotate_center="12.0 200.0" rotate_start="0" rotate_end="360" img_name="./instance/108/MINUTEHAND.png" bind_data="10" period="10"></rotate_img>
     <!-- 秒钟 -->
     <rotate_img id="second" position="221 28" rotate_center="12.0 205.0" rotate_start="0" rotate_end="360" img_name="./instance/108/SECONDHAND.png" bind_data="12" period="60"></rotate_img>
+
 </dial>
diff --git a/tools/dial_converter_tool/instance/109/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/109/MAIN_FACE_IMAGE.png
index a4310e82a..585e00f16 100644
Binary files a/tools/dial_converter_tool/instance/109/MAIN_FACE_IMAGE.png and b/tools/dial_converter_tool/instance/109/MAIN_FACE_IMAGE.png differ
diff --git a/tools/dial_converter_tool/instance/109/succulents.xml b/tools/dial_converter_tool/instance/109/succulents.xml
index b09820f57..b5acde1a1 100644
--- a/tools/dial_converter_tool/instance/109/succulents.xml
+++ b/tools/dial_converter_tool/instance/109/succulents.xml
@@ -1,25 +1,25 @@
 <dial title="succulents" description="多肉" size="466 466" version="1.0" preview_img="./instance/109/succulents.png">
     <static_img id="back_ground" position="0 0" img_name="./instance/109/MAIN_FACE_IMAGE.png"></static_img>
 
-    <!-- 电量进度条 -->
-    <box_progress id="battery_progress" rect="180 56 31 19" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
-    <!-- 电量选项图片 -->
-    <option_img position="174 49" img_names="./instance/109/Battery/Battery.png,./instance/109/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
-    <!-- 电量标签 -->
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="226 47 200 60" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>
+    <!-- 月份标签 -->
+    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="142 390 60 30" text="%02.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
+    <!-- 日期标签 -->
+    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="192 390 60 30" text="%02.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
+    <!-- 星期显示 -->
+    <label id="week_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="262 390 100 30" text="%s" font_size="26" align="center" bind_data="20480" period="10"></label>
+    
+    <!-- 电池进度条 -->
+    <box_progress id="battery_progress" rect="180 58 30 18" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
+    <!-- 电池图像 -->
+    <option_img position="173 52" img_names="./instance/109/Battery/Battery.png,./instance/109/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
+    <!-- 电池百分比标签 -->
+    <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>
 
     <!-- 小时标签 -->
-    <label id="hour_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="117 300 200 60" text="%02.0f" font_size="75" align="center" bind_data="15" period="10"></label>
+    <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>
     <!-- 分钟标签 -->
-    <label id="minute_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="248 300 200 60" text="%02.0f" font_size="75" align="center" bind_data="14" period="10"></label>
-    <!-- 分隔符标签 -->
-    <label id="point_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="198 279 50 120" text=":" font_size="90" align="center" bind_data="15" period="10"></label>
-
+    <label id="minute_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="adapt" rect="260 318 200 60" text="%02.0f" font_size="65" align="center" bind_data="14" period="10"></label>
+    <!-- 分隔符 -->
+    <label id="point_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="ellipsis" rect="220 308 50 120" text=":" font_size="75" align="center"></label>
 
-    <!-- 月份标签 -->
-    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="142 393 60 30" text="%2.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
-    <!-- 日期标签 -->
-    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="185 393 60 30" text="%2.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
-    <!-- 星期选项图片 -->
-    <option_img position="262 393" img_names="./instance/109/week/7.png,./instance/109/week/1.png,./instance/109/week/2.png,./instance/109/week/3.png,./instance/109/week/4.png,./instance/109/week/5.png,./instance/109/week/6.png" bind_data="17" period="10"></option_img>
 </dial>
\ No newline at end of file
diff --git a/tools/dial_converter_tool/instance/110/spaceman.xml b/tools/dial_converter_tool/instance/110/spaceman.xml
index 138f10897..1221f16c2 100644
--- a/tools/dial_converter_tool/instance/110/spaceman.xml
+++ b/tools/dial_converter_tool/instance/110/spaceman.xml
@@ -3,25 +3,25 @@
     <video id="video" rect="0 0 466 466" source="./instance/110/spaceman.mp4" color_key="0xff212324" preview_frame="./instance/110/preview_spaceman.png"></video>
 
 
-    <!-- 电量进度条 -->
-    <box_progress id="battery_progress" rect="180 55 31 19" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
-    <!-- 电量选项图片 -->
-    <option_img position="174 49" img_names="./instance/110/Battery/Battery.png,./instance/110/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
-    <!-- 电量标签 -->
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="226 47 200 60" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>
+    <!-- 月份标签 -->
+    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="142 390 60 30" text="%02.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
+    <!-- 日期标签 -->
+    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="192 390 60 30" text="%02.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
+    <!-- 星期显示 -->
+    <label id="week_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="262 390 100 30" text="%s" font_size="26" align="center" bind_data="20480" period="10"></label>
+
+    <!-- 电池进度条 -->
+    <box_progress id="battery_progress" rect="180 58 30 18" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
+    <!-- 电池图像 -->
+    <option_img position="173 52" img_names="./instance/110/Battery/Battery.png,./instance/110/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
+    <!-- 电池百分比标签 -->
+    <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>
 
     <!-- 小时标签 -->
-    <label id="hour_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="117 300 200 60" text="%02.0f" font_size="75" align="center" bind_data="15" period="10"></label>
+    <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>
     <!-- 分钟标签 -->
-    <label id="minute_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="248 300 200 60" text="%02.0f" font_size="75" align="center" bind_data="14" period="10"></label>
-    <!-- 分隔符标签 -->
-    <label id="point_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="198 279 50 120" text=":" font_size="90" align="center" bind_data="15" period="10"></label>
+    <label id="minute_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="adapt" rect="260 318 200 60" text="%02.0f" font_size="65" align="center" bind_data="14" period="10"></label>
+    <!-- 分隔符 -->
+    <label id="point_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="ellipsis" rect="220 308 50 120" text=":" font_size="75" align="center"></label>
 
-    
-    <!-- 月份标签 -->
-    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="142 393 60 30" text="%2.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
-    <!-- 日期标签 -->
-    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="185 393 60 30" text="%2.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
-    <!-- 星期选项图片 -->
-    <option_img position="262 393" img_names="./instance/110/week/7.png,./instance/110/week/1.png,./instance/110/week/2.png,./instance/110/week/3.png,./instance/110/week/4.png,./instance/110/week/5.png,./instance/110/week/6.png" bind_data="17" period="10"></option_img>
 </dial>
\ No newline at end of file
diff --git a/tools/dial_converter_tool/instance/111/satellite.xml b/tools/dial_converter_tool/instance/111/satellite.xml
index eeaf21821..a6d869084 100644
--- a/tools/dial_converter_tool/instance/111/satellite.xml
+++ b/tools/dial_converter_tool/instance/111/satellite.xml
@@ -3,25 +3,25 @@
 
     <video id="video" rect="0 0 466 466" source="./instance/111/satellite.mp4" color_key="0xff212324" preview_frame="./instance/111/preview_satellite.png"></video>
 
-    <!-- 电量进度条 -->
-    <box_progress id="battery_progress" rect="180 55 31 19" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
-    <!-- 电量选项图片 -->
-    <option_img position="174 49" img_names="./instance/111/Battery/Battery.png,./instance/111/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
-    <!-- 电量标签 -->
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="226 47 200 60" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>
+    <!-- 月份标签 -->
+    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="142 390 60 30" text="%02.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
+    <!-- 日期标签 -->
+    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="192 390 60 30" text="%02.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
+    <!-- 星期显示 -->
+    <label id="week_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="262 390 100 30" text="%s" font_size="26" align="center" bind_data="20480" period="10"></label>
+
+    <!-- 电池进度条 -->
+    <box_progress id="battery_progress" rect="180 58 30 18" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
+    <!-- 电池图像 -->
+    <option_img position="173 52" img_names="./instance/111/Battery/Battery.png,./instance/111/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
+    <!-- 电池百分比标签 -->
+    <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>
 
     <!-- 小时标签 -->
-    <label id="hour_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="117 300 200 60" text="%02.0f" font_size="75" align="center" bind_data="15" period="10"></label>
+    <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>
     <!-- 分钟标签 -->
-    <label id="minute_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="248 300 200 60" text="%02.0f" font_size="75" align="center" bind_data="14" period="10"></label>
-    <!-- 分隔符标签 -->
-    <label id="point_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="198 279 50 120" text=":" font_size="90" align="center" bind_data="15" period="10"></label>
+    <label id="minute_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="adapt" rect="260 318 200 60" text="%02.0f" font_size="65" align="center" bind_data="14" period="10"></label>
+    <!-- 分隔符 -->
+    <label id="point_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="ellipsis" rect="220 308 50 120" text=":" font_size="75" align="center"></label>
 
-    
-    <!-- 月份标签 -->
-    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="142 393 60 30" text="%2.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
-    <!-- 日期标签 -->
-    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="185 393 60 30" text="%2.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
-    <!-- 星期选项图片 -->
-    <option_img position="262 393" img_names="./instance/111/week/7.png,./instance/111/week/1.png,./instance/111/week/2.png,./instance/111/week/3.png,./instance/111/week/4.png,./instance/111/week/5.png,./instance/111/week/6.png" bind_data="17" period="10"></option_img>
 </dial>
\ No newline at end of file
diff --git a/tools/dial_converter_tool/instance/112/birdie.xml b/tools/dial_converter_tool/instance/112/birdie.xml
index 49e056b40..710db34b7 100644
--- a/tools/dial_converter_tool/instance/112/birdie.xml
+++ b/tools/dial_converter_tool/instance/112/birdie.xml
@@ -1,27 +1,26 @@
-
 <dial title="birdie" description="飞鸟" size="466 466" version="1.0" preview_img="./instance/112/birdie.png">
 
     <video id="video" rect="0 0 466 466" source="./instance/112/birdie.mp4" color_key="0xff212324" preview_frame="./instance/112/preview_birdie.png"></video>
 
-    <!-- 电量进度条 -->
-    <box_progress id="battery_progress" rect="180 55 31 19" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
-    <!-- 电量选项图片 -->
-    <option_img position="174 49" img_names="./instance/112/Battery/Battery.png,./instance/112/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
-    <!-- 电量标签 -->
-    <label id="battery_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="226 47 200 60" text="%2.0f%%" font_size="26" align="center" bind_data="8" period="10"></label>
+    <!-- 月份标签 -->
+    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="142 390 60 30" text="%02.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
+    <!-- 日期标签 -->
+    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="192 390 60 30" text="%02.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
+    <!-- 星期显示 -->
+    <label id="week_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="262 390 100 30" text="%s" font_size="26" align="center" bind_data="20480" period="10"></label>
+
+    <!-- 电池进度条 -->
+    <box_progress id="battery_progress" rect="180 58 30 18" color="0xFFFFFFFF" cap_type="none" direction="left_to_right" background_color="0x00FFFFFF" bind_data="25" period="10"></box_progress>
+    <!-- 电池图像 -->
+    <option_img position="173 52" img_names="./instance/112/Battery/Battery.png,./instance/112/Battery/BatteryCharge.png" bind_data="20" period="10"></option_img>
+    <!-- 电池百分比标签 -->
+    <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>
 
     <!-- 小时标签 -->
-    <label id="hour_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="117 300 200 60" text="%02.0f" font_size="75" align="center" bind_data="15" period="10"></label>
+    <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>
     <!-- 分钟标签 -->
-    <label id="minute_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="248 300 200 60" text="%02.0f" font_size="75" align="center" bind_data="14" period="10"></label>
-    <!-- 分隔符标签 -->
-    <label id="point_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="198 279 50 120" text=":" font_size="90" align="center" bind_data="15" period="10"></label>
+    <label id="minute_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="adapt" rect="260 318 200 60" text="%02.0f" font_size="65" align="center" bind_data="14" period="10"></label>
+    <!-- 分隔符 -->
+    <label id="point_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="ellipsis" rect="220 308 50 120" text=":" font_size="75" align="center"></label>
 
-    
-    <!-- 月份标签 -->
-    <label id="month_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="142 393 60 30" text="%2.0f月" font_size="26" align="center" bind_data="18" period="10"></label>
-    <!-- 日期标签 -->
-    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="185 393 60 30" text="%2.0f号" font_size="26" align="center" bind_data="16" period="10"></label>
-    <!-- 星期选项图片 -->
-    <option_img position="262 393" img_names="./instance/112/week/7.png,./instance/112/week/1.png,./instance/112/week/2.png,./instance/112/week/3.png,./instance/112/week/4.png,./instance/112/week/5.png,./instance/112/week/6.png" bind_data="17" period="10"></option_img>
 </dial>
\ No newline at end of file
diff --git a/tools/dial_converter_tool/instance/113/Battery/Battery.png b/tools/dial_converter_tool/instance/113/Battery/Battery.png
new file mode 100644
index 000000000..916febe86
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/Battery/Battery.png differ
diff --git a/tools/dial_converter_tool/instance/113/Battery/BatteryCharge.png b/tools/dial_converter_tool/instance/113/Battery/BatteryCharge.png
new file mode 100644
index 000000000..4c26888f3
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/Battery/BatteryCharge.png differ
diff --git a/tools/dial_converter_tool/instance/113/HOURHAND.png b/tools/dial_converter_tool/instance/113/HOURHAND.png
new file mode 100644
index 000000000..6d6cbbdc9
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/HOURHAND.png differ
diff --git a/tools/dial_converter_tool/instance/113/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/113/MAIN_FACE_IMAGE.png
new file mode 100644
index 000000000..b03740b49
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/MAIN_FACE_IMAGE.png differ
diff --git a/tools/dial_converter_tool/instance/113/MINUTEHAND.png b/tools/dial_converter_tool/instance/113/MINUTEHAND.png
new file mode 100644
index 000000000..3ee2d1941
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/MINUTEHAND.png differ
diff --git a/tools/dial_converter_tool/instance/113/golden_ball.png b/tools/dial_converter_tool/instance/113/golden_ball.png
new file mode 100644
index 000000000..238060ffa
Binary files /dev/null and b/tools/dial_converter_tool/instance/113/golden_ball.png differ
diff --git a/tools/dial_converter_tool/instance/113/golden_ball.xml b/tools/dial_converter_tool/instance/113/golden_ball.xml
new file mode 100644
index 000000000..cc5a38422
--- /dev/null
+++ b/tools/dial_converter_tool/instance/113/golden_ball.xml
@@ -0,0 +1,15 @@
+<dial title="golden_ball" description="数字足球" size="466 466" version="1.0" preview_img="./instance/113/golden_ball.png">
+    <!-- 背景 -->
+    <static_img id="back_ground" position="0 0" img_name="./instance/113/MAIN_FACE_IMAGE.png"></static_img>
+
+    <!-- 心率显示 -->
+    <label id="heart_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="ellipsis" rect="87 349 60 30" text="%2.0f" font_size="23" align="center" bind_data="2" period="10"></label>
+
+    <!-- 电量 -->
+    <label id="battery_label" color="0xFFFFFFFF" font="Gilroy_Bold.ttf" break_mode="ellipsis" rect="253 349 200 60" text="%2.0f%%" font_size="23" align="center" bind_data="8" period="60"></label>
+
+    <!-- 小时 -->
+    <rotate_img id="hour" position="210 0" rotate_center="18.0 147" rotate_start="0" rotate_end="360" img_name="./instance/113/HOURHAND.png" bind_data="9" period="10"></rotate_img>
+    <!-- 分钟 -->
+    <rotate_img id="minute" position="211 0" rotate_center="18.7 147" rotate_start="0" rotate_end="360" img_name="./instance/113/MINUTEHAND.png" bind_data="10" period="10"></rotate_img>
+</dial>
diff --git "a/tools/dial_converter_tool/\347\246\273\347\272\277\350\241\250\347\233\230\345\274\200\345\217\221\346\214\207\345\215\227.docx" "b/tools/dial_converter_tool/\347\246\273\347\272\277\350\241\250\347\233\230\345\274\200\345\217\221\346\214\207\345\215\227.docx"
new file mode 100644
index 000000000..3cd3eb930
Binary files /dev/null and "b/tools/dial_converter_tool/\347\246\273\347\272\277\350\241\250\347\233\230\345\274\200\345\217\221\346\214\207\345\215\227.docx" differ
diff --git a/tools/image_converter_tool/test/clock_test/Galaxy.bin b/tools/image_converter_tool/test/clock_test/Galaxy.bin
new file mode 100644
index 000000000..3f5c01b12
--- /dev/null
+++ b/tools/image_converter_tool/test/clock_test/Galaxy.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7438da4391198ecb1b2aa41e9707b4da703375892ae9c43b965443bf076715a9
+size 146040
diff --git a/tools/image_converter_tool/test/clocks/Galaxy.png b/tools/image_converter_tool/test/clocks/Galaxy.png
new file mode 100644
index 000000000..0ea475e8e
Binary files /dev/null and b/tools/image_converter_tool/test/clocks/Galaxy.png differ