20201112

wxr

2020-11-12 a715181089be0d31cd737a5367ffd02690b9d77f

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

@@ -131,15 +131,18 @@
                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.ChangeCommunicationMode(DriverLayer.CommunicationMode.local_BusUdp);
                            UdpSocket._BusSocket.SearchNetDeviceAction = (revIp) =>
                            {
                                MainPage.Log($"搜索到网络设备：{revIp}");
                            };
                            DriverLayer.Control.ins.myUdp.ReadGatewayIP();
                        });
                };
#endif

@@ -859,7 +862,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)