Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

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

@@ -111,7 +111,7 @@
                    Y = Application.GetRealHeight(46),
                    Width = Application.GetRealWidth(6),
                    Height = Application.GetRealWidth(6),
                    BackgroundColor = CSS_Color.MainColor,
                    BackgroundColor = CSS_Color.LinkTipFail,
                    Radius = (uint)Application.GetRealWidth(3),
                };
                topView.AddChidren(btnLinkStateTip);
@@ -131,15 +131,13 @@
                topView.AddChidren(btnResidenceName);

#if DEBUG
                //启动a网关mqtt
                //btnResidenceName.MouseUpEventHandler = (sender, e) =>
                //{
                //    System.Threading.Tasks.Task.Run(
                //        async () => { await Mqtt_A_Protocol.StartMqtt();
                //    });
                //};
                btnResidenceName.MouseUpEventHandler = (sender, e) => {
                    Control.SearchLocalGateway();
                //搜索网关
                btnResidenceName.MouseUpEventHandler = (sender, e) =>
                {
                    System.Threading.Tasks.Task.Run(() =>
                        {
                            DriverLayer.Control.Ins.SearchLoaclGateway();
                        });
                };
#endif

@@ -346,6 +344,12 @@
            {
                MainPage.Log($"HomePage LoadPage Error : {ex.Message}");
            }


            System.Threading.Tasks.Task.Run(() =>
            {
                //DriverLayer.Control.Ins.SearchLoaclGateway();
            });
        }

        /// <summary>
@@ -697,14 +701,14 @@
                            btnPower.IsSelected = false;
                            Music.SendMethod.Pause(a31player);
                            a31player.A31PlayStatus.status = "pause";
                            a31player.trait_on_off.value = "off";
                            a31player.trait_on_off.curValue = "off";
                        }
                        else
                        {
                            btnPower.IsSelected = true;
                            Music.SendMethod.Play(a31player);
                            a31player.A31PlayStatus.status = "play";
                            a31player.trait_on_off.value = "on";
                            a31player.trait_on_off.curValue = "on";
                        }
                        UpdataFunctionStates(a31player);
                    };
@@ -859,7 +863,18 @@
                LoadEvent_ControlScene(btnCoverd,btnName,btnZone, function);

                btnSettingIcon.MouseUpEventHandler = (sender, e) => {

                    Action backAction = () => {
                        //LoadSceneFunctionControlZone();
                    };
                    Action refreshAction = () => {
                        btnName.Text = function.name;
                        btnZone.Text = function.GetRoomListName();
                        view.BackgroundImagePath = (function as Scene).ImagePath;
                    };
                    var aep = new SceneEditPage(function as Scene, backAction);
                    MainPage.BasePageView.AddChidren(aep);
                    aep.LoadPage(StringId.EditScene, refreshAction);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                };
            }
            catch (Exception ex)