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/Common/Controls/CompoundControls/SafeguardLogControl.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs b/ZigbeeApp/Shared/Phone/Common/Controls/CompoundControls/SafeguardLogControl.cs
similarity index 97%
rename from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs
rename to ZigbeeApp/Shared/Phone/Common/Controls/CompoundControls/SafeguardLogControl.cs
index 54dd891..6d4a984 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Controls/CompoundControls/SafeguardLogControl.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone.UserCenter
+namespace Shared.Phone
{
/// <summary>
/// 瀹夐槻璁板綍鎺т欢
@@ -79,7 +79,7 @@
this.frameTable.AddChidren(btnDay);
//绾�
- var btnLine = new NormalViewControl(Application.GetRealWidth(904), ControlCommonResourse.BottomLineHeight, false);
+ var btnLine = new NormalViewControl(Application.GetRealWidth(904), HdlControlResourse.BottomLineHeight, false);
btnLine.X = Application.GetRealWidth(29);
btnLine.Y = Application.GetRealHeight(98);
btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
@@ -329,12 +329,12 @@
btnRoom.Text = alarmInfo.RoomName;
rowFrame.AddChidren(btnRoom);
//璁惧
- string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(alarmInfo.DeviceAddr, alarmInfo.DeviceEpoint);
- var device = Common.LocalDevice.Current.GetDevice(mainkeys);
+ string mainkeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(alarmInfo.DeviceAddr, alarmInfo.DeviceEpoint);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(mainkeys);
var btnDevice = new NormalViewControl(271, 58, true);
btnDevice.X = Application.GetRealWidth(199);
btnDevice.TextColor = UserCenterColor.Current.TextGrayColor3;
- btnDevice.Text = device == null ? alarmInfo.DeviceName : Common.LocalDevice.Current.GetDeviceEpointName(device);
+ btnDevice.Text = device == null ? alarmInfo.DeviceName : HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
rowFrame.AddChidren(btnDevice);
//鎶ヨ淇℃伅
var btnMsg = new NormalViewControl(303, 58, true);
--
Gitblit v1.8.0