水阀功能

wei

2021-02-01 8da70e1a39328e1769b02bb1e05303916bb30eb5

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

@@ -134,41 +134,39 @@
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = aC.collect
            };
            controlView.AddChidren(btnCollection);
            //controlView.AddChidren(btnCollection);
            //2020-12-16 如果是成员隐藏收藏功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            {
                controlView.AddChidren(btnCollection);
            }

            arcBar = new DiyArcSeekBar()
            {
#if __IOS__
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(120+25),
                Width = Application.GetRealWidth(260-40),
                Height = Application.GetRealWidth(260-40),
                OpenAngle = 160,
                ThumbImagePath = aC.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
                ThumbImageHeight = Application.GetRealWidth(50),
                ProgressBarColor = aC.trait_on_off.curValue.ToString() == "on"? CSS_Color.MainColor :CSS_Color.PromptingColor2,
                MinValue = 16,
                MaxValue = 38,
                Progress = Convert.ToInt32( aC.trait_temp.curValue),
                IsClickable =  aC.trait_on_off.curValue.ToString() == "on" ,
                ProgressBarColor = CSS_Color.MainColor,
                OfflineProgressBarColor = CSS_Color.PromptingColor2,
                IsOffline = aC.trait_on_off.curValue.ToString() == "off",
                MinValue = aC.trait_temp.min,
                MaxValue = aC.trait_temp.max,
                //IsClickable = aC.trait_on_off.curValue.ToString() == "on",
                ArcColor = CSS_Color.BackgroundColor,
                Progress = Convert.ToInt32(aC.trait_temp.curValue),
#if __IOS__
                Y = Application.GetRealHeight(120 + 25),
                Width = Application.GetRealWidth(260 - 40),
                Height = Application.GetRealWidth(260 - 40),
                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.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
                ThumbImageHeight = Application.GetRealWidth(50),
                ProgressBarColor = aC.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2,
                MinValue = 16,
                MaxValue = 38,
                Progress = Convert.ToInt32( aC.trait_temp.curValue),
                IsClickable = aC.trait_on_off.curValue.ToString() == "on",
                ArcColor = CSS_Color.BackgroundColor,
                SeekBarPadding = Application.GetRealWidth(7),
#endif

            };
            controlView.AddChidren(arcBar);

@@ -204,7 +202,7 @@
            {
                Gravity = Gravity.CenterHorizontal,
                Y = btnTemp.Bottom,
                Width = Application.GetRealWidth(100),
                Width = Application.GetRealWidth(120),
                Height = Application.GetRealHeight(20),
                Text = Language.StringByID(StringId.IndoorTemp) + "20°C",
                TextColor = CSS_Color.PromptingColor1,
@@ -255,9 +253,9 @@
            btnSwitch = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(462),
                Width = Application.GetRealWidth(40),
                Height = Application.GetRealWidth(40),
                Y = Application.GetRealHeight(466),
                Width = Application.GetRealWidth(32),
                Height = Application.GetRealWidth(32),
                UnSelectedImagePath = "Public/PowerClose.png",
                SelectedImagePath = "Public/PowerOpen.png",
                IsSelected = aC.trait_on_off.curValue.ToString() == "on"
@@ -265,7 +263,12 @@
            controlView.AddChidren(btnSwitch);

            LoadEventList();
            new TopViewDiv(bodyView,aC.name).LoadTopView_FunctionTop(aC, actionRefresh);
            new TopViewDiv(bodyView,Language.StringByID(StringId.AC)).LoadTopView_FunctionTop(aC, actionRefresh);
            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(aC);
            })
            { IsBackground = true }.Start();
        }
        /// <summary>
        /// 加载修改模式区域
@@ -288,8 +291,6 @@
                Width = Application.GetRealWidth(160),
                Height = Application.GetRealHeight(287),
                BackgroundImagePath = "FunctionIcon/AC/DivBg1.png",
                Animate = Animate.UpToDown,
                AnimateSpeed = 0.3f
            };
            dialogView.AddChidren(modeChangeView);

@@ -334,7 +335,7 @@
                    X = Application.GetRealWidth(12) + btnModeIcon.Right,
                    Y = Application.GetRealHeight(44 * (aC.trait_mode.value.IndexOf(m) + 1) + 8),
                    Height = Application.GetRealHeight(44),
                    Width = Application.GetRealWidth(70),
                    Width = Application.GetRealWidth(90),
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    SelectedTextColor = CSS_Color.MainColor,
@@ -411,9 +412,7 @@
                Y = Application.GetRealHeight(172),
                Width = Application.GetRealWidth(160),
                Height = Application.GetRealHeight(243),
                AnimateSpeed = 0.3f,
                BackgroundImagePath = "FunctionIcon/AC/DivBg2.png",
                Animate = Animate.UpToDown,
            };
            dialogView.AddChidren(modeChangeView);