From 7f233a10afa6882b4d9531185af60e8843bc1af2 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期一, 11 五月 2020 09:21:36 +0800 Subject: [PATCH] 20200511 --- HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs index 24a1dd9..f44f442 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs @@ -302,28 +302,28 @@ }; modeChangeView.AddChidren(btnLine); - foreach(var m in aC.mode) + foreach(var m in aC.modeList) { Button btnModeIcon = new Button() { X = btnTitle.X, - Y = Application.GetRealHeight(44 * (aC.mode.IndexOf(m) + 1) + 10 + 8), + Y = Application.GetRealHeight(44 * (aC.modeList.IndexOf(m) + 1) + 10 + 8), Width = Application.GetRealWidth(24), Height = Application.GetRealWidth(24), - IsSelected = aC.curMode == m, + IsSelected = aC.trait_mode.curValues == m, }; modeChangeView.AddChidren(btnModeIcon); Button btnModeText = new Button() { X = Application.GetRealWidth(12) + btnModeIcon.Right, - Y = Application.GetRealHeight(44 * (aC.mode.IndexOf(m) + 1) + 8), + Y = Application.GetRealHeight(44 * (aC.modeList.IndexOf(m) + 1) + 8), Height = Application.GetRealHeight(44), Width = Application.GetRealWidth(70), TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.FirstLevelTitleColor, SelectedTextColor = CSS_Color.MainColor, - IsSelected = aC.curMode == m, + IsSelected = aC.trait_mode.curValues == m, }; modeChangeView.AddChidren(btnModeText); @@ -356,7 +356,7 @@ break; } - if(aC.mode.IndexOf(m) < aC.mode.Count-1) + if(aC.modeList.IndexOf(m) < aC.modeList.Count-1) { modeChangeView.AddChidren(new Button() { @@ -424,28 +424,28 @@ }; modeChangeView.AddChidren(btnLine); - foreach (var m in aC.fan) + foreach (var m in aC.fan_List) { Button btnFanIcon = new Button() { X = btnTitle.X, - Y = Application.GetRealHeight(44 * (aC.fan.IndexOf(m) + 1) + 10 + 8), + Y = Application.GetRealHeight(44 * (aC.fan_List.IndexOf(m) + 1) + 10 + 8), Width = Application.GetRealWidth(24), Height = Application.GetRealWidth(24), - IsSelected = aC.curFan == m, + IsSelected = aC.trait_fan.curValues.ToString() == m, }; modeChangeView.AddChidren(btnFanIcon); Button btnFanText = new Button() { X = Application.GetRealWidth(12) + btnFanIcon.Right, - Y = Application.GetRealHeight(44 * (aC.fan.IndexOf(m) + 1) + 8), + Y = Application.GetRealHeight(44 * (aC.fan_List.IndexOf(m) + 1) + 8), Height = Application.GetRealHeight(44), Width = Application.GetRealWidth(70), TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.FirstLevelTitleColor, SelectedTextColor = CSS_Color.MainColor, - IsSelected = aC.curFan == m, + IsSelected = aC.trait_fan.curValues.ToString() == m, }; modeChangeView.AddChidren(btnFanText); @@ -473,7 +473,7 @@ break; } - if (aC.mode.IndexOf(m) < aC.mode.Count - 1) + if (aC.modeList.IndexOf(m) < aC.modeList.Count - 1) { modeChangeView.AddChidren(new Button() { -- Gitblit v1.8.0