From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 2fdd1b4..cba96cc 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -131,13 +131,19 @@
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) =>
+ {
+ 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
environmentalView = new FrameLayout()
@@ -386,11 +392,11 @@
{
if (!function.collection)
continue;
- if (function.roomIdList.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
- {
- function.collection = false;
- continue;
- }
+ //if (function.roomIdList.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
+ //{
+ // function.collection = false;
+ // continue;
+ //}
}
if (index % 2 == 0)
{
@@ -856,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