20200813

wxr

2020-08-13 6a9ad7ec93218913a2ce3b898bb036f18f8f0da4

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

@@ -25,7 +25,7 @@
        /// <summary>
        /// 空调温度控制控件
        /// </summary>
        ArcSeekBar arcBar;
        DiyArcSeekBar arcBar;
        /// <summary>
        /// 减号按钮
        /// </summary>
@@ -136,25 +136,39 @@
            };
            controlView.AddChidren(btnCollection);

            arcBar = new ArcSeekBar()
            arcBar = new DiyArcSeekBar()
            {
#if __IOS__
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(120),
                Width = Application.GetRealWidth(280),
                Height = Application.GetRealWidth(280),
                Y = Application.GetRealHeight(120+25),
                Width = Application.GetRealWidth(260-40),
                Height = Application.GetRealWidth(260-40),
                OpenAngle = 160,
                ThumbColor = CSS_Color.AuxiliaryColor1,
                ThumbModeFill = true,
                ThumbImagePath = aC.on_off == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
                ThumbImageHeight = Application.GetRealWidth(50),
                ProgressBarColor = aC.on_off == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
                ThumbRadius = Application.GetRealWidth(12),
                ArcWidthWithDefaultStyle = Application.GetRealWidth(12),
                MinValue = 16,
                MaxValue = 38,
                Progress = aC.curTemp,
                ProgressBarUnitSring = "°C",
                IsClickable = true,
                ProgressTextColor = 0x00000000,
                IsClickable =  aC.on_off == "on" ,
                ArcColor = CSS_Color.BackgroundColor,
                SeekBarPadding = Application.GetRealWidth(8),
#else
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(120 + 40),
                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",
                ThumbImageHeight = Application.GetRealWidth(50),
                ProgressBarColor = aC.on_off == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2,
                MinValue = 16,
                MaxValue = 38,
                Progress = aC.curTemp,
                IsClickable = aC.on_off == "on",
                ArcColor = CSS_Color.BackgroundColor,
                SeekBarPadding = Application.GetRealWidth(7),
#endif
            };
            controlView.AddChidren(arcBar);

@@ -177,7 +191,7 @@
                X = btnTemp.Right,
                Y = btnTemp.Y,
                Width = Application.GetRealWidth(30),
                Height = Application.GetRealWidth(20),
                Height = Application.GetRealHeight(30),
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
                IsBold = true,
@@ -251,7 +265,7 @@
            controlView.AddChidren(btnSwitch);

            LoadEventList();
            new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(aC, actionRefresh);
            new TopViewDiv(bodyView,aC.name).LoadTopView(aC, actionRefresh);
        }
        /// <summary>
        /// 加载修改模式区域
@@ -325,6 +339,7 @@
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    SelectedTextColor = CSS_Color.MainColor,
                    IsSelected = aC.trait_mode.curValues == m,
                    TextSize = CSS_FontSize.TextFontSize,
                };
                modeChangeView.AddChidren(btnModeText);

@@ -448,6 +463,7 @@
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    SelectedTextColor = CSS_Color.MainColor,
                    IsSelected = aC.trait_fan.curValues.ToString() == m,
                    TextSize = CSS_FontSize.TextFontSize,
                };
                modeChangeView.AddChidren(btnFanText);

@@ -475,7 +491,7 @@
                        break;
                }

                if (aC.modeList.IndexOf(m) < aC.modeList.Count - 1)
                if (aC.fan_List.IndexOf(m) < aC.fan_List.Count - 1)
                {
                    modeChangeView.AddChidren(new Button()
                    {