From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index 64b91d0..ea9b15c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -144,13 +144,13 @@
Width = Application.GetRealWidth(260-40),
Height = Application.GetRealWidth(260-40),
OpenAngle = 160,
- ThumbImagePath = aC.on_off == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
+ ThumbImagePath = aC.trait_on_off.value.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
ThumbImageHeight = Application.GetRealWidth(50),
- ProgressBarColor = aC.on_off == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
+ ProgressBarColor = aC.trait_on_off.value.ToString() == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
MinValue = 16,
MaxValue = 38,
Progress = Convert.ToInt32( aC.trait_temp.value),
- IsClickable = aC.on_off == "on" ,
+ IsClickable = aC.trait_on_off.value.ToString() == "on" ,
ArcColor = CSS_Color.BackgroundColor,
SeekBarPadding = Application.GetRealWidth(8),
#else
@@ -265,7 +265,7 @@
controlView.AddChidren(btnSwitch);
LoadEventList();
- new TopViewDiv(bodyView,aC.name).LoadTopView(aC, actionRefresh);
+ new TopViewDiv(bodyView,aC.name).LoadTopView_FunctionTop(aC, actionRefresh);
}
/// <summary>
/// 鍔犺浇淇敼妯″紡鍖哄煙
@@ -288,7 +288,7 @@
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(287),
BackgroundImagePath = "FunctionIcon/AC/DivBg1.png",
- Animate = Animate.DownToUp,
+ Animate = Animate.UpToDown,
AnimateSpeed = 0.3f
};
dialogView.AddChidren(modeChangeView);
@@ -325,7 +325,7 @@
Y = Application.GetRealHeight(44 * (aC.trait_mode.value_key.IndexOf(m) + 1) + 10 + 8),
Width = Application.GetRealWidth(24),
Height = Application.GetRealWidth(24),
- IsSelected = aC.trait_mode.value == m,
+ IsSelected = aC.trait_mode.value.ToString() == m,
};
modeChangeView.AddChidren(btnModeIcon);
@@ -338,7 +338,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
SelectedTextColor = CSS_Color.MainColor,
- IsSelected = aC.trait_mode.value == m,
+ IsSelected = aC.trait_mode.value.ToString() == m,
TextSize = CSS_FontSize.TextFontSize,
};
modeChangeView.AddChidren(btnModeText);
@@ -413,7 +413,7 @@
Height = Application.GetRealHeight(243),
AnimateSpeed = 0.3f,
BackgroundImagePath = "FunctionIcon/AC/DivBg2.png",
- Animate = Animate.DownToUp,
+ Animate = Animate.UpToDown,
};
dialogView.AddChidren(modeChangeView);
--
Gitblit v1.8.0