From ee98f41de96865281eab6e270bd081d82990edeb Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 20 七月 2023 15:08:53 +0800
Subject: [PATCH] 群控更新
---
HDL-ON_iOS/Resources/Language.ini | 10 +++++++++-
HDL-ON_Android/Assets/Language.ini | 8 ++++++++
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/groupControl_blue.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/groupControl_blue.png | 0
HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs | 8 +++++++-
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/groupControl_white.png | 0
HDL_ON/Common/R.cs | 5 ++++-
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/groupControl_white.png | 0
8 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 659b4f9..1bc5df1 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -665,6 +665,7 @@
678=Current user data has been cleared, about to return to the previous page.
679=Group control
680=Colorful switch
+681=Test
@@ -2004,6 +2005,7 @@
678=褰撳墠鐢ㄦ埛鏁版嵁宸叉竻绌猴紝鍗冲皢杩斿洖涓婁竴椤点��
679=缇ゆ帶
680=鐐僵寮�鍏�
+681=鑷姩鐐僵娴嬭瘯
@@ -3342,6 +3344,7 @@
678=Current user data has been cleared, about to return to the previous page.
679=Group control
680=Colorful switch
+681=Test
@@ -4676,6 +4679,7 @@
678=Current user data has been cleared, about to return to the previous page.
679=Group control
680=Colorful switch
+681=Test
@@ -5999,6 +6003,10 @@
678=Current user data has been cleared, about to return to the previous page.
679=Group control
680=Colorful switch
+681=Test
+
+
+
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/groupControl_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/groupControl_blue.png
index 53eeb27..cc8383a 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/groupControl_blue.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/groupControl_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/groupControl_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/groupControl_white.png
index b923744..90b408e 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/groupControl_white.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/groupControl_white.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 659b4f9..151518e 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -665,6 +665,7 @@
678=Current user data has been cleared, about to return to the previous page.
679=Group control
680=Colorful switch
+681=Test
@@ -2002,8 +2003,9 @@
676=涓�
677=楂�
678=褰撳墠鐢ㄦ埛鏁版嵁宸叉竻绌猴紝鍗冲皢杩斿洖涓婁竴椤点��
-679=缇ゆ帶
+679=缁勬帶
680=鐐僵寮�鍏�
+681=鑷姩鐐僵娴嬭瘯
@@ -3342,6 +3344,7 @@
678=Current user data has been cleared, about to return to the previous page.
679=Group control
680=Colorful switch
+681=Test
@@ -4676,6 +4679,7 @@
678=Current user data has been cleared, about to return to the previous page.
679=Group control
680=Colorful switch
+681=Test
@@ -5999,6 +6003,10 @@
678=Current user data has been cleared, about to return to the previous page.
679=Group control
680=Colorful switch
+681=Test
+
+
+
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/groupControl_blue.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/groupControl_blue.png
index 53eeb27..cc8383a 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/groupControl_blue.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/groupControl_blue.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/groupControl_white.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/groupControl_white.png
index b923744..90b408e 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/groupControl_white.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/groupControl_white.png
Binary files differ
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index a809493..b870c59 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,7 +4,10 @@
{
public static class StringId
{
-
+ /// <summary>
+ /// 鑷姩鐐僵娴嬭瘯
+ /// </summary>
+ public const int CulorfulTest = 681;
/// <summary>
/// 鐐僵寮�鍏�
/// </summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
index 2fd1ff6..86ce901 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorfulInfoPage.cs
@@ -61,7 +61,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.ColorfulFunction,
+ TextID = StringId.ColorfulSwitch,
};
viewSwitch.AddChidren(btnSwitchText);
@@ -107,6 +107,12 @@
{ IsBackground = true }.Start();
};
+ contentView.AddChidren(new Button
+ {
+ Height = Application.GetRealHeight(10),
+ BackgroundColor = CSS_Color.BackgroundColor,
+ });
+
#endregion
#region 璧峰棰滆壊
--
Gitblit v1.8.0