From b562a582ac3a288193e6e4f57c5eff8a344305a4 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 13:52:17 +0800
Subject: [PATCH] Update AndroidManifest.xml
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs
index 1baeb5b..a12ecd9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs
@@ -85,7 +85,7 @@
controlView = new FrameLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(327),
Height = Application.GetRealHeight(526),
BackgroundImagePath = "Public/Fragmentbg.png",
@@ -153,7 +153,7 @@
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.TextFontSize,
};
- controlView.AddChidren(btnRunStatus); //鐘舵�佹棤娉曟祴璇曪紝鏆傛椂闅愯棌--2021-10-14 13:58:48 钁ｆ辰鏂�
+ controlView.AddChidren(btnRunStatus);
UpdataRunStatus();
}
@@ -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.EnergyMonitoring)).LoadTopView_FunctionTop(function, actionRefresh);
new System.Threading.Thread(() =>
{
DriverLayer.Control.Ins.SendReadCommand(function);
@@ -258,6 +265,11 @@
{
if (btnRunStatus == null)
return;
+ if (function.GetAttrState(FunctionAttributeKey.OnOff) == "off")
+ {
+ btnRunStatus.Text = "";
+ return;
+ }
var runStatus = function.GetAttrState("run_status");
if (Language.CurrentLanguage == "Chinese")
{
@@ -273,6 +285,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 +407,6 @@
{
LoadSwitchEvent();
LoadCollectionEvent();
-
- //鍥為��鍒锋柊淇℃伅浜嬩欢
- actionRefresh = () => {
- btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
- btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
- //function.SaveFunctionData(true);
- };
}
/// <summary>
@@ -417,7 +427,7 @@
{
btnSwitchIcon.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)
+ if (!function.isOnline())
{
new Tip()
{
@@ -439,7 +449,7 @@
};
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- if (!function.online)
+ if (!function.isOnline())
{
new Tip()
{
--
Gitblit v1.8.0