From e35967bbb7a3a678752283c64fe2a496e2f3b702 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 03 八月 2023 23:37:23 +0800
Subject: [PATCH] Merge branch 'wxr-2.1' of http://59.41.255.150:6688/r/~wxr/OnPro into wxr-2.1
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs
index b0887f6..88ad3f0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs
@@ -153,7 +153,7 @@
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.TextFontSize,
};
- controlView.AddChidren(btnRunStatus); //鐘舵�佹棤娉曟祴璇曪紝鏆傛椂闅愯棌--2021-10-14 13:58:48 钁ｆ辰鏂�
+ controlView.AddChidren(btnRunStatus);
UpdataRunStatus();
}
@@ -183,7 +183,7 @@
controlView.AddChidren(btnEnergyText);
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
- var skipView = new EnergyMainPage();
+ var skipView = new AirSwitchP3EnergyPage(function);
MainPage.BasePageView.AddChidren(skipView);
skipView.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -210,7 +210,14 @@
};
controlView.AddChidren(btnSwitch);
- new TopViewDiv(bodyView, Language.StringByID(StringId.Electric)).LoadTopView_FunctionTop(function, actionRefresh, false);
+ //鍥為��鍒锋柊淇℃伅浜嬩欢
+ actionRefresh = () => {
+ btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
+ btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
+ //function.SaveFunctionData(true);
+ };
+
+ new TopViewDiv(bodyView, Language.StringByID(StringId.Electric)).LoadTopView_FunctionTop(function, actionRefresh);
new System.Threading.Thread(() =>
{
DriverLayer.Control.Ins.SendReadCommand(function);
@@ -273,6 +280,11 @@
btnRunStatus.Text = "杩囧帇棰勮";
btnRunStatus.TextColor = 0xFFFC9C04;
break;
+ ////* HV:杩囧帇棰勮
+ //case "HV_A":
+ // btnRunStatus.Text = "A椤硅繃鍘嬮璀�";
+ // btnRunStatus.TextColor = 0xFFFC9C04;
+ // break;
//* LV:娆犲帇棰勮
case "LV":
btnRunStatus.Text = "娆犲帇棰勮";
@@ -390,13 +402,6 @@
{
LoadSwitchEvent();
LoadCollectionEvent();
-
- //鍥為��鍒锋柊淇℃伅浜嬩欢
- actionRefresh = () => {
- btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
- btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
- //function.SaveFunctionData(true);
- };
}
/// <summary>
--
Gitblit v1.8.0