2020-06-16-1

陈嘉乐

2020-06-16 7167334c0e89dd84827d59e726123d14776e3a09

 HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs

@@ -142,7 +142,7 @@
                Y = Application.GetRealHeight(120),
                Width = Application.GetRealWidth(280),
                Height = Application.GetRealWidth(280),
                Angle = 160,
                //Angle = 160,
                ThumbColor = CSS_Color.AuxiliaryColor1,
                ThumbModeFill = true,
                ProgressBarColor = aC.on_off == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
@@ -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()
                    {