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/Device/Bind/PaneTargetsBaseForm.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
index ad5d45e..0fdd8c3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
@@ -527,7 +527,7 @@
X = devicePic.Right + Application.GetRealWidth(20),
TextAlignment = TextAlignment.CenterLeft,
TextSize = 15,
- Text = Common.LocalDevice.Current.GetDeviceEpointName(device),
+ Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device),
};
rowLayout.AddChidren(btnBindName);
@@ -556,7 +556,7 @@
{
line2.Visible = false;
}
- if (Common.LocalDevice.Current.CheckDeviceIsOnline(device) == true)
+ if (HdlDeviceCommonLogic.Current.CheckDeviceIsOnline(device) == true)
{
btnBindName.TextColor = Shared.Common.ZigbeeColor.Current.TextBlack;
}
@@ -573,14 +573,14 @@
devicePic.UnSelectedImagePath = "Device/SensorTemperature.png";
if (device.Type == DeviceType.PMSensor)
{
- btnBindName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
+ btnBindName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
}
break;
case DeviceBind.BindInfo.BindType.Humidity:
devicePic.UnSelectedImagePath = "Device/SensorHumidity.png";
if (device.Type == DeviceType.PMSensor)
{
- btnBindName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
+ btnBindName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
}
break;
case DeviceBind.BindInfo.BindType.PM:
@@ -752,12 +752,12 @@
var mainKey = bindDev.BindMacAddr + bindDev.BindEpoint;
//鍒嗛厤鐨勭洰鏍囧垪琛�
- if (Shared.Common.LocalDevice.Current.listAllDevice.Count != 0)
+ if (HdlDeviceCommonLogic.Current.listAllDevice.Count != 0)
{
var dev = currentPanelSupportBindDeviceList.Find(obj => (obj != null) && (obj.DeviceAddr + obj.DeviceEpoint == mainKey));
if (dev != null)
{
- var device = LocalDevice.Current.GetDevice(dev.DeviceAddr, dev.DeviceEpoint);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(dev.DeviceAddr, dev.DeviceEpoint);
if (device != null)
{
BindTypeTargetsList(device, bindDev);
@@ -771,7 +771,7 @@
var dev = undistruibuteDevList.Find(obj => (obj != null) && (obj.DeviceAddr + obj.DeviceEpoint == mainKey));
if (dev != null)
{
- var device = LocalDevice.Current.GetDevice(dev.DeviceAddr, dev.DeviceEpoint);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(dev.DeviceAddr, dev.DeviceEpoint);
if (device != null)
{
BindTypeTargetsList(device, bindDev);
@@ -834,7 +834,7 @@
foreach (var dev in targetList)
{
//鑾峰彇鏈湴璁惧鍒楄〃
- var localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
+ var localDeviceList = HdlDeviceCommonLogic.Current.listAllDevice;
var tempDev = localDeviceList.Find(obj => obj.DeviceAddr == dev.DeviceAddr && obj.DeviceEpoint == dev.DeviceEpoint);
if (tempDev != null)
{
@@ -854,7 +854,7 @@
if (canUpdateBindName)
{
//鏇存柊澶栭潰鐩爣鍚嶅瓧锛氬叿浣撳悕瀛椼�愬埛鏂版湰鍦扮晫闈細瀵艰嚧澶栭儴鐩爣鍙樺寲銆�
- string bindName = Common.LocalDevice.Current.GetDeviceEpointName(dev);
+ string bindName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(dev);
switch (curDeviceBindType)
{
case BindInfo.BindType.Temperature:
@@ -1196,19 +1196,19 @@
addBindInfo.BindType = 0;
addBindInfo.BindMacAddr = de.DeviceAddr;
addBindInfo.BindEpoint = de.DeviceEpoint;
- addBindeDev.BindName = Common.LocalDevice.Current.GetDeviceEpointName(de);
+ addBindeDev.BindName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(de);
switch (curDeviceBindType)
{
case BindInfo.BindType.Temperature:
if (de.Type == DeviceType.PMSensor)
{
- addBindeDev.BindName = Common.LocalDevice.Current.GetDeviceEpointName(de) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
+ addBindeDev.BindName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(de) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
}
break;
case BindInfo.BindType.Humidity:
if (de.Type == DeviceType.PMSensor)
{
- addBindeDev.BindName = Common.LocalDevice.Current.GetDeviceEpointName(de) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
+ addBindeDev.BindName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(de) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
}
break;
}
@@ -1406,9 +1406,9 @@
{
case BindInfo.BindType.FreshAir:
//鑾峰彇璁惧绫诲瀷鐨�
- var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
//鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
- if (deviceEnumInfo.ConcreteType != Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+ if (deviceEnumInfo.ConcreteType != DeviceConcreteType.ButtonPanel_FangyueFreshAir)
{
if (device.Type == DeviceType.FreshAir)
{
@@ -1498,7 +1498,7 @@
return;
}
//鑾峰彇鏈湴璁惧鍒楄〃
- var localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
+ var localDeviceList = HdlDeviceCommonLogic.Current.listAllDevice;
var tempDev = localDeviceList.Find(obj => obj.DeviceAddr == bindDev.DeviceAddr && obj.DeviceEpoint == bindDev.DeviceEpoint);
if (tempDev != null)
{
--
Gitblit v1.8.0