From 8ce0f9b1e568dd9125e74421cd02fbc29381c1f1 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 29 七月 2020 12:53:33 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Common/Device.cs | 54 ++++++++++++++++++++++++++----------------------------
1 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index 8b92a87..a813749 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -99,7 +99,7 @@
this.dicDeviceEpoint.Clear();
//鍒濆鍖栬澶囨灇涓�
- this.InitDeviceModelIdEnum();
+ this.InitDeviceModelIdEnum();
//鑾峰彇鏈湴鍏ㄩ儴鐨勮澶囨枃浠�
List<string> listFile = this.GetAllDeviceFile();
@@ -565,7 +565,7 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return Phone.ModelData.DeviceModelDataLogic.Current.ReDeviceMacName(device, macName, "MacRename");
+ return Phone.TemplateData.TemplateDeviceDataLogic.Current.ReDeviceMacName(device, macName);
}
//鑾峰彇缂栬緫璁惧Mac鍚嶅瓧鐨勫懡浠ゅ瓧绗�
@@ -576,7 +576,7 @@
return null;
}
//鍔犵紦瀛�
- Phone.ModelData.DeviceModelDataLogic.Current.ReDeviceMacName(device, macName, "MacRename");
+ Phone.TemplateData.TemplateDeviceDataLogic.Current.ReDeviceMacName(device, macName);
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.RenameDeviceMacNameData>(result.ReceiptData);
return new CommonDevice.RenameDeviceMacNameAllData { renameDeviceMacNameData = tempData };
@@ -593,7 +593,7 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return Phone.ModelData.DeviceModelDataLogic.Current.ReDeviceEpointName(device, deviceName, "DeviceRename");
+ return Phone.TemplateData.TemplateDeviceDataLogic.Current.ReDeviceEpointName(device, deviceName);
}
//鑾峰彇缂栬緫璁惧绔偣鍚嶅瓧鐨勫懡浠ゅ瓧绗�
var sendData = this.GetReDeviceEpointNameCommandText(device.DeviceAddr, device.DeviceEpoint, deviceName);
@@ -603,7 +603,7 @@
return null;
}
//鍔犵紦瀛�
- Phone.ModelData.DeviceModelDataLogic.Current.ReDeviceEpointName(device, deviceName, "DeviceRename");
+ Phone.TemplateData.TemplateDeviceDataLogic.Current.ReDeviceEpointName(device, deviceName);
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceRenameResponseData>(result.ReceiptData);
return new CommonDevice.DeviceRenameAllData { deviceRenameData = tempData };
@@ -885,7 +885,7 @@
return false;
}
//娓╂箍搴︿紶鎰熷櫒娌℃湁瀹氫綅鍔熻兘
- if (myTypeInfo.ConcreteType == DeviceConcreteType.Sensor_TemperatrueHumidity)
+ if (myTypeInfo.ConcreteType == DeviceConcreteType.Sensor_TemperatureHumidity)
{
return false;
}
@@ -1386,6 +1386,16 @@
//闈㈡澘鐨勬俯搴︽帰澶村彨 闈㈡澘鍚嶅瓧+娓╁害
return deviceInfoType.DeviceDefultName + Language.StringByID(R.MyInternationalizationString.uTemperature);
}
+ else if (((TemperatureSensor)device).SensorDiv == 1)
+ {
+ //娓╁害浼犳劅鍣�
+ return Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
+ }
+ else if (((TemperatureSensor)device).SensorDiv == 2)
+ {
+ //婀垮害浼犳劅鍣�
+ return Language.StringByID(R.MyInternationalizationString.HumiditySensor);
+ }
}
//鍏朵粬鎯呭喌,浣跨敤瀹冪殑榛樿鍚嶇О
return deviceInfoType.DeviceDefultName + epointNo;
@@ -1420,7 +1430,7 @@
/// <param name="device">璁惧瀵硅薄</param>
/// <param name="macName">Mac鍚嶅瓧</param>
/// <returns></returns>
- private void SetMacName(CommonDevice device, string macName)
+ public void SetMacName(CommonDevice device, string macName)
{
device.DeviceName = macName;
}
@@ -1431,7 +1441,7 @@
/// <param name="device">璁惧瀵硅薄</param>
/// <param name="epointName">绔偣鍚嶅瓧</param>
/// <returns></returns>
- private void SetEpointName(CommonDevice device, string epointName)
+ public void SetEpointName(CommonDevice device, string epointName)
{
device.DeviceEpointName = epointName;
}
@@ -2079,14 +2089,14 @@
//璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
info.BeloneType = DeviceBeloneType.A娓╂箍搴︿紶鎰熷櫒;
info.ConcreteText = this.dicDeviceModelIdEnum["A411"].A瀹樻柟鍚嶅瓧;
- info.ConcreteType = DeviceConcreteType.Sensor_TemperatrueHumidity;
+ info.ConcreteType = DeviceConcreteType.Sensor_TemperatureHumidity;
}
else if (temperatrue == true && humidity == false)
{
//璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
info.BeloneType = DeviceBeloneType.A娓╁害浼犳劅鍣�;
info.ConcreteText = this.dicDeviceModelIdEnum["A412"].A瀹樻柟鍚嶅瓧;
- info.ConcreteType = DeviceConcreteType.Sensor_Temperatrue;
+ info.ConcreteType = DeviceConcreteType.Sensor_Temperature;
}
else if (temperatrue == false && humidity == true)
{
@@ -2187,12 +2197,6 @@
//闂ㄧ獥浼犳劅鍣�
info.ConcreteType = DeviceConcreteType.Sensor_DoorWindow;
info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uSensorDoorWindow);
- }
- else if (iasZone.IasDeviceType == 541)
- {
- //鐞冨瀷绉诲姩浼犳劅鍣�
- info.ConcreteType = DeviceConcreteType.Sensor_SphericalMotion;
- info.ConcreteText = this.dicDeviceModelIdEnum["MSPIRB-ZB.10"].A瀹樻柟鍚嶅瓧;
}
}
@@ -2877,14 +2881,8 @@
/// <param name="device">璁剧疆婧愯澶囧璞�</param>
public void SetDeviceInfoToMain(CommonDevice mainDevice, CommonDevice device)
{
- if (string.IsNullOrEmpty(device.DeviceInfo.MacName) == false)
- {
- mainDevice.DeviceName = device.DeviceInfo.MacName;
- }
- if (string.IsNullOrEmpty(device.DeviceInfo.DeviceName) == false)
- {
- mainDevice.DeviceEpointName = device.DeviceInfo.DeviceName;
- }
+ mainDevice.DeviceName = device.DeviceInfo.MacName;
+ mainDevice.DeviceEpointName = device.DeviceInfo.DeviceName;
mainDevice.CurrentGateWayId = device.CurrentGateWayId;
mainDevice.ZigbeeType = device.DeviceInfo.ZigbeeType;
mainDevice.IsOnline = device.DeviceInfo.IsOnline;
@@ -3399,9 +3397,9 @@
/// </summary>
Sensor_PMTwoPointFive = 1307,
/// <summary>
- /// 娓╂箍搴︿紶鎰熷櫒
+ /// 娓╂箍搴︿紶鎰熷櫒(杩欎釜鍗曡瘝鎷奸敊浜�,浣嗘槸閿欎簡灏遍敊浜嗗憲,灏辫繖鏍蜂簡)
/// </summary>
- Sensor_TemperatrueHumidity = 1308,
+ Sensor_TemperatureHumidity = 1308,
/// <summary>
/// 杩愬姩浼犳劅鍣�
@@ -3412,9 +3410,9 @@
/// </summary>
Sensor_Keyfob = -1307,
/// <summary>
- /// 娓╁害浼犳劅鍣�
+ /// 娓╁害浼犳劅鍣�(杩欎釜鍗曡瘝鎷奸敊浜�,浣嗘槸閿欎簡灏遍敊浜嗗憲,灏辫繖鏍蜂簡)
/// </summary>
- Sensor_Temperatrue = -1309,
+ Sensor_Temperature = -1309,
/// <summary>
/// 婀垮害浼犳劅鍣�
/// </summary>
--
Gitblit v1.8.0