From: penglei <1624952103@qq.com>
Date: Wed, 28 Aug 2024 11:29:44 +0000 (+0800)
Subject: 优化省电模式4G、蓝牙开关逻辑，添加“黑曜律动”表盘（待优化）
X-Git-Tag: release_V1.2.70_20241020_135402~549^2~16
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=4d606cb6de2928ff794e2565b237e46ed7f99c07;p=mirrors%2FFD230.git

优化省电模式4G、蓝牙开关逻辑，添加“黑曜律动”表盘（待优化）
---

diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt
index 46837da2e..8981da594 100644
--- a/code/sdk/application/wearable/fd230app/CMakeLists.txt
+++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt
@@ -168,6 +168,7 @@ 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/DialModelWeatherStr.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
diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
index cf46569a2..86a93fc03 100644
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
@@ -135,10 +135,11 @@ typedef enum : uint16_t
 #ifdef SUPPORT_ALIPAY_SEC
     VIEW_MAIN_ALIPAY,
 #endif
-
+    /*请在最末添加新的viewID*/
     VIEW_MAX_INTER_APP,       // 在此之前添加native应用ID.
     VIEW_EXTERN_APP = 0xFFFE, // 三方应用
     VIEW_INVALIDE_APP = 0xFFFF,
+
 } AppViewId;
 
 /*
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 fbaa2175e..03894a1de 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
@@ -43,6 +43,7 @@ enum class DialDataType
     DATA_TYPE_TEXT_BASE = 0x4fff, // 文本数据类型基值
     DATA_TYPE_WEEK_STR,           // 星期(string)
     DATA_TYPE_DATE_STR,           // 日期(string)
+    DATA_TYPE_WEATHER_STR,        // 天气（string)
 
     DATA_TYPE_MAX = 0x7fff, // 数据类型的最大值
 };
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeather.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeather.h
index 214dd3f99..eefd660fe 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeather.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeather.h
@@ -1,3 +1,13 @@
+/*
+ * @Author: penglei 1624952103@qq.com
+ * @Date: 2024-06-07 11:18:25
+ * @LastEditors: penglei 1624952103@qq.com
+ * @LastEditTime: 2024-08-28 11:28:26
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeather.h
+ * @Description: 
+ * 
+ * Copyright (c) 2024 by ${git_name_email}, All Rights Reserved. 
+ */
 /*
  * Copyright (c) CompanyNameMagicTag 2023. All rights reserved.
  * Description: DialModelWeather
@@ -24,10 +34,12 @@ namespace OHOS
         }
         bool GetDialFloatData(DialDataType &type, float &out) override;
         void UpdateWeather(int16_t Weather);
+        void UpdateWeatherStr(std::string text);
         int GetWeatherData(void);
 
     private:
         float Weather_ = 0; // 默认晴天
+        std::string Weather_Str = "25° 晴";
     };
 }
 #endif
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeatherStr.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeatherStr.h
new file mode 100644
index 000000000..422028936
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeatherStr.h
@@ -0,0 +1,39 @@
+/*
+ * @Author: penglei 1624952103@qq.com
+ * @Date: 2024-08-28 16:45:12
+ * @LastEditors: penglei 1624952103@qq.com
+ * @LastEditTime: 2024-08-28 16:55:58
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeatherStr.h
+ * @Description: 
+ * 
+ * Copyright (c) 2024 by ${git_name_email}, All Rights Reserved. 
+ */
+
+
+#ifndef DIAL_MODEL_WeatherStr_H
+#define DIAL_MODEL_WeatherStr_H
+
+#include "DialBaseModel.h"
+#include <cstdint>
+#include <string>
+
+namespace OHOS
+{
+    class DialModelWeatherStr : public DialBaseModel
+    {
+    public:
+        DialModelWeatherStr() {}
+        virtual ~DialModelWeatherStr() {}
+        static DialModelWeatherStr *GetInstance()
+        {
+            static DialModelWeatherStr instance;
+            return &instance;
+        }
+        bool GetDialTextData(DialDataType &type, std::string *&out, int16_t &strNum) override;
+        void UpdateWeatherStr(const std::string dialWeatherStr);
+
+    private:
+        std::string dialWeatherStr_;
+    };
+}
+#endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelWeatherStr.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelWeatherStr.cpp
new file mode 100644
index 000000000..d2c82ddab
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelWeatherStr.cpp
@@ -0,0 +1,41 @@
+/*
+ * @Author: penglei 1624952103@qq.com
+ * @Date: 2024-08-23 10:50:37
+ * @LastEditors: penglei 1624952103@qq.com
+ * @LastEditTime: 2024-08-28 16:57:26
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelWeatherStr.cpp
+ * @Description: 
+ * 
+ * Copyright (c) 2024 by ${git_name_email}, All Rights Reserved. 
+ */
+#include "RegisterDialModel.h"
+#include "DialModelWeatherStr.h"
+#include <string>
+#include <ctime>
+#include <time.h>
+#include "sys/time.h"
+#include "wearable_log.h"
+
+REGIST_DIAL_MODULE(DialDataType::DATA_TYPE_WEATHER_STR, OHOS::DialModelWeatherStr::GetInstance());
+namespace OHOS
+{
+
+    bool DialModelWeatherStr::GetDialTextData(DialDataType &type, std::string *&out, int16_t &strNum)
+    {
+        (void)type;
+
+        out = &dialWeatherStr_;
+        strNum = 1;
+        return true;
+    }
+
+    void DialModelWeatherStr::UpdateWeatherStr(const std::string dialWeatherStr)
+    {
+        dialWeatherStr_.clear();
+        dialWeatherStr_ = dialWeatherStr; // 更新字符串
+        if (onChangeListener_ != nullptr)
+        {
+            onChangeListener_->OnDialTextDataUpdate(DialDataType::DATA_TYPE_WEATHER_STR, &dialWeatherStr_, 1);
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp
index 34769a5cb..bf9f6e803 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp
@@ -780,8 +780,7 @@ namespace OHOS
          }  
         display_api->set_auto_timeout_function(false);
 
-        uapi_cat1_power_on(1);
-        uapi_cat1_reset(0);
+        uapi_set4GCapability(true);
 
         start_custom_ble_service();
     }
diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherModel.cpp
index eb23d0194..b4bb5648f 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherModel.cpp
@@ -1,14 +1,15 @@
 /*
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-04-08 18:40:09
- * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-23 14:54:46
+ * @LastEditors: penglei 1624952103@qq.com
+ * @LastEditTime: 2024-08-28 17:12:21
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherModel.cpp
  */
 #include "weather/include/WeatherModel.h"
 #include "weather/include/MainWeatherView.h"
 #include "weather/include/WeatherControlView.h"
-
+#include "DialModelWeather.h"
+#include "DialModelWeatherStr.h"
 namespace OHOS
 {
 #if __cplusplus
@@ -302,6 +303,13 @@ namespace OHOS
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "p_WeatherControlView");
             p_WeatherControlView->UpdateWeatherControlViewVisibility();
         }
+        if(DialModelWeather::GetInstance()){
+            DialModelWeather::GetInstance()->UpdateWeather(Weather_data_seven_data[0].iconDay); //更新主界面天气图标
+            // const std::string str = GetWeatherTemperature() + " "+GetWeatherDescription();
+            const std::string str = GetWeatherTemperature();
+            DialModelWeatherStr::GetInstance()->UpdateWeatherStr(str);
+        }
+
     }
 
     /*更新天气界面的时间显示*/
diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp
index e92c90a88..41f3781d9 100644
--- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp
+++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp
@@ -929,7 +929,11 @@ void restart_sleep_cat1_timer(void)
 
 static void time_sync_func(void)
 {
-    
+    if(uapi_dev_runtime_get_saveele_status())
+    {
+        //省电模式直接返回
+        return;
+    }
     // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"time_sync_func\n");
     
     if (uapi_cat1_get_power_stat() == false )
diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index 1bbb96a7c..f828adad4 100644
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@ -281,8 +281,11 @@ bool start_custom_ble_service(void)
         PRINT("start custom protocol classic bt ble service !\r\n");
         bluetooth_enable_all();
 #endif 
+    if(!uapi_dev_runtime_get_saveele_status())
+    {
+        uapi_dev_runtime_set_bt_powerstat(1);
+    }
 
-    uapi_dev_runtime_set_bt_powerstat(1);
     return true;
 }
 
@@ -292,7 +295,11 @@ bool stop_custom_ble_service(void)
     PRINT("stop custom protocol classic bt ble service !\r\n");
     bluetooth_close_all();
 #endif 
-    uapi_dev_runtime_set_bt_powerstat(0);
+    if(!uapi_dev_runtime_get_saveele_status())
+    {
+        uapi_dev_runtime_set_bt_powerstat(0);
+    }   
+
     return true;
 }
 
@@ -1177,7 +1184,10 @@ void uapi_set4GCapability(bool isopen)
     if(isopen)
     {
         power_on_cat1();
-        uapi_dev_runtime_set_cat1_powerstat(1);
+        if(!uapi_dev_runtime_get_saveele_status())
+        {
+            uapi_dev_runtime_set_cat1_powerstat(1);
+        }
         #ifdef SUPPORT_TCPIP
             tcp_thread_id = tcp_get_thread_id();
             ret = uapi_resume_thread(tcp_thread_id);
@@ -1190,7 +1200,11 @@ void uapi_set4GCapability(bool isopen)
     else
     {
         power_off_cat1();
-        uapi_dev_runtime_set_cat1_powerstat(0);
+        if(!uapi_dev_runtime_get_saveele_status())
+        {
+            uapi_dev_runtime_set_cat1_powerstat(0);
+        }
+            
         #ifdef SUPPORT_TCPIP
             tcp_thread_id = tcp_get_thread_id();
             ret = uapi_suspend_thread(tcp_thread_id);
@@ -2284,11 +2298,18 @@ void uapi_enter_power_saving_mode(void)
 
     //关闭蓝牙
     if(uapi_dev_runtime_get_bt_powerstat())
+    {
+        
         stop_custom_ble_service();
+    }
+        
 
     //关闭cat1
     if(uapi_dev_runtime_get_cat1_powerstat())
+    {
         uapi_set4GCapability(false);
+    }
+        
     //停止心率周期检测
     
     //进入normal模式
@@ -2306,8 +2327,7 @@ void uapi_enter_power_saving_mode(void)
 void uapi_exit_power_saving_mode(void)
 {
     PRINT("Exit Power Saving Mode !!! \r\n");
-    //配置runtime
-    uapi_dev_runtime_set_saveele_status(0);
+    
 
     //打开蓝牙
     if(uapi_dev_runtime_get_bt_powerstat())
@@ -2322,6 +2342,9 @@ void uapi_exit_power_saving_mode(void)
     //开启运动识别
     if(uapi_dev_runtime_get_motion_recognition_status())
         do_cywee_service_check_msg(CYWEE_SERVICE_CMD_OPEN_AR_ALERT,NULL);
+
+    //配置runtime
+    uapi_dev_runtime_set_saveele_status(0);
 }
 
 
diff --git a/tools/dial_converter_tool/instance/114/HOURHAND.png b/tools/dial_converter_tool/instance/114/HOURHAND.png
new file mode 100644
index 000000000..b23ba8a10
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/HOURHAND.png differ
diff --git a/tools/dial_converter_tool/instance/114/MAIN_FACE_IMAGE.png b/tools/dial_converter_tool/instance/114/MAIN_FACE_IMAGE.png
new file mode 100644
index 000000000..030b3555d
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/MAIN_FACE_IMAGE.png differ
diff --git a/tools/dial_converter_tool/instance/114/MINUTEHAND.png b/tools/dial_converter_tool/instance/114/MINUTEHAND.png
new file mode 100644
index 000000000..d0799575a
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/MINUTEHAND.png differ
diff --git a/tools/dial_converter_tool/instance/114/SECONDHAND.png b/tools/dial_converter_tool/instance/114/SECONDHAND.png
new file mode 100644
index 000000000..ddf585d64
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/SECONDHAND.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/1.png b/tools/dial_converter_tool/instance/114/background/1.png
new file mode 100644
index 000000000..c6e62d80a
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/1.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/10.png b/tools/dial_converter_tool/instance/114/background/10.png
new file mode 100644
index 000000000..2de72ff3f
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/10.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/11.png b/tools/dial_converter_tool/instance/114/background/11.png
new file mode 100644
index 000000000..d8a0a6ddb
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/11.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/12.png b/tools/dial_converter_tool/instance/114/background/12.png
new file mode 100644
index 000000000..5da1302ca
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/12.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/13.png b/tools/dial_converter_tool/instance/114/background/13.png
new file mode 100644
index 000000000..09c80df9f
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/13.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/14.png b/tools/dial_converter_tool/instance/114/background/14.png
new file mode 100644
index 000000000..5694d8489
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/14.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/15.png b/tools/dial_converter_tool/instance/114/background/15.png
new file mode 100644
index 000000000..3fa6e02a8
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/15.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/16.png b/tools/dial_converter_tool/instance/114/background/16.png
new file mode 100644
index 000000000..f34482775
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/16.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/17.png b/tools/dial_converter_tool/instance/114/background/17.png
new file mode 100644
index 000000000..f654dd654
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/17.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/18.png b/tools/dial_converter_tool/instance/114/background/18.png
new file mode 100644
index 000000000..7825682ef
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/18.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/19.png b/tools/dial_converter_tool/instance/114/background/19.png
new file mode 100644
index 000000000..78c1e35b6
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/19.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/2.png b/tools/dial_converter_tool/instance/114/background/2.png
new file mode 100644
index 000000000..968930048
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/2.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/20.png b/tools/dial_converter_tool/instance/114/background/20.png
new file mode 100644
index 000000000..f4828b50b
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/20.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/21.png b/tools/dial_converter_tool/instance/114/background/21.png
new file mode 100644
index 000000000..1810a0ee4
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/21.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/3.png b/tools/dial_converter_tool/instance/114/background/3.png
new file mode 100644
index 000000000..e15692561
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/3.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/4.png b/tools/dial_converter_tool/instance/114/background/4.png
new file mode 100644
index 000000000..b1c0e606b
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/4.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/5.png b/tools/dial_converter_tool/instance/114/background/5.png
new file mode 100644
index 000000000..48db0d20e
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/5.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/6.png b/tools/dial_converter_tool/instance/114/background/6.png
new file mode 100644
index 000000000..a99d3b0da
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/6.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/7.png b/tools/dial_converter_tool/instance/114/background/7.png
new file mode 100644
index 000000000..3fc71bcd8
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/7.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/8.png b/tools/dial_converter_tool/instance/114/background/8.png
new file mode 100644
index 000000000..0994d4317
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/8.png differ
diff --git a/tools/dial_converter_tool/instance/114/background/9.png b/tools/dial_converter_tool/instance/114/background/9.png
new file mode 100644
index 000000000..72d9ca8d5
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/background/9.png differ
diff --git a/tools/dial_converter_tool/instance/114/module/calories.png b/tools/dial_converter_tool/instance/114/module/calories.png
new file mode 100644
index 000000000..773163fb5
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/module/calories.png differ
diff --git a/tools/dial_converter_tool/instance/114/module/ellipse.png b/tools/dial_converter_tool/instance/114/module/ellipse.png
new file mode 100644
index 000000000..c43613d54
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/module/ellipse.png differ
diff --git a/tools/dial_converter_tool/instance/114/module/heartrate.png b/tools/dial_converter_tool/instance/114/module/heartrate.png
new file mode 100644
index 000000000..cb77da6c2
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/module/heartrate.png differ
diff --git a/tools/dial_converter_tool/instance/114/module/step.png b/tools/dial_converter_tool/instance/114/module/step.png
new file mode 100644
index 000000000..ece0b4f4f
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/module/step.png differ
diff --git a/tools/dial_converter_tool/instance/114/obsidianrhythm.mp4 b/tools/dial_converter_tool/instance/114/obsidianrhythm.mp4
new file mode 100644
index 000000000..8bad27149
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/obsidianrhythm.mp4 differ
diff --git a/tools/dial_converter_tool/instance/114/obsidianrhythm.png b/tools/dial_converter_tool/instance/114/obsidianrhythm.png
new file mode 100644
index 000000000..f30682ce8
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/obsidianrhythm.png differ
diff --git a/tools/dial_converter_tool/instance/114/obsidianrhythm.xml b/tools/dial_converter_tool/instance/114/obsidianrhythm.xml
new file mode 100644
index 000000000..e544170e0
--- /dev/null
+++ b/tools/dial_converter_tool/instance/114/obsidianrhythm.xml
@@ -0,0 +1,64 @@
+<dial title="obsidianrhythm" description="黑曜律动" size="466 466" version="1.0" preview_img="./instance/114/obsidianrhythm.png">
+    <!-- 视频背景-->
+	<video id="video" rect="0 0 466 466" source="./instance/114/obsidianrhythm.mp4" color_key="0xff212324" preview_frame="./instance/114/preview_obsidianrhythm.png"></video>
+     
+    <!-- 动态背景 
+    <sequence_img img_names="./instance/114/background/1.png,./instance/114/background/2.png,./instance/114/background/3.png,./instance/114/background/4.png,./instance/114/background/5.png,./instance/114/background/6.png,./instance/114/background/7.png,./instance/114/background/8.png,./instance/114/background/9.png,./instance/114/background/10.png,./instance/114/background/11.png,./instance/114/background/12.png,./instance/114/background/13.png,./instance/114/background/14.png,./instance/114/background/15.png,./instance/114/background/16.png,./instance/114/background/17.png,./instance/114/background/18.png,./instance/114/background/19.png,./instance/114/background/20.png,./instance/114/background/21.png" position="0 0" repeat="true" interval="100"></sequence_img>
+    -->
+
+    <!-- 背景   -->
+    <static_img id="back_ground" position="0 0" img_name="./instance/114/MAIN_FACE_IMAGE.png"></static_img>
+
+    <!-- 天气显示 -->
+    <option_img position="201 69" img_names="./instance/114/weather/SUNNY.png,./instance/114/weather/SUNNY.png,./instance/114/weather/CLEAR_SUNNY.png,./instance/114/weather/SUNNY_CLOUDY.png,./instance/114/weather/CLEAR_CLOUDY.png,./instance/114/weather/OVERCAST.png,./instance/114/weather/RAIN.png,./instance/114/weather/THUNDERSHOWER.png,./instance/114/weather/SNOW.png,./instance/114/weather/FOGGY.png,./instance/114/weather/HAZE.png,./instance/114/weather/DUSTSTORM.png,./instance/114/weather/UNKNOWN.png" bind_data="24" ></option_img>
+    
+    <!-- 星期显示 -->
+    <option_img position="75 173" img_names="./instance/114/week/WEEK_SUN.png,./instance/114/week/WEEK_MON.png,./instance/114/week/WEEK_TUE.png,./instance/114/week/WEEK_WED.png,./instance/114/week/WEEK_THU.png,./instance/114/week/WEEK_FRI.png,./instance/114/week/WEEK_SAT.png" bind_data="17" period="10"></option_img>
+
+    <!-- 天气信息显示 -->
+    <label id="weather_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="83 134 300 30" text="%s" font_size="26" align="center" bind_data="20482" ></label>
+
+    <!-- 日期显示 -->
+    <label id="day_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="125 225 33 40" text="%2.0f" font_size="26" align="center" bind_data="16" period="10"></label>
+    
+    <!-- 心率显示 -->
+    <label id="heart_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="127 348 49 25" text="%3.0f" font_size="20" align="center" bind_data="2"></label>
+    <!-- 步数显示 -->
+    <label id="step_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="188 374 67 25" text="%5.0f" font_size="20" align="center" bind_data="1"></label>
+    <!-- 卡路里显示 -->
+    <label id="calories_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="ellipsis" rect="282 348 45 25" text="%3.f" font_size="20" align="center" bind_data="3"></label>
+    
+    <!-- 心率icon显示 -->
+    <static_img  position="144 315"  img_name="./instance/114/module/heartrate.png"></static_img>
+    <!-- 步数icon显示 -->
+    <static_img  position="220 341"  img_name="./instance/114/module/step.png"></static_img>
+    <!-- 卡路里icon显示 -->
+    <static_img  position="296 315"  img_name="./instance/114/module/calories.png"></static_img>
+    <!-- 时间背景框icon显示 -->
+    <static_img  position="300 213"  img_name="./instance/114/module/ellipse.png"></static_img>
+
+    <!-- 小时显示 -->
+    <label id="hour_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="312 220 77 104" text="%02.0f" font_size="26" align="center" bind_data="15" period="10"></label>
+    <!-- 分号显示 -->
+    <label id="point_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="342 220 28 139" text=":" font_size="26" align="center"></label>
+    <!-- 分钟显示 -->
+    <label id="minute_label" color="0xFFFFFFFF" font="HarmonyOS_Sans_SC_Regular.ttf" break_mode="adapt" rect="350 220 77 104" text="%02.0f" font_size="26" align="center" bind_data="14" period="10"></label>
+
+    <!-- 小时 -->
+    <rotate_img id="hour" position="212 75" rotate_center="21.0 158.0" rotate_start="0" rotate_end="360" img_name="./instance/114/HOURHAND.png" bind_data="9" period="10"></rotate_img>
+    <!-- 分钟 -->
+    <rotate_img id="minute" position="218 23" rotate_center="15.0 210.0" rotate_start="0" rotate_end="360" img_name="./instance/114/MINUTEHAND.png" bind_data="10" period="10"></rotate_img>
+    <!-- 秒钟 -->
+    <rotate_img id="second" position="220 17" rotate_center="13.0 216.0" rotate_start="0" rotate_end="360" img_name="./instance/114/SECONDHAND.png" bind_data="12" period="60"></rotate_img>
+    
+    <!--通话
+    <click rect="0 193 80 80" action_slice="84"></click>
+    -->
+    <!--天气-->
+    <click rect="193 0 80 80" action_slice="13"></click>
+    <!--支付宝
+    <click rect="386 193 80 80" action_slice="98"></click>
+    -->
+    <!--每日活动-->
+    <click rect="193 396 80 80" action_slice="87"></click>
+</dial>
diff --git a/tools/dial_converter_tool/instance/114/preview_obsidianrhythm.png b/tools/dial_converter_tool/instance/114/preview_obsidianrhythm.png
new file mode 100644
index 000000000..030b3555d
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/preview_obsidianrhythm.png differ
diff --git a/tools/dial_converter_tool/instance/114/weather/CLEAR_CLOUDY.png b/tools/dial_converter_tool/instance/114/weather/CLEAR_CLOUDY.png
new file mode 100644
index 000000000..d387a5501
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/weather/CLEAR_CLOUDY.png differ
diff --git a/tools/dial_converter_tool/instance/114/weather/CLEAR_SUNNY.png b/tools/dial_converter_tool/instance/114/weather/CLEAR_SUNNY.png
new file mode 100644
index 000000000..f0a8a2d0f
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/weather/CLEAR_SUNNY.png differ
diff --git a/tools/dial_converter_tool/instance/114/weather/DUSTSTORM.png b/tools/dial_converter_tool/instance/114/weather/DUSTSTORM.png
new file mode 100644
index 000000000..3588ac410
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/weather/DUSTSTORM.png differ
diff --git a/tools/dial_converter_tool/instance/114/weather/FOGGY.png b/tools/dial_converter_tool/instance/114/weather/FOGGY.png
new file mode 100644
index 000000000..2d9a3bd46
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/weather/FOGGY.png differ
diff --git a/tools/dial_converter_tool/instance/114/weather/HAZE.png b/tools/dial_converter_tool/instance/114/weather/HAZE.png
new file mode 100644
index 000000000..57bba860c
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/weather/HAZE.png differ
diff --git a/tools/dial_converter_tool/instance/114/weather/OVERCAST.png b/tools/dial_converter_tool/instance/114/weather/OVERCAST.png
new file mode 100644
index 000000000..175538b45
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/weather/OVERCAST.png differ
diff --git a/tools/dial_converter_tool/instance/114/weather/RAIN.png b/tools/dial_converter_tool/instance/114/weather/RAIN.png
new file mode 100644
index 000000000..f70dd0a7c
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/weather/RAIN.png differ
diff --git a/tools/dial_converter_tool/instance/114/weather/SNOW.png b/tools/dial_converter_tool/instance/114/weather/SNOW.png
new file mode 100644
index 000000000..99ff98b51
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/weather/SNOW.png differ
diff --git a/tools/dial_converter_tool/instance/114/weather/SUNNY.png b/tools/dial_converter_tool/instance/114/weather/SUNNY.png
new file mode 100644
index 000000000..4270b0068
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/weather/SUNNY.png differ
diff --git a/tools/dial_converter_tool/instance/114/weather/SUNNY_CLOUDY.png b/tools/dial_converter_tool/instance/114/weather/SUNNY_CLOUDY.png
new file mode 100644
index 000000000..ae9e0d514
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/weather/SUNNY_CLOUDY.png differ
diff --git a/tools/dial_converter_tool/instance/114/weather/THUNDERSHOWER.png b/tools/dial_converter_tool/instance/114/weather/THUNDERSHOWER.png
new file mode 100644
index 000000000..fa73721db
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/weather/THUNDERSHOWER.png differ
diff --git a/tools/dial_converter_tool/instance/114/weather/UNKNOWN.png b/tools/dial_converter_tool/instance/114/weather/UNKNOWN.png
new file mode 100644
index 000000000..60d37ae3b
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/weather/UNKNOWN.png differ
diff --git a/tools/dial_converter_tool/instance/114/week/WEEK_FRI.png b/tools/dial_converter_tool/instance/114/week/WEEK_FRI.png
new file mode 100644
index 000000000..59536e8e5
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/week/WEEK_FRI.png differ
diff --git a/tools/dial_converter_tool/instance/114/week/WEEK_MON.png b/tools/dial_converter_tool/instance/114/week/WEEK_MON.png
new file mode 100644
index 000000000..2482d252a
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/week/WEEK_MON.png differ
diff --git a/tools/dial_converter_tool/instance/114/week/WEEK_SAT.png b/tools/dial_converter_tool/instance/114/week/WEEK_SAT.png
new file mode 100644
index 000000000..cdf9f5ce5
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/week/WEEK_SAT.png differ
diff --git a/tools/dial_converter_tool/instance/114/week/WEEK_SUN.png b/tools/dial_converter_tool/instance/114/week/WEEK_SUN.png
new file mode 100644
index 000000000..780bcf1ec
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/week/WEEK_SUN.png differ
diff --git a/tools/dial_converter_tool/instance/114/week/WEEK_THU.png b/tools/dial_converter_tool/instance/114/week/WEEK_THU.png
new file mode 100644
index 000000000..a23c62dfb
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/week/WEEK_THU.png differ
diff --git a/tools/dial_converter_tool/instance/114/week/WEEK_TUE.png b/tools/dial_converter_tool/instance/114/week/WEEK_TUE.png
new file mode 100644
index 000000000..edea9abff
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/week/WEEK_TUE.png differ
diff --git a/tools/dial_converter_tool/instance/114/week/WEEK_WED.png b/tools/dial_converter_tool/instance/114/week/WEEK_WED.png
new file mode 100644
index 000000000..f5a6cd6ed
Binary files /dev/null and b/tools/dial_converter_tool/instance/114/week/WEEK_WED.png differ