From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Common/Device.cs | 83 +++++++++++++++++++++++++++--------------
1 files changed, 54 insertions(+), 29 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
old mode 100644
new mode 100755
similarity index 98%
rename from ZigbeeApp20200414/Shared/Common/Device.cs
rename to ZigbeeApp/Shared/Common/Device.cs
index 494100f..0f8e7c2
--- a/ZigbeeApp20200414/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -115,7 +115,7 @@
{
CommonDevice device = null;
//鍙嶅簭鍒楀寲涓烘寚瀹氱殑绫伙紝涓嶇劧鏁版嵁浼氫涪澶辫�屽鑷存棤娉曞己杞�
- try
+ try
{
device = CommonDevice.CommonDeviceByFilePath(file);
}
@@ -968,7 +968,7 @@
/// <param name="device">璁惧瀵硅薄</param>
/// <returns></returns>
public string GetDeviceEpointName(CommonDevice device)
- {
+ {
string dName = this.GetSimpleEpointName(device);
if (string.IsNullOrEmpty(dName) == false)
{
@@ -978,52 +978,77 @@
if (this.GetDevicesCountByMac(device.DeviceAddr) <= 1)
{
return this.GetDeviceMacName(device);
- }
-
+ }
+
+ //鍚屼竴璁惧閲岄潰,涓嶅悓绫诲瀷鐨勫洖璺�,瀹冪殑鍛藉悕閮戒粠1寮�濮�
+ int epointNo = 0;
+ var listSort = this.GetDevicesByMac(device.DeviceAddr);
+ foreach (var myDevice in listSort)
+ {
+ if (myDevice.Type == device.Type)
+ {
+ //鍚屼竴绫诲瀷缂栧彿+1
+ epointNo++;
+ if (myDevice.DeviceEpoint == device.DeviceEpoint)
+ {
+ //宸茬粡鍒拌揪瀹冭嚜宸�
+ break;
+ }
+ }
+ }
+
if (device.Type == DeviceType.OnOffOutput
|| device.Type == DeviceType.DimmableLight || device.Type == DeviceType.ColorDimmableLight)
{
//缁х數鍣�,鎺夊厜鍣ㄩ兘鍙洖璺�
- return Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + device.DeviceEpoint;
+ return Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + epointNo;
}
- else if (device.Type == DeviceType.Thermostat)
- {
- //绌鸿皟閮藉彨瀹ゅ唴鏈�
- return Language.StringByID(R.MyInternationalizationString.uIndoorUnit) + device.DeviceEpoint;
+ if (device.Type == DeviceType.Thermostat)
+ {
+ //绌鸿皟閮藉彨瀹ゅ唴鏈�
+ return Language.StringByID(R.MyInternationalizationString.uIndoorUnit) + epointNo;
}
else if (device.Type == DeviceType.FreshAir)
{
//鏂伴闈㈡澘涓殑鎸夐敭鍙柊椋�
- return Language.StringByID(R.MyInternationalizationString.FreshAir);
- }
- else if (device.Type == DeviceType.TemperatureSensor)
- {
- //鏂伴闈㈡澘涓殑Thermostat涓烘俯搴︿紶鎰熷櫒
- return Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
+ return Language.StringByID(R.MyInternationalizationString.FreshAir);
}
else if (device.Type == DeviceType.FreshAirHumiditySensor)
{
//鏂伴闈㈡澘婀垮害浼犳劅鍣�
- return Language.StringByID(R.MyInternationalizationString.HumiditySensor);
- }
-
+ return Language.StringByID(R.MyInternationalizationString.HumiditySensor);
+ }
+
//鑾峰彇璁惧绫诲瀷
- var deviceInfoType = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ var deviceInfoType = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
if (device.Type == DeviceType.OnOffSwitch)
{
//闈㈡澘鐨勫共鎺ョ偣鍙寜閿�
if (deviceInfoType.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘)
{
- return Language.StringByID(R.MyInternationalizationString.uPanelButton) + device.DeviceEpoint;
+ return Language.StringByID(R.MyInternationalizationString.uPanelButton) + epointNo;
}
//鍏朵粬鐨勫共鎺ョ偣鍙共鎺ョ偣
else
{
- return Language.StringByID(R.MyInternationalizationString.uDeviceBelongId16) + device.DeviceEpoint;
+ return Language.StringByID(R.MyInternationalizationString.uDeviceBelongId16) + epointNo;
}
- }
- //鍏朵粬鎯呭喌,浣跨敤瀹冪殑榛樿鍚嶇О
- return Language.StringByID(deviceInfoType.DefultNameId) + device.DeviceEpoint;
+ }
+ else if (device.Type == DeviceType.TemperatureSensor)
+ {
+ if (deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+ {
+ //鏂伴闈㈡澘涓殑Thermostat涓烘俯搴︿紶鎰熷櫒
+ return Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
+ }
+ else if (deviceInfoType.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘)
+ {
+ //闈㈡澘鐨勬俯搴︽帰澶村彨 闈㈡澘鍚嶅瓧+娓╁害
+ return Language.StringByID(deviceInfoType.DefultNameId) + Language.StringByID(R.MyInternationalizationString.uTemperature);
+ }
+ }
+ //鍏朵粬鎯呭喌,浣跨敤瀹冪殑榛樿鍚嶇О
+ return Language.StringByID(deviceInfoType.DefultNameId) + epointNo;
}
/// <summary>
@@ -1999,8 +2024,8 @@
list.Add(DeviceBeloneType.A浼犳劅鍣�);
//鍏朵粬鐨勭湅鐫�鍔炲憲,閮芥槸鎺掑湪鍚庨潰鐨�,閮藉綊涓鸿繖涓睘鎬�
- list.Add(DeviceBeloneType.A鏈煡璁惧);
-
+ list.Add(DeviceBeloneType.A鏈煡璁惧);
+
return list;
}
@@ -2801,9 +2826,9 @@
/// <summary>
/// 鏂规偊鏂伴灏忔ā鍧� 闀滃儚id锛�2310
/// </summary>
- Relay_FangyueFreshAirModul = 2310,
-
- //=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
+ Relay_FangyueFreshAirModul = 2310,
+
+ //=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
/// <summary>
/// 璋冨厜鍣�
/// </summary>
--
Gitblit v1.8.0