From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaExistSensorForm.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaExistSensorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaExistSensorForm.cs
index 1018198..cb5c2e3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaExistSensorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaExistSensorForm.cs
@@ -99,7 +99,7 @@
/// <param name="addLine">鏄惁娣诲姞搴曠嚎</param>
private void AddRowLayout(Safeguard.ZoneDeviceListData sensorInfo, bool addLine)
{
- CommonDevice device = Common.LocalDevice.Current.GetDevice(sensorInfo.MacAddr, sensorInfo.Epoint);
+ CommonDevice device = HdlDeviceCommonLogic.Current.GetDevice(sensorInfo.MacAddr, sensorInfo.Epoint);
if (device == null)
{
return;
@@ -120,9 +120,9 @@
//鏃佽矾璁剧疆
var btnBypass = new NormalViewControl(Application.GetRealWidth(184), rowLayout.Height, false);
- btnBypass.TextID = R.MyInternationalizationString.uBypass;
- btnBypass.BackgroundColor = 0xff4a4a4a;
- btnBypass.TextColor = UserCenterColor.Current.TextColor3;
+ btnBypass.TextID = R.MyInternationalizationString.uBypass;
+ btnBypass.BackgroundColor = 0xff4a4a4a;
+ btnBypass.TextColor = UserCenterColor.Current.TextColor3;
btnBypass.TextAlignment = TextAlignment.Center;
btnBypass.TextSize = 12;
if (sensorInfo.IsBypass == 1)
@@ -141,9 +141,9 @@
//鍒犻櫎
var btnDelete = new NormalViewControl(Application.GetRealWidth(184), rowLayout.Height, false);
- btnDelete.TextID = R.MyInternationalizationString.uDelete;
- btnDelete.BackgroundColor = 0xfff75858;
- btnDelete.TextColor = UserCenterColor.Current.TextColor3;
+ btnDelete.TextID = R.MyInternationalizationString.uDelete;
+ btnDelete.BackgroundColor = 0xfff75858;
+ btnDelete.TextColor = UserCenterColor.Current.TextColor3;
btnDelete.TextAlignment = TextAlignment.Center;
btnDelete.TextSize = 12;
rowLayout.AddRightView(btnDelete);
@@ -257,7 +257,7 @@
private List<CommonDevice> GetCanAddSensorDevice()
{
List<CommonDevice> listNew = new List<CommonDevice>();
- List<CommonDevice> listDevices = Common.LocalDevice.Current.listAllDevice;
+ List<CommonDevice> listDevices = HdlDeviceCommonLogic.Current.listAllDevice;
foreach (CommonDevice device in listDevices)
{
//鍙浼犳劅鍣�
--
Gitblit v1.8.0