From 652243206427f35a256400a149a1734085824cb9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:35:03 +0800
Subject: [PATCH] 2020-09-02-4
---
ZigbeeApp/Shared/Common/Device.cs | 2144 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 1,658 insertions(+), 486 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index 4a805f6..8031876 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -37,7 +37,7 @@
}
}
/// <summary>
- /// 鏈湴鎵�鏈夎澶囩殑缂撳瓨(鎺掑簭)
+ /// 鏈湴鎵�鏈夎澶囩殑缂撳瓨
/// </summary>
public List<CommonDevice> listAllDevice
{
@@ -45,28 +45,22 @@
{
lock (dicAllDevice)
{
- var list = new List<CommonDevice>();
- foreach (var device in dicAllDevice.Values)
+ //鍏堣幏鍙栧叏閮ㄧ殑Mac
+ var listMac = new List<string>();
+ foreach (var strMac in this.dicDeviceEpoint.Keys)
{
- list.Add(device);
+ listMac.Add(strMac);
}
- return list;
+ //鏍规嵁MAC鍦板潃,鑾峰彇鍏ㄩ儴鍥炶矾鐨勮澶囧璞�(寮哄埗鎺掑簭)
+ return this.GetDevicesByMac(listMac);
}
}
}
/// <summary>
- /// R鏂囦欢閲岄潰璁惧妯″潡ID鐨勭炕璇戝悕瀛楃殑鍓嶇紑
+ /// 璁惧鐨勬ā鍧桰D鐨勬灇涓� keys:妯″潡ID (Axxx浠ｈ〃鏄涓夋柟璁惧)
/// </summary>
- public const string deviceModelIdName = "uDeviceModelId";
- /// <summary>
- /// R鏂囦欢閲岄潰璁惧榛樿鍚嶅瓧鐨処D
- /// </summary>
- public Dictionary<string, int> dicDeviceDefultNameID = null;
- /// <summary>
- /// 璁惧鐨勬ā鍧桰D鐨勬灇涓�(keys:妯″潡ID value:璁惧鍏蜂綋绫诲瀷鍊�-璁惧鎵�灞炵被鍨嬪��(鑷畾涔夌殑鍊�,鍢�,鍙涓嶉噸澶嶅氨鍙互)
- /// </summary>
- private Dictionary<string, string> dicDeviceModelIdEnum = null;
+ private Dictionary<string, DeviceNameContent> dicDeviceModelIdEnum = null;
/// <summary>
/// 闇�瑕佽浆鎹㈢殑璁惧鐨勬ā鍧桰D(keys:鏃фā鍧桰D,value:鏂版ā鍧桰D)
/// </summary>
@@ -103,9 +97,9 @@
{
this.dicAllDevice.Clear();
this.dicDeviceEpoint.Clear();
-
- //鍒濆鍖朢鏂囦欢閲岄潰璁惧榛樿鍚嶅瓧鐨処D
- this.InitDeviceDefultNameIDList();
+
+ //鍒濆鍖栬澶囨灇涓�
+ this.InitDeviceModelIdEnum();
//鑾峰彇鏈湴鍏ㄩ儴鐨勮澶囨枃浠�
List<string> listFile = this.GetAllDeviceFile();
@@ -121,12 +115,6 @@
if (device == null || device.CurrentGateWayId == null)
{
-#if DEBUG
- //璋冩煡,涓轰粈涔堝畠浼氭妸鍏ㄩ儴璁惧鍒犳帀锛�
- string file1 = UserCenterLogic.CombinePath(file);
- string file2 = UserCenterLogic.CombinePath("Back_" + file);
- System.IO.File.Copy(file1, file2, true);
-#endif
//澶辨晥鐨勬枃浠讹紝娌℃湁缃戝叧id鐨勯兘鍒犻櫎鎺�
Global.DeleteFilebyHomeId(file);
continue;
@@ -141,12 +129,6 @@
}
else
{
-#if DEBUG
- //璋冩煡,涓轰粈涔堝畠浼氭妸鍏ㄩ儴璁惧鍒犳帀锛�
- string file1 = UserCenterLogic.CombinePath(file);
- string file2 = UserCenterLogic.CombinePath("Back_" + file);
- System.IO.File.Copy(file1, file2, true);
-#endif
//濡傛灉鏄富浜�,鎴栬�呯鐞嗗憳,閭ｄ箞杩欎釜鏂囦欢鏄潪娉曠殑,鐩存帴鍒犻櫎
Global.DeleteFilebyHomeId(file);
continue;
@@ -209,7 +191,7 @@
var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();
foreach (var gateway in listGateway)
{
- string gwId = HdlGatewayLogic.Current.GetGatewayId(gateway);
+ string gwId = gateway.GwId;
if (listId.Contains(gwId) == false)
{
//杩欎釜缃戝叧瀵逛簬褰撳墠杩欎釜鎴愬憳鏉ヨ鏄潪娉曠殑
@@ -227,12 +209,13 @@
/// <para>-1:寮傚父 1:姝ｅ父 2:璁惧淇℃伅缂烘崯</para>
/// </summary>
/// <param name="zbGateway">缃戝叧瀵硅薄</param>
- public int SetDeviceToMemmoryByGateway(ZbGateway zbGateway)
+ /// <param name="useLocalConnect">鏄惁寮哄埗浣跨敤鏈湴杩炴帴鍙戦��</param>
+ public int SetDeviceToMemmoryByGateway(ZbGateway zbGateway, bool useLocalConnect)
{
//浠庣綉鍏宠幏鍙栧叏閮ㄧ殑璁惧
int statu = 0;
List<CommonDevice> listDevice = new List<CommonDevice>();
- List<CommonDevice> list = this.GetDeviceListFromGateway(zbGateway, ref statu, true);
+ List<CommonDevice> list = this.GetDeviceListFromGateway(zbGateway, ref statu, useLocalConnect);
if (list == null)
{
return -1;
@@ -240,8 +223,17 @@
listDevice.AddRange(list);
//鑾峰彇杩欎釜缃戝叧鐨勬湰鍦版墍鏈夎澶�
- string gwID = HdlGatewayLogic.Current.GetGatewayId(zbGateway);
+ string gwID = zbGateway.GwId;
List<CommonDevice> listLocalDevices = this.GetDeviceByGatewayID(gwID);
+ //鑾峰彇ota璁惧
+ foreach (var ota in this.dicOTADevice.Values)
+ {
+ if (ota.CurrentGateWayId == gwID)
+ {
+ listLocalDevices.Add(ota);
+ }
+ }
+
Dictionary<string, CommonDevice> dicExist = new Dictionary<string, CommonDevice>();
foreach (var device in listLocalDevices)
{
@@ -250,6 +242,7 @@
}
//娣诲姞璁惧鐨勭紦瀛�
+ var listDriveDevice = new List<CommonDevice>();
for (int i = 0; i < listDevice.Count; i++)
{
var device = listDevice[i];
@@ -267,47 +260,47 @@
dicExist.Remove(maikey);
}
//鑾峰彇璁惧鐨勫浐瀹氬睘鎬�
- HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device);
- }
-
- for (int i = 0; i < listDevice.Count; i++)
- {
- var device = listDevice[i];
- //瀵规湭鍛藉悕鐨勮澶囬噸鏂板懡鍚�
- if (this.GetSimpleEpointName(device) == string.Empty)
+ if (HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device) == true)
{
- //鏍规嵁璁惧绫诲瀷鑾峰彇鍚嶇О
- var dName = this.GetDeviceObjectText(new List<CommonDevice>() { device }, false);
- //铏氭嫙璁惧鐨勮瘽锛岄檮鍔犲洖璺彿
- if (device.DriveCode > 0)
- {
- //鍦ㄧ鐐瑰悕瀛楃殑鍚庨潰闄勫姞銆愬洖璺�戝瓧鏍�
- dName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
- }
- //澶氬洖璺澶囩殑璇濓紝闄勫姞鍥炶矾鍙�
- else if (dicDeviceEpoint.ContainsKey(device.DeviceAddr) == true && dicDeviceEpoint[device.DeviceAddr].Count > 1)
- {
- var arry = dName.Split(new string[] { "(" }, StringSplitOptions.RemoveEmptyEntries);
- dName = arry[0].Trim();
- //鍦ㄧ鐐瑰悕瀛楃殑鍚庨潰闄勫姞銆愬洖璺�戝瓧鏍�
- dName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
- }
-
- HdlThreadLogic.Current.RunThread(async () =>
- {
- await this.ReName(device, dName, ShowErrorMode.NO);
- });
+ System.Threading.Thread.Sleep(200);
+ }
+ //瀵规湭鍛藉悕鐨勮櫄鎷熻澶囬噸鏂板懡鍚�
+ if (device.DriveCode > 0 && this.GetSimpleEpointName(device) == string.Empty)
+ {
+ listDriveDevice.Add(device);
}
}
+ //璁剧疆铏氭嫙璁惧鐨勯粯璁ゅ悕瀛�
+ this.SetDriveDeviceDefultName(listDriveDevice);
//鍙湁瀹屽叏鑾峰彇鐨勬椂鍊�,鎵嶄細鍘诲鐞嗗垹闄ょ殑闂
- if (statu == 1)
+ if (statu != 1)
{
- //濡傛灉鏈湴鍜岀綉鍏崇殑璁惧涓嶄竴鑷寸殑鏃跺�欙紝鍒犻櫎鏈湴鐨勮澶�
- foreach (var device in dicExist.Values)
+ return statu;
+ }
+
+ //濡傛灉鏈湴鍜岀綉鍏崇殑璁惧涓嶄竴鑷寸殑鏃跺�欙紝鍒犻櫎鏈湴鐨勮澶�
+ var listDeleteMac = new List<string>();
+ foreach (var device in dicExist.Values)
+ {
+ if (device is OTADevice)
+ {
+ this.DeleteMemmoryOtaDevice(device.DeviceAddr);
+ }
+ else
{
this.DeleteMemmoryDevice(device, true);
}
+ if (listDeleteMac.Contains(device.DeviceAddr) == false)
+ {
+ //鏀堕泦琚垹闄ょ殑Mac
+ listDeleteMac.Add(device.DeviceAddr);
+ }
+ }
+ if (listDeleteMac.Count > 0)
+ {
+ //灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+ this.DeleteRealDeviceFromRoom(listDeleteMac);
}
return statu;
@@ -333,6 +326,8 @@
var tempDevice = this.dicOTADevice[mainKeys];
//灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
this.SetDeviceInfoToMain(tempDevice, device);
+ //鍒锋柊璁惧鍔熻兘绫诲瀷(杩欎釜涓滆タ闇�瑕佺嫭绔嬪嚭鏉�)
+ this.RefreshDeviceFunctionType(tempDevice, device, false);
device = tempDevice;
}
@@ -354,6 +349,8 @@
var tempDevice = this.dicAllDevice[mainKeys];
//灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
this.SetDeviceInfoToMain(tempDevice, device);
+ //鍒锋柊璁惧鍔熻兘绫诲瀷(杩欎釜涓滆タ闇�瑕佺嫭绔嬪嚭鏉�)
+ this.RefreshDeviceFunctionType(tempDevice, device, false);
device = tempDevice;
}
else
@@ -381,28 +378,57 @@
}
}
+ /// <summary>
+ /// 娣诲姞铏氭嫙璁惧鍒扮紦瀛�
+ /// </summary>
+ /// <param name="device">璁惧瀵硅薄</param>
+ public void AddVirtualDeviceToMemory(CommonDevice device)
+ {
+ string mainKeys = this.GetDeviceMainKeys(device);
+ this.dicAllDevice[mainKeys] = device;
+
+ //璁惧鍥炶矾鏀堕泦
+ if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == false)
+ {
+ this.dicDeviceEpoint[device.DeviceAddr] = new HashSet<int>();
+ }
+ if (this.dicDeviceEpoint[device.DeviceAddr].Contains(device.DeviceEpoint) == false)
+ {
+ this.dicDeviceEpoint[device.DeviceAddr].Add(device.DeviceEpoint);
+ }
+ device.ReSave();
+ }
+
#endregion
#region 鈻� 淇敼璁惧___________________________
/// <summary>
- /// 鏇存敼鍚嶅瓧骞朵笖鍒锋柊缂撳瓨(淇敼澶辫触鏃讹紝浼氭樉绀轰俊鎭�)
+ /// 鏇存敼绔偣鍚嶅瓧骞朵笖鍒锋柊缂撳瓨(淇敼澶辫触鏃讹紝浼氭樉绀轰俊鎭�)
/// </summary>
/// <param name="device">璁惧瀵硅薄</param>
/// <param name="newName">鏂板悕瀛�</param>
/// <param name="mode">鏄惁鏄剧ず閿欒</param>
- public async Task<bool> ReName(CommonDevice device, string newName, ShowErrorMode mode = ShowErrorMode.YES)
+ public bool ReName(CommonDevice device, string newName, ShowErrorMode mode = ShowErrorMode.YES)
{
//鍏堝埆绠￠偅涔堝锛屾洿鏀瑰悕瀛楀悗锛屽埛鏂拌澶囩紦瀛�
this.SetEpointName(device, newName);
this.BackupDeviceAfterReName(device);
+ //濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ //淇敼璁惧鍚嶅瓧鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ Phone.UserView.UserPage.Instance.RefreshAllForm = true;
+ return true;
+ }
+
//涓嶅啀妫�娴嬪悕瀛楁槸鍚︿竴鏍�
//鎴愬憳鍙兘淇敼鑷繁鏈湴鐨勫悕瀛�
if (UserCenterResourse.UserInfo.AuthorityNo != 3)
{
- var result = await device.RenameDeviceNameAsync(device.DeviceAddr, device.DeviceEpoint, newName);
+ var result = this.RenameDeviceNameAsync(device, newName);
if (result == null || result.deviceRenameData == null || result.deviceRenameData.Result == 1)
{
//璁惧鍚嶇О淇敼澶辫触
@@ -416,9 +442,9 @@
}
return false;
}
- //澶囦唤鏁版嵁
- await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(device, GatewayBackupEnum.A绔偣鍚嶇О, newName);
}
+ //淇敼璁惧鍚嶅瓧鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ Phone.UserView.UserPage.Instance.RefreshAllForm = true;
return true;
}
@@ -428,7 +454,7 @@
/// <param name="listDevice">璁惧瀵硅薄</param>
/// <param name="newMacName">鏂板悕瀛�</param>
/// <param name="mode">鏄惁鏄剧ず閿欒</param>
- public async Task<bool> ReMacName(List<CommonDevice> listDevice, string newMacName, ShowErrorMode mode = ShowErrorMode.YES)
+ public bool ReMacName(List<CommonDevice> listDevice, string newMacName, ShowErrorMode mode = ShowErrorMode.YES)
{
if (listDevice.Count == 0)
{
@@ -444,6 +470,11 @@
//鏇存敼鍚嶅瓧鍚庯紝鍒锋柊璁惧缂撳瓨
this.BackupDeviceAfterReName(device2);
}
+ //濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ return true;
+ }
CommonDevice device = listDevice[0];
//涓嶅啀妫�娴嬪悕瀛楁槸鍚︿竴鏍�
@@ -451,7 +482,7 @@
if (UserCenterResourse.UserInfo.AuthorityNo != 3)
{
//淇敼鐗╃悊鍚嶅瓧
- var result = await device.RenameDeviceMacNameAsync(device.DeviceAddr, device.DeviceEpoint, newMacName);
+ var result = this.RenameDeviceMacNameAsync(device, newMacName);
if (result == null || result.renameDeviceMacNameData == null || result.renameDeviceMacNameData.Result != 0)
{
//璁惧鍚嶇О淇敼澶辫触
@@ -464,15 +495,162 @@
}
return false;
}
- //澶囦唤鏁版嵁
- await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(device, GatewayBackupEnum.AMac鍚嶇О, newMacName);
//濡傛灉瀹冨彧鏈変竴涓洖璺�,鍒欐洿鏀圭鐐瑰悕瀛�
- if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == true && this.dicDeviceEpoint[device.DeviceAddr].Count == 1)
+ if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == true)
{
- return await this.ReName(device, newMacName);
+ //鍙湁涓�涓鐐�
+ if (this.dicDeviceEpoint[device.DeviceAddr].Count == 1)
+ {
+ return this.ReName(device, newMacName);
+ }
+ //濡傛灉瀹冩湁涓や釜绔偣鏃�,pir浼犳劅鍣ㄧ壒娈婂鐞�
+ else if (this.dicDeviceEpoint[device.DeviceAddr].Count == 2)
+ {
+ var myType = this.GetMyDeviceEnumInfo(listDevice);
+ if (myType.ConcreteType == DeviceConcreteType.Sensor_Pir)
+ {
+ foreach (var myDevice in listDevice)
+ {
+ if (myDevice.Type == DeviceType.IASZone)
+ {
+ return this.ReName(myDevice, newMacName);
+ }
+ }
+ }
+ }
}
}
return true;
+ }
+
+ /// <summary>
+ /// 璁剧疆铏氭嫙璁惧鐨勯粯璁ゅ悕瀛�
+ /// </summary>
+ /// <param name="listDriveDevice">铏氭嫙璁惧鍒楄〃</param>
+ private void SetDriveDeviceDefultName(List<CommonDevice> listDriveDevice)
+ {
+ if (listDriveDevice.Count == 0)
+ {
+ return;
+ }
+ //濡傛灉铏氭嫙璁惧杩樻病鏈夊悕瀛楃殑璇�
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //濡傛灉涓嶈繖鏍锋斁鍦ㄤ竴涓嚎绋嬮噷,鏈夊彲鑳藉Dictionary浜х敓褰卞搷
+ foreach (var myDevice in listDriveDevice)
+ {
+ string dName = string.Empty;
+ if (this.IsMiniLight(myDevice) == true)
+ {
+ //Mini澶滅伅
+ dName = Language.StringByID(R.MyInternationalizationString.uMiniNightLight);
+ }
+ else
+ {
+ //鏍规嵁璁惧绫诲瀷鑾峰彇鍚嶇О
+ dName = this.GetDeviceObjectText(new List<CommonDevice>() { myDevice }, false);
+ //鍦ㄧ鐐瑰悕瀛楃殑鍚庨潰闄勫姞銆愬洖璺�戝瓧鏍�
+ dName += "(" + myDevice.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
+ }
+ this.ReName(myDevice, dName, ShowErrorMode.NO);
+
+ System.Threading.Thread.Sleep(100);
+ }
+ });
+ }
+
+ ///<summary >
+ /// 淇敼璁惧mac鍚嶇О
+ /// <para>macName:璁惧鍚嶇О</para>
+ /// </summary>
+ private CommonDevice.RenameDeviceMacNameAllData RenameDeviceMacNameAsync(CommonDevice device, string macName)
+ {
+ //濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ return Phone.TemplateData.TemplateDeviceDataLogic.Current.ReDeviceMacName(device, macName);
+ }
+
+ //鑾峰彇缂栬緫璁惧Mac鍚嶅瓧鐨勫懡浠ゅ瓧绗�
+ var sendData = this.GetReDeviceMacNameCommandText(device.DeviceAddr, device.DeviceEpoint, macName);
+ var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "MacRename", sendData, "MacRename_Respon", 8);
+ if (result.ErrorMsg != null || result.ErrorMsgDiv == 0)
+ {
+ return null;
+ }
+ //鍔犵紦瀛�
+ Phone.TemplateData.TemplateDeviceDataLogic.Current.ReDeviceMacName(device, macName);
+
+ var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.RenameDeviceMacNameData>(result.ReceiptData);
+ return new CommonDevice.RenameDeviceMacNameAllData { renameDeviceMacNameData = tempData };
+ }
+
+ /// <summary>
+ /// 淇敼璁惧绔彛锛堟寜閿級鍚嶇О
+ /// </summary>
+ /// <param name="device">璁惧瀵硅薄</param>
+ /// <param name="deviceName">璁惧绔偣鍚嶅瓧</param>
+ /// <returns></returns>
+ private CommonDevice.DeviceRenameAllData RenameDeviceNameAsync(CommonDevice device, string deviceName)
+ {
+ //濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ return Phone.TemplateData.TemplateDeviceDataLogic.Current.ReDeviceEpointName(device, deviceName);
+ }
+ //鑾峰彇缂栬緫璁惧绔偣鍚嶅瓧鐨勫懡浠ゅ瓧绗�
+ var sendData = this.GetReDeviceEpointNameCommandText(device.DeviceAddr, device.DeviceEpoint, deviceName);
+ var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "DeviceRename", sendData, "DeviceRenameRespon", 8);
+ if (result.ErrorMsg != null || result.ErrorMsgDiv == 0)
+ {
+ return null;
+ }
+ //鍔犵紦瀛�
+ Phone.TemplateData.TemplateDeviceDataLogic.Current.ReDeviceEpointName(device, deviceName);
+
+ var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceRenameResponseData>(result.ReceiptData);
+ return new CommonDevice.DeviceRenameAllData { deviceRenameData = tempData };
+ }
+
+ /// <summary>
+ /// 鑾峰彇缂栬緫璁惧Mac鍚嶅瓧鐨勫懡浠ゅ瓧绗�
+ /// </summary>
+ /// <param name="deviceAddr"></param>
+ /// <param name="deviceEpoint"></param>
+ /// <param name="deviceName"></param>
+ /// <returns></returns>
+ public string GetReDeviceMacNameCommandText(string deviceAddr, int deviceEpoint, string deviceName)
+ {
+ var bytes = new byte[64];
+ var reamarkGwBytes = Encoding.UTF8.GetBytes(deviceName);
+ System.Array.Copy(reamarkGwBytes, 0, bytes, 0, 64 < reamarkGwBytes.Length ? 64 : reamarkGwBytes.Length);
+ deviceName = Encoding.UTF8.GetString(bytes);
+
+ var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", deviceAddr }, { "Epoint", deviceEpoint }, { "Cluster_ID", 0 }, { "Command", 100 } };
+ var data = new Newtonsoft.Json.Linq.JObject { { "MacName", deviceName } };
+ jObject.Add("Data", data);
+ return jObject.ToString();
+ }
+
+ /// <summary>
+ /// 鑾峰彇缂栬緫璁惧绔偣鍚嶅瓧鐨勫懡浠ゅ瓧绗�
+ /// </summary>
+ /// <param name="deviceAddr"></param>
+ /// <param name="deviceEpoint"></param>
+ /// <param name="deviceName"></param>
+ /// <returns></returns>
+ public string GetReDeviceEpointNameCommandText(string deviceAddr, int deviceEpoint, string deviceName)
+ {
+ var bytes = new byte[64];
+ var reamarkGwBytes = Encoding.UTF8.GetBytes(deviceName);
+ System.Array.Copy(reamarkGwBytes, 0, bytes, 0, 64 < reamarkGwBytes.Length ? 64 : reamarkGwBytes.Length);
+ deviceName = Encoding.UTF8.GetString(bytes);
+
+ var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", deviceAddr }, { "Epoint", deviceEpoint }, { "Cluster_ID", 0 }, { "Command", 96 } };
+ var data = new Newtonsoft.Json.Linq.JObject { { "DeviceName", deviceName } };
+ jObject.Add("Data", data);
+
+ return jObject.ToString();
}
/// <summary>
@@ -484,15 +662,25 @@
lock (dicAllDevice)
{
string mainKeys = this.GetDeviceMainKeys(device);
- if (this.dicAllDevice.ContainsKey(mainKeys) == false)
+ if (this.dicAllDevice.ContainsKey(mainKeys) == true)
{
- return;
- }
- this.dicAllDevice[mainKeys] = device;
- device.ReSave();
+ //涓�鑸澶�
+ this.dicAllDevice[mainKeys] = device;
+ device.ReSave();
- //娣诲姞鑷姩澶囦唤
- HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
+ //娣诲姞鑷姩澶囦唤
+ HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
+ }
+ else if (this.dicOTADevice.ContainsKey(mainKeys) == true)
+ {
+ //Ota璁惧
+ this.dicOTADevice[mainKeys] = (OTADevice)device;
+ device.ReSave();
+
+ //娣诲姞鑷姩澶囦唤
+ HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
+
+ }
}
}
@@ -506,29 +694,36 @@
/// <param name="listdevice">璁惧瀵硅薄(MAC鍦板潃蹇呴』瑕佺浉鍚�)</param>
public async Task<bool> DeleteDevice(List<CommonDevice> listdevice)
{
- var data = new CommonDevice.RemoveDeviceData();
- var info = new CommonDevice.RemoveDeviceListInfo();
- info.DeviceAddr = listdevice[0].DeviceAddr;
- data.DeviceAddrList.Add(info);
-
- //鍒犱竴娆＄殑鏃跺�欙紝瀹冧細鎶奙AC鍦板潃涓嬮潰鍏ㄩ儴鐨勮澶囬兘鍒犻櫎
- var result = await listdevice[0].DeleteDeviceAsync(data);
- if (result == null || result.removeDeviceResponseData == null || result.removeDeviceResponseData.Result != 0)
+ //铏氭嫙浣忓畢鐨勮瘽,涓嶉渶瑕佸垹闄ょ綉鍏崇殑璁惧
+ if (Config.Instance.Home.IsVirtually == false)
{
- //璁惧鍒犻櫎澶辫触
- string msg = Language.StringByID(R.MyInternationalizationString.uDeviceDeleteFail);
- //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
+ var data = new CommonDevice.RemoveDeviceData();
+ var info = new CommonDevice.RemoveDeviceListInfo();
+ info.DeviceAddr = listdevice[0].DeviceAddr;
+ data.DeviceAddrList.Add(info);
- this.ShowErrorMsg(msg);
- return false;
+ //鍒犱竴娆＄殑鏃跺�欙紝瀹冧細鎶奙AC鍦板潃涓嬮潰鍏ㄩ儴鐨勮澶囬兘鍒犻櫎
+ var result = await listdevice[0].DeleteDeviceAsync(data);
+ if (result == null || result.removeDeviceResponseData == null || result.removeDeviceResponseData.Result != 0)
+ {
+ //璁惧鍒犻櫎澶辫触
+ string msg = Language.StringByID(R.MyInternationalizationString.uDeviceDeleteFail);
+ //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
+
+ this.ShowErrorMsg(msg);
+ return false;
+ }
}
- //鍒犻櫎鏂囦欢
+ //鍒犻櫎缂撳瓨鐨凮ta璁惧
+ this.DeleteMemmoryOtaDevice(listdevice[0].DeviceAddr);
+ //鍒犻櫎涓�鑸澶囨枃浠�
foreach (CommonDevice device in listdevice)
{
this.DeleteMemmoryDevice(device);
}
+
if (this.dicDeviceRoomId.ContainsKey(listdevice[0].DeviceAddr) == true)
{
//绉婚櫎鐪熷疄璁惧鐨勬埧闂寸储寮�
@@ -539,18 +734,21 @@
}
/// <summary>
- /// 鍒犻櫎缂撳瓨鐨勮澶�
+ /// 鍒犻櫎缂撳瓨鐨勪竴鑸澶�
/// </summary>
/// <param name="device">璁惧瀵硅薄</param>
/// <param name="deleteRoom">鏄惁浠庢埧闂村垹闄�</param>
public void DeleteMemmoryDevice(CommonDevice device, bool deleteRoom = true)
{
- if (deleteRoom == true && Room.CurrentRoom != null)
+ //鍒犻櫎缂撳瓨璁惧鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ Phone.UserView.UserPage.Instance.RefreshAllForm = true;
+
+ if (deleteRoom == true)
{
//浠庢埧闂翠腑鍒犻櫎
- Room.CurrentRoom.DeleteDevice(device);
+ HdlRoomLogic.Current.DeleteDevice(device);
//鍒犻櫎鎴戠殑鍠滅埍鐨勮澶�
- Room.CurrentRoom.DeleteLoveDevice(device);
+ HdlRoomLogic.Current.DeleteLoveDevice(device);
}
//鍒犻櫎缂撳瓨
@@ -560,6 +758,11 @@
if (this.dicAllDevice.ContainsKey(mainKeys) == true)
{
this.dicAllDevice.Remove(mainKeys);
+ }
+ if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == true)
+ {
+ //鍙樻洿绔偣鏁�
+ this.dicDeviceEpoint[device.DeviceAddr].Remove(device.DeviceEpoint);
}
}
@@ -580,9 +783,17 @@
HdlAutoBackupLogic.DeleteFile(device.FilePath);
}
}
+ }
+ /// <summary>
+ /// 鍒犻櫎缂撳瓨鐨凮ta璁惧
+ /// </summary>
+ /// <param name="macAdrr"></param>
+ /// <param name="ePoint"></param>
+ public void DeleteMemmoryOtaDevice(string macAdrr, int ePoint = 200)
+ {
//鍒犻櫎200绔彛鏂囦欢
- string otaKeys = this.GetDeviceMainKeys(device.DeviceAddr, 200);
+ string otaKeys = this.GetDeviceMainKeys(macAdrr, ePoint);
if (this.dicOTADevice.ContainsKey(otaKeys) == true)
{
string otaFile = this.dicOTADevice[otaKeys].FilePath;
@@ -591,12 +802,12 @@
if (UserCenterResourse.UserInfo.AuthorityNo == 3)
{
//鎴愬憳鐨勮瘽,鐩存帴鍒犻櫎,娌℃湁鍟嗛噺鐨勪綑鍦�
- Global.DeleteFilebyHomeId(filePath);
+ Global.DeleteFilebyHomeId(otaFile);
}
else
{
//鍙樻洿锛氭悶鎺夊畠,涓嶇暀浜�
- Global.DeleteFilebyHomeId(filePath);
+ Global.DeleteFilebyHomeId(otaFile);
//鍒犻櫎鑷姩澶囦唤
HdlAutoBackupLogic.DeleteFile(otaFile);
}
@@ -607,6 +818,33 @@
#endregion
+ #region 鈻� 鍚屾璁惧___________________________
+ /// <summary>
+ /// 鍚屾璁惧骞朵笖鍒锋柊缂撳瓨(鍚屾澶辫触鏃讹紝浼氭樉绀轰俊鎭�)
+ /// </summary>
+ /// <param name="litdevice">璁惧瀵硅薄(MAC鍦板潃蹇呴』瑕佺浉鍚�)</param>
+ public async Task<bool> SynchronizationDevice(List<CommonDevice> listdevice)
+ {
+ //铏氭嫙浣忓畢鐨勮瘽,涓嶉渶瑕佸垹闄ょ綉鍏崇殑璁惧
+ if (Config.Instance.Home.IsVirtually == false)
+ {
+ //鍚屾
+ var result = await listdevice[0].SyncMsgToBindSource(listdevice[0].DeviceAddr, listdevice[0].DeviceEpoint);
+ if (result == null || result.result != 0)
+ {
+ //鍚屾鍒犻櫎澶辫触
+ string msg = Language.StringByID(R.MyInternationalizationString.SynchronizationFailed);
+ //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
+
+ this.ShowErrorMsg(msg);
+ return false;
+ }
+ }
+ return true;
+ }
+ #endregion
+
#region 鈻� 娴嬭瘯璁惧___________________________
/// <summary>
@@ -615,7 +853,11 @@
/// <param name="device"></param>
public void SetFixedPositionCommand(CommonDevice device)
{
- device.IdentifyControl(device.DeviceAddr, device.DeviceEpoint, 5);
+ //濡傛灉褰撳墠浣忓畢涓嶆槸铏氭嫙浣忓畢
+ if (Common.Config.Instance.Home.IsVirtually == false)
+ {
+ device.IdentifyControl(device.DeviceAddr, device.DeviceEpoint, 5);
+ }
}
/// <summary>
@@ -625,6 +867,32 @@
/// <returns></returns>
public bool DeviceIsCanFixedPosition(CommonDevice device)
{
+ if (device.Type == DeviceType.DoorLock || device.Type == DeviceType.PMSensor)
+ {
+ //闂ㄩ攣娌℃湁瀹氫綅鍔熻兘
+ return false;
+ }
+ var myTypeInfo = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ if (device.Type == DeviceType.IASZone)
+ {
+ if (myTypeInfo.ConcreteType == DeviceConcreteType.Sensor_Pir)
+ {
+ //浼犳劅鍣ㄩ櫎浜哖ir閮芥病鏈夊畾浣嶅姛鑳�
+ return true;
+ }
+ else if (myTypeInfo.ConcreteType == DeviceConcreteType.Sensor_SphericalMotion)
+ {
+ //鐞冨瀷绉诲姩浼犳劅鍣ㄨ櫧鐒舵槸鐢垫睜璁惧,浣嗘槸瀹冩湁瀹氫綅鍔熻兘
+ return true;
+ }
+ return false;
+ }
+ //娓╂箍搴︿紶鎰熷櫒娌℃湁瀹氫綅鍔熻兘
+ if (myTypeInfo.ConcreteType == DeviceConcreteType.Sensor_TemperatureHumidity)
+ {
+ return false;
+ }
+
foreach (var data in device.InClusterList)
{
//鎷ユ湁on/off鍔熻兘鐨勶紝鎵嶆敮鎸佹祴璇�
@@ -632,6 +900,22 @@
{
return true;
}
+ }
+ return false;
+ }
+
+ /// <summary>
+ /// 妫�娴嬭澶囨槸鍚︽嫢鏈変竴閿悓姝ュ姛鑳�
+ /// </summary>
+ /// <param name="device"></param>
+ /// <returns></returns>
+ public bool DeviceIsCanSynchronization(CommonDevice device)
+ {
+ //鑾峰彇璁惧绫诲瀷鐨�
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ return true;
}
return false;
}
@@ -679,24 +963,23 @@
/// <summary>
/// 鏍规嵁缃戝叧ID鑾峰彇鎵�鏈夌殑璁惧
/// </summary>
- /// <param name="gwId">缃戝叧ID</param>
+ /// <param name="gwId">缃戝叧ID</param>>
/// <returns></returns>
public List<CommonDevice> GetDeviceByGatewayID(string gwId)
{
- List<CommonDevice> list = new List<CommonDevice>();
lock (dicAllDevice)
{
- //鍚勭綉鍏崇殑鎵�鏈夎澶�
+ var listMac = new List<string>();
+ //鍚勭綉鍏崇殑鎵�鏈夎澶囩殑Mac
foreach (CommonDevice device in this.dicAllDevice.Values)
{
if (gwId == device.CurrentGateWayId)
{
- list.Add(device);
+ listMac.Add(device.DeviceAddr);
}
}
+ return this.GetDevicesByMac(listMac);
}
-
- return list;
}
/// <summary>
@@ -767,6 +1050,122 @@
}
/// <summary>
+ /// 鏍规嵁MAC鍦板潃,鑾峰彇绠�绾﹂潰鏉垮叏閮ㄥ洖璺殑璁惧瀵硅薄
+ /// </summary>
+ /// <param name="listDevice"></param>
+ /// <returns></returns>
+ public List<CommonDevice> GetMutilfunctionPanelByMac(List<CommonDevice> listDevice, bool sort = true)
+ {
+ //鍜屽姜鍝ャ�佽澶囧拰浜у搧閮ㄥ悓浜嬬‘璁わ細
+ //绠�绾﹀鍔熻兘闈㈡澘[涓嶆樉绀哄浣欑殑鍥炶矾锛屽彧鏄剧ず鎼哄甫鐨�2涓户鐢靛櫒锛�1涓俯搴︿紶鎰熷櫒锛�1涓箍搴︿紶鎰熷櫒
+ var list = new List<CommonDevice>();
+ foreach (var dev in listDevice)
+ {
+ if (dev.Type == DeviceType.TemperatureSensor)
+ {
+ if (dev.DeviceEpoint == 64)
+ {
+ list.Add(dev);
+ }
+ }
+ else if (dev.Type == DeviceType.FreshAirHumiditySensor)
+ {
+ if (dev.DeviceEpoint == 65)
+ {
+ list.Add(dev);
+ }
+ }
+ else if (dev.Type == DeviceType.OnOffOutput)
+ {
+ list.Add(dev);
+ }
+ }
+
+ if (sort == false)
+ {
+ return list;
+ }
+ list.Sort((obj1, obj2) =>
+ {
+ if (obj1.DeviceEpoint > obj2.DeviceEpoint)
+ {
+ return 1;
+ }
+ return -1;
+ });
+
+ return list;
+ }
+
+ /// <summary>
+ /// 鏍规嵁MAC鍦板潃,鑾峰彇鏂伴銆佺畝绾︾幆澧冮潰鏉垮叏閮ㄥ洖璺殑璁惧瀵硅薄
+ /// </summary>
+ /// <param name="listDevice"></param>
+ /// <returns></returns>
+ public List<CommonDevice> GetPanelMatchEpointByMac(List<CommonDevice> listDevice, bool sort = true)
+ {
+ var list = new List<CommonDevice>();
+ foreach (var dev in listDevice)
+ {
+ if (dev.Type == DeviceType.TemperatureSensor)
+ {
+ list.Add(dev);
+ }
+ else if (dev.Type == DeviceType.FreshAirHumiditySensor)
+ {
+ list.Add(dev);
+ }
+ }
+ if (sort == false)
+ {
+ return list;
+ }
+ list.Sort((obj1, obj2) =>
+ {
+
+ if (obj1.DeviceEpoint > obj2.DeviceEpoint)
+ {
+ return 1;
+ }
+ return -1;
+ });
+ return list;
+ }
+
+ /// <summary>
+ /// 鏍规嵁MAC鍦板潃,鑾峰彇鍏ㄩ儴鍥炶矾鐨勮澶囧璞�(寮哄埗鎺掑簭)
+ /// </summary>
+ /// <param name="DeviceAddr">Mac鍦板潃</param>
+ /// <returns></returns>
+ public List<CommonDevice> GetDevicesByMac(List<string> listMacAddr)
+ {
+ //鍏堟帓搴�
+ listMacAddr.Sort();
+
+ var list = new List<CommonDevice>();
+ foreach (string strMac in listMacAddr)
+ {
+ var listEpoint = new List<int>();
+ //鑾峰彇鍏ㄩ儴鐨勭鐐�
+ foreach (int epoint in this.dicDeviceEpoint[strMac])
+ {
+ listEpoint.Add(epoint);
+ }
+ //鐒跺悗鎺掑簭
+ listEpoint.Sort();
+ foreach (int epoint in listEpoint)
+ {
+ var device = this.GetDevice(strMac, epoint);
+ if (device != null)
+ {
+ list.Add(device);
+ }
+ }
+ }
+ return list;
+ }
+
+ /// <summary>
/// 鏍规嵁MAC鍦板潃,鑾峰彇鍏ㄩ儴鍥炶矾鐨勬暟閲�
/// </summary>
/// <param name="DeviceAddr">Mac鍦板潃</param>
@@ -787,7 +1186,7 @@
public List<string> GetAllDeviceFile()
{
List<string> listDeviceFile = new List<string>();
- List<string> listAllFile = Global.FileListByHomeId();
+ List<string> listAllFile = HdlFileLogic.Current.GetRootPathListFile();
foreach (string file in listAllFile)
{
@@ -817,6 +1216,104 @@
return this.dicOTADevice[mainkeys];
}
+ /// <summary>
+ /// 鑾峰彇鐗规畩鐨�,娌℃湁鍏朵粬鍥炶矾,鍗曠函鍙湁200绔偣鐨凮TA璁惧
+ /// </summary>
+ /// <param name="gwId">缃戝叧ID</param>
+ /// <returns></returns>
+ public List<OTADevice> GetSpecialOtaDevice(string gwId)
+ {
+ var list = new List<OTADevice>();
+ foreach (var ota in this.dicOTADevice.Values)
+ {
+ if (ota.CurrentGateWayId != gwId)
+ {
+ //涓嶆槸鍚屼竴涓綉鍏�
+ continue;
+ }
+ //娌℃湁鍏朵粬鍥炶矾
+ if (dicDeviceEpoint.ContainsKey(ota.DeviceAddr) == false
+ || dicDeviceEpoint[ota.DeviceAddr].Count == 0)
+ {
+ //鐩墠鍙拡瀵逛腑澶┖璋�
+ if (ota.ModelIdentifier == "MAC/GW-ZB.10")
+ {
+ list.Add(ota);
+ }
+ }
+ }
+ return list;
+ }
+
+ #endregion
+
+ #region 鈻� 鑾峰彇璁惧淇℃伅_______________________
+
+ /// <summary>
+ /// 璇诲彇鍗曚釜绔偣鍥炶矾璁惧淇℃伅
+ /// </summary>
+ /// <param name="device">璁惧瀵硅薄</param>
+ /// <returns></returns>
+ public CommonDevice.DeviceInfoData ReadDeviceEpointDeviceInfo(CommonDevice device)
+ {
+ var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", device.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 80 } };
+ var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "GetStatusRecord", jObject.ToString(), "GetStatusRecord_Respon");
+ if (result.ErrorMsg != null || result.ErrorMsgDiv == 0)
+ {
+ return null;
+ }
+ var info = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceInfoData>(result.ReceiptData);
+ return info;
+ }
+
+ #endregion
+
+ #region 鈻� 璁剧疆璁惧鍔熻兘绫诲瀷___________________
+
+ /// <summary>
+ /// 璁剧疆璁惧鍔熻兘绫诲瀷鍒扮綉鍏�
+ /// </summary>
+ /// <param name="device">璁惧鍥炶矾</param>
+ /// <param name="functionType">鍔熻兘绫诲瀷</param>
+ /// <returns></returns>
+ public bool SendDeviceFunctionTypeToGateway(CommonDevice device, DeviceFunctionType functionType)
+ {
+ //濡傛灉鏄櫄鎷熶綇瀹�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ device.DfunctionType = functionType;
+ return true;
+ }
+ //鑾峰彇鍛戒护瀛楃
+ var sendCommond = this.GetDeviceFunctionTypeCommandText(device, functionType);
+ var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "Device/SetEPDeviceFunctionType", sendCommond, "Device/SetEPDeviceFunctionTypeRespon");
+ if (result.ErrorMsg != null || result.ErrorMsgDiv == 0)
+ {
+ return false;
+ }
+ var resultData = Newtonsoft.Json.Linq.JObject.Parse(result.ReceiptData);
+ if (resultData.Property("Result") != null)
+ {
+ //0:淇敼鎴愬姛 1:淇敼澶辫触
+ return resultData["Result"].ToString() == "0";
+ }
+ return false;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏇存敼璁惧鍔熻兘绫诲瀷鐨勫懡浠ゆ枃鏈�
+ /// </summary>
+ /// <param name="device"></param>
+ /// <param name="functionType"></param>
+ /// <returns></returns>
+ public string GetDeviceFunctionTypeCommandText(CommonDevice device, DeviceFunctionType functionType)
+ {
+ var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", device.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 110 } };
+ var data = new Newtonsoft.Json.Linq.JObject { { "FunctionType", (int)functionType } };
+ jObject.Add("Data", data);
+ return jObject.ToString();
+ }
+
#endregion
#region 鈻� 鑾峰彇璁惧鍚嶇О_______________________
@@ -833,18 +1330,98 @@
{
return dName;
}
- //鏍规嵁璁惧绫诲瀷鑾峰彇鍚嶇О
- dName = this.GetDeviceObjectText(new List<CommonDevice>() { device }, false);
- //濡傛灉鏄櫄鎷熻澶�
- if (device.DriveCode > 0
- || (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == true && this.dicDeviceEpoint[device.DeviceAddr].Count > 1))
+ if (this.IsMiniLight(device) == true)
{
- var arry = dName.Split(new string[] { "(" }, StringSplitOptions.RemoveEmptyEntries);
- dName = arry[0].Trim();
- //鍦ㄧ鐐瑰悕瀛楃殑鍚庨潰闄勫姞銆愬洖璺�戝瓧鏍�
- dName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
+ //Mini澶滅伅
+ return Language.StringByID(R.MyInternationalizationString.uMiniNightLight);
}
- return dName;
+
+ //濡傛灉杩欎釜璁惧鍙湁涓�涓洖璺殑璇�,杩斿洖Mac鍚嶅瓧缁欏畠
+ 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
+ || device.Type == DeviceType.ColorTemperatureLight)
+ {
+ //缁х數鍣�,鎺夊厜鍣ㄩ兘鍙洖璺�
+ return Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + epointNo;
+ }
+ if (device.Type == DeviceType.Thermostat)
+ {
+ //绌鸿皟閮藉彨瀹ゅ唴鏈�
+ return Language.StringByID(R.MyInternationalizationString.uIndoorUnit) + epointNo;
+ }
+
+ //鑾峰彇璁惧绫诲瀷
+ var deviceInfoType = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ if (device.Type == DeviceType.OnOffSwitch)
+ {
+ //闈㈡澘鐨勫共鎺ョ偣鍙寜閿�
+ if (deviceInfoType.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘)
+ {
+ return Language.StringByID(R.MyInternationalizationString.uPanelButton) + epointNo;
+ }
+ //鍏朵粬鐨勫共鎺ョ偣鍙共鎺ョ偣
+ else
+ {
+ var infoContent = this.GetDeviceModelIdNameInfo("A419");
+ return infoContent != null ? infoContent.A瀹樻柟鍚嶅瓧 : string.Empty;
+ }
+ }
+ else if (device.Type == DeviceType.FreshAirHumiditySensor)
+ {
+ //鏂伴闈㈡澘/绠�绾﹀鍔熻兘/绠�绾︾幆澧冮潰鏉挎箍搴︿紶鎰熷櫒
+ return deviceInfoType.DeviceDefultName + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
+ }
+ else if (device.Type == DeviceType.TemperatureSensor)
+ {
+ if (deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir
+ || deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment
+ || deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment
+ || deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ //鏂伴闈㈡澘/绠�绾﹀鍔熻兘/绠�绾�/鏂规偊鐜闈㈡澘 娓╁害浼犳劅鍣�
+ return deviceInfoType.DeviceDefultName + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
+ }
+ else if (deviceInfoType.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘)
+ {
+ //闈㈡澘鐨勬俯搴︽帰澶村彨 闈㈡澘鍚嶅瓧+娓╁害
+ 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;
}
/// <summary>
@@ -859,53 +1436,15 @@
{
return dName;
}
-
- //鏄惁鎷ユ湁閰嶇疆鐨勬ā鍧桰D
- if (this.dicDeviceModelIdEnum.ContainsKey(device.ModelIdentifier) == true)
+ if (this.IsMiniLight(device) == true)
{
- //鑾峰彇妯″潡ID鍚嶅瓧
- return this.GetNameByModelId(device);
- }
- else
- {
- //鑾峰彇绗笁鏂硅澶囩殑缈昏瘧鍚嶅瓧
- var myDeviceType = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
- return Language.StringByID(myDeviceType.ConcreteTextId);
- }
- }
-
- /// <summary>
- /// 鏍规嵁妯″潡ID锛岃幏鍙栫炕璇戝悕瀛�
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- private string GetNameByModelId(CommonDevice device)
- {
- if (device.ModelIdentifier == string.Empty)
- {
- //鏈煡璁惧
- return Language.StringByID(R.MyInternationalizationString.UnknowDevice);
+ //Mini澶滅伅
+ return Language.StringByID(R.MyInternationalizationString.uMiniNightLight);
}
- string modelKeys = device.ModelIdentifier;
- if (this.dicDeviceModelIdEnum.ContainsKey(modelKeys) == false)
- {
- //鏈煡璁惧
- return Language.StringByID(R.MyInternationalizationString.UnknowDevice);
- }
-
- string[] strValue = this.dicDeviceModelIdEnum[modelKeys].Split(new string[] { "-" }, StringSplitOptions.RemoveEmptyEntries);
- int ConcreteValue = Convert.ToInt32(strValue[0]);
-
- string keyName = deviceModelIdName + ConcreteValue;
- if (this.dicDeviceDefultNameID.ContainsKey(keyName) == true)
- {
- //R鏂囦欢閲岄潰璁剧疆鐨勫悕瀛�
- return Language.StringByID(this.dicDeviceDefultNameID[keyName]);
- }
-
- //鏈煡璁惧
- return Language.StringByID(R.MyInternationalizationString.UnknowDevice);
+ //鑾峰彇璁惧绫诲瀷
+ var deviceInfoType = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ return deviceInfoType.DeviceDefultName;
}
/// <summary>
@@ -914,7 +1453,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;
}
@@ -925,7 +1464,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;
}
@@ -948,32 +1487,6 @@
public string GetSimpleEpointName(CommonDevice device)
{
return device.DeviceEpointName;
- }
-
- /// <summary>
- /// 鍒濆鍖朢鏂囦欢閲岄潰璁惧榛樿鍚嶅瓧鐨処D
- /// </summary>
- private void InitDeviceDefultNameIDList()
- {
- if (this.dicDeviceDefultNameID != null)
- {
- return;
- }
- this.dicDeviceDefultNameID = new Dictionary<string, int>();
- Type type = typeof(R.MyInternationalizationString);
-
- var PropertyList = type.GetFields();
- foreach (var item in PropertyList)
- {
- if (item.Name.StartsWith(deviceModelIdName) == true
- || item.Name.StartsWith("uDeviceBelongId") == true)
- {
- this.dicDeviceDefultNameID[item.Name] = Convert.ToInt32(item.GetValue(null));
- }
- }
-
- //鍒濆鍖栬澶囨灇涓�
- this.InitDeviceModelIdEnum();
}
#endregion
@@ -1016,9 +1529,41 @@
//鑾峰彇璁惧銆愬浘鏍囥��
this.GetDeviceIcon(device, ref unSelectFilePath, ref selectFilePath);
+ if (btnIcon.UnSelectedImagePath != unSelectFilePath)
+ {
+ btnIcon.UnSelectedImagePath = unSelectFilePath;
+ }
+ if (btnIcon.SelectedImagePath != selectFilePath)
+ {
+ btnIcon.SelectedImagePath = selectFilePath;
+ }
+ }
- btnIcon.UnSelectedImagePath = unSelectFilePath;
- btnIcon.SelectedImagePath = selectFilePath;
+ /// <summary>
+ /// 璁剧疆璁惧銆愬浘鏍囥�戝埌鎸囧畾鐨勬帶浠�(娉ㄦ剰,姝ゅ嚱鏁拌缃殑閫夋嫨鐘舵�佺殑鍥剧墖鏄櫧鑹茬殑)
+ /// </summary>
+ /// <param name="btnIcon">鎺т欢瀵硅薄</param>
+ /// <param name="device">璁惧瀵硅薄</param>
+ /// <returns></returns>
+ public void SetDeviceIconToControl2(Button btnIcon, CommonDevice device)
+ {
+ if (device == null)
+ {
+ btnIcon.UnSelectedImagePath = "Device/ThirdPartyDevice.png";
+ return;
+ }
+ string unSelectFilePath = device.IconPath;
+ string selectFilePath = unSelectFilePath.Replace(".png", "Selected2.png");
+
+ //鑾峰彇璁惧銆愬浘鏍囥��
+ if (btnIcon.UnSelectedImagePath != unSelectFilePath)
+ {
+ btnIcon.UnSelectedImagePath = unSelectFilePath;
+ }
+ if (btnIcon.SelectedImagePath != selectFilePath)
+ {
+ btnIcon.SelectedImagePath = selectFilePath;
+ }
}
/// <summary>
@@ -1095,7 +1640,7 @@
}
/// <summary>
- /// 璁剧疆銆愯澶囩被鍨嬨�戠殑鍥炬爣鍒版寚瀹氱殑鎺т欢
+ /// 璁剧疆銆愯澶囩被鍨嬨�戠殑鍥炬爣鍒版寚瀹氱殑鎺т欢(姝ゆ柟娉曚笉鑳界敤鍦ㄨ澶囧姛鑳界被鍨嬭彍鍗曠殑鍥炬爣)
/// </summary>
/// <param name="btnIcon">鎺т欢瀵硅薄</param>
/// <param name="listdevice">璁惧瀵硅薄</param>
@@ -1117,7 +1662,7 @@
}
/// <summary>
- /// 鑾峰彇銆愯澶囩被鍨嬨�戠殑鍥炬爣
+ /// 鑾峰彇銆愯澶囩被鍨嬨�戠殑鍥炬爣(姝ゆ柟娉曚笉鑳界敤鍦ㄨ澶囧姛鑳界被鍨嬭彍鍗曠殑鍥炬爣)
/// </summary>
/// <param name="listdevice">璁惧瀵硅薄</param>
/// <param name="unSelectPath">鍥剧墖鍦板潃</param>
@@ -1133,13 +1678,42 @@
}
/// <summary>
- /// 鑾峰彇銆愯澶囩被鍨嬨�戠殑鍥炬爣
+ /// 鑾峰彇銆愯澶囧姛鑳界被鍨嬨�戠殑鑿滃崟鍥炬爣
/// </summary>
/// <param name="specificType">鑷畾涔夎澶囩被鍨�</param>
/// <param name="unSelectPath">鍥剧墖鍦板潃</param>
/// <param name="selectPath">鍥剧墖鍦板潃</param>
/// <returns></returns>
- public void GetDeviceObjectIcon(DeviceConcreteType specificType, ref string unSelectPath, ref string selectPath)
+ public void GetDeviceFunctionTypeMenuIcon(DeviceConcreteType specificType, ref string unSelectPath, ref string selectPath)
+ {
+ //鏂伴灏忔ā鍧�
+ if (specificType == DeviceConcreteType.Relay_FangyueFreshAirModul)
+ {
+ unSelectPath = "Device/FreshAirEpoint.png";
+ selectPath = "Device/FreshAirEpointSelected.png";
+ return;
+ }
+ //PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+ else if (specificType == DeviceConcreteType.Sensor_PMTwoPointFive)
+ {
+ unSelectPath = "Device/AirQualitySensorEpoint.png";
+ selectPath = "Device/AirQualitySensorEpointSelected.png";
+ return;
+ }
+ //涓婇潰闇�瑕佺壒娈婂鐞�
+
+ //鑾峰彇銆愯澶囩被鍨嬨�戠殑鍥炬爣
+ this.GetDeviceObjectIcon(specificType, ref unSelectPath, ref selectPath);
+ }
+
+ /// <summary>
+ /// 鑾峰彇銆愯澶囩被鍨嬨�戠殑鍥炬爣 2020.05.13:娆″嚱鏁颁笉鍐嶅叕寮�
+ /// </summary>
+ /// <param name="specificType">鑷畾涔夎澶囩被鍨�</param>
+ /// <param name="unSelectPath">鍥剧墖鍦板潃</param>
+ /// <param name="selectPath">鍥剧墖鍦板潃</param>
+ /// <returns></returns>
+ private void GetDeviceObjectIcon(DeviceConcreteType specificType, ref string unSelectPath, ref string selectPath)
{
//灏嗗叿浣撶被鍨嬭浆瀛楃涓�
string strSpecific = Enum.GetName(typeof(DeviceConcreteType), specificType);
@@ -1179,43 +1753,6 @@
#endregion
- #region 鈻� 璁惧UI鐩稿叧_________________________
-
- /// <summary>
- /// 鑾峰彇璁惧鎵�鍖归厤鐨勮澶嘦I瀵硅薄
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- public DeviceUI GetDeviceUI(CommonDevice device)
- {
- //鍒涘缓涓�涓柊鐨勪笢瑗跨粰杩囧幓
- var deviceUi = new DeviceUI();
- deviceUi.DeviceAddr = device.DeviceAddr;
- deviceUi.DeviceEpoint = device.DeviceEpoint;
- return deviceUi;
- }
-
- /// <summary>
- /// 鑾峰彇璁惧鎵�鍖归厤鐨勮澶嘦I瀵硅薄
- /// </summary>
- /// <param name="filePath"></param>
- /// <returns></returns>
- public DeviceUI GetDeviceUI(string filePath)
- {
- string[] arry = filePath.Split(new string[] { "_" }, StringSplitOptions.RemoveEmptyEntries);
- if (arry.Length != 4)
- {
- return null;
- }
- //鍒涘缓涓�涓柊鐨勪笢瑗跨粰杩囧幓
- var deviceUi = new DeviceUI();
- deviceUi.DeviceAddr = arry[2];
- deviceUi.DeviceEpoint = Convert.ToInt32(arry[3]);
- return deviceUi;
- }
-
- #endregion
-
#region 鈻� 鑾峰彇鑷畾涔夌殑璁惧绫诲瀷_______________
/// <summary>
@@ -1242,7 +1779,11 @@
return info;
}
//鑾峰彇绗笁鏂硅澶囩殑銆愯澶囩被鍨嬨��
- return this.GetNotHdlMyDeviceEnumInfo(listdevice);
+ info = this.GetNotHdlMyDeviceEnumInfo(listdevice);
+ //杩欓噷鍐嶆鍒ゆ柇鏄惁鏄渤涓滆澶�,鏈夊彲鑳藉畠鐨勬ā鍧桰D鍐欓敊浜�
+ info.IsHdlDevice = this.IsHdlDevice(checkDevice);
+
+ return info;
}
/// <summary>
@@ -1262,28 +1803,39 @@
checkDevice = temp;
}
}
+ //鑾峰彇鑷畾涔夎澶囩被鍨�
+ var myInfoType = this.GetMyDeviceEnumInfo(listDevice);
+ //鑾峰彇璁惧绫诲瀷鐨勭炕璇戝悕瀛�
+ string strName = myInfoType.ObjectTypeName;
+ if (strName == string.Empty)
+ {
+ //鍔犱竴灞備繚闄�,鏈煡璁惧
+ strName = Language.StringByID(R.MyInternationalizationString.UnknowDevice);
+ }
- string strName = string.Empty;
- if (this.dicDeviceModelIdEnum.ContainsKey(checkDevice.ModelIdentifier) == true)
+ if (ApendFalge == true)
{
- //鏍规嵁妯″潡ID锛岃幏鍙栬澶囧悕瀛�
- strName = this.GetNameByModelId(checkDevice);
- }
- else
- {
- //鑾峰彇绗笁鏂硅澶囩殑銆愯澶囩被鍨嬨��
- var myDeviceType = this.GetNotHdlMyDeviceEnumInfo(listDevice);
- strName = Language.StringByID(myDeviceType.ConcreteTextId);
- }
- if (ApendFalge == true && listDevice[0].DriveCode > 0)
- {
- //铏氭嫙璁惧鍔犱釜鏍囪瘑
- strName += "鉁�";
- }
- else if (ApendFalge == true && this.IsHdlDevice(checkDevice) == false)
- {
- //绗笁鏂硅澶囧姞涓爣璇�
- strName += "鈽�";
+ if (listDevice[0].DriveCode > 0)
+ {
+ //铏氭嫙璁惧鍔犱釜鏍囪瘑
+ strName += "鉁�";
+ }
+ else
+ {
+ foreach (var temp in listDevice)
+ {
+ //鎷挎嫢鏈夋ā鍧桰D鐨勯偅涓洖璺潵鍒ゆ柇
+ if (temp.ModelIdentifier != string.Empty)
+ {
+ if (this.IsHdlDevice(checkDevice) == false)
+ {
+ //绗笁鏂硅澶囧姞涓爣璇�
+ strName += "鈽�";
+ break;
+ }
+ }
+ }
+ }
}
return strName;
}
@@ -1307,29 +1859,35 @@
return null;
}
string modelKeys = device.ModelIdentifier;
+ //浜ゆ崲涓�涓嬫ā鍧桰D(楹︿箰鍏嬮偅杈圭殑浼犳劅鍣�)
+ this.ChangedDeviceModeId(ref modelKeys);
+
if (this.dicDeviceModelIdEnum.ContainsKey(modelKeys) == false)
{
//娌℃湁鍖归厤鍒版ā鍧桰D锛屽垯鐩存帴璧扮涓夋柟璁惧鐨勫垽鏂�
return null;
}
- string[] strValue = this.dicDeviceModelIdEnum[modelKeys].Split(new string[] { "-" }, StringSplitOptions.RemoveEmptyEntries);
- int ConcreteValue = Convert.ToInt32(strValue[0]);
- int BeloneValue = Convert.ToInt32(strValue[1]);
+ var nameContent = this.dicDeviceModelIdEnum[modelKeys];
//璁剧疆璁惧鐨勩�愯澶囨墍灞炵被鍨嬨��
- info.BeloneType = (DeviceBeloneType)BeloneValue;
- if (dicDeviceDefultNameID.ContainsKey("uDeviceBelongId" + BeloneValue) == true)
- {
- //璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
- info.BeloneTextId = dicDeviceDefultNameID["uDeviceBelongId" + BeloneValue];
- }
+ info.BeloneType = (DeviceBeloneType)nameContent.BeloneTypeValue;
+ info.BeloneText = nameContent.A鎵�灞炲悕瀛�;
//璁惧鍏蜂綋绫诲瀷
- info.ConcreteType = (DeviceConcreteType)ConcreteValue;
- if (info.ConcreteType.ToString() == ConcreteValue.ToString())
+ info.ConcreteType = (DeviceConcreteType)nameContent.ConcreteTypeValue;
+ if (info.ConcreteType.ToString() == nameContent.ConcreteTypeValue.ToString())
{
info.ConcreteType = DeviceConcreteType.UnKownDevice;
}
+ //璁惧鐨勫畼鏂瑰悕绉�
+ info.ConcreteText = nameContent.A瀹樻柟鍚嶅瓧;
+
+ //璁惧鐨勭被鍨嬬炕璇戝悕绉�
+ info.ObjectTypeName = nameContent.A绫诲瀷鍚嶅瓧;
+
+ //璁惧榛樿鍚嶅瓧
+ info.DeviceDefultName = nameContent.A澶囨敞鍚嶅瓧;
+
return info;
}
@@ -1349,31 +1907,22 @@
|| info.BeloneType == DeviceBeloneType.A褰╃伅)
{
//褰掍负鐏厜
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId15;
- info.BeloneType = DeviceBeloneType.A鐏厜;
info.ConcreteType = DeviceConcreteType.Light;
-
- int value = (int)info.BeloneType;
- if (dicDeviceDefultNameID.ContainsKey("uDeviceBelongId" + value) == true)
- {
- //璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
- info.BeloneTextId = dicDeviceDefultNameID["uDeviceBelongId" + value];
- }
+ info.ConcreteText = this.dicDeviceModelIdEnum["A418"].A瀹樻柟鍚嶅瓧;
+ info.BeloneType = DeviceBeloneType.A鐏厜;
+ info.BeloneText = this.dicDeviceModelIdEnum["A418"].A瀹樻柟鍚嶅瓧;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A418"].A绫诲瀷鍚嶅瓧;//璋冨厜妯″潡
}
else if (info.BeloneType == DeviceBeloneType.A浼犳劅鍣�
- || device.Type == DeviceType.TemperatureSensor)
+ || device.Type == DeviceType.TemperatureSensor
+ || device.Type == DeviceType.FreshAirHumiditySensor)
{
//浼犳劅鍣ㄥ悎骞�
- info.BeloneType = DeviceBeloneType.A浼犳劅鍣�;
info.ConcreteType = DeviceConcreteType.Sensor;
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId1200;
-
- int value = (int)info.BeloneType;
- if (dicDeviceDefultNameID.ContainsKey("uDeviceBelongId" + value) == true)
- {
- //璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
- info.BeloneTextId = dicDeviceDefultNameID["uDeviceBelongId" + value];
- }
+ info.ConcreteText = this.dicDeviceModelIdEnum["A402"].A瀹樻柟鍚嶅瓧;
+ info.BeloneType = DeviceBeloneType.A浼犳劅鍣�;
+ info.BeloneText = this.dicDeviceModelIdEnum["A402"].A瀹樻柟鍚嶅瓧;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A402"].A绫诲瀷鍚嶅瓧;//浼犳劅鍣�
}
return info;
@@ -1401,47 +1950,50 @@
{
if (listdevice.Count > 1)
{
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId200;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A401"].A瀹樻柟鍚嶅瓧;
info.BeloneType = DeviceBeloneType.A鎸夐敭闈㈡澘;
info.ConcreteType = DeviceConcreteType.ButtonPanel;
}
else
{
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId16;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A419"].A瀹樻柟鍚嶅瓧;
info.BeloneType = DeviceBeloneType.A骞叉帴鐐�;
info.ConcreteType = DeviceConcreteType.DryContact;
}
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A401"].A绫诲瀷鍚嶅瓧;//鏅鸿兘闈㈡澘
}
//3鍖呭惈绐楀笜鐨勮瘽,褰撶獥甯樺鐞�
else if (dicType.ContainsKey(DeviceType.WindowCoveringDevice) == true)
{
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId100;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A400"].A瀹樻柟鍚嶅瓧;
info.BeloneType = DeviceBeloneType.A绐楀笜;
info.ConcreteType = DeviceConcreteType.Curtain;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A400"].A绫诲瀷鍚嶅瓧;//閬槼妯″潡
}
//4绌烘皵寮�鍏�
else if (dicType.ContainsKey(DeviceType.AirSwitch) == true)
{
//榛樿鍊�
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId4100;
- info.BeloneType = DeviceBeloneType.A鏅鸿兘绌哄紑;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A408"].A瀹樻柟鍚嶅瓧;
+ info.BeloneType = DeviceBeloneType.A寮�鍏�;
info.ConcreteType = DeviceConcreteType.AirSwitch;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A408"].A绫诲瀷鍚嶅瓧;//寮�鍏虫ā鍧�
if (dicType[DeviceType.AirSwitch].DfunctionType == DeviceFunctionType.A寮�鍏�)
{
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId13;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A416"].A瀹樻柟鍚嶅瓧;
info.BeloneType = DeviceBeloneType.A寮�鍏�;
info.ConcreteType = DeviceConcreteType.Switch;
}
else if (dicType[DeviceType.AirSwitch].DfunctionType == DeviceFunctionType.A鎻掑骇)
{
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId14;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A417"].A瀹樻柟鍚嶅瓧;
info.BeloneType = DeviceBeloneType.A鎻掑骇;
info.ConcreteType = DeviceConcreteType.Socket1;
}
else if (dicType[DeviceType.AirSwitch].DfunctionType == DeviceFunctionType.A鐏厜)
{
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId15;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A418"].A瀹樻柟鍚嶅瓧;
info.BeloneType = DeviceBeloneType.A鐏厜;
info.ConcreteType = DeviceConcreteType.Light;
}
@@ -1450,25 +2002,26 @@
else if (dicType.ContainsKey(DeviceType.OnOffOutput) == true)
{
//榛樿鍊�
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId2300;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A403"].A瀹樻柟鍚嶅瓧;
info.BeloneType = DeviceBeloneType.A缁х數鍣�;
info.ConcreteType = DeviceConcreteType.Relay;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A403"].A绫诲瀷鍚嶅瓧;//寮�鍏虫ā鍧�
if (dicType[DeviceType.OnOffOutput].DfunctionType == DeviceFunctionType.A寮�鍏�)
{
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId13;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A416"].A瀹樻柟鍚嶅瓧;
info.BeloneType = DeviceBeloneType.A寮�鍏�;
info.ConcreteType = DeviceConcreteType.Switch;
}
else if (dicType[DeviceType.OnOffOutput].DfunctionType == DeviceFunctionType.A鎻掑骇)
{
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId14;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A417"].A瀹樻柟鍚嶅瓧;
info.BeloneType = DeviceBeloneType.A鎻掑骇;
info.ConcreteType = DeviceConcreteType.Socket1;
}
else if (dicType[DeviceType.OnOffOutput].DfunctionType == DeviceFunctionType.A鐏厜)
{
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId15;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A418"].A瀹樻柟鍚嶅瓧;
info.BeloneType = DeviceBeloneType.A鐏厜;
info.ConcreteType = DeviceConcreteType.Light;
}
@@ -1476,51 +2029,58 @@
//6璋冨厜鍣�
else if (dicType.ContainsKey(DeviceType.DimmableLight) == true)
{
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId2500;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A404"].A瀹樻柟鍚嶅瓧;
info.BeloneType = DeviceBeloneType.A璋冨厜鍣�;
info.ConcreteType = DeviceConcreteType.DimmableLight;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A404"].A绫诲瀷鍚嶅瓧;//璋冨厜妯″潡
}
//7褰╃伅
else if (dicType.ContainsKey(DeviceType.ColorDimmableLight) == true)
{
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId9;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A410"].A瀹樻柟鍚嶅瓧;
info.BeloneType = DeviceBeloneType.A褰╃伅;
info.ConcreteType = DeviceConcreteType.ColorLight;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A410"].A绫诲瀷鍚嶅瓧;//璋冨厜妯″潡
}
//8绌鸿皟
else if (dicType.ContainsKey(DeviceType.Thermostat) == true)
{
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId3600;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A406"].A瀹樻柟鍚嶅瓧;
info.BeloneType = DeviceBeloneType.A绌鸿皟;
info.ConcreteType = DeviceConcreteType.AirConditioner;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A406"].A绫诲瀷鍚嶅瓧;//绌鸿皟妯″潡
}
//9涓户鍣�
else if (dicType.ContainsKey(DeviceType.Repeater) == true)
{
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId3900;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A407"].A瀹樻柟鍚嶅瓧;
info.BeloneType = DeviceBeloneType.A涓户鍣�;
info.ConcreteType = DeviceConcreteType.Repeater;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A407"].A绫诲瀷鍚嶅瓧;//绯荤粺璁惧
}
//10杞崲鍣�
else if (dicType.ContainsKey(DeviceType.Transverter) == true)
{
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId4200;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A409"].A瀹樻柟鍚嶅瓧;
info.BeloneType = DeviceBeloneType.A杞崲鍣�;
info.ConcreteType = DeviceConcreteType.Converter;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A409"].A绫诲瀷鍚嶅瓧;//杞崲鍣�
}
//11鏅鸿兘闂ㄩ攣
else if (dicType.ContainsKey(DeviceType.DoorLock) == true)
{
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId2800;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A405"].A瀹樻柟鍚嶅瓧;
info.BeloneType = DeviceBeloneType.A鏅鸿兘闂ㄩ攣;
info.ConcreteType = DeviceConcreteType.IntelligentLocks;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A405"].A绫诲瀷鍚嶅瓧;//鏅鸿兘闂ㄩ攣
}
//12鍖呭惈浼犳劅鍣ㄧ殑璇�,褰撲紶鎰熷櫒澶勭悊
else if (dicType.ContainsKey(DeviceType.IASZone) == true)
{
info.BeloneType = DeviceBeloneType.A浼犳劅鍣�;
info.ConcreteType = DeviceConcreteType.Sensor;
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId1200;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A402"].A瀹樻柟鍚嶅瓧;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A402"].A绫诲瀷鍚嶅瓧;//浼犳劅鍣�
//璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
this.SetSensorDeviceSpecificType(ref info, listdevice);
}
@@ -1551,31 +2111,53 @@
{
//璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
info.BeloneType = DeviceBeloneType.A娓╂箍搴︿紶鎰熷櫒;
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId10;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A411"].A瀹樻柟鍚嶅瓧;
info.ConcreteType = DeviceConcreteType.Sensor_TemperatureHumidity;
}
else if (temperatrue == true && humidity == false)
{
//璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
info.BeloneType = DeviceBeloneType.A娓╁害浼犳劅鍣�;
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId11;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A412"].A瀹樻柟鍚嶅瓧;
info.ConcreteType = DeviceConcreteType.Sensor_Temperature;
}
else if (temperatrue == false && humidity == true)
{
//璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
info.BeloneType = DeviceBeloneType.A婀垮害浼犳劅鍣�;
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId12;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A413"].A瀹樻柟鍚嶅瓧;
info.ConcreteType = DeviceConcreteType.Sensor_Humidity;
}
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A411"].A绫诲瀷鍚嶅瓧;//浼犳劅鍣�
+ }
+ //14鏂伴璁惧
+ else if (dicType.ContainsKey(DeviceType.FreshAir) == true)
+ {
+ info.ConcreteText = this.dicDeviceModelIdEnum["A414"].A瀹樻柟鍚嶅瓧;
+ info.BeloneType = DeviceBeloneType.A鏂伴;
+ info.ConcreteType = DeviceConcreteType.Relay_FangyueFreshAirModul;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A414"].A绫诲瀷鍚嶅瓧;//鏂伴
+ }
+ //15 PM2.5浼犳劅鍣ㄨ澶�
+ else if (dicType.ContainsKey(DeviceType.PMSensor) == true)
+ {
+ info.ConcreteText = this.dicDeviceModelIdEnum["A415"].A瀹樻柟鍚嶅瓧;
+ info.BeloneType = DeviceBeloneType.APM2鐐�5绌烘皵璐ㄩ噺浼犳劅鍣�;
+ info.ConcreteType = DeviceConcreteType.Sensor_PMTwoPointFive;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A415"].A绫诲瀷鍚嶅瓧;//浼犳劅鍣�
+ }
+ //16鑹叉俯鐏�
+ else if (dicType.ContainsKey(DeviceType.ColorTemperatureLight) == true)
+ {
+ info.ConcreteText = this.dicDeviceModelIdEnum["A420"].A瀹樻柟鍚嶅瓧;
+ info.BeloneType = DeviceBeloneType.A褰╃伅;
+ info.ConcreteType = DeviceConcreteType.ColorLight_Temperature;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A420"].A绫诲瀷鍚嶅瓧;//璋冨厜妯″潡
}
- int value = (int)info.BeloneType;
- if (dicDeviceDefultNameID.ContainsKey("uDeviceBelongId" + value) == true)
- {
- //璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
- info.BeloneTextId = dicDeviceDefultNameID["uDeviceBelongId" + value];
- }
+ //璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
+ info.BeloneText = info.ConcreteText;
+ info.DeviceDefultName = info.ConcreteText;
return info;
}
@@ -1601,43 +2183,43 @@
{
//杩愬姩浼犳劅鍣�
info.ConcreteType = DeviceConcreteType.Sensor_Motion;
- info.ConcreteTextId = R.MyInternationalizationString.uMotionSensor;
+ info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uMotionSensor);
}
else if (iasZone.IasDeviceType == 40)
{
//鐑熼浘浼犳劅鍣�
info.ConcreteType = DeviceConcreteType.Sensor_Fire;
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1302;
+ info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uSensorFire);
}
else if (iasZone.IasDeviceType == 42)
{
//姘翠镜浼犳劅鍣�
info.ConcreteType = DeviceConcreteType.Sensor_Water;
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1304;
+ info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uSensorWater);
}
else if (iasZone.IasDeviceType == 43)
{
//鐕冩皵浼犳劅鍣�
info.ConcreteType = DeviceConcreteType.Sensor_CarbonMonoxide;
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1300;
+ info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uSensorCarbonMonoxide);
}
else if (iasZone.IasDeviceType == 44)
{
//绱ф�ユ寜閽�
info.ConcreteType = DeviceConcreteType.Sensor_EmergencyButton;
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1305;
+ info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uSensorEmergencyButton);
}
else if (iasZone.IasDeviceType == 277)
{
//閽ュ寵鎵�
info.ConcreteType = DeviceConcreteType.Sensor_Keyfob;
- info.ConcreteTextId = R.MyInternationalizationString.uKeyfob;
+ info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uKeyfob);
}
else if (iasZone.IasDeviceType == 21 || iasZone.IasDeviceType == 22)
{
//闂ㄧ獥浼犳劅鍣�
info.ConcreteType = DeviceConcreteType.Sensor_DoorWindow;
- info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1301;
+ info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uSensorDoorWindow);
}
}
@@ -1651,12 +2233,21 @@
private void InitRealDeviceRoomId()
{
this.dicDeviceRoomId = new Dictionary<string, string>();
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
- var strData = UserCenterLogic.LoadFileContent(fullName);
+ string fullName = DirNameResourse.DeviceRoomIdFile;
+ var strData = HdlFileLogic.Current.ReadFileTextContent(fullName);
if (strData != null)
{
this.dicDeviceRoomId = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(strData);
}
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鐗╃悊璁惧鎵�灞炴埧闂寸殑璁板綍
+ /// </summary>
+ /// <returns></returns>
+ public Dictionary<string, string> GetAllRealDeviceRoomData()
+ {
+ return this.dicDeviceRoomId;
}
/// <summary>
@@ -1667,22 +2258,53 @@
/// <param name="saveRoadDevice">濡傛灉鍙湁涓�涓洖璺�,鏄惁鎶婂洖璺殑鎴块棿涓�璧蜂慨鏀�</param>
public void SaveRealDeviceRoomId(List<CommonDevice> listDevice, string roomId, bool saveRoadDevice = true)
{
- if (listDevice != null)
+ if (listDevice == null)
{
- this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
+ return;
}
-
- //淇濆瓨璁板綍
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
- UserCenterLogic.SaveFileContent(fullName, this.dicDeviceRoomId);
-
- //娣诲姞鑷姩澶囦唤
- HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
-
//濡傛灉璁惧鍙湁涓�涓洖璺紝濡傛灉鏀瑰彉浜嗙湡瀹炶澶囧尯鍩燂紝鍒欏畠鐨勫洖璺殑鍖哄煙涔熶竴璧锋敼浜�
if (saveRoadDevice == true && listDevice != null && listDevice.Count == 1)
{
- Common.Room.CurrentRoom.ChangedRoom(listDevice[0], roomId, false);
+ if (listDevice[0] is OTADevice)
+ {
+ //鍗曠函鍙槸Ota璁惧鍒欎笉澶勭悊
+ return;
+ }
+ HdlRoomLogic.Current.ChangedRoom(listDevice[0], roomId, false);
+ }
+ bool save = false;
+ if (roomId == string.Empty)
+ {
+ //閫夋嫨鐨勬槸鏈垎閰�
+ this.dicDeviceRoomId.Remove(listDevice[0].DeviceAddr);
+ save = true;
+ }
+ else
+ {
+ if (this.dicDeviceRoomId.ContainsKey(listDevice[0].DeviceAddr) == false)
+ {
+ this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
+ save = true;
+ }
+ else
+ {
+ //2020.05.18杩藉姞:濡傛灉璁板綍鐨勬埧闂碔D鏄笉瀛樺湪鐨勮瘽,鍒欓噸鏂拌鐩�
+ var room = HdlRoomLogic.Current.GetRoomById(this.dicDeviceRoomId[listDevice[0].DeviceAddr]);
+ if (room == null || this.dicDeviceRoomId[listDevice[0].DeviceAddr] != roomId)
+ {
+ this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
+ save = true;
+ }
+ }
+ }
+
+ if (save == true)
+ {
+ //淇濆瓨璁板綍
+ HdlFileLogic.Current.SaveFileContent(DirNameResourse.DeviceRoomIdFile, this.dicDeviceRoomId);
+
+ //娣诲姞鑷姩澶囦唤
+ HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
}
}
@@ -1698,13 +2320,8 @@
//鏈垎閰嶅尯鍩�
return Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
}
- var room = Room.CurrentRoom.GetRoomById(this.dicDeviceRoomId[device.DeviceAddr]);
- if (room != null)
- {
- return room.Name;
- }
- //鏈垎閰嶅尯鍩�
- return Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
+ var room = HdlRoomLogic.Current.GetRoomById(this.dicDeviceRoomId[device.DeviceAddr]);
+ return HdlRoomLogic.Current.GetRoomName(room);
}
/// <summary>
@@ -1718,12 +2335,222 @@
{
return null;
}
- return Room.CurrentRoom.GetRoomById(this.dicDeviceRoomId[device.DeviceAddr]);
+ return HdlRoomLogic.Current.GetRoomById(this.dicDeviceRoomId[device.DeviceAddr]);
+ }
+
+ /// <summary>
+ /// 灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+ /// </summary>
+ /// <param name="device">闅忎究涓�涓洖璺�</param>
+ public void DeleteRealDeviceFromRoom(CommonDevice device)
+ {
+ //灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+ this.DeleteRealDeviceFromRoom(new List<string>() { device.DeviceAddr });
+ }
+
+ /// <summary>
+ /// 灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+ /// </summary>
+ /// <param name="listMac">璁惧Mac鍦板潃</param>
+ public void DeleteRealDeviceFromRoom(List<string> listMac)
+ {
+ bool save = false;
+ foreach (var deviceMacAddr in listMac)
+ {
+ if (this.dicDeviceRoomId.ContainsKey(deviceMacAddr) == true)
+ {
+ this.dicDeviceRoomId.Remove(deviceMacAddr);
+ save = true;
+ }
+ }
+ if (save == false)
+ {
+ //娌℃湁鏀瑰彉,涓嶉渶瑕佷繚瀛�
+ return;
+ }
+ //淇濆瓨璁板綍
+ HdlFileLogic.Current.SaveFileContent(DirNameResourse.DeviceRoomIdFile, this.dicDeviceRoomId);
+
+ //娣诲姞鑷姩澶囦唤
+ HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
+ }
+
+ /// <summary>
+ /// 鏍规嵁鎴块棿ID,绉婚櫎鎸囧畾鐨勭湡瀹炵墿鐞嗚澶囩殑鎵�灞炴埧闂磋褰�
+ /// </summary>
+ /// <param name="i_RoomId"></param>
+ public void DeleteRealDeviceByRoomId(string i_RoomId)
+ {
+ var listDeleteKey = new List<string>();
+ foreach (var deviceAddr in this.dicDeviceRoomId.Keys)
+ {
+ if (this.dicDeviceRoomId[deviceAddr] == i_RoomId
+ && listDeleteKey.Contains(deviceAddr) == false)
+ {
+ listDeleteKey.Add(deviceAddr);
+ }
+ }
+ //灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+ this.DeleteRealDeviceFromRoom(listDeleteKey);
+ }
+
+ #endregion
+
+ #region 鈻� 璁惧鎺掑簭___________________________
+
+ /// <summary>
+ /// 璁惧鎺掑簭
+ /// </summary>
+ /// <param name="i_listDevice">璇风‘淇濊繖涓笢瑗垮凡缁忔寜mac鍜岀鐐规帓搴忎簡</param>
+ /// <returns></returns>
+ public List<CommonDevice> SortDeviceByBelongType(List<CommonDevice> i_listDevice)
+ {
+ //鑾峰彇鎺掑簭瑙勫垯
+ var listRule = this.GetBelongTypeSortRule();
+ var dicDevice = new Dictionary<DeviceBeloneType, List<CommonDevice>>();
+ dicDevice[DeviceBeloneType.A鏈煡璁惧] = new List<CommonDevice>();
+
+ foreach (var device in i_listDevice)
+ {
+ //鑾峰彇鎵�灞炵被鍨�
+ var typeInfo = this.GetDeviceBelongEnumInfo(device);
+ if (listRule.Contains(typeInfo.BeloneType) == false)
+ {
+ //涓嶅湪鎺掑簭鑼冨洿鍐�,閮戒涪鍦ㄦ渶鍚庨潰
+ dicDevice[DeviceBeloneType.A鏈煡璁惧].Add(device);
+ continue;
+ }
+ if (dicDevice.ContainsKey(typeInfo.BeloneType) == false)
+ {
+ dicDevice[typeInfo.BeloneType] = new List<CommonDevice>();
+ }
+ dicDevice[typeInfo.BeloneType].Add(device);
+ }
+
+ var listSort = new List<CommonDevice>();
+ foreach (var myType in listRule)
+ {
+ //鏍规嵁瑙勫垯椤哄簭,娣诲姞璁惧
+ if (dicDevice.ContainsKey(myType) == false || dicDevice[myType].Count == 0)
+ {
+ continue;
+ }
+ listSort.AddRange(dicDevice[myType]);
+ }
+
+ return listSort;
+ }
+
+ /// <summary>
+ /// 鑾峰彇璁惧鎵�灞炵被鍨嬬殑鐨勬帓搴忚鍒�
+ /// </summary>
+ /// <returns></returns>
+ public HashSet<DeviceBeloneType> GetBelongTypeSortRule()
+ {
+ //璋佸湪鍓嶉潰,璋佸氨浼樺厛鏄剧ず
+ var list = new HashSet<DeviceBeloneType>();
+ list.Add(DeviceBeloneType.A鐏厜);
+ list.Add(DeviceBeloneType.A褰╃伅);
+ list.Add(DeviceBeloneType.A寮�鍏�);
+ list.Add(DeviceBeloneType.A鎻掑骇);
+ list.Add(DeviceBeloneType.A璋冨厜鍣�);
+ list.Add(DeviceBeloneType.A绐楀笜);
+ list.Add(DeviceBeloneType.A鏂伴);
+ list.Add(DeviceBeloneType.A绌鸿皟);
+ list.Add(DeviceBeloneType.A缁х數鍣�);
+ list.Add(DeviceBeloneType.A骞叉帴鐐�);
+ list.Add(DeviceBeloneType.A鏅鸿兘闂ㄩ攣);
+ list.Add(DeviceBeloneType.A鏅鸿兘绌哄紑);
+ list.Add(DeviceBeloneType.A浼犳劅鍣�);
+
+ //鍏朵粬鐨勭湅鐫�鍔炲憲,閮芥槸鎺掑湪鍚庨潰鐨�,閮藉綊涓鸿繖涓睘鎬�
+ list.Add(DeviceBeloneType.A鏈煡璁惧);
+
+ return list;
}
#endregion
#region 鈻� 涓�鑸柟娉昣__________________________
+
+ /// <summary>
+ /// 浠庣紦瀛樺彉閲忔娴嬭澶囨槸鍚﹀湪绾�
+ /// </summary>
+ /// <param name="i_device"></param>
+ /// <param name="checkAll">鏄惁妫�娴嬪叏閮ㄥ洖璺�</param>
+ /// <returns></returns>
+ public bool CheckDeviceIsOnline(CommonDevice i_device, bool checkAll = true)
+ {
+ if (checkAll == false)
+ {
+ //涓嶆娴嬪叏閮ㄥ洖璺�
+ return i_device.IsOnline == 1 || i_device.IsOnline == 2;
+ }
+ var listDevice = this.GetDevicesByMac(i_device.DeviceAddr, false);
+ foreach (var device in listDevice)
+ {
+ //0:绂荤嚎 1:鍦ㄧ嚎 2:姝ｅ湪鍒锋柊鐘舵��
+ bool statu = i_device.IsOnline == 1 || i_device.IsOnline == 2;
+ if (statu == true)
+ {
+ //鏈変竴涓洖璺湪绾�,鍗冲湪绾�
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ樉绀哄湪涓婚〉
+ /// </summary>
+ /// <param name="i_device"></param>
+ /// <returns></returns>
+ public bool CanShowInHomeHomeMainPage(CommonDevice i_device)
+ {
+ if (i_device == null || i_device.Type == DeviceType.OnOffSwitch)//骞叉帴鐐�
+ {
+ //杩欎釜璁惧涓嶈浜�
+ return false;
+ }
+ if (i_device.Type == DeviceType.OnOffOutput || i_device.Type == DeviceType.AirSwitch)
+ {
+ //2020.03.23杩藉姞寮忔牱:鏈寚瀹氱被鍨嬬殑缁х數鍣�,涓嶆樉绀�
+ if (i_device.DfunctionType == DeviceFunctionType.A鏈畾涔�
+ || i_device.DfunctionType == DeviceFunctionType.A涓嶆寚瀹�)
+ {
+ return false;
+ }
+ }
+ //2020.03.30杩藉姞寮忔牱:濡傛灉鏄潰鏉跨殑娓╁害鎺㈠ご,涓嶆樉绀�
+ else if (i_device.Type == DeviceType.TemperatureSensor && ((TemperatureSensor)i_device).SensorDiv == 1)
+ {
+ var myInfoType = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { i_device });
+ if (myInfoType.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘)
+ {
+ return false;
+ }
+ }
+ else if (i_device.Type == DeviceType.FreshAirHumiditySensor)
+ {
+ //鏂伴鐨勬箍搴︿紶鎰熷櫒涓嶆樉绀�
+ return false;
+ }
+
+ //濡傛灉鏄柊椋庨潰鏉挎垨鐜闈㈡澘,鍒欓兘涓嶆樉绀轰换浣曞洖璺�
+ var myInfoTypeTemp = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { i_device });
+ if (myInfoTypeTemp.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir || myInfoTypeTemp.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
+ {
+ return false;
+ }
+ else if (myInfoTypeTemp.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ if (i_device.Type != DeviceType.OnOffOutput)
+ {
+ return false;
+ }
+ }
+ return true;
+ }
/// <summary>
/// 鍒ゆ柇鏄笉鏄渤涓滅殑璁惧
@@ -1736,13 +2563,23 @@
}
/// <summary>
+ /// 鏄惁鏄疢ini澶滅伅
+ /// </summary>
+ /// <param name="device"></param>
+ /// <returns></returns>
+ public bool IsMiniLight(CommonDevice device)
+ {
+ return device.DriveCode != 0 && device.Type == DeviceType.ColorTemperatureLight;
+ }
+
+ /// <summary>
/// 鑾峰彇璁惧鐨勫敮涓�涓婚敭
/// </summary>
/// <param name="device"></param>
/// <returns></returns>
public string GetDeviceMainKeys(CommonDevice device)
{
- return device.DeviceAddr + device.DeviceEpoint;
+ return this.GetDeviceMainKeys(device.DeviceAddr, device.DeviceEpoint);
}
/// <summary>
@@ -1753,7 +2590,7 @@
/// <returns></returns>
public string GetDeviceMainKeys(string DeviceAddr, int DeviceEpoint)
{
- return DeviceAddr + DeviceEpoint;
+ return DeviceAddr + "_" + DeviceEpoint;
}
/// <summary>
@@ -1773,22 +2610,42 @@
}
/// <summary>
+ /// 鑾峰彇妯″潡ID鎵�鎸囧悜鐨勫悇绉嶅悕瀛椾俊鎭�
+ /// </summary>
+ /// <param name="strKey"></param>
+ /// <returns></returns>
+ public DeviceNameContent GetDeviceModelIdNameInfo(string strKey)
+ {
+ if (this.dicDeviceModelIdEnum.ContainsKey(strKey) == false)
+ {
+ return new DeviceNameContent();
+ }
+ return this.dicDeviceModelIdEnum[strKey];
+ }
+
+ /// <summary>
/// 闄勫姞璁惧鐨勭増鏈唬鍙�(杩斿洖Ver.XXX)
/// </summary>
/// <param name="versionValue">鐗堟湰鍙�</param>
/// <returns></returns>
public string AppendVersion(int versionValue)
{
+ //10101 3涓猙yte 鏄剧ず涓猴細ver.1.01.01
+ //涓棿閭ｄ釜byte涓哄鏁版椂锛屼唬琛ㄦ槸娴嬭瘯鐗堟湰,鍦ㄦ樉绀烘渶鏂扮増鏈椂,涓嶉渶瑕佹樉绀猴紝浣嗘槸鍦ㄥ巻鍙茬増鏈偅閲屽彲浠ユ樉绀�
+ //涓棿閭ｄ釜byte涓哄伓鏁版椂, 浠ｈ〃鏄寮忕増鏈�
+
//鐩存帴鏄�10杩涘埗
- string txt10 = Convert.ToString(versionValue).PadLeft(4, '0');
- //杩欎釜鏄皬鏁扮偣鍓嶉潰鐨勫��
- int value1 = Convert.ToInt32(txt10.Substring(0, txt10.Length - 2));
- //杩欎釜鏄皬鏁扮偣鍚庨潰鐨勫��
- int value2 = Convert.ToInt32(txt10.Substring(txt10.Length - 2, 2));
+ string txt10 = Convert.ToString(versionValue).PadLeft(6, '0');
+ //杩欎釜鏄涓�浣�
+ int value1 = Convert.ToInt32(txt10.Substring(0, 2));
+ //杩欎釜鏄浜屼綅
+ string value2 = txt10.Substring(2, 2);
+ //杩欎釜鏄涓変綅
+ string value3 = txt10.Substring(4, 2);
//Ver.
string ver = Language.StringByID(R.MyInternationalizationString.uVersionAbbreviation);
- return ver + value1 + "." + value2.ToString().PadLeft(2, '0');
+ return ver + value1 + "." + value2 + "." + value3;
}
/// <summary>
@@ -1797,7 +2654,7 @@
/// <param name="msg"></param>
private void ShowErrorMsg(string msg)
{
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
var contr = new ShowMsgControl(ShowMsgType.Error, msg);
contr.Show();
@@ -1810,7 +2667,7 @@
/// <param name="msg"></param>
private void ShowTipMsg(string msg)
{
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
contr.Show();
@@ -1829,22 +2686,11 @@
/// </summary>
/// <param name="zbGateway">缃戝叧瀵硅薄</param>
/// <param name="statu">鐘舵��-> -1:寮傚父,浼氳繑鍥瀗ull, 1锛氭病鏈夊紓甯�, 2:鏁版嵁鎺ユ敹涓嶅叏</param>
- /// <param name="ignoreTime">鏄惁鏃犺鏃堕棿(姝ゅ彉閲忔槸缁欒幏鍙栧湪绾跨姸鎬佺敤鐨�),true:姣忔璋冪敤閮藉幓缃戝叧鑾峰彇,false:3鍒嗛挓鍐呰繑鍥炵殑鏄湰鍦扮殑璁惧</param>
+ /// <param name="useLocalConnect">鏄惁浣跨敤鏈湴杩炴帴鍙戦��</param>
/// <param name="mode">鏄惁鏄剧ず閿欒</param>
/// <returns></returns>
- public List<CommonDevice> GetDeviceListFromGateway(ZbGateway zbGateway, ref int statu, bool ignoreTime, ShowErrorMode mode = ShowErrorMode.YES)
+ public List<CommonDevice> GetDeviceListFromGateway(ZbGateway zbGateway, ref int statu, bool useLocalConnect, ShowErrorMode mode = ShowErrorMode.YES)
{
- if (ignoreTime == false)
- {
- if ((DateTime.Now - zbGateway.LastDateTime).TotalMilliseconds < 3 * 60 * 1000)
- {
- //涓嶆棤瑙嗘椂闂�,杩斿洖鏈湴璁惧鍒楄〃
- statu = 1;
- return this.GetDeviceByGatewayID(HdlGatewayLogic.Current.GetGatewayId(zbGateway));
- }
- }
- zbGateway.LastDateTime = DateTime.Now;
-
//濡傛灉鍒囨崲鍒颁簡鍒殑鐣岄潰锛屽垯涓嶆樉绀洪敊璇俊鎭�
string nowFormId = UserCenterResourse.NowActionFormID;
@@ -1860,11 +2706,13 @@
statu = -1;
return null;
}
+ //闇�瑕佸彉鏇村姛鑳界被鍨嬬殑鍥炶矾
+ var listFucDevice = new List<CommonDevice>();
//鏄惁杈炬垚涓柇鐨勬椂鏈�
bool canBreak = false;
//缃戝叧ID
- string gatewayID = HdlGatewayLogic.Current.GetGatewayId(zbGateway);
+ string gatewayID = zbGateway.GwId;
//瓒呮椂鏃堕棿
int TimeOut = 0;
//璁惧鎬绘暟
@@ -1877,7 +2725,7 @@
var listCheck = new HashSet<string>();
Action<string, string> getDeviceAction = (topic, message) =>
{
- if (topic == gatewayID + "/" + "DeviceInfoRespon")
+ if (topic == gatewayID + "/DeviceInfoRespon")
{
try
{
@@ -1911,8 +2759,36 @@
if (listCheck.Contains(mainkeys) == false)
{
listDevice.Add(device);
-
listCheck.Add(mainkeys);
+ //鍒锋柊涓�涓嬫湰鍦扮紦瀛�
+ var localDevice = this.GetDevice(mainkeys);
+ var tempDevice = localDevice == null ? device : localDevice;
+
+ //濡傛灉杩欎釜璁惧ID鍙樻洿浜嗙殑璇�
+ bool typeNotEquals = localDevice != null && deviceID != localDevice.Type;
+ if (typeNotEquals == true)
+ {
+ //閲嶆柊New杩欎釜瀵硅薄
+ typeNotEquals = this.ReNewDeviceOnTypeIsChanged(localDevice, deviceID);
+ //閲嶆柊鍐嶆鑾峰彇瀵硅薄
+ tempDevice = this.GetDevice(mainkeys);
+ }
+
+ //鍒锋柊灞炴��
+ this.SetDeviceInfoToMain(tempDevice, device);
+ if (this.RefreshDeviceFunctionType(tempDevice, device, false) == true)
+ {
+ //闇�瑕佸彂閫佸姛鑳界被鍨嬬粰缃戝叧
+ listFucDevice.Add(tempDevice);
+ }
+ if (typeNotEquals == true)
+ {
+ //閲嶆柊鐢熸垚缂撳瓨
+ tempDevice.ReSave();
+ HdlAutoBackupLogic.AddOrEditorFile(tempDevice.FilePath);
+ //鍏ㄩ儴涓婚〉鑿滃崟闇�瑕佸埛鏂�
+ Phone.UserView.UserPage.Instance.RefreshAllForm = true;
+ }
}
}
}
@@ -1926,13 +2802,24 @@
canBreak = true;
}
}
+ else if (topic == gatewayID + "/DeviceInfoResponEnd")
+ {
+ }
};
realWay.Actions += getDeviceAction;
try
{
var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 93 } };
- realWay.Send("GetDeviceInfo", jObject.ToString());
+ if (useLocalConnect == false)
+ {
+ realWay.Send("GetDeviceInfo", jObject.ToString());
+ }
+ else
+ {
+ //寮哄埗浣跨敤鏈湴杩炴帴
+ realWay.SendLocation("GetDeviceInfo", Encoding.UTF8.GetBytes(jObject.ToString()));
+ }
}
catch { canBreak = true; }
@@ -1972,7 +2859,63 @@
statu = 2;
}
}
+ else
+ {
+ statu = 1;
+ }
+ if (listFucDevice.Count > 0)
+ {
+ //濡傛灉瀛樺湪闇�瑕佸彉鏇寸殑鍔熻兘绫诲瀷
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ for (int i = 0; i < listFucDevice.Count; i++)
+ {
+ this.SendDeviceFunctionTypeToGateway(listFucDevice[i], listFucDevice[i].DfunctionType);
+ System.Threading.Thread.Sleep(100);
+ }
+ });
+ }
+
return listDevice;
+ }
+
+ /// <summary>
+ /// 鍦ㄨ澶嘥ype鍙樻洿鏃�,閲嶆柊New杩欎釜璁惧瀵硅薄(浠呴檺鍦ㄥ埛鏂拌澶囧垪琛ㄤ娇鐢�,骞朵笖鏈湴闇�瑕佸瓨鍦�)
+ /// </summary>
+ /// <param name="oldLocalDevice">鍘熸潵鐨勬湰鍦板璞�</param>
+ /// <param name="newDeviceType">鏂扮殑璁惧Type</param>
+ private bool ReNewDeviceOnTypeIsChanged(CommonDevice oldLocalDevice, DeviceType newDeviceType)
+ {
+ //鍏堣幏鍙栨湰鍦拌繖涓棫璁惧瀵硅薄鐨刯son
+ string oldFile = System.IO.Path.Combine(Config.Instance.FullPath, oldLocalDevice.FilePath);
+ var deviceData = HdlFileLogic.Current.ReadFileTextContent(oldFile);
+ if (deviceData == null)
+ {
+ //搴旇涓嶄細
+ return false;
+ }
+ //鏍规嵁鏂癟ype閲嶆柊New瀵硅薄
+ var newDevice = CommonDevice.CommonDeviceByByteString(newDeviceType.ToString(), deviceData);
+ if (newDevice == null)
+ {
+ //濂藉儚鏈夌偣鍙兘
+ return false;
+ }
+ //鍒犻櫎鏈湴鏂囦欢
+ HdlFileLogic.Current.DeleteFile(oldFile);
+ HdlAutoBackupLogic.DeleteFile(oldLocalDevice.FilePath);
+
+ //閲嶆柊鐢熸垚鏂囦欢
+ if (newDevice.IsCustomizeImage == false)
+ {
+ newDevice.IconPath = string.Empty;
+ }
+ string mainkey = this.GetDeviceMainKeys(newDevice);
+ lock (dicAllDevice)
+ {
+ this.dicAllDevice[mainkey] = newDevice;
+ }
+ return true;
}
#endregion
@@ -1980,7 +2923,7 @@
#region 鈻� 鍒涘缓鏂拌澶囧璞＄浉鍏砡________________
/// <summary>
- /// 鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
+ /// 鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�(鏁版嵁鍦―eviceInfo涓�)
/// </summary>
/// <param name="deviceType">璁惧绫诲瀷</param>
/// <param name="jobject">涓婚Data</param>
@@ -1988,7 +2931,7 @@
/// <returns></returns>
private CommonDevice NewDeviceObjectByDeviceId(DeviceType deviceType, Newtonsoft.Json.Linq.JObject jobject, ZbGateway zbGateway)
{
- string gwId = HdlGatewayLogic.Current.GetGatewayId(zbGateway);
+ string gwId = zbGateway.GwId;
//鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
CommonDevice device = this.NewDeviceObjectByDeviceId(deviceType);
@@ -2003,15 +2946,10 @@
{
return null;
}
- this.SetMacName(device, string.Empty);
- this.SetEpointName(device, string.Empty);
//璁剧疆璁惧涓婚敭绫�
this.SetNewDeviceMainKeys(device, jobject);
device.CurrentGateWayId = gwId;
-
- //灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
- this.SetDeviceInfoToMain(device, device);
return device;
}
@@ -2023,20 +2961,16 @@
/// <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;
mainDevice.DriveCode = device.DeviceInfo.DriveCode;
mainDevice.IasDeviceType = device.DeviceInfo.DeviceType;
mainDevice.Profile = device.DeviceInfo.Profile;
mainDevice.Type = device.Type;
+ mainDevice.DeviceID = (int)device.Type;
//鍥轰欢鐗堟湰
mainDevice.ImgVersion = device.DeviceInfo.ImgVersion;
@@ -2050,6 +2984,13 @@
mainDevice.ModelIdentifier = device.DeviceInfo.ModelIdentifier;
//搴忓垪鍙�
mainDevice.SerialNumber = device.DeviceInfo.ProductCode;
+ //璁惧鍔熻兘绫诲瀷
+ mainDevice.DfunctionType = (DeviceFunctionType)device.DeviceInfo.FunctionType;
+ if (mainDevice.DfunctionType == DeviceFunctionType.A涓嶆寚瀹�)
+ {
+ //寮忔牱鍙樻洿:鍔熻兘绫诲瀷涓嶅厑璁搁�夋嫨涓虹┖ 缃戝叧榛樿鐨凢unctionType涓�0
+ mainDevice.DfunctionType = DeviceFunctionType.A鏈畾涔�;
+ }
mainDevice.InClusterList.Clear();
mainDevice.InClusterList.AddRange(device.DeviceInfo.InClusterList);
@@ -2074,24 +3015,6 @@
}
}
}
- //濡傛灉鏄皟鍏夊櫒
- else if (mainDevice.Type == DeviceType.DimmableLight)
- {
- mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
- if (mainDevice.IsCustomizeImage == false)
- {
- mainDevice.IconPath = "Device/Light.png";
- }
- }
- //濡傛灉鏄僵鐏殑璇�
- else if (mainDevice.Type == DeviceType.ColorDimmableLight)
- {
- mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
- if (mainDevice.IsCustomizeImage == false)
- {
- mainDevice.IconPath = "Device/ColorLight.png";
- }
- }
}
/// <summary>
@@ -2106,15 +3029,23 @@
//鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
if (deviceType == DeviceType.ColorDimmableLight) { device = new ColorDimmableLight(); }
else if (deviceType == DeviceType.DimmableLight) { device = new DimmableLight(); }
+ else if (deviceType == DeviceType.ColorDimmerSwitch) { device = new ColorDimmerSwitch(); }
+ else if (deviceType == DeviceType.LevelControlSwitch) { device = new LevelControlSwitch(); }
else if (deviceType == DeviceType.OnOffSwitch) { device = new Panel(); }
else if (deviceType == DeviceType.OnOffOutput) { device = new ToggleLight(); }
else if (deviceType == DeviceType.AirSwitch) { device = new AirSwitch(); }
else if (deviceType == DeviceType.WindowCoveringDevice) { device = new Rollershade(); }
+ else if (deviceType == DeviceType.WindowCoveringController) { device = new WindowCoveringController(); }
else if (deviceType == DeviceType.IASZone) { device = new IASZone(); }
else if (deviceType == DeviceType.Repeater) { device = new Repeater(); }
else if (deviceType == DeviceType.Thermostat) { device = new AC(); }
+ else if (deviceType == DeviceType.FreshAir) { device = new FreshAir(); }
else if (deviceType == DeviceType.DoorLock) { device = new DoorLock(); }
else if (deviceType == DeviceType.TemperatureSensor) { device = new TemperatureSensor(); }
+ else if (deviceType == DeviceType.PMSensor) { device = new PMSensor(); }
+ else if (deviceType == DeviceType.FreshAirHumiditySensor) { device = new HumiditySensor(); }
+ else if (deviceType == DeviceType.ColorTemperatureLight) { device = new ColorTemperatureLight(); }
+ else if (deviceType == DeviceType.Buzzer) { device = new Buzzer(); }
else if (deviceType == DeviceType.OtaDevice || deviceType == DeviceType.OtaPanelDevice) { device = new OTADevice(); }
else { return null; }
@@ -2132,11 +3063,142 @@
public void SetNewDeviceMainKeys(CommonDevice device, Newtonsoft.Json.Linq.JObject jobject)
{
//璁剧疆璁惧涓婚敭绫�
- device.Time = jobject.Value<int>("Time");
device.DeviceID = jobject.Value<int>("Device_ID");
device.DeviceAddr = jobject.Value<string>("DeviceAddr");
device.DeviceEpoint = jobject.Value<int>("Epoint");
- device.DataID = jobject.Value<int>("Data_ID");
+ }
+
+ #endregion
+
+ #region 鈻� 鍒锋柊璁惧鍔熻兘绫诲瀷___________________
+
+ /// <summary>
+ /// 鍒锋柊璁惧鐨勫姛鑳界被鍨�,濡傛灉杩斿洖true,浠ｈ〃闇�瑕佸彟澶栬皟鐢ㄣ�怱endDeviceFunctionTypeToGateway銆戝嚱鏁�,sendFucType涓簍rue鏃惰嚜鍔ㄨ皟鐢�
+ /// </summary>
+ /// <param name="mainDevice">涓昏澶囧璞�</param>
+ /// <param name="device">璁剧疆婧愯澶囧璞�</param>
+ /// <param name="sendFucType">褰撻渶瑕佸彉鏇存椂,鏄惁鍙戦�佸姛鑳界被鍨嬪埌缃戝叧(姝ゅ彉閲忕粰鑾峰彇璁惧鍒楄〃鏈夌壒娈婂惈涔�)</param>
+ public bool RefreshDeviceFunctionType(CommonDevice mainDevice, CommonDevice device, bool sendFucType)
+ {
+ //濡傛灉鏄皟鍏夊櫒
+ if (mainDevice.Type == DeviceType.DimmableLight)
+ {
+ if (mainDevice.IsCustomizeImage == false)
+ {
+ mainDevice.IconPath = "Device/Light.png";
+ }
+ mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
+ if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
+ {
+ //璋冨厜鍣ㄥ浐瀹氱伅鍏�
+ if (sendFucType == true)
+ {
+ this.SendDeviceFunctionTypeToGateway(mainDevice, DeviceFunctionType.A鐏厜);
+ }
+ return true;
+ }
+ }
+ //濡傛灉鏄壊娓╃伅
+ else if (mainDevice.Type == DeviceType.ColorTemperatureLight)
+ {
+ if (mainDevice.IsCustomizeImage == false)
+ {
+ mainDevice.IconPath = "Device/ColorLightTemperature.png";
+ }
+ mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
+ if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
+ {
+ //鑹叉俯鐏浐瀹氱伅鍏�
+ if (sendFucType == true)
+ {
+ this.SendDeviceFunctionTypeToGateway(mainDevice, DeviceFunctionType.A鐏厜);
+ }
+ return true;
+ }
+ }
+ //濡傛灉鏄笁璺户鐢靛櫒鐨勫洖璺殑璇�,榛樿涓虹伅鍏�
+ else if (mainDevice.Type == DeviceType.OnOffOutput)
+ {
+ //鏍规嵁鍔熻兘绫诲瀷,閲嶆柊璁剧疆璁惧鍥炶矾鍥炬爣
+ this.ResetIconPathByDeviceFunctionType(mainDevice);
+ //2020.05.13鍙樻洿:缁х數鍣ㄩ兘榛樿涓虹伅鍏�
+ if (mainDevice.DfunctionType == DeviceFunctionType.A鏈畾涔�)
+ {
+ mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
+ if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
+ {
+ //缁х數鍣ㄩ粯璁や负鐏厜
+ if (sendFucType == true)
+ {
+ this.SendDeviceFunctionTypeToGateway(mainDevice, DeviceFunctionType.A鐏厜);
+ }
+ return true;
+ }
+ }
+ }
+ //濡傛灉鏄┖姘斿紑鍏崇殑璇�
+ else if (mainDevice.Type == DeviceType.AirSwitch)
+ {
+ //鏍规嵁鍔熻兘绫诲瀷,閲嶆柊璁剧疆璁惧鍥炶矾鍥炬爣
+ this.ResetIconPathByDeviceFunctionType(mainDevice);
+ //绌烘皵寮�鍏抽粯璁や负寮�鍏�
+ if (mainDevice.DfunctionType == DeviceFunctionType.A鏈畾涔�)
+ {
+ mainDevice.DfunctionType = DeviceFunctionType.A寮�鍏�;
+ if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A寮�鍏�)
+ {
+ //绌烘皵寮�鍏抽粯璁や负寮�鍏�
+ if (sendFucType == true)
+ {
+ this.SendDeviceFunctionTypeToGateway(mainDevice, DeviceFunctionType.A寮�鍏�);
+ }
+ return true;
+ }
+ }
+ }
+ //濡傛灉鏄僵鐏殑璇�
+ else if (mainDevice.Type == DeviceType.ColorDimmableLight)
+ {
+ if (mainDevice.IsCustomizeImage == false)
+ {
+ mainDevice.IconPath = "Device/ColorLight.png";
+ }
+ mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
+ if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
+ {
+ //褰╃伅榛樿涓哄紑鍏�
+ if (sendFucType == true)
+ {
+ this.SendDeviceFunctionTypeToGateway(mainDevice, DeviceFunctionType.A寮�鍏�);
+ }
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍔熻兘绫诲瀷,閲嶆柊璁剧疆璁惧鍥炶矾鍥炬爣
+ /// </summary>
+ /// <param name="device"></param>
+ private void ResetIconPathByDeviceFunctionType(CommonDevice device)
+ {
+ if (device.IsCustomizeImage == true)
+ {
+ return;
+ }
+ if (device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+ {
+ device.IconPath = "Device/Switch.png";
+ }
+ else if (device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+ {
+ device.IconPath = "Device/Socket1.png";
+ }
+ else
+ {
+ device.IconPath = "Device/Light.png";
+ }
}
#endregion
@@ -2150,71 +3212,49 @@
/// </summary>
private void InitDeviceModelIdEnum()
{
+ //*********************************************************************
+ //鏂拌澶囨坊鍔犳柟娉曪細
+ //1銆佸湪鏈�涓嬮潰娣诲姞 DeviceConcreteType 锛岀劧鍚庢槸 DeviceBeloneType
+ //2銆佷互璁惧鐨勫叿浣撶被鍨嬩负鍚嶅瓧DeviceConcreteType(鍘绘帀銆�-銆�)娣诲姞璁惧鐨勩�愭墍灞炲浘鐗囥�戯紝銆愮湡瀹炵墿鐞嗗浘鐗囥�戙�傚洖璺浘鐗囬渶瑕佺壒娈婂鐞�
+ //3銆佸鏋滈渶瑕佸叡鏈夊浘鐗�,鍒欏湪杩欎釜鍑芥暟鐨勬渶搴曚笅娣诲姞
+ //4銆佹樉绀虹殑妯″潡ID闇�瑕佷氦鎹㈢殑璇�,鍒欏湪杩欎釜鍑芥暟鐨勬渶搴曚笅娣诲姞
+ //*********************************************************************
+
if (this.dicDeviceModelIdEnum != null)
{
return;
}
- this.dicDeviceModelIdEnum = new Dictionary<string, string>();
+ this.dicDeviceModelIdEnum = new Dictionary<string, DeviceNameContent>();
- //瀹氫箟瑙勫垯锛氭ā鍧桰D(宸茬炕璇�)=璁惧鍏蜂綋绫诲瀷鍊�-璁惧鎵�灞炵被鍨嬪��(鑷畾涔夌殑鍊�,鍢�,鍙涓嶉噸澶嶅氨鍙互)
- //绗竴涓�兼槸:DeviceConcreteType 绗簩涓�兼槸:DeviceBeloneType
-
- //*********************************************************************
- //鏂拌澶囨坊鍔犳柟娉曪細
- //1銆佸湪杩欓噷濉啓涓婃ā鍧桰D锛岀劧鍚庢槸 DeviceConcreteType 锛岀劧鍚庢槸 DeviceBeloneType
- //2銆佺劧鍚庡湪鏈�涓嬮潰娣诲姞銆愯澶囩殑鍏蜂綋绫诲瀷銆戯紝銆愯澶囩殑鎵�灞炵被鍨嬨��
- //3銆佸凡璁惧鐨勫叿浣撶被鍨嬩负鍚嶅瓧(鍘绘帀銆�-銆�)娣诲姞璁惧鐨勩�愭墍灞炲浘鐗囥�戯紝銆愮湡瀹炵墿鐞嗗浘鐗囥�戙�傚洖璺浘鐗囬渶瑕佺壒娈婂鐞�
- //4銆佹坊鍔燫鏂囦欢,娣诲姞Language鏂囦欢
- //*********************************************************************
-
- //=========鈽呪槄寮�鍚堝笜绫�(100-199)鈽呪槄=========
- this.dicDeviceModelIdEnum["MWM65B-ZB.20"] = "100-100";//鏅鸿兘寮�鍚堝笜鐢垫満
- this.dicDeviceModelIdEnum["MVSM35B-ZB.20"] = "101-100";//鏅鸿兘绠＄姸鐢垫満
-
- //=========鈽呪槄鎸夐敭闈㈡澘绫�(200-1199)鈽呪槄=========
- this.dicDeviceModelIdEnum["MPT4/R4-ZB.18"] = "200-200";//4鎸夐敭瑙︽懜闈㈡澘(甯�4璺户鐢靛櫒搴曞骇)
- this.dicDeviceModelIdEnum["MPT3/R3-ZB.18"] = "201-200";//3鎸夐敭瑙︽懜闈㈡澘
- this.dicDeviceModelIdEnum["MPT2/R2-ZB.18"] = "202-200";//2鎸夐敭瑙︽懜闈㈡澘
- this.dicDeviceModelIdEnum["MPT1/R1-ZB.18"] = "203-200";//12鎸夐敭瑙︽懜闈㈡澘
- this.dicDeviceModelIdEnum["MPT4-ZB.18"] = "210-200";//4鎸夐敭瑙︽懜闈㈡澘(鍙甫鐢垫簮搴曞骇)
- this.dicDeviceModelIdEnum["MPT4R4L/S-ZB.18"] = "220-200";//绠�绾�4鎸夐敭闈㈡澘
- this.dicDeviceModelIdEnum["MPT3R3L/S-ZB.18"] = "221-200";//绠�绾�3鎸夐敭闈㈡澘
- this.dicDeviceModelIdEnum["MPT2R2L/S-ZB.18"] = "222-200";//绠�绾�2鎸夐敭闈㈡澘
-
- //=========鈽呪槄PIR浼犳劅鍣ㄧ被(1200-1299)鈽呪槄=========
- this.dicDeviceModelIdEnum["MSPIR01-ZB.10"] = "1200-1200";//pir浼犳劅鍣�220
-
- //=========鈽呪槄瀹夐槻绫讳紶鎰熷櫒绫�(1300-2299)鈽呪槄=========
- this.dicDeviceModelIdEnum["MULTI-GASE--EA07"] = "1300-1300";//鐕冩皵浼犳劅鍣�
- this.dicDeviceModelIdEnum["MULTI-MECI--EA01"] = "1301-1300";//闂ㄧ獥纾佷紶鎰熷櫒
- this.dicDeviceModelIdEnum["MULTI-FIRE--EA05"] = "1302-1300";//鐑熼浘浼犳劅鍣�
- this.dicDeviceModelIdEnum["MULTI-MOTI--EA04"] = "1303-1300";//绾㈠浼犳劅鍣�
- this.dicDeviceModelIdEnum["MULTI-WATE--EA02"] = "1304-1300";//姘存蹈浼犳劅鍣�
- this.dicDeviceModelIdEnum["MULTI-BURO--EA06"] = "1305-1300";//绱ф�ユ寜閿�
-
- //=========鈽呪槄缁х數鍣ㄧ被(2300-2499)鈽呪槄=========
- this.dicDeviceModelIdEnum["MPR0310-ZB.10"] = "2300-2300";//3璺户鐢靛櫒灏忔ā鍧�
-
- //=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
- this.dicDeviceModelIdEnum["MPD0101-ZB.10"] = "2500-2500";//1璺皟鍏夊櫒灏忔ā鍧�
-
- //=========鈽呪槄鏅鸿兘闂ㄩ攣绫�(2800-????)鈽呪槄=========
- this.dicDeviceModelIdEnum["H06C"] = "2800-2800";//鏅鸿兘闂ㄩ攣(H06C)
-
- //=========鈽呪槄绌鸿皟绫�(3600-3899)鈽呪槄=========
- this.dicDeviceModelIdEnum["MAC/GW-ZB.10"] = "3600-3600";//zigbee绌鸿皟缃戝叧妯″潡
-
- //=========鈽呪槄涓户鍣ㄧ被(3900-3999)鈽呪槄=========
- this.dicDeviceModelIdEnum["MSR-ZB.10"] = "3900-3900"; //zigbee涓户鍣�
-
- //=========鈽呪槄绌烘皵寮�鍏崇被(4100-4199)鈽呪槄=========
- this.dicDeviceModelIdEnum["MBCI01-ZB.10"] = "4100-4100";//zigbee寰柇浜戞帶鍒跺櫒
-
- //=========鈽呪槄杞崲鍣ㄧ被(4200-4699)鈽呪槄=========
- this.dicDeviceModelIdEnum["MBUS/GW-ZB.10"] = "4200-4200";//zigbee杞琤uspro鍗忚杞崲鍣�
- this.dicDeviceModelIdEnum["M485/GW-ZB.10"] = "4201-4200";//zigbee杞�485鍗忚杞崲鍣�
-
-
+ var listText = this.GetDeviceNameFileContent();
+ foreach (var dataText in listText)
+ {
+ if (dataText == string.Empty || dataText.StartsWith(";") == true)
+ {
+ //杩欐槸娉ㄩ噴
+ continue;
+ }
+ string[] strArry1 = dataText.Split(new string[] { "=" }, StringSplitOptions.RemoveEmptyEntries);
+ if (strArry1.Length != 2)
+ {
+ //闈炴硶璁剧疆
+ continue;
+ }
+ string[] strArry2 = strArry1[1].Split(new string[] { "/" }, StringSplitOptions.RemoveEmptyEntries);
+ if (strArry2.Length < 6)
+ {
+ //闈炴硶璁剧疆
+ continue;
+ }
+ var content = new DeviceNameContent();
+ content.ConcreteTypeValue = Convert.ToInt32(strArry2[0].Trim());
+ content.A瀹樻柟鍚嶅瓧 = strArry2[1].Trim();
+ content.A澶囨敞鍚嶅瓧 = strArry2[2].Trim();
+ content.BeloneTypeValue= Convert.ToInt32(strArry2[3].Trim());
+ content.A鎵�灞炲悕瀛� = strArry2[4].Trim();
+ content.A绫诲瀷鍚嶅瓧 = strArry2[5].Trim();
+ this.dicDeviceModelIdEnum[strArry1[0].Trim()] = content;
+ }
//鉁┾湬鉁┾湬鉁╅渶瑕佷氦鎹㈢殑妯″潡ID鉁┾湬鉁┾湬鉁�
this.dicDeviceModelIdChanged = new Dictionary<string, string>();
@@ -2226,13 +3266,64 @@
this.dicDeviceModelIdChanged["MULTI-WATE--EA02"] = "MSW01/M-ZB.10";//姘存蹈浼犳劅鍣�
this.dicDeviceModelIdChanged["MULTI-BURO--EA06"] = "MBU01/M-ZB.10";//绱ф�ユ寜閿�
-
-
//鉁┾湬鉁┾湬鉁╅渶瑕佸叡鏈夌殑鍥剧墖瀵硅薄鉁┾湬鉁┾湬鉁�
+ //涓よ�呴兘鏄疍eviceConcreteType
+ //Keys:鎸囧畾鐨勮澶� value:娌跨敤鐨勫浘鐗囨槸鍝璁惧鐨�
this.dicPictrueShard = new Dictionary<string, string>();
this.dicPictrueShard["ButtonPanel_SimpleFour"] = "ButtonPanel_Four";//绠�绾�4鎸夐敭闈㈡澘 娌跨敤 4鎸夐敭鐨勫浘鏍�
this.dicPictrueShard["ButtonPanel_SimpleThree"] = "ButtonPanel_Three";//绠�绾�3鎸夐敭闈㈡澘 娌跨敤 3鎸夐敭鐨勫浘鏍�
this.dicPictrueShard["ButtonPanel_SimpleTwo"] = "ButtonPanel_Two";//绠�绾�2鎸夐敭闈㈡澘 娌跨敤 2鎸夐敭鐨勫浘鏍�
+ this.dicPictrueShard["IntelligentLocks_Sone"] = "IntelligentLocks_H06C";//S-one鐨勯棬閿佸浘鐗� 娌跨敤 H06C鐨勫浘鏍�
+ this.dicPictrueShard["Relay_FangyueFreshAirModul"] = "Relay_ThreeLoad";//鏂规偊鏂伴灏忔ā鍧楀浘鐗� 娌跨敤 3璺户鐢靛櫒鐨勫浘鏍�
+ this.dicPictrueShard["ButtonPanel_FourButtonScene"] = "ButtonPanel_Four";//绠�绾�4鎸夐敭鍦烘櫙闈㈡澘 娌跨敤 4鎸夐敭闈㈡澘鐨勫浘鏍�
+ }
+
+ /// <summary>
+ /// 鑾峰彇璁惧鍚嶅瓧鏂囦欢鐨勫唴瀹�
+ /// </summary>
+ /// <returns></returns>
+ private List<string> GetDeviceNameFileContent()
+ {
+ System.IO.StreamReader streamReader = null;
+ var listText = new List<string>();
+ try
+ {
+#if iOS
+ string textFile = Foundation.NSBundle.MainBundle.PathForResource("DeviceName.ini", null);
+ streamReader = new System.IO.StreamReader(textFile, Encoding.UTF8);
+ string text;
+ while ((text = streamReader.ReadLine()) != null)
+ {
+ listText.Add(text.Trim());
+ }
+ return listText;
+#endif
+#if Android
+ var stream = Application.Activity.Assets.Open("DeviceName.ini");
+ streamReader = new System.IO.StreamReader(stream, Encoding.UTF8);
+ string text;
+ while ((text = streamReader.ReadLine()) != null)
+ {
+ listText.Add(text.Trim());
+ }
+ stream.Close();
+ return listText;
+#endif
+ }
+ catch
+ {
+ return listText;
+ }
+ finally
+ {
+ try
+ {
+ streamReader?.Close();
+ }
+ catch
+ {
+ }
+ }
}
#endregion
@@ -2241,13 +3332,10 @@
#region 鈻� 鑷畾涔夎澶囩被鍨媉________________________
/// <summary>
- /// <para>浠呴檺搴曞眰浣跨敤锛氳澶囩殑鍏蜂綋銆愯澶囩被鍨嬨��,鑷畾涔変笌妯″潡id鍏宠仈鐨勬灇涓�(鍊间负LocalDevice閲岄潰dicDeviceModelIdEnum鎵�鎸囧畾鐨勫��)</para>
- /// <para>鍙橀噺鍚嶅彲浠ヤ綔涓恒�愯澶囩被鍨嬨�戝浘鐗�,杩欎釜鍊兼槸鐬庡啓鐨�,娌′粈涔堢壒娈婃剰涔�</para>
+ /// <para>璁惧鐨勫叿浣撱�愯澶囩被鍨嬨��,鍙橀噺鍚嶅彲浠ヤ綔涓恒�愯澶囩被鍨嬨�戝浘鐗�,杩欎釜鍊兼槸鐬庡啓鐨�,娌′粈涔堢壒娈婃剰涔�</para>
/// </summary>
public enum DeviceConcreteType
{
- //瀹氫箟瑙勫垯锛氥�愯澶囩被鍨嬨�戝浘鐗囧悕瀛�=LocalDevice閲岄潰dicDeviceModelIdEnum鎵�鎸囧畾鐨勫��
-
/// <summary>
/// 鏈煡璁惧
/// </summary>
@@ -2304,6 +3392,46 @@
/// 绠�绾�2鎸夐敭闈㈡澘 闀滃儚id锛�222
/// </summary>
ButtonPanel_SimpleTwo = 222,
+ /// <summary>
+ /// 绠�绾�4鎸夐敭鍦烘櫙闈㈡澘 闀滃儚id锛�224
+ /// </summary>
+ ButtonPanel_FourButtonScene = 224,
+ /// <summary>
+ /// 绠�绾�2璺獥甯橀潰鏉� 闀滃儚id锛�226
+ /// </summary>
+ ButtonPanel_TwoButtonCurtain = 226,
+ /// <summary>
+ /// 鏂规偊2鎸夐敭杞昏Е寮忛潰鏉� 闀滃儚id锛�240
+ /// </summary>
+ ButtonPanel_FangyueTwo = 240,
+ /// <summary>
+ /// 鏂规偊4鎸夐敭杞昏Е寮忛潰鏉� 闀滃儚id锛�241
+ /// </summary>
+ ButtonPanel_FangyueFour = 241,
+ /// <summary>
+ /// 鏂规偊8鎸夐敭杞昏Е寮忛潰鏉� 闀滃儚id锛�242
+ /// </summary>
+ ButtonPanel_FangyueEight = 242,
+ /// <summary>
+ /// 鏂规偊鏂伴闈㈡澘 闀滃儚id锛�250
+ /// </summary>
+ ButtonPanel_FangyueFreshAir = 250,
+ /// <summary>
+ /// 鏂规偊鐜闈㈡澘 闀滃儚id锛�253
+ /// </summary>
+ ButtonPanel_FangyueEnvironment = 253,
+ /// <summary>
+ /// 绐楀笜闈㈡澘 闀滃儚id锛�256
+ /// </summary>
+ ButtonPanel_Curtain = 256,
+ /// <summary>
+ /// 绠�绾﹀鍔熻兘闈㈡澘 闀滃儚ID锛�212
+ /// </summary>
+ ButtonPanel_SimpleMultifunction = 212,
+ /// <summary>
+ /// 绠�绾︾幆澧冮潰鏉�
+ /// </summary>
+ ButtonPanel_SimpleEnvironment = 230,
//=========鈽呪槄PIR浼犳劅鍣ㄧ被(1200-1299)鈽呪槄=========
/// <summary>
@@ -2314,6 +3442,10 @@
/// pir浼犳劅鍣�220 闀滃儚id锛�1200
/// </summary>
Sensor_Pir = 1200,
+ /// <summary>
+ /// 鐞冨舰绉诲姩浼犳劅鍣� 闀滃儚id锛�1205
+ /// </summary>
+ Sensor_SphericalMotion = 1205,
//=========鈽呪槄瀹夐槻绫讳紶鎰熷櫒绫�(1300-2299)鈽呪槄=========
/// <summary>
@@ -2341,6 +3473,19 @@
/// </summary>
Sensor_EmergencyButton = 1305,
/// <summary>
+ /// 鍚搁《鐕冩皵浼犳劅鍣�
+ /// </summary>
+ Sensor_CeilingGas = 1306,
+ /// <summary>
+ /// PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+ /// </summary>
+ Sensor_PMTwoPointFive = 1307,
+ /// <summary>
+ /// 娓╂箍搴︿紶鎰熷櫒(杩欎釜鍗曡瘝鎷奸敊浜�,浣嗘槸閿欎簡灏遍敊浜嗗憲,灏辫繖鏍蜂簡)
+ /// </summary>
+ Sensor_TemperatureHumidity = 1308,
+
+ /// <summary>
/// 杩愬姩浼犳劅鍣�
/// </summary>
Sensor_Motion = -1306,
@@ -2349,11 +3494,7 @@
/// </summary>
Sensor_Keyfob = -1307,
/// <summary>
- /// 娓╂箍搴︿紶鎰熷櫒
- /// </summary>
- Sensor_TemperatureHumidity = -1308,
- /// <summary>
- /// 娓╁害浼犳劅鍣�
+ /// 娓╁害浼犳劅鍣�(杩欎釜鍗曡瘝鎷奸敊浜�,浣嗘槸閿欎簡灏遍敊浜嗗憲,灏辫繖鏍蜂簡)
/// </summary>
Sensor_Temperature = -1309,
/// <summary>
@@ -2370,6 +3511,22 @@
/// 涓夎矾缁х數鍣� 闀滃儚id锛�2300
/// </summary>
Relay_ThreeLoad = 2300,
+ /// <summary>
+ /// 鏂规偊鏂伴灏忔ā鍧� 闀滃儚id锛�2310
+ /// </summary>
+ Relay_FangyueFreshAirModul = 2310,
+ /// <summary>
+ /// 鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 闀滃儚id锛�2311(涓存椂)
+ /// </summary>
+ Relay_NationalThreeLoadTenA = 2311,
+ /// <summary>
+ /// 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 闀滃儚id锛�2312(涓存椂)
+ /// </summary>
+ Relay_EuropeanTwoLoadFiveA = 2312,
+ /// <summary>
+ /// 娆ф爣14璺共鎺ョ偣灏忔ā鍧� 闀滃儚id锛�2313(涓存椂)
+ /// </summary>
+ Relay_EuropeanFourteenLoadDryContact = 2313,
//=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
/// <summary>
@@ -2390,12 +3547,20 @@
/// H06C
/// </summary>
IntelligentLocks_H06C = 2800,
+ /// <summary>
+ /// S-one
+ /// </summary>
+ IntelligentLocks_Sone = 2802,
//=========鈽呪槄褰╃伅绫�(????-????)鈽呪槄=========
/// <summary>
/// 褰╃伅
/// </summary>
ColorLight = -10,
+ /// <summary>
+ /// 鑹叉俯鐏�(瀹冪殑闀滃儚ID鏈畾,鏆傚畾20000)
+ /// </summary>
+ ColorLight_Temperature = 20000,
//=========鈽呪槄绌鸿皟(3600-3899)鈽呪槄=========
/// <summary>
@@ -2443,26 +3608,25 @@
//=========鈽呪槄鍏朵粬绫�(????-????)鈽呪槄=========
/// <summary>
- /// 骞叉帴鐐�
+ /// 骞叉帴鐐�(娉ㄦ剰,瀹冨睘浜庡叾浠栫被,涓嶆槸璁惧绫诲瀷)
/// </summary>
DryContact = -10000,
/// <summary>
- /// 鐏厜(娉ㄦ剰,瀹冭緭鍏ュ叾浠栫被,涓嶆槸璁惧绫诲瀷)
+ /// 鐏厜(娉ㄦ剰,瀹冨睘浜庡叾浠栫被,涓嶆槸璁惧绫诲瀷)
/// </summary>
Light = -10001,
/// <summary>
- /// 鎻掑骇
+ /// 鎻掑骇(娉ㄦ剰,瀹冨睘浜庡叾浠栫被,涓嶆槸璁惧绫诲瀷)
/// </summary>
Socket1 = -10002,
/// <summary>
- /// 寮�鍏�
+ /// 寮�鍏�(娉ㄦ剰,瀹冨睘浜庡叾浠栫被,涓嶆槸璁惧绫诲瀷)
/// </summary>
Switch = -10003,
}
/// <summary>
- /// <para>浠呴檺搴曞眰浣跨敤锛氳澶囨墍灞炵殑銆愯澶囩绫汇��,鑷畾涔変笌妯″潡id鍏宠仈鐨勬灇涓�(鍊间负LocalDevice閲岄潰dicDeviceModelIdEnum鎵�鎸囧畾鐨勫��)</para>
- /// <para>杩欎釜鍊兼槸鐬庡啓鐨�,娌′粈涔堢壒娈婃剰涔�</para>
+ /// <para>璁惧鎵�灞炴灇涓�,杩欎釜鍊兼槸鐬庡啓鐨�,娌′粈涔堢壒娈婃剰涔�</para>
/// </summary>
public enum DeviceBeloneType
{
@@ -2483,9 +3647,17 @@
/// </summary>
A浼犳劅鍣� = 1200,
/// <summary>
+ /// PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+ /// </summary>
+ APM2鐐�5绌烘皵璐ㄩ噺浼犳劅鍣� = 1307,
+ /// <summary>
/// 缁х數鍣�(2300-2499)
/// </summary>
A缁х數鍣� = 2300,
+ /// <summary>
+ /// 鏂伴
+ /// </summary>
+ A鏂伴 = 2310,
/// <summary>
/// 璋冨厜鍣�(2500-2799)
/// </summary>
@@ -2541,7 +3713,7 @@
/// <summary>
/// 骞叉帴鐐�
/// </summary>
- A骞叉帴鐐� = 16
+ A骞叉帴鐐� = 16,
}
#endregion
--
Gitblit v1.8.0