From ec074f7a42c10995732739c842e60ed84aedce20 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 20 十一月 2020 18:02:59 +0800
Subject: [PATCH] 2020-11-20 1.更新
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index c4065f0..cba96cc 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/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)
--
Gitblit v1.8.0