From 34b65350abbb8b740b9c3bc0b43254cbbe23fcb5 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 19 五月 2020 09:31:44 +0800
Subject: [PATCH] 合并代码，更改面板目标信息
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs
index 176cc98..1abe160 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs
@@ -53,7 +53,7 @@
btnArea.X = Application.GetRealWidth(46);
btnArea.TextSize = 12;
btnArea.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnArea.Text = Common.Room.CurrentRoom.GetRoomNameByDevice(device);
+ btnArea.Text = HdlRoomLogic.Current.GetRoomNameByDevice(device);
this.AddChidren(btnArea);
//鐘舵��
var btnStatu = new NormalViewControl(200, 49, true);
@@ -81,7 +81,7 @@
btnOnline.X = this.Width - Application.GetRealWidth(200 + 46);
btnOnline.Y = btnDeviceName.Y;
btnOnline.TextAlignment = TextAlignment.CenterRight;
- this.SetOnlineStatu(device.IsOnline == 1);
+ this.SetOnlineStatu(Common.LocalDevice.Current.CheckDeviceIsOnline(device));
this.AddChidren(btnOnline);
}
@@ -119,6 +119,23 @@
{
return;
}
+ string strMsg = reportInfo.AlarmMsg;
+ if (reportInfo.DemolishmenMsg != null)
+ {
+ //琚媶鎶ヨ
+ strMsg = reportInfo.DemolishmenMsg;
+ }
+ else if (reportInfo.BatteryMsg != null)
+ {
+ //鐢垫睜鎶ヨ
+ strMsg = reportInfo.BatteryMsg;
+ }
+ if (strMsg == null || strMsg == string.Empty)
+ {
+ //涓嶆槸鍦ㄥ唽鐨勬姤璀︽秷鎭�
+ return;
+ }
+
//鍦ㄧ嚎鐘舵�佺殑鎺т欢闅愯棌
btnOnline.Visible = false;
@@ -138,18 +155,7 @@
btnMsg.Y = Application.GetRealHeight(141);
this.AddChidren(btnMsg);
}
- if (reportInfo.DemolishmenMsg != null)
- {
- btnMsg.Text = reportInfo.DemolishmenMsg;
- }
- else if (reportInfo.BatteryMsg != null)
- {
- btnMsg.Text = reportInfo.BatteryMsg;
- }
- else
- {
- btnMsg.Text = reportInfo.AlarmMsg;
- }
+ btnMsg.Text = strMsg;
}
#endregion
--
Gitblit v1.8.0