Merge branch 'temp-wxr' into WJC

陈嘉乐

2021-03-08 79133766997cb86b2e463671b50137588ded6588

 HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs

@@ -21,6 +21,16 @@
                bodyView.btnPm25Values.Text = MainPage.cityInfo.pm25 == null ? "--" : MainPage.cityInfo.pm25;
            }
        }
        /// <summary>
        /// 更新功能列表主页
        /// </summary>
        public static void RefreshFunctionView()
        {
            if (bodyView != null)
            {
                bodyView.LoadDeviceFunctionControlZone();
            }
        }

        /// <summary>
        /// 更新连接状态图标
@@ -163,7 +173,7 @@
        /// </summary>
        public static void UpdataFunctionStates(Function function)
        {
            Application.RunOnMainThread((Action)(() =>
            Application.RunOnMainThread(() =>
            {
                try
                {
@@ -173,7 +183,16 @@
                        {
                            if (view.Tag.ToString() == function.sid)
                            {
                                var state = function.trait_on_off.curValue.ToString() == "on";
                                var state = false;
                                if (function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades || function.spk == SPK.CurtainTrietex ||
                                function.spk == SPK.CurtainSwitch)//窗帘设备根据百分比判断开关状态
                                {
                                    state = function.GetAttrState(FunctionAttributeKey.Percent) != "0";
                                }
                                else
                                {
                                    state = function.trait_on_off.curValue.ToString() == "on";
                                }
                                for (int i = 0; i < view.ChildrenCount; i++)
                                {
                                    if (view.GetChildren(i).GetType() == typeof(Button))
@@ -204,7 +223,7 @@
                {
                    MainPage.Log($"HomePage updata funciton states error {ex.Message}");
                }
            }));
            });
        }

        /// <summary>
@@ -284,18 +303,17 @@
                    Dictionary<string, string> d = new Dictionary<string, string>();
                    if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
                    {
                        var light = function as Light;
                        d.Add(FunctionAttributeKey.OnOff, light.trait_on_off.curValue.ToString());
                        d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                        if (btnSwitch.IsSelected)
                        {
                            d.Add(FunctionAttributeKey.Brightness, light.lastBrightness.ToString());
                            d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
                        }
                        else
                        {
                            light.lastBrightness = light.brightness;
                            function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));
                        }
                        d.Add(FunctionAttributeKey.FadeTime, light.fadeTime.ToString());
                        Control.Ins.SendWriteCommand(light, d);
                        d.Add(FunctionAttributeKey.FadeTime, function.GetAttrState(FunctionAttributeKey.FadeTime));
                        Control.Ins.SendWriteCommand(function, d);
                    }
                    else
                    {
@@ -312,44 +330,36 @@
        /// </summary>
        /// <param name="tV"></param>
        /// <param name="button"></param>
        void LoadEvent_ControlTV(TV tV, Button button)
        void LoadEvent_ControlTV(Function tV, Button button)
        {
            button.MouseUpEventHandler = (sender, e) =>
            {
                tV.ControlTV(InfraredCode_TV.Power);
                new TV().ControlTV(InfraredCode_TV.Power, tV);
            };
        }

        /// <summary>
        /// 加载窗帘控制事件
        /// </summary>
        void LoadEvent_ControlCurtain(Curtain curtain, Button btnClose, Button btnOpen)
        void LoadEvent_ControlCurtain(Function curtain, Button btnClose, Button btnOpen)
        {
            btnClose.MouseDownEventHandler = (sender, e) =>
            {
                btnClose.IsSelected = true;
            };
            btnClose.MouseUpEventHandler = (sender, e) =>
            {
                btnClose.IsSelected = false;
                btnClose.IsSelected = true;
                curtain.trait_on_off.curValue = "off";
                curtain.percent = 0;
                curtain.SetAttrState(FunctionAttributeKey.Percent, 0);
                Dictionary<string, string> d = new Dictionary<string, string>();
                d.Add("on_off", curtain.trait_on_off.curValue.ToString());
                d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
                Control.Ins.SendWriteCommand(curtain, d);
            };

            btnOpen.MouseDownEventHandler = (sender, e) =>
            {
                btnOpen.IsSelected = true;
            };
            btnOpen.MouseUpEventHandler = (sender, e) =>
            {
                btnOpen.IsSelected = false;
                btnOpen.IsSelected = true;
                curtain.trait_on_off.curValue = "on";
                curtain.percent = 100;
                curtain.SetAttrState(FunctionAttributeKey.Percent, 100);
                Dictionary<string, string> d = new Dictionary<string, string>();
                d.Add("on_off", curtain.trait_on_off.curValue.ToString());
                d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
                Control.Ins.SendWriteCommand(curtain, d);
            };
        }
@@ -365,7 +375,15 @@
            };
            btnUp.MouseUpEventHandler = (sender, e) =>
            {
                btnUp.IsSelected = false;
                new System.Threading.Thread(() =>
                {
                    System.Threading.Thread.Sleep(2000);
                    Application.RunOnMainThread(() =>
                    {
                        btnUp.IsSelected = false;
                    });
                })
                { IsBackground = true }.Start();
                function.SetAttrState(FunctionAttributeKey.Position, "up");
                Dictionary<string, string> d = new Dictionary<string, string>();
                d.Add(FunctionAttributeKey.Position, "up");
@@ -378,7 +396,15 @@
            };
            btnDown.MouseUpEventHandler = (sender, e) =>
            {
                btnDown.IsSelected = false;
                new System.Threading.Thread(() =>
                {
                    System.Threading.Thread.Sleep(2000);
                    Application.RunOnMainThread(() =>
                    {
                        btnDown.IsSelected = false;
                    });
                })
                { IsBackground = true }.Start();
                function.SetAttrState(FunctionAttributeKey.Position, "down");
                Dictionary<string, string> d = new Dictionary<string, string>();
                d.Add(FunctionAttributeKey.Position, "down");