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/Category/AdjustTargetAddDeviceForm.cs | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs b/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs
index 96be5ac..969c537 100755
--- a/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs
@@ -208,7 +208,7 @@
if (data.Type == 0)
{
//鍙璁惧
- string mainkey = LocalDevice.Current.GetDeviceMainKeys(data.DeviceAddr, data.Epoint);
+ string mainkey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(data.DeviceAddr, data.Epoint);
dicOldListTask[mainkey] = data.TaskList;
}
}
@@ -221,7 +221,7 @@
{
foreach (var mainkey in room.ListDevice)
{
- var device = LocalDevice.Current.GetDevice(mainkey);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(mainkey);
if (this.CheckDeviceCanShow(device) == true)
{
//杩欎釜璁惧鏈湴瀛樺湪,骞朵笖瀹冭繕娌℃湁鍔犲叆鍒版墽琛岀洰鏍囧垪琛�,鍒欒繖涓埧闂村彲浠ユ樉绀�
@@ -251,14 +251,14 @@
{
//璁惧鑿滃崟鐨勭櫧鑹茶儗鏅�
var functionBack1 = new FrameLayout();
- functionBack1.X = ControlCommonResourse.XXLeft;
+ functionBack1.X = HdlControlResourse.XXLeft;
functionBack1.Height = Application.GetRealHeight(160);
functionBack1.Width = Application.GetRealWidth(1028);
functionBack1.BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
functionBodyView.AddChidren(functionBack1);
functionBack1.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft);
var functionBack2 = new FrameLayout();
- functionBack2.X = ControlCommonResourse.XXLeft;
+ functionBack2.X = HdlControlResourse.XXLeft;
functionBack2.Y = functionBack1.Bottom - Application.GetRealHeight(50);
functionBack2.Height = Application.GetRealHeight(279 - 160 + 50);
functionBack2.Width = Application.GetRealWidth(1028);
@@ -268,14 +268,14 @@
//璁惧鑿滃崟鐨勫乏鍙虫粦鍔ㄧ殑鎺т欢
this.deviceFunctionMenuContr = new HorizontalScrolViewLayout();
- deviceFunctionMenuContr.X = ControlCommonResourse.XXLeft;
+ deviceFunctionMenuContr.X = HdlControlResourse.XXLeft;
deviceFunctionMenuContr.Height = Application.GetRealHeight(279);
deviceFunctionMenuContr.Width = Application.GetRealWidth(1028);
functionBodyView.AddChidren(deviceFunctionMenuContr);
//璁惧鐨勮儗鏅鍣�
var frameDeviceBack = new FrameLayout();
- frameDeviceBack.X = ControlCommonResourse.XXLeft;
+ frameDeviceBack.X = HdlControlResourse.XXLeft;
frameDeviceBack.Y = deviceFunctionMenuContr.Bottom + Application.GetRealHeight(35);
frameDeviceBack.BackgroundColor = UserCenterColor.Current.White;
frameDeviceBack.Width = bodyFrameLayout.Width;
@@ -360,7 +360,7 @@
var listDevice = new List<CommonDevice>();
for (int i = 0; i < rowInfo.listDeviceKeys.Count; i++)
{
- var device = LocalDevice.Current.GetDevice(rowInfo.listDeviceKeys[i]);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(rowInfo.listDeviceKeys[i]);
if (device != null)
{
listDevice.Add(device);
@@ -391,10 +391,10 @@
/// <param name="device"></param>
private void AddDeviceRow(VerticalListControl listView, CommonDevice device)
{
- string mainkey = LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainkey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
//璁惧鎺т欢
var rowDevice = new FrameRowControl(listView.rowSpace / 2);
- rowDevice.RightOffset = ControlCommonResourse.XXLeft - Application.GetRealWidth(109);
+ rowDevice.RightOffset = HdlControlResourse.XXLeft - Application.GetRealWidth(109);
listView.AddChidren(rowDevice);
//璁惧鍥炬爣鑳屾櫙鎺т欢
@@ -411,7 +411,7 @@
//璁惧鍥炬爣鎺т欢
var btnDeviceIcon = new IconViewControl(78);
btnDeviceIcon.Gravity = Gravity.Center;
- Common.LocalDevice.Current.SetDeviceIconToControl(btnDeviceIcon, device);
+ HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnDeviceIcon, device);
frameIconBackGroud.AddChidren(btnDeviceIcon);
//閲嶆柊缁戝畾浜嬩欢
rowDevice.ChangedChidrenBindMode(frameIconBackGroud, ChidrenBindMode.BindEvent);
@@ -420,13 +420,13 @@
var btnDeviceName = new NormalViewControl(600, 60, true);
btnDeviceName.X = Application.GetRealWidth(181);
btnDeviceName.Gravity = Gravity.CenterVertical;
- btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);
+ btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
rowDevice.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);
btnDeviceName.Y += rowDevice.chidrenYaxis;
//搴曠嚎
- var btnBottomLine = new NormalViewControl(Application.GetRealWidth(841), ControlCommonResourse.BottomLineHeight, false);
+ var btnBottomLine = new NormalViewControl(Application.GetRealWidth(841), HdlControlResourse.BottomLineHeight, false);
btnBottomLine.X = Application.GetRealWidth(181);
- btnBottomLine.Y = rowDevice.Height - ControlCommonResourse.BottomLineHeight;
+ btnBottomLine.Y = rowDevice.Height - HdlControlResourse.BottomLineHeight;
btnBottomLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
rowDevice.AddChidren(btnBottomLine, ChidrenBindMode.NotBind);
//鍙崇澶�
@@ -456,7 +456,7 @@
/// <param name="btnStatu"></param>
private void ShowDeviceDetailSettion(CommonDevice device, NormalViewControl btnStatu)
{
- string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
List<Safeguard.TaskListInfo> listTaskinfo = null;
if (dicNewListTask.ContainsKey(mainKeys) == true)
@@ -524,7 +524,7 @@
/// <param name="listInfo"></param>
private void AddSettionDataToMemory(CommonDevice device, List<Safeguard.TaskListInfo> listInfo)
{
- string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
if (listInfo == null || listInfo.Count == 0)
{
//鎸囧畾涓烘棤鍔ㄤ綔妯″紡
@@ -571,11 +571,11 @@
}
//鏍规嵁璁惧鎵�灞炵被鍨嬫帓搴�
- listDevice = LocalDevice.Current.SortDeviceByBelongType(listDevice);
+ listDevice = HdlDeviceCommonLogic.Current.SortDeviceByBelongType(listDevice);
var dic = new Dictionary<string, DeviceRowInfo>();
foreach (var device in listDevice)
{
- var typeInfo = LocalDevice.Current.GetDeviceBelongEnumInfo(device);
+ var typeInfo = HdlDeviceCommonLogic.Current.GetDeviceBelongEnumInfo(device);
//鎸夋墍灞濱D鍒嗙粍
if (dic.ContainsKey(typeInfo.BeloneText) == false)
{
@@ -583,12 +583,12 @@
string path1 = string.Empty;
string path2 = string.Empty;
//鑾峰彇鍥剧墖
- LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo, ref path1, ref path2);
+ HdlDeviceCommonLogic.Current.GetDeviceFunctionTypeMenuIcon(typeInfo, ref path1, ref path2);
dic[typeInfo.BeloneText].IconPath = path1;
dic[typeInfo.BeloneText].IconPathSelected = path2;
dic[typeInfo.BeloneText].TextId = typeInfo.BeloneText;
}
- dic[typeInfo.BeloneText].listDeviceKeys.Add(LocalDevice.Current.GetDeviceMainKeys(device));
+ dic[typeInfo.BeloneText].listDeviceKeys.Add(HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device));
}
return dic;
}
@@ -626,7 +626,7 @@
device.Type == DeviceType.ColorTemperatureLight ||//鑹叉俯鐏�
device.Type == DeviceType.WindowCoveringDevice)//绐楀笜
{
- string mainkey = LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainkey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
return this.dicOldListTask.ContainsKey(mainkey) == false;
}
return false;
--
Gitblit v1.8.0