From e75af6a5ff3ce3b6036a559c5ee3dbc2c962dd40 Mon Sep 17 00:00:00 2001
From: wangweiyuan <wangweiyuan2@huawei.com>
Date: Fri, 20 Dec 2024 18:54:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E5=B1=82=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangweiyuan <wangweiyuan2@huawei.com>
---
 .../main/resources/2in1/element/float.json    |   2 +-
 .../main/resources/base/element/float.json    |  56 ++++++++
 .../resources/base/element/id_defined.json    |  74 +++++------
 .../main/resources/base/element/pattern.json  |  56 ++++++++
 .../resources/wearable/element/color.json     |  92 ++++++++++++++
 .../resources/wearable/element/float.json     | 120 ++++++++++++++++++
 .../wearable/media/ohos_hide_password.svg     |  14 ++
 .../wearable/media/ohos_show_password.svg     |  14 ++
 8 files changed, 383 insertions(+), 45 deletions(-)
 create mode 100644 systemres/main/resources/wearable/media/ohos_hide_password.svg
 create mode 100644 systemres/main/resources/wearable/media/ohos_show_password.svg

diff --git a/systemres/main/resources/2in1/element/float.json b/systemres/main/resources/2in1/element/float.json
index c77bd5e1..5158614c 100644
--- a/systemres/main/resources/2in1/element/float.json
+++ b/systemres/main/resources/2in1/element/float.json
@@ -85,7 +85,7 @@
             "value": "1"
         },
         {
-            "name": "toast_padding_new",
+            "name": "toast_padding_level8",
             "value": "8.0vp"
         },
         {
diff --git a/systemres/main/resources/base/element/float.json b/systemres/main/resources/base/element/float.json
index 3d5c25ec..54bf6b56 100644
--- a/systemres/main/resources/base/element/float.json
+++ b/systemres/main/resources/base/element/float.json
@@ -3799,6 +3799,62 @@
         {
             "name": "side_length",
             "value":"288.0vp"
+        },
+        {
+            "name": "line_spacing",
+            "value": "0.0vp"
+        },
+        {
+            "name": "font_weight",
+            "value": "10.0"
+        },
+        {
+            "name": "text_align",
+            "value": "0.0"
+        },
+        {
+            "name": "text_align_error",
+            "value": "0.0"
+        },
+        {
+            "name": "toast_limit_height_ratio",
+            "value": "0.65"
+        },
+        {
+            "name": "toast_text_align",
+            "value": "0.0"
+        },
+        {
+            "name": "toast_align",
+            "value": "-1.0"
+        },
+        {
+            "name": "track_thickness",
+            "value": "4.0vp"
+        },
+        {
+            "name": "indicator_width_ratio",
+            "value": "0.135"
+        },
+        {
+            "name": "indicator_height_ratio",
+            "value": "0.087"
+        },
+        {
+            "name": "indicator_corner_radius_ratio",
+            "value": "0.01"
+        },
+        {
+            "name": "indicator_border_ratio",
+            "value": "0.06"
+        },
+        {
+            "name": "interval_ratio",
+            "value": "0.008"
+        },
+        {
+            "name": "toast_bg_theme_color_mode",
+            "value": "0.0"
         }
     ]
 }
\ No newline at end of file
diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json
index 4085a43d..a7ef5030 100644
--- a/systemres/main/resources/base/element/id_defined.json
+++ b/systemres/main/resources/base/element/id_defined.json
@@ -26383,27 +26383,23 @@
         },
         {
             "type": "float",
-            "name": "placeholder_5236",
-            "order": 5236,
-            "flags": "private"
+            "name": "text_align",
+            "order": 5236
         },
         {
             "type": "float",
-            "name": "placeholder_5237",
-            "order": 5237,
-            "flags": "private"
+            "name": "line_spacing",
+            "order": 5237
         },
         {
             "type": "float",
-            "name": "placeholder_5238",
-            "order": 5238,
-            "flags": "private"
+            "name": "font_weight",
+            "order": 5238
         },
         {
             "type": "float",
-            "name": "placeholder_5239",
-            "order": 5239,
-            "flags": "private"
+            "name": "text_align_error",
+            "order": 5239
         },
         {
             "type": "float",
@@ -26413,63 +26409,53 @@
         },
         {
             "type": "float",
-            "name": "placeholder_5241",
-            "order": 5241,
-            "flags": "private"
+            "name": "toast_limit_height_ratio",
+            "order": 5241
         },
         {
             "type": "float",
-            "name": "placeholder_5242",
-            "order": 5242,
-            "flags": "private"
+            "name": "toast_text_align",
+            "order": 5242
         },
         {
             "type": "float",
-            "name": "placeholder_5243",
-            "order": 5243,
-            "flags": "private"
+            "name": "toast_bg_theme_color_mode",
+            "order": 5243
         },
         {
-            "type": "color",
-            "name": "placeholder_5244",
-            "order": 5244,
-            "flags": "private"
+            "type": "float",
+            "name": "toast_align",
+            "order": 5244
         },
         {
             "type": "float",
-            "name": "placeholder_5245",
-            "order": 5245,
-            "flags": "private"
+            "name": "indicator_width_ratio",
+            "order": 5245
         },
         {
             "type": "float",
-            "name": "placeholder_5246",
-            "order": 5246,
-            "flags": "private"
+            "name": "indicator_height_ratio",
+            "order": 5246
         },
         {
             "type": "float",
-            "name": "placeholder_5247",
-            "order": 5247,
-            "flags": "private"
+            "name": "indicator_corner_radius_ratio",
+            "order": 5247
         },
         {
             "type": "float",
-            "name": "placeholder_5248",
-            "order": 5248,
-            "flags": "private"
+            "name": "indicator_border_ratio",
+            "order": 5248
         },
         {
             "type": "float",
-            "name": "placeholder_5249",
-            "order": 5249,
-            "flags": "private"
+            "name": "track_thickness",
+            "order": 5249
         },
         {
-            "type": "color",
-            "name": "placeholder_5250",
-            "order": 5250,
-            "flags": "private"
+            "type": "float",
+            "name": "interval_ratio",
+            "order": 5250
         },
         {
             "type": "float",
diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json
index bb8b1956..7beb1cf9 100644
--- a/systemres/main/resources/base/element/pattern.json
+++ b/systemres/main/resources/base/element/pattern.json
@@ -4733,6 +4733,18 @@
                 {
                     "name": "text_menu_search_is_support",
                     "value": "$string:res_menu_search_is_support"
+                },
+                {
+                    "name": "text_line_spacing",
+                    "value": "$float:line_spacing"
+                },
+                {
+                    "name": "text_font_weight",
+                    "value": "$float:font_weight"
+                },
+                {
+                    "name": "text_align",
+                    "value": "$float:text_align"
                 }
             ]
         },
@@ -5174,6 +5186,10 @@
                 {
                     "name": "textfield_menu_search_is_support",
                     "value": "$string:res_menu_search_is_support"
+                },
+                {
+                    "name": "textfield_error_text_align",
+                    "value": "$float:text_align_error"
                 }
             ]
         },
@@ -5444,6 +5460,22 @@
                 {
                     "name": "toast_background_blur_style",
                     "value": "$float:toast_background_blur_style"
+                },
+                {
+                    "name": "toast_limit_height_ratio",
+                    "value": "$float:toast_limit_height_ratio"
+                },
+                {
+                    "name": "toast_text_align",
+                    "value": "$float:toast_text_align"
+                },
+                {
+                    "name": "toast_bg_theme_color_mode",
+                    "value": "$float:toast_bg_theme_color_mode"
+                },
+                {
+                    "name": "toast_align",
+                    "value": "$float:toast_align"
                 }
             ]
         },
@@ -7777,6 +7809,30 @@
                 {
                     "name": "limit_value_min_font_size",
                     "value": "$float:ohos_id_text_size_caption"
+                },
+                {
+                    "name": "indicator_width_ratio",
+                    "value": "$float:indicator_width_ratio"
+                },
+                {
+                    "name": "indicator_height_ratio",
+                    "value": "$float:indicator_height_ratio"
+                },
+                {
+                    "name": "indicator_corner_radius_ratio",
+                    "value": "$float:indicator_corner_radius_ratio"
+                },
+                {
+                    "name": "indicator_border_ratio",
+                    "value": "$float:indicator_border_ratio"
+                },
+                {
+                    "name": "track_thickness",
+                    "value": "$float:track_thickness"
+                },
+                {
+                    "name": "interval_ratio",
+                    "value": "$float:interval_ratio"
                 }
             ]
         },
diff --git a/systemres/main/resources/wearable/element/color.json b/systemres/main/resources/wearable/element/color.json
index 1c08acf4..3e54c7c5 100644
--- a/systemres/main/resources/wearable/element/color.json
+++ b/systemres/main/resources/wearable/element/color.json
@@ -175,6 +175,98 @@
         {
             "name": "ohos_id_color_text_secondary",
             "value": "#a9ffffff"
+        },
+        {
+            "name": "ohos_id_color_text_field_sub_bg",
+            "value": "#19ffffff"
+        },
+        {
+            "name": "ohos_id_color_text_hint",
+            "value": "#99ffffff"
+        },
+        {
+            "name": "ohos_id_color_dialog_bg",
+            "value": "#ff202224"
+        },
+        {
+            "name": "font_primary",
+            "value": "#e5ffffff"
+        },
+        {
+            "name": "ohos_id_color_subheading_separator",
+            "value": "#19ffffff"
+        },
+        {
+            "name": "ohos_id_color_datapanel_color1_start",
+            "value": "#EB933D"
+        },
+        {
+            "name": "ohos_id_color_datapanel_color2_start",
+            "value": "#D9542B"
+        },
+        {
+            "name": "ohos_id_color_datapanel_color3_start",
+            "value": "#D6568D"
+        },
+        {
+            "name": "ohos_id_color_datapanel_color4_start",
+            "value": "#8639BF"
+        },
+        {
+            "name": "ohos_id_color_datapanel_color5_start",
+            "value": "#5552D9"
+        },
+        {
+            "name": "ohos_id_color_datapanel_color6_start",
+            "value": "#217BD9"
+        },
+        {
+            "name": "ohos_id_color_datapanel_color8_start",
+            "value": "#70BA5D"
+        },
+        {
+            "name": "ohos_id_color_datapanel_color9_start",
+            "value": "#6B6B76"
+        },
+        {
+            "name": "ohos_id_color_datapanel_color1_end",
+            "value": "#D1A738"
+        },
+        {
+            "name": "ohos_id_color_datapanel_color2_end",
+            "value": "#E67E50"
+        },
+        {
+            "name": "ohos_id_color_datapanel_color3_end",
+            "value": "#D5749E"
+        },
+        {
+            "name": "ohos_id_color_datapanel_color4_end",
+            "value": "#9973D1"
+        },
+        {
+            "name": "ohos_id_color_datapanel_color5_end",
+            "value": "#7977D9"
+        },
+        {
+            "name": "ohos_id_color_datapanel_color6_end",
+            "value": "#4C81D9"
+        },
+        {
+            "name": "ohos_id_color_datapanel_color7_end",
+            "value": "#5EA6D1"
+        },
+        {
+            "name": "ohos_id_color_datapanel_color8_end",
+            "value": "#91C23A"
+        },
+        {
+            "name": "ohos_id_color_datapanel_color9_end",
+            "value": "#8C8C99"
+        },
+        {
+            "name": "ohos_id_color_primary_contrary",
+            "value": "#A9000000"
         }
     ]
 }
\ No newline at end of file
diff --git a/systemres/main/resources/wearable/element/float.json b/systemres/main/resources/wearable/element/float.json
index 983f825d..45a871b0 100644
--- a/systemres/main/resources/wearable/element/float.json
+++ b/systemres/main/resources/wearable/element/float.json
@@ -87,6 +87,126 @@
         {
             "name": "ohos_id_default_progress_diameter",
             "value": "46.0vp"
+        },
+        {
+            "name": "ohos_id_text_font_size",
+            "value": "15.0fp"
+        },
+        {
+            "name": "line_spacing",
+            "value": "1.0vp"
+        },
+        {
+            "name": "font_weight",
+            "value": "14.0"
+        },
+        {
+            "name": "text_align",
+            "value": "1.0"
+        },
+        {
+            "name": "ohos_id_textfield_height",
+            "value": "34.0vp"
+        },
+        {
+            "name": "ohos_id_textfield_content_height",
+            "value": "28.0vp"
+        },
+        {
+            "name": "ohos_id_textfield_border_radius",
+            "value": "22.0vp"
+        },
+        {
+            "name": "ohos_id_textfield_padding_horizontal",
+            "value": "10.0vp"
+        },
+        {
+            "name": "ohos_id_text_size_body3",
+            "value": "13.0fp"
+        },
+        {
+            "name": "text_align_error",
+            "value": "1.0"
+        },
+        {
+            "name": "ohos_id_textfield_icon_size",
+            "value": "28.0vp"
+        },
+        {
+            "name": "ohos_id_textfield_icon_hot_zone_size",
+            "value": "46.0vp"
+        },
+        {
+            "name": "Body_M",
+            "value": "15.0fp"
+        },
+        {
+            "name": "ohos_id_toast_content_min_height",
+            "value": "40.0vp"
+        },
+        {
+            "name": "ohos_id_toast_content_limit_max_width",
+            "value": "201.0vp"
+        },
+        {
+            "name": "toast_border_radius_new",
+            "value": "20.0vp"
+        },
+        {
+            "name": "toast_padding_level4",
+            "value": "10.0vp"
+        },
+        {
+            "name": "toast_padding_level8",
+            "value": "10.0vp"
+        },
+        {
+            "name": "toast_align",
+            "value": "4.0"
+        },
+        {
+            "name": "toast_bg_theme_color_mode",
+            "value": "2.0"
+        },
+        {
+            "name": "ohos_id_toast_content_min_width",
+            "value": "116.0vp"
+        },
+        {
+            "name": "toast_limit_height_ratio",
+            "value": "0.61"
+        },
+        {
+            "name": "toast_text_align",
+            "value": "1.0"
+        },
+        {
+            "name": "ohos_id_datapanel_thickness",
+            "value": "10.0vp"
+        },
+        {
+            "name": "indicator_width_ratio",
+            "value": "0.09"
+        },
+        {
+            "name": "indicator_height_ratio",
+            "value": "0.058"
+        },
+        {
+            "name": "indicator_corner_radius_ratio",
+            "value": "0.0134"
+        },
+        {
+            "name": "indicator_border_ratio",
+            "value": "0.054"
+        },
+        {
+            "name": "track_thickness",
+            "value": "10.0vp"
+        },
+        {
+            "name": "interval_ratio",
+            "value": "0.009"
         }
     ]
 }
\ No newline at end of file
diff --git a/systemres/main/resources/wearable/media/ohos_hide_password.svg b/systemres/main/resources/wearable/media/ohos_hide_password.svg
new file mode 100644
index 00000000..6597e7b3
--- /dev/null
+++ b/systemres/main/resources/wearable/media/ohos_hide_password.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>ic_hide</title>
+    <defs>
+        <path d="M3.24433269,2.18592862 L3.28033009,2.21966991 L21.7803301,20.7196699 C22.0732233,21.0125631 22.0732233,21.4874369 21.7803301,21.7803301 C21.4991526,22.0615076 21.0502619,22.0727547 20.7556673,21.8140714 L20.7196699,21.7803301 L16.8721008,17.932592 C15.3324474,18.6243412 13.6700217,19 12,19 C7.6616265,19 3.34195001,16.4588234 1.1237988,12.4261126 C0.958720986,12.1259928 0.958734525,11.7622639 1.12383468,11.4621564 C2.22017457,9.46930648 3.82685023,7.86720015 5.69590623,6.75670025 L2.21966991,3.28033009 C1.9267767,2.98743687 1.9267767,2.51256313 2.21966991,2.21966991 C2.5008474,1.93849242 2.94973814,1.92724532 3.24433269,2.18592862 Z M2.6270143,11.855814 L2.57475,11.94425 L2.62906687,12.0363214 C4.20829156,14.682087 6.85453152,16.5732705 9.73508149,17.238259 C7.96961792,16.3923274 6.75,14.5885922 6.75,12.5 C6.75,11.9635357 6.83046337,11.4458645 6.9799799,10.9583969 C7.05366048,10.7181766 7.27572261,10.7770121 7.3241015,10.9659401 C7.58677335,11.9917192 8.51733369,12.75 9.625,12.75 C10.201929,12.75 10.7308116,12.5442893 11.1423007,12.2022152 L6.79486267,7.85576427 C5.10284139,8.78587388 3.64173689,10.1577737 2.6270143,11.855814 Z M14.2654924,17.2373858 L14.5117917,17.1777816 C14.9230064,17.0721181 15.3287239,16.9413925 15.7265286,16.7869819 L15.4217087,16.4818804 C15.0731107,16.7817122 14.6847015,17.036551 14.2654924,17.2373858 Z M11.9855652,5 C16.3241739,5 20.6294483,7.43580293 22.8461207,11.4681793 C23.0110287,11.7681655 23.0110272,12.1316601 22.8461169,12.4316451 C21.9169357,14.1218985 20.622921,15.5497164 19.1132976,16.6379205 L18.0366544,15.561523 C19.3555913,14.6523638 20.4980275,13.4559114 21.3406926,12.0424401 L21.395,11.95 L21.3427165,11.8611806 C19.3982331,8.6048523 15.8133859,6.54561308 12.1090841,6.50074831 L11.9855652,6.5 C11.0839296,6.5 10.1885641,6.61938777 9.32124627,6.84647433 L8.11784946,5.64302867 C9.3660598,5.22201139 10.6741502,5 11.9855652,5 Z M12,7.25 L12.2164046,7.25437905 C15.0155511,7.36786837 17.25,9.67299244 17.25,12.5 C17.25,12.639781 17.2456993,12.7637607 17.2371876,12.8731375 C17.1991898,13.4128088 17.0793591,13.9312499 16.8898895,14.4147476 L10.0849199,7.6102408 C10.1876906,7.56995961 10.2920404,7.53282481 10.3978507,7.49895493 C10.4034478,7.49733403 10.4100403,7.49502721 10.4168532,7.49287563 L10.523457,7.46048776 C10.5414874,7.4552137 10.5595579,7.45003377 10.5776681,7.44494854 L10.4168532,7.49287563 C10.5266282,7.45820774 10.6379617,7.42704833 10.7507223,7.39952944 L10.8001557,7.38773526 C10.8415571,7.37805619 10.8831468,7.36886707 10.9249186,7.36017433 L10.7507223,7.39952944 C10.8643833,7.37179081 10.9794942,7.34775107 11.0959203,7.32754546 C11.1654222,7.31549531 11.234869,7.3048751 11.3047495,7.29562937 C11.3270733,7.29267296 11.3495242,7.28984962 11.3720187,7.28716849 C11.4447555,7.27849891 11.5180446,7.27130708 11.5917602,7.26563766 C11.6262556,7.2629848 11.660759,7.2606707 11.6953521,7.2586915 C11.7961526,7.25292396 11.8977348,7.25 12,7.25 L12,7.25 L12,7.25 Z"
+              id="path-1"></path>
+    </defs>
+    <g id="ic_hide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="形状结合" fill="#ffffff" xlink:href="#path-1"></use>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/systemres/main/resources/wearable/media/ohos_show_password.svg b/systemres/main/resources/wearable/media/ohos_show_password.svg
new file mode 100644
index 00000000..063196f1
--- /dev/null
+++ b/systemres/main/resources/wearable/media/ohos_show_password.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>ic_eye</title>
+    <defs>
+        <path d="M11.9855652,5 C16.3241739,5 20.6294483,7.43580293 22.8461207,11.4681793 C23.0110287,11.7681655 23.0110272,12.1316601 22.8461169,12.4316451 C20.6306141,16.4618187 16.3409683,19 12,19 C7.6616265,19 3.34195001,16.4588234 1.1237988,12.4261126 C0.958720986,12.1259928 0.958734525,11.7622639 1.12383468,11.4621564 C3.34091662,7.43210006 7.6450303,5 11.9855652,5 Z M12.1090841,6.50074831 L11.9855652,6.5 C8.23510787,6.5 4.59313857,8.56569489 2.6270143,11.855814 L2.57475,11.94425 L2.62906687,12.0363214 C4.20829156,14.682087 6.85453152,16.5732705 9.73508149,17.238259 C7.96961792,16.3923274 6.75,14.5885922 6.75,12.5 C6.75,11.9635357 6.83046337,11.4458645 6.9799799,10.9583969 C7.05366048,10.7181766 7.27572261,10.7770121 7.3241015,10.9659401 C7.58677335,11.9917192 8.51733369,12.75 9.625,12.75 C10.9140612,12.75 11.9632598,11.7230265 11.9990559,10.4426197 L12,10.375 L12,10.125 C12,9.09101624 11.3392463,8.21135977 10.4169507,7.88524243 C10.2077236,7.81126118 10.1886209,7.56495342 10.4168532,7.49287563 C10.5266282,7.45820774 10.6379617,7.42704833 10.7507223,7.39952944 C11.151119,7.3018138 11.5695086,7.25 12,7.25 C14.8994949,7.25 17.25,9.60050506 17.25,12.5 C17.25,14.5881939 16.0308472,16.3916395 14.2654924,17.2373858 C17.1354905,16.5737801 19.7632982,14.688333 21.3406926,12.0424401 L21.395,11.95 L21.3427165,11.8611806 C19.3982331,8.6048523 15.8133859,6.54561308 12.1090841,6.50074831 Z"
+              id="path-1"></path>
+    </defs>
+    <g id="ic_eye" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="形状结合" fill="#ffffff" xlink:href="#path-1"></use>
+    </g>
+</svg>
\ No newline at end of file
-- 
Gitee