代码合并-温居城

wxr

2021-07-05 6b7a07bcbe147be7ed64994c40bcc5b0a2042aae

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

@@ -359,6 +359,13 @@
                btnSwitch.IsSelected = !btnSwitch.IsSelected;
                new System.Threading.Thread(() =>
                {
                    if(SPK.NotStatusSpkList.Contains(function.spk))
                    {
                        System.Threading.Thread.Sleep(1000);
                        Application.RunOnMainThread(() => {
                            btnSwitch.IsSelected = !btnSwitch.IsSelected;
                        });
                    }
                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                    Dictionary<string, string> d = new Dictionary<string, string>();
                    if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
@@ -388,21 +395,35 @@
        /// <summary>
        /// 加载电视控制事件
        /// </summary>
        /// <param name="tV"></param>
        /// <param name="button"></param>
        void LoadEvent_ControlTV(Function tV, Button button)
        /// <param name="function"></param>
        /// <param name="btnSwitch"></param>
        void LoadEvent_ControlTV(Function function, Button btnSwitch)
        {
            button.MouseUpEventHandler = (sender, e) =>
            btnSwitch.MouseUpEventHandler = (sender, e) =>
            {
                if (DB_ResidenceData.Instance.GatewayType == 1)
                {
                    Dictionary<string, string> d = new Dictionary<string, string>();
                    d.Add("on_off", "");
                    Control.Ins.SendWriteCommand(tV, d);
                    btnSwitch.IsSelected = !btnSwitch.IsSelected;
                    new System.Threading.Thread(() =>
                    {
                        if (SPK.NotStatusSpkList.Contains(function.spk))
                        {
                            System.Threading.Thread.Sleep(2000);
                            Application.RunOnMainThread(() =>
                            {
                                btnSwitch.IsSelected = !btnSwitch.IsSelected;
                            });
                        }

                        Dictionary<string, string> d = new Dictionary<string, string>();
                        d.Add("on_off", "");
                        Control.Ins.SendWriteCommand(function, d);
                    })
                    { IsBackground = true }.Start();
                }
                else
                {
                    new TV().ControlTV(InfraredCode_TV.Power, tV);
                    new TV().ControlTV(InfraredCode_TV.Power, function);
                }
            };
        }