From: penglei <1624952103@qq.com>
Date: Tue, 10 Sep 2024 08:32:47 +0000 (+0800)
Subject: 修复黑曜表盘天气图标显示错误BUG
X-Git-Tag: release_V1.2.70_20241020_135402~485^2~7^2~9
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=ce0ee4dd9d69b8eed266c0df84c320bb75b33350;p=mirrors%2FFD230.git

修复黑曜表盘天气图标显示错误BUG
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelWeather.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelWeather.cpp
index adade5b93..d549ea367 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelWeather.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelWeather.cpp
@@ -28,7 +28,7 @@ namespace OHOS
     /*表盘更新天气Icon*/
     void DialModelWeather::UpdateWeather(int16_t Weather)
     {
-        Weather_ = static_cast<float>(Weather);
+        Weather_ = static_cast<float>(Weather - 1);
         if (onChangeListener_ != nullptr)
         {
             onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_WEATHER, Weather_);
diff --git a/tools/dial_converter_tool/instance/114/obsidianrhythm.xml b/tools/dial_converter_tool/instance/114/obsidianrhythm.xml
index d1b19b504..24516a07e 100644
--- a/tools/dial_converter_tool/instance/114/obsidianrhythm.xml
+++ b/tools/dial_converter_tool/instance/114/obsidianrhythm.xml
@@ -11,24 +11,23 @@
 
     <!-- 天气显示 -->
     <option_img position="201 69" img_names="./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="201 69" img_names="./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="Audiowide_Regular.ttf" break_mode="ellipsis" rect="83 130 300 30" text="%s" font_size="26" align="center" bind_data="20482" ></label>
-    <label id="weather_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="83 130 300 30" text="%s" font_size="26" align="center" bind_data="20482" ></label>
-
+ 
     <!-- 日期显示 -->
     <label id="day_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="adapt" rect="120 222 33 40" text="%02.0f" font_size="24" align="center" bind_data="16" period="10"></label>
     
     <!-- 心率显示 -->
     <label id="heart_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="126 348 49 25" text="%3.0f" font_size="20" align="center" bind_data="2"></label>
-    <label id="heart_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="126 348 49 25" text="%3.0f" font_size="20" align="center" bind_data="2"></label>
+    
     <!-- 步数显示 -->
     <label id="step_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="187 374 67 25" text="%5.0f" font_size="20" align="center" bind_data="1"></label>
-    <label id="step_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="187 374 67 25" text="%5.0f" font_size="20" align="center" bind_data="1"></label>
+    
     <!-- 卡路里显示 -->
     <label id="calories_label" color="0xFFFFFFFF" font="Audiowide_Regular.ttf" break_mode="ellipsis" rect="281 348 45 25" text="%3.0f" font_size="20" align="center" bind_data="3"></label>