2021-1-12-3

陈嘉乐

2021-01-11 631f94758c3cb42abcdda8094e77895f376eff16

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

@@ -21,32 +21,63 @@
                bodyView.btnPm25Values.Text = MainPage.cityInfo.pm25 == null ? "--" : MainPage.cityInfo.pm25;
            }
        }

        /// <summary>
        /// 更新连接状态图标
        /// </summary>
        void CheckLinkStatus()
        {
            if (Control.Ins.GatewayOnline)
            {
                if (Control.Ins.IsRemote)
                {
                    bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
                }
                else
                {
                    bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipRemote;
                }
            }
            else
            {
                bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
            }
        }

        /// <summary>
        /// 确认连接状态
        /// </summary>
        public static void LoadEvent_CheckLinkStatus()
        {
            if (bodyView != null)
            Application.RunOnMainThread(() =>
            {
                Application.RunOnMainThread(() =>
                if (bodyView != null)
                {
                    if (Control.Ins.GatewayOnline)
                    {
                        if (Control.Ins.IsRemote)
                        {
                            bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipRemote;
                        }
                        else
                        {
                            bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
                        }
                    }
                    else
                    {
                        bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
                    }
                });
            }
                    bodyView.CheckLinkStatus();
                }
            });

            //if (bodyView != null)
            //{
            //    Application.RunOnMainThread(() =>
            //    {
            //        if (Control.Ins.GatewayOnline)
            //        {
            //            if (Control.Ins.IsRemote)
            //            {
            //                bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
            //            }
            //            else
            //            {
            //                bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipRemote;
            //            }
            //        }
            //        else
            //        {
            //            bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
            //        }
            //    });
            //}
        }

        /// <summary>
@@ -57,7 +88,7 @@
            btn.MouseUpEventHandler += (sender, e) =>
            {
                function.collect = false;
                if (function.functionCategory == FunctionCategory.Music)//处理音乐主从关系
                if (function.Spk_Prefix == FunctionCategory.Music)//处理音乐主从关系
                {
                    if ((function as Music.A31MusicModel).ServerClientType == 1)
                    {
@@ -67,7 +98,7 @@
                }
                string msg = function.name + Language.StringByID(StringId.CollectionCancelled);
                LoadDeviceFunctionControlZone();
                function.SaveFunctionData(true);
                function.CollectFunction();
                new PublicAssmebly().TipMsgAutoClose(msg, true);
            };
        }
@@ -146,7 +177,7 @@
        /// </summary>
        public static void UpdataFunctionStates(Function function)
        {
            Application.RunOnMainThread(() =>
            Application.RunOnMainThread((Action)(() =>
            {
                try
                {
@@ -165,13 +196,16 @@
                                        btn.IsSelected = state;
                                        if (btn.Tag != null && btn.Tag.ToString() == "state")
                                        {
                                            if (function.functionCategory == FunctionCategory.Music)
                                            if (function.Spk_Prefix == FunctionCategory.Music)
                                            {
                                                btn.Text = (function as Music.A31MusicModel).A31PlayStatus.Title;
                                            }
                                            else
                                            {
                                                btn.Text = function.lastState;
                                                if (function.spk != SPK.LightSwitch)
                                                {
                                                    btn.Text = function.lastState;
                                                }
                                            }
                                        }
                                    }
@@ -184,20 +218,64 @@
                {
                    MainPage.Log($"HomePage updata funciton states error {ex.Message}");
                }
            });
            }));
        }

        /// <summary>
        /// 加载场景控制事件
        /// </summary>
        void LoadEvent_ControlScene(Button btnCoverd, Button btnName, Button btnZone, Scene scene)
        void LoadEvent_ControlScene(Button btnCoverd, Button btnName, Button btnZone,Button btnShowDelay, Scene scene)
        {

            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                //场景正在倒计时执行中，不允许再点击
                if (scene.LastExecutionTime == "" || Convert.ToDouble(scene.LastExecutionTime) + Convert.ToDouble(scene.delay) < Convert.ToDouble(Utlis.GetTimestamp(false)))
                {
                    scene.LastExecutionTime = Utlis.GetTimestamp(false);
                }
                else
                {
                    return;
                }
                string msg = scene.name + Language.StringByID(StringId.AlreadyOpened);
                new PublicAssmebly().TipMsgAutoClose(msg, true);
                Control.Ins.ControlScene(scene);
                scene.SceneCountDown(btnShowDelay);
                //new System.Threading.Thread(() => {
                //    int time = Convert.ToInt32(scene.delay);
                //    if (time > 0)
                //    {
                //        while (time > 0)
                //        {
                //            Application.RunOnMainThread(() =>
                //            {
                //                if (time / 60 > 1)
                //                {
                //                    btnShowDelay.Text = (time / 60).ToString() + "min";
                //                }
                //                else
                //                {
                //                    btnShowDelay.Text = (time--).ToString() + "s";
                //                }
                //            });
                //            if (time / 60 > 1)
                //            {
                //                System.Threading.Thread.Sleep(time / 60 * 60000);
                //            }
                //            else
                //            {
                //                System.Threading.Thread.Sleep(1000);
                //            }
                //        }
                //        Application.RunOnMainThread(() =>
                //        {
                //            btnShowDelay.Text = "";
                //        });
                //    }
                //})
                //{ IsBackground = true, Priority = System.Threading.ThreadPriority.BelowNormal }.Start();

            };
            btnCoverd.MouseUpEventHandler = eventHandler;
            btnName.MouseUpEventHandler = eventHandler;
@@ -230,6 +308,7 @@
                        {
                            light.lastBrightness = light.brightness;
                        }
                        d.Add(FunctionAttributeKey.FadeTime, light.fadeTime.ToString());
                        Control.Ins.SendWriteCommand(light, d);
                    }
                    else