From dc0309e64f02227d8e1468b7326c07955f804612 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 22 六月 2022 11:22:18 +0800
Subject: [PATCH] 修改引用路径
---
ZigbeeApp/Shared/Common/Device.cs | 5109 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 3,155 insertions(+), 1,954 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
old mode 100755
new mode 100644
index 0d5c065..5ff29c8
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -43,55 +43,44 @@
{
get
{
- var list = new List<CommonDevice>();
- foreach (var device in dicAllDevice.Values)
+ lock (dicAllDevice)
{
- list.Add(device);
+ //鍏堣幏鍙栧叏閮ㄧ殑Mac
+ var listMac = new List<string>();
+ foreach (var strMac in this.dicDeviceEpoint.Keys)
+ {
+ listMac.Add(strMac);
+ }
+ //鏍规嵁MAC鍦板潃,鑾峰彇鍏ㄩ儴鍥炶矾鐨勮澶囧璞�(寮哄埗鎺掑簭)
+ return this.GetDevicesByMac(listMac);
}
- return list;
}
}
/// <summary>
- /// R鏂囦欢閲岄潰璁惧榛樿鍚嶅瓧鐨処D鐨勫墠缂�
+ /// 璁惧鐨勬ā鍧桰D鐨勬灇涓� keys:妯″潡ID (Axxx浠ｈ〃鏄涓夋柟璁惧)
/// </summary>
- public const string deviceDefultNameFlag = "uDeviceDefultName";
+ private Dictionary<string, DeviceNameContent> dicDeviceModelIdEnum = null;
/// <summary>
- /// R鏂囦欢閲岄潰璁惧榛樿鍚嶅瓧鐨処D
+ /// 闇�瑕佽浆鎹㈢殑璁惧鐨勬ā鍧桰D(keys:鏃фā鍧桰D,value:鏂版ā鍧桰D)
/// </summary>
- public Dictionary<string, int> dicDeviceDefultNameID = null;
+ private Dictionary<string, string> dicDeviceModelIdChanged = null;
/// <summary>
- /// 璁惧鐨勬ā鍧桰D鐨勬灇涓�(keys:妯″潡ID(宸茬炕璇�),value:璁惧鍏蜂綋绫诲瀷鍊�-璁惧鎵�灞炵被鍨嬪��(鑷畾涔夌殑鍊�,鍢�,鍙涓嶉噸澶嶅氨鍙互)
+ /// 鍥剧墖鍏辨湁(keys:鎸囧畾璁惧鐨勫叿浣撶被鍨� value:鎸囧畾鍏辨湁瀵硅薄鐨勫叿浣撶被鍨�)
/// </summary>
- private Dictionary<string, string> dicDeviceModelIdEnum = null;
+ private Dictionary<string, string> dicPictrueShard = null;
/// <summary>
/// 鏈湴鎵�鏈夎澶囩殑缂撳瓨(闈炲叕寮�)
/// </summary>
private Dictionary<string, CommonDevice> dicAllDevice = new Dictionary<string, CommonDevice>();
/// <summary>
- /// 鏈湴鎵�鏈夎澶嘦I鐨勭紦瀛�(闈炲叕寮�)
- /// </summary>
- private Dictionary<string, DeviceUI> dicAllDeviceUI = new Dictionary<string, DeviceUI>();
- /// <summary>
/// 鏈湴鎵�鏈夌殑椤剁偣鍗囩骇璁惧(闈炲叕寮�锛屼富閿槸MAC+200绔彛)
/// </summary>
private Dictionary<string, OTADevice> dicOTADevice = new Dictionary<string, OTADevice>();
/// <summary>
- /// 璁惧璁℃暟
+ /// 璁惧鐨勬�诲洖璺�(keys:Mac鍦板潃 value:鍏ㄩ儴绔彛鍙�)
/// </summary>
- private Dictionary<string, DeviceCountInfo> dicDeviceCount = new Dictionary<string, DeviceCountInfo>();
- /// <summary>
- /// 璁惧鏂囦欢鐨勫墠缂�鍚嶅瓧
- /// </summary>
- public const string deviceFirstName = "Device_";
- /// <summary>
- /// 澶囩敤璁惧鏂囦欢鐨勫墠缂�鏍囪瘑鍚嶅瓧(涓鸿澶囧垹闄ゆ墍鐢�,杩欎釜鏂囦欢涓�鏃﹁澶囧垹闄ゅ悗灏变細涓�鐩村瓨鍦�)
- /// </summary>
- private string deviceBackupName = "Backup";
- /// <summary>
- /// 閿�
- /// </summary>
- private object objLock = new object();
+ private Dictionary<string, HashSet<int>> dicDeviceEpoint = new Dictionary<string, HashSet<int>>();
#endregion
@@ -103,18 +92,30 @@
public void ReFreshByLocal()
{
this.dicAllDevice.Clear();
- this.dicAllDeviceUI.Clear();
- this.dicDeviceCount.Clear();
+ this.dicDeviceEpoint.Clear();
- //鍒濆鍖朢鏂囦欢閲岄潰璁惧榛樿鍚嶅瓧鐨処D
- this.InitDeviceDefultNameIDList();
+ //鍒濆鍖栬澶囨灇涓�
+ this.InitDeviceModelIdEnum();
//鑾峰彇鏈湴鍏ㄩ儴鐨勮澶囨枃浠�
List<string> listFile = this.GetAllDeviceFile();
foreach (string file in listFile)
{
+ CommonDevice device = null;
//鍙嶅簭鍒楀寲涓烘寚瀹氱殑绫伙紝涓嶇劧鏁版嵁浼氫涪澶辫�屽鑷存棤娉曞己杞�
- var device = ZigBee.Device.CommonDevice.CommonDeviceByFilePath(file);
+ try
+ {
+ //璇诲彇瀹冪殑鍐呭
+ var fileData = HdlFileLogic.Current.ReadFileTextContent(System.IO.Path.Combine(Config.Instance.FullPath, file));
+ var jobject = Newtonsoft.Json.Linq.JObject.Parse(fileData);
+ if (jobject.Property("DeviceID") == null)
+ {
+ continue;
+ }
+ device = CommonDevice.CommonDeviceByByteString(Convert.ToInt32(jobject["DeviceID"].ToString()), fileData);
+ }
+ catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); }
+
if (device == null || device.CurrentGateWayId == null)
{
//澶辨晥鐨勬枃浠讹紝娌℃湁缃戝叧id鐨勯兘鍒犻櫎鎺�
@@ -122,12 +123,12 @@
continue;
}
//濡傛灉杩欎釜璁惧鐨勭綉鍏矷D涓嶅瓨鍦ㄧ殑璇�
- if (Common.LocalGateway.Current.IsGatewayExist(device.CurrentGateWayId) == false)
+ if (HdlGatewayLogic.Current.IsGatewayExist(device.CurrentGateWayId) == false)
{
if (UserCenterResourse.UserInfo.AuthorityNo == 3)
{
//濡傛灉浠栨槸鎴愬憳鐨勮瘽,甯粬鏂板缓涓�涓綉鍏�
- Common.LocalGateway.Current.AddVirtualGateway(device.CurrentGateWayId);
+ HdlGatewayLogic.Current.AddVirtualGateway(device.CurrentGateWayId);
}
else
{
@@ -144,42 +145,62 @@
this.dicOTADevice[mainKey] = (OTADevice)device;
continue;
}
+ //濡傛灉璁惧鏄櫨琛ｆ灦,鍒欎竴绔偣锛屽叾浠栫鐐癸紙2锝�5锛夎繃婊�,
+ //鍥犱负鍏朵粬绔偣鍙湁鎺у埗浣滅敤锛岋紙2:鎺у埗鐓ф槑锛�3:鎺у埗椋庡共锛�4:鎺у埗鐑樺共锛�5:鎺у埗娑堟瘨锛�
+ //浜у搧缁忕悊涓嶈鏄剧ず
+ if (device is Airer)
+ {
+ if (device.DeviceEpoint == 2 || device.DeviceEpoint == 3 || device.DeviceEpoint == 4 || device.DeviceEpoint == 5)
+ continue;
+ }
//娣诲姞缂撳瓨
this.dicAllDevice[mainKey] = device;
- //鍥炶矾璁℃暟
- if (this.dicDeviceCount.ContainsKey(device.DeviceAddr) == false)
+ //鍥炶矾鏀堕泦
+ if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == false)
{
- this.dicDeviceCount[device.DeviceAddr] = new DeviceCountInfo();
+ this.dicDeviceEpoint[device.DeviceAddr] = new HashSet<int>();
}
- this.dicDeviceCount[device.DeviceAddr].Count += 1;
- this.dicDeviceCount[device.DeviceAddr].hsEpoint.Add(device.DeviceEpoint);
+ this.dicDeviceEpoint[device.DeviceAddr].Add(device.DeviceEpoint);
- //妫�娴婾i鍥剧墖鏄惁姝ｇ‘
- var deviceUi = this.GetDeviceUIFromLocalFile(device);
- if (deviceUi == null)
+ //瀵瑰簲鏃х増鏈殑璁惧鏂囦欢 Device_OnoffOutput_abcdfrtgg_01
+ bool bolSave = file.Split(new string[] { "_" }, StringSplitOptions.None).Length == 4;
+ if (bolSave == true)
{
- deviceUi = new DeviceUI();
- deviceUi.DeviceFileName = device.FilePath;
- deviceUi.Save();
- HdlAutoBackupLogic.AddOrEditorFile(deviceUi.FileName);
+ //鍒犳帀杩欎釜鏂囦欢,閲嶆柊鐢熸垚
+ HdlAutoBackupLogic.DeleteFile(file);
+ Global.DeleteFilebyHomeId(file);
}
- else
+
+ //妫�娴婾i鍥剧墖鏄惁姝ｇ‘,杩欎釜鍥剧墖鏈湴鏄惁瀛樺湪锛�
+ if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(device.IconPath)) == true)
{
- //杩欎釜鍥剧墖鏈湴鏄惁瀛樺湪锛�
- if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(deviceUi.IconPath)) == true)
- {
- //涓嶅瓨鍦ㄧ殑璇濓紝閲嶆柊鐢熸垚
- deviceUi.IconPath = string.Empty;
- deviceUi.ReSave();
- HdlAutoBackupLogic.AddOrEditorFile(deviceUi.FileName);
- }
+ //涓嶅瓨鍦ㄧ殑璇濓紝閲嶆柊鐢熸垚
+ device.IconPath = string.Empty;
+ device.ReSave();
+ HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
+
+ bolSave = false;
}
- //娣诲姞缂撳瓨
- this.dicAllDeviceUI[deviceUi.FileName] = deviceUi;
+ //閲嶆柊鐢熸垚鏂囦欢
+ if (bolSave == true)
+ {
+ device.ReSave();
+ HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
+ }
}
//鎴愬憳韬唤鐨勬椂鍊�,鍒犻櫎鎺夐潪娉曠殑缃戝叧鏂囦欢
this.DeleteGatewayFileByMemberModel();
+ //鍒濆鍖栫墿鐞嗚澶囨墍灞炴埧闂寸殑璁板綍
+ HdlRoomLogic.Current.InitRealDeviceRoomId();
+
+#if DEBUG
+ if (UserCenterResourse.HideOption.CenterHideMenu == 1)
+ {
+ //妫�娴嬩竴浜涗唬鐮侀厤缃�(debug)
+ this.CheckOhtherSettion();
+ }
+#endif
}
/// <summary>
@@ -192,21 +213,57 @@
return;
}
var listId = new HashSet<string>();
- foreach (var device in this.dicAllDevice.Values)
+
+ lock (dicAllDevice)
{
- if (listId.Contains(device.CurrentGateWayId) == false)
+ foreach (var device in this.dicAllDevice.Values)
{
- listId.Add(device.CurrentGateWayId);
+ if (listId.Contains(device.CurrentGateWayId) == false)
+ {
+ listId.Add(device.CurrentGateWayId);
+ }
}
}
- var listGateway = Common.LocalGateway.Current.GetAllLocalGateway();
+ var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();
foreach (var gateway in listGateway)
{
- string gwId = Common.LocalGateway.Current.GetGatewayId(gateway);
+ string gwId = gateway.GwId;
if (listId.Contains(gwId) == false)
{
//杩欎釜缃戝叧瀵逛簬褰撳墠杩欎釜鎴愬憳鏉ヨ鏄潪娉曠殑
- Common.LocalGateway.Current.DeleteGatewayFile(gwId);
+ HdlGatewayLogic.Current.DeleteGatewayFile(gwId);
+ }
+ }
+ }
+
+ /// <summary>
+ /// 妫�娴嬩竴浜涗唬鐮侀厤缃�(debug)
+ /// </summary>
+ private void CheckOhtherSettion()
+ {
+ foreach (var item in Enum.GetValues(typeof(DeviceType)))
+ {
+ string itemName = item.ToString();
+ int itemValue = (int)item;
+ if (itemName == "UnKown" || itemName == "ZbGateway")
+ {
+ continue;
+ }
+ var device = this.NewDeviceObjectByDeviceId((DeviceType)itemValue, 1);
+ string strMsg = string.Empty;
+ if (device == null)
+ {
+ strMsg = itemName + "娌℃湁瀹炶(1)";
+ }
+ device = CommonDevice.CommonDeviceByByteString(itemValue, "{}");
+ if (device == null)
+ {
+ strMsg += "\r\n" + itemName + "娌℃湁瀹炶(2)";
+ }
+ if (strMsg != string.Empty)
+ {
+ this.ShowErrorMsg(strMsg);
+ return;
}
}
}
@@ -216,26 +273,34 @@
#region 鈻� 娣诲姞璁惧___________________________
/// <summary>
- /// 灏嗘寚瀹氱綉鍏崇殑璁惧瀛樺叆缂撳瓨涓�(浠庢柊鑾峰彇闀滃儚)
+ /// <para>灏嗘寚瀹氱綉鍏崇殑璁惧瀛樺叆缂撳瓨涓�(浠庢柊鑾峰彇闀滃儚)</para>
+ /// <para>-1:寮傚父 1:姝ｅ父 2:璁惧淇℃伅缂烘崯</para>
/// </summary>
- /// <param name="zbGateway">缃戝叧瀵硅薄</param>
- /// <param name="deviceComingAction">鎺ユ敹鍒拌澶囨椂鐨勪簨浠�,璁惧瀵硅薄涓簄ull鏃�,浠ｈ〃鎺ユ敹瀹屾垚</param>
- /// <returns>涓�鐩磋繑鍥瀟rue</returns>
- public async Task<bool> SetDeviceToMemmoryByGateway(ZbGateway zbGateway, Action<CommonDevice> deviceComingAction = null)
+ /// <param name="gatewayId">缃戝叧Id</param>
+ /// <param name="useLocalConnect">鏄惁寮哄埗浣跨敤鏈湴杩炴帴鍙戦��</param>
+ public int SetDeviceToMemmoryByGateway(string gatewayId, bool useLocalConnect)
{
//浠庣綉鍏宠幏鍙栧叏閮ㄧ殑璁惧
+ int statu = 0;
List<CommonDevice> listDevice = new List<CommonDevice>();
- List<CommonDevice> list = await this.GetDeviceListFromGateway(zbGateway, deviceComingAction);
-
+ List<CommonDevice> list = this.GetDeviceListFromGateway(gatewayId, ref statu, useLocalConnect);
if (list == null)
{
- return false;
+ return -1;
}
listDevice.AddRange(list);
//鑾峰彇杩欎釜缃戝叧鐨勬湰鍦版墍鏈夎澶�
- string gwID = Common.LocalGateway.Current.GetGatewayId(zbGateway);
- List<CommonDevice> listLocalDevices = this.GetDeviceByGatewayID(gwID);
+ List<CommonDevice> listLocalDevices = this.GetDeviceByGatewayID(gatewayId);
+ //鑾峰彇ota璁惧
+ foreach (var ota in this.dicOTADevice.Values)
+ {
+ if (ota.CurrentGateWayId == gatewayId)
+ {
+ listLocalDevices.Add(ota);
+ }
+ }
+
Dictionary<string, CommonDevice> dicExist = new Dictionary<string, CommonDevice>();
foreach (var device in listLocalDevices)
{
@@ -244,6 +309,7 @@
}
//娣诲姞璁惧鐨勭紦瀛�
+ var listDriveDevice = new List<CommonDevice>();
for (int i = 0; i < listDevice.Count; i++)
{
var device = listDevice[i];
@@ -260,54 +326,64 @@
{
dicExist.Remove(maikey);
}
- }
-
- //濡傛灉鏈湴鍜岀綉鍏崇殑璁惧涓嶄竴鑷寸殑鏃跺�欙紝鏆傛椂鍒犻櫎鏈湴鐨勮澶�
- //娉ㄦ剰锛氬彧鏄垹闄よ澶囨枃浠讹紝鎴块棿鍐呭浠�涔堢殑杩樺瓨鍦ㄧ潃
- foreach (var device in dicExist.Values)
- {
- this.DeleteMemmoryDevice(device, false);
- }
-
- if (listDevice.Count > 0)
- {
- //绛夊緟涓�涓嬭澶囩殑纭欢淇℃伅
- await Task.Delay(1500);
- //閲嶆柊鍙樻洿UI
- foreach (var device in listDevice)
+ //鑾峰彇璁惧鐨勫浐瀹氬睘鎬�
+ if (HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device) == true)
{
- if (device == null || device.DeviceAddr == null || (device is OTADevice))
- {
- continue;
- }
- var ui = this.GetDeviceUI(device);
- if (ui.IsCustomizeImage == false)
- {
- ui.IconPath = string.Empty;
- ui.ReSave();
- }
+ System.Threading.Thread.Sleep(200);
+ }
+ //瀵规湭鍛藉悕鐨勮櫄鎷熻澶囬噸鏂板懡鍚�
+ if (device.DriveCode > 0 && this.GetSimpleEpointName(device) == string.Empty)
+ {
+ listDriveDevice.Add(device);
}
}
+ //璁剧疆铏氭嫙璁惧鐨勯粯璁ゅ悕瀛�
+ this.SetDriveDeviceDefultName(listDriveDevice);
- return true;
+ //鍙湁瀹屽叏鑾峰彇鐨勬椂鍊�,鎵嶄細鍘诲鐞嗗垹闄ょ殑闂
+ if (statu != 1)
+ {
+ 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)
+ {
+ //灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+ HdlRoomLogic.Current.DeleteRealDeviceFromRoom(listDeleteMac);
+ }
+
+ return statu;
}
/// <summary>
/// 娣诲姞璁惧鍒扮紦瀛�,瀛樺湪鏃惰鐩�
/// </summary>
/// <param name="device">璁惧瀵硅薄(杩欎釜涓滆タ鏈夊彲鑳戒細琚洿鏀�)</param>
- /// <param name="ResetImageType">鏄惁閲嶇疆闀滃儚绫诲瀷</param>
- public void AddDeviceToMemory(ref CommonDevice device, bool ResetImageType = false)
+ public void AddDeviceToMemory(ref CommonDevice device)
{
- //灏濊瘯鎭㈠鍒犻櫎浜嗙殑鏂囦欢
- bool backFile = this.RecoverBackupDeviceFile(ref device);
-
string mainKeys = this.GetDeviceMainKeys(device);
//濡傛灉瀹冩槸鍗囩骇鐨勯《绔鐐�,鍒欎笉鑳借瀹冨姞鍏ュ埌缂撳瓨锛屼絾鏄彲浠ヨ浠栫敓鎴愭枃浠�
if (device is OTADevice)
{
- //灏濊瘯鎭㈠鏂囦欢鎴愬姛,鎴栬�呮湰鍦伴兘娌℃湁杩欎釜璁惧
- if (backFile == true || this.dicOTADevice.ContainsKey(mainKeys) == false)
+ if (this.dicOTADevice.ContainsKey(mainKeys) == false)
{
this.dicOTADevice[mainKeys] = (OTADevice)device;
}
@@ -317,87 +393,59 @@
var tempDevice = this.dicOTADevice[mainKeys];
//灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
this.SetDeviceInfoToMain(tempDevice, device);
+ //鍒锋柊璁惧鍔熻兘绫诲瀷(杩欎釜涓滆タ闇�瑕佺嫭绔嬪嚭鏉�)
+ this.RefreshDeviceFunctionType(tempDevice, device, false);
device = tempDevice;
- }
-
- if (ResetImageType == true)
- {
- //ota璁惧鐨勯暅鍍忕被鍨嬪垵濮嬪�艰缃负-1
- device.ImgTypeId = -1;
- device.ImgVersion = -1;
}
bool exists = Global.IsExistsByHomeId(device.FilePath);
device.ReSave();
-
if (exists == false)
{
//娣诲姞鑷姩澶囦唤
HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
}
-
- //璁剧疆璁惧鍏ㄩ儴鐨勯暅鍍忎俊鎭�
- this.SetAllImageInfoToOtaDevice((OTADevice)device);
-
return;
}
- if (this.dicAllDevice.ContainsKey(mainKeys) == true)
+ //濡傛灉璁惧鏄櫨琛ｆ灦,鍒欎竴绔偣锛屽叾浠栫鐐癸紙2锝�5锛夎繃婊�,
+ //鍥犱负鍏朵粬绔偣鍙湁鎺у埗浣滅敤锛岋紙2:鎺у埗鐓ф槑锛�3:鎺у埗椋庡共锛�4:鎺у埗鐑樺共锛�5:鎺у埗娑堟瘨锛�
+ //浜у搧缁忕悊涓嶈鏄剧ず
+ if (device is Airer)
{
- //浜ゆ崲灞炴��
- var tempDevice = this.dicAllDevice[mainKeys];
- //灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
- this.SetDeviceInfoToMain(tempDevice, device);
- device = tempDevice;
+ if (device.DeviceEpoint == 2 || device.DeviceEpoint == 3 || device.DeviceEpoint == 4 || device.DeviceEpoint == 5)
+ return;
}
- else
- {
- this.dicAllDevice[mainKeys] = device;
- }
- //鑾峰彇璁惧鐨勭‖浠朵俊鎭�
- this.SetAllHardFirmwareInfoToDevice(device);
- //铏氭嫙璁惧鐨勮瘽锛岄檮鍔犲洖璺彿
- if (device.DriveCode > 0 && this.GetSimpleEpointName(device) == string.Empty)
+ lock (dicAllDevice)
{
- //鏍规嵁璁惧绫诲瀷鑾峰彇鍚嶇О
- var dName = this.GetDeviceObjectText(new List<CommonDevice>() { device }, false);
- //鍦ㄧ鐐瑰悕瀛楃殑鍚庨潰闄勫姞銆愬洖璺�戝瓧鏍�
- dName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
- this.SetEpointName(device, dName);
- new System.Threading.Thread(async () =>
+ if (this.dicAllDevice.ContainsKey(mainKeys) == true)
{
- //鍥犱负铏氭嫙璁惧涓嶄細缁忚繃璁惧鍏ョ綉杩欎竴姝ワ紝鎵�浠ョ洿鎺ョ粰瀹冧竴涓粯璁ゅ悕瀛�
- await this.ReName(this.dicAllDevice[mainKeys], dName, ShowErrorMode.NO);
- })
- { IsBackground = true }.Start();
+ //浜ゆ崲灞炴��
+ var tempDevice = this.dicAllDevice[mainKeys];
+ //灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
+ this.SetDeviceInfoToMain(tempDevice, device);
+ //鍒锋柊璁惧鍔熻兘绫诲瀷(杩欎釜涓滆タ闇�瑕佺嫭绔嬪嚭鏉�)
+ this.RefreshDeviceFunctionType(tempDevice, device, false);
+ device = tempDevice;
+ }
+ else
+ {
+ this.dicAllDevice[mainKeys] = device;
+ }
}
- //璁惧璁℃暟
- if (this.dicDeviceCount.ContainsKey(device.DeviceAddr) == false)
+ //璁惧鍥炶矾鏀堕泦
+ if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == false)
{
- this.dicDeviceCount[device.DeviceAddr] = new DeviceCountInfo();
+ this.dicDeviceEpoint[device.DeviceAddr] = new HashSet<int>();
}
- if (this.dicDeviceCount[device.DeviceAddr].hsEpoint.Contains(device.DeviceEpoint) == false)
+ if (this.dicDeviceEpoint[device.DeviceAddr].Contains(device.DeviceEpoint) == false)
{
- this.dicDeviceCount[device.DeviceAddr].Count += 1;
- this.dicDeviceCount[device.DeviceAddr].hsEpoint.Add(device.DeviceEpoint);
+ this.dicDeviceEpoint[device.DeviceAddr].Add(device.DeviceEpoint);
}
- //娣诲姞璁惧鐨勬椂鍊欙紝鐩存帴鍒涘缓璁惧鐨刄I鍥�
- DeviceUI deviceUI = new DeviceUI();
- deviceUI.DeviceFileName = device.FilePath;
-
- bool exists2 = Global.IsExistsByHomeId(deviceUI.FileName);
- deviceUI.Save();
- if (exists2 == false)
- {
- //娣诲姞鑷姩澶囦唤
- HdlAutoBackupLogic.AddOrEditorFile(deviceUI.FileName);
- this.dicAllDeviceUI[deviceUI.FileName] = deviceUI;
- }
-
- exists2 = Global.IsExistsByHomeId(device.FilePath);
+ bool exists2 = Global.IsExistsByHomeId(device.FilePath);
device.ReSave();
if (exists2 == false)
{
@@ -407,37 +455,38 @@
}
/// <summary>
- /// 鎭㈠鍒犻櫎浜嗙殑鏂囦欢(浠呴檺娣诲姞璁惧鐨勬椂鍊�)
+ /// 娣诲姞铏氭嫙璁惧鍒扮紦瀛�
/// </summary>
- /// <param name="device"></param>
- private bool RecoverBackupDeviceFile(ref CommonDevice device)
+ /// <param name="device">璁惧瀵硅薄</param>
+ public void AddVirtualDeviceToMemory(CommonDevice device)
{
- //濡傛灉鏈湴瀛樺湪澶囩敤鐨勬枃浠跺す鐨勮瘽,鍒欎娇鐢ㄥ浠界殑鏂囦欢澶逛綔涓哄璞�
- string backFile = deviceBackupName + device.FilePath;
- if (Global.IsExistsByHomeId(device.FilePath) == true || Global.IsExistsByHomeId(backFile) == false)
+ string mainKeys = this.GetDeviceMainKeys(device);
+ if (device is OTADevice)
{
- //鍙湁鍦ㄦ湰鍦扮洰鏍囪澶囨枃浠朵笉瀛樺湪锛屽苟涓斿浠芥枃浠跺瓨鍦ㄧ殑鏃跺�欐墠澶勭悊
- return false;
+ this.dicOTADevice[mainKeys] = (OTADevice)device;
+ device.ReSave();
+ return;
}
-
- //鍙嶅簭鍒楀寲涓烘寚瀹氱殑绫伙紝涓嶇劧鏁版嵁浼氫涪澶辫�屽鑷存棤娉曞己杞�(鈽呰繖涓笢瑗夸繚瀛樼潃浠ュ墠鐨勭綉鍏冲浠芥暟鎹槄)
- var tempDevice = ZigBee.Device.CommonDevice.CommonDeviceByFilePath(backFile);
- if (tempDevice == null)
+ //濡傛灉璁惧鏄櫨琛ｆ灦,鍒欎竴绔偣锛屽叾浠栫鐐癸紙2锝�5锛夎繃婊�,
+ //鍥犱负鍏朵粬绔偣鍙湁鎺у埗浣滅敤锛岋紙2:鎺у埗鐓ф槑锛�3:鎺у埗椋庡共锛�4:鎺у埗鐑樺共锛�5:鎺у埗娑堟瘨锛�
+ //浜у搧缁忕悊涓嶈鏄剧ず
+ if (device is Airer)
{
- return false;
+ if (device.DeviceEpoint == 2 || device.DeviceEpoint == 3 || device.DeviceEpoint == 4 || device.DeviceEpoint == 5)
+ return;
}
- //涓嶆部鐢ㄥ悕瀛�,鍏堣繖鏍峰惂
- this.SetMacName(tempDevice, string.Empty);
- this.SetEpointName(tempDevice, string.Empty);
+ this.dicAllDevice[mainKeys] = device;
- //灏咲eviceInfo鐨勫睘鎬ц缃埌涓诲睘鎬т腑
- this.SetDeviceInfoToMain(tempDevice, device);
- //鏇挎崲瀵硅薄
- device = tempDevice;
-
- //杩欓噷缁х画淇濈暀鐫�閭ｄ釜澶囦唤鏂囦欢锛屽ソ鍍忎篃娌′粈涔堥棶棰樼殑鏍峰瓙
-
- return true;
+ //璁惧鍥炶矾鏀堕泦
+ 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
@@ -445,24 +494,37 @@
#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)
{
//璁惧鍚嶇О淇敼澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uDeviceReNameFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result.errorMessageBase);
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
if (mode == ShowErrorMode.YES)
{
@@ -470,15 +532,9 @@
}
return false;
}
- //澶囦唤鏁版嵁
- await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(device, GatewayBackupEnum.A绔偣鍚嶇О, newName);
}
-
- //鏇存敼鍚嶅瓧鍚庯紝鍒锋柊璁惧缂撳瓨
- this.SetEpointName(device, newName);
-
- this.BackupDeviceAfterReName(device);
-
+ //淇敼璁惧鍚嶅瓧鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ Phone.UserView.UserPage.Instance.RefreshAllForm = true;
return true;
}
@@ -488,37 +544,13 @@
/// <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)
{
return true;
}
- CommonDevice device = listDevice[0];
-
- //涓嶅啀妫�娴嬪悕瀛楁槸鍚︿竴鏍�
- //鎴愬憳鍙兘淇敼鑷繁鏈湴鐨勫悕瀛�
- if (UserCenterResourse.UserInfo.AuthorityNo != 3)
- {
- //淇敼鐗╃悊鍚嶅瓧
- var result = await device.RenameDeviceMacNameAsync(device.DeviceAddr, device.DeviceEpoint, newMacName);
- if (result == null || result.renameDeviceMacNameData == null || result.renameDeviceMacNameData.Result == 1)
- {
- //璁惧鍚嶇О淇敼澶辫触
- string msg = Language.StringByID(R.MyInternationalizationString.uDeviceReNameFail);
- //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result.errorMessageBase);
- if (mode == ShowErrorMode.YES)
- {
- this.ShowErrorMsg(msg);
- }
- return false;
- }
- //澶囦唤鏁版嵁
- await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(device, GatewayBackupEnum.AMac鍚嶇О, newMacName);
- }
-
- //淇敼缂撳瓨
+ //鍏堝埆绠￠偅涔堝锛屽厛淇敼缂撳瓨
for (int i = 0; i < listDevice.Count; i++)
{
var device2 = listDevice[i];
@@ -528,7 +560,187 @@
//鏇存敼鍚嶅瓧鍚庯紝鍒锋柊璁惧缂撳瓨
this.BackupDeviceAfterReName(device2);
}
+ //濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ return true;
+ }
+
+ CommonDevice device = listDevice[0];
+ //涓嶅啀妫�娴嬪悕瀛楁槸鍚︿竴鏍�
+ //鎴愬憳鍙兘淇敼鑷繁鏈湴鐨勫悕瀛�
+ if (UserCenterResourse.UserInfo.AuthorityNo != 3)
+ {
+ //淇敼鐗╃悊鍚嶅瓧
+ var result = this.RenameDeviceMacNameAsync(device, newMacName);
+ if (result == null || result.renameDeviceMacNameData == null || result.renameDeviceMacNameData.Result != 0)
+ {
+ //璁惧鍚嶇О淇敼澶辫触
+ string msg = Language.StringByID(R.MyInternationalizationString.uDeviceReNameFail);
+ //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
+ if (mode == ShowErrorMode.YES)
+ {
+ this.ShowErrorMsg(msg);
+ }
+ return false;
+ }
+ //濡傛灉瀹冨彧鏈変竴涓洖璺�,鍒欐洿鏀圭鐐瑰悕瀛�
+ if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == true)
+ {
+ //鍙湁涓�涓鐐�
+ 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>
@@ -537,16 +749,29 @@
/// <param name="device"></param>
private void BackupDeviceAfterReName(CommonDevice device)
{
- string mainKeys = this.GetDeviceMainKeys(device);
- if (this.dicAllDevice.ContainsKey(mainKeys) == false)
+ lock (dicAllDevice)
{
- return;
- }
- this.dicAllDevice[mainKeys] = device;
- device.ReSave();
+ string mainKeys = this.GetDeviceMainKeys(device);
+ if (this.dicAllDevice.ContainsKey(mainKeys) == true)
+ {
+ //涓�鑸澶�
+ 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);
+
+ }
+ }
}
#endregion
@@ -559,45 +784,75 @@
/// <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.errorMessageBase);
+ 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);
}
+ //绉婚櫎鐪熷疄璁惧鐨勬埧闂寸储寮�
+ HdlRoomLogic.Current.DeleteRealDeviceFromRoom(listdevice[0]);
+
return true;
}
/// <summary>
- /// 鍒犻櫎缂撳瓨鐨勮澶�
+ /// 鍒犻櫎缂撳瓨鐨勪竴鑸澶�
/// </summary>
/// <param name="device">璁惧瀵硅薄</param>
/// <param name="deleteRoom">鏄惁浠庢埧闂村垹闄�</param>
public void DeleteMemmoryDevice(CommonDevice device, bool deleteRoom = true)
{
+ //鍒犻櫎缂撳瓨璁惧鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
+ Phone.UserView.UserPage.Instance.RefreshAllForm = true;
+
+ if (deleteRoom == true)
+ {
+ //浠庢埧闂翠腑鍒犻櫎
+ HdlRoomLogic.Current.DeleteDevice(device);
+ //鍒犻櫎鎴戠殑鍠滅埍鐨勮澶�
+ HdlRoomLogic.Current.DeleteLoveDevice(device);
+ }
+
//鍒犻櫎缂撳瓨
string mainKeys = this.GetDeviceMainKeys(device);
- if (this.dicAllDevice.ContainsKey(mainKeys) == true)
+ lock (dicAllDevice)
{
- this.dicAllDevice.Remove(mainKeys);
+ if (this.dicAllDevice.ContainsKey(mainKeys) == true)
+ {
+ this.dicAllDevice.Remove(mainKeys);
+ }
+ if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == true)
+ {
+ //鍙樻洿绔偣鏁�
+ this.dicDeviceEpoint[device.DeviceAddr].Remove(device.DeviceEpoint);
+ }
}
+ //鍒犻櫎妯℃澘鏁版嵁
+ Phone.TemplateData.TemplateCommonLogic.Current.DeleteDevice(device);
//鍒犻櫎璁惧鏂囦欢
string filePath = device.FilePath;
@@ -610,17 +865,23 @@
}
else
{
- //涓嶅垹闄ゆ枃浠讹紝鐩存帴鏀瑰悕瀛�
- string oldFile = UserCenterLogic.CombinePath(filePath);
- string newFile = UserCenterLogic.CombinePath(deviceBackupName + filePath);
- Global.MoveFileToDirectory(oldFile, newFile);
+ //鍙樻洿锛氭悶鎺夊畠,涓嶇暀浜�
+ Global.DeleteFilebyHomeId(filePath);
//鍒犻櫎鑷姩澶囦唤
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;
@@ -629,62 +890,109 @@
if (UserCenterResourse.UserInfo.AuthorityNo == 3)
{
//鎴愬憳鐨勮瘽,鐩存帴鍒犻櫎,娌℃湁鍟嗛噺鐨勪綑鍦�
- Global.DeleteFilebyHomeId(filePath);
+ Global.DeleteFilebyHomeId(otaFile);
}
else
{
- //涓嶅垹闄ゆ枃浠讹紝鐩存帴鏀瑰悕瀛�
- string oldFile = UserCenterLogic.CombinePath(otaFile);
- string newFile = UserCenterLogic.CombinePath(deviceBackupName + otaFile);
- Global.MoveFileToDirectory(oldFile, newFile);
+ //鍙樻洿锛氭悶鎺夊畠,涓嶇暀浜�
+ Global.DeleteFilebyHomeId(otaFile);
//鍒犻櫎鑷姩澶囦唤
HdlAutoBackupLogic.DeleteFile(otaFile);
}
}
this.dicOTADevice.Remove(otaKeys);
}
-
- if (deleteRoom == true && Room.CurrentRoom != null)
- {
- //浠庢埧闂翠腑鍒犻櫎
- Room.CurrentRoom.DeleteDevice(device);
- }
}
+ #endregion
+
+ #region 鈻� 鍚屾璁惧___________________________
/// <summary>
- /// 鍒犻櫎璁惧鐨勫浠芥枃浠�(搴旇鍙湁鍦ㄥ垹闄ょ綉鍏崇殑鏃跺�欎娇鐢ㄥ惂)
+ /// 鍚屾璁惧骞朵笖鍒锋柊缂撳瓨(鍚屾澶辫触鏃讹紝浼氭樉绀轰俊鎭�)
/// </summary>
- /// <param name="device"></param>
- public void DeleteDeviceBackupFile(CommonDevice device)
+ /// <param name="litdevice">璁惧瀵硅薄(MAC鍦板潃蹇呴』瑕佺浉鍚�)</param>
+ public async Task<bool> SynchronizationDevice(List<CommonDevice> listdevice)
{
- string backFile = deviceBackupName + device.FilePath;
- if (Global.IsExistsByHomeId(backFile) == true)
+ //铏氭嫙浣忓畢鐨勮瘽,涓嶉渶瑕佸垹闄ょ綉鍏崇殑璁惧
+ if (Config.Instance.Home.IsVirtually == false)
{
- Global.DeleteFilebyHomeId(backFile);
- HdlAutoBackupLogic.DeleteFile(backFile);
- }
- }
+ //鍚屾
+ 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>
- /// 鍙戦�佹祴璇曟寚浠ゅ埌璁惧
+ /// 鍙戦�佸畾浣嶆寚浠ゅ埌璁惧
/// </summary>
- /// <param name="device"></param>
- public void SetTestCommand(CommonDevice device)
+ /// <param name="device">璁惧鍥炶矾</param>
+ /// <param name="isRealDevice">鏄惁鏄畾浣嶇湡瀹炶澶�</param>
+ public void SetFixedPositionCommand(CommonDevice device, bool isRealDevice = false)
{
- device.IdentifyControl(device.DeviceAddr, device.DeviceEpoint, 5);
+ //濡傛灉褰撳墠浣忓畢涓嶆槸铏氭嫙浣忓畢
+ if (Common.Config.Instance.Home.IsVirtually == false)
+ {
+ int epoint = device.DeviceEpoint;
+ //濡傛灉鏄畾浣嶇湡瀹炶澶囩殑璇�
+ if (isRealDevice == true)
+ {
+ var myType = this.GetMyDeviceEnumInfo(new List<CommonDevice> { device });
+ if (myType.ConcreteType == DeviceConcreteType.DimmableLight_OneLoad)
+ {
+ //涓�璺皟鍏夊櫒闇�瑕佸彂8鍥炶矾
+ epoint = 8;
+ }
+ }
+ device.IdentifyControl(device.DeviceAddr, epoint, 5);
+ }
}
/// <summary>
- /// 妫�娴嬭澶囨槸鍚︽嫢鏈夋祴璇曠殑鍔熻兘
+ /// 妫�娴嬭澶囨槸鍚︽嫢鏈夊畾浣嶇殑鍔熻兘
/// </summary>
/// <param name="device"></param>
/// <returns></returns>
- public bool DeviceIsCanTest(CommonDevice device)
+ public bool DeviceIsCanFixedPosition(CommonDevice device)
{
+ if (device.Type == DeviceType.DoorLock || device.Type == DeviceType.Airer || 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鍔熻兘鐨勶紝鎵嶆敮鎸佹祴璇�
@@ -692,6 +1000,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;
}
@@ -739,21 +1063,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>();
- //鍚勭綉鍏崇殑鎵�鏈夎澶�
- foreach (CommonDevice device in this.dicAllDevice.Values)
+ lock (dicAllDevice)
{
- if (gwId == device.CurrentGateWayId)
+ var listMac = new List<string>();
+ //鍚勭綉鍏崇殑鎵�鏈夎澶囩殑Mac
+ foreach (CommonDevice device in this.dicAllDevice.Values)
{
- list.Add(device);
+ if (gwId == device.CurrentGateWayId)
+ {
+ listMac.Add(device.DeviceAddr);
+ }
}
+ return this.GetDevicesByMac(listMac);
}
-
- return list;
}
/// <summary>
@@ -763,9 +1089,12 @@
/// <returns></returns>
public CommonDevice GetDevice(string mainKeys)
{
- if (this.dicAllDevice.ContainsKey(mainKeys) == true)
+ lock (dicAllDevice)
{
- return this.dicAllDevice[mainKeys];
+ if (this.dicAllDevice.ContainsKey(mainKeys) == true)
+ {
+ return this.dicAllDevice[mainKeys];
+ }
}
return null;
}
@@ -783,16 +1112,185 @@
}
/// <summary>
+ /// 鏍规嵁MAC鍦板潃,鑾峰彇鍏ㄩ儴鍥炶矾鐨勮澶囧璞�
+ /// </summary>
+ /// <param name="DeviceAddr">Mac鍦板潃</param>
+ /// <param name="sort">鏄惁鎺掑簭</param>
+ /// <returns></returns>
+ public List<CommonDevice> GetDevicesByMac(string DeviceAddr, bool sort = true)
+ {
+ var list = new List<CommonDevice>();
+ if (dicDeviceEpoint.ContainsKey(DeviceAddr) == false)
+ {
+ return list;
+ }
+ foreach (var point in dicDeviceEpoint[DeviceAddr])
+ {
+ var device = this.GetDevice(DeviceAddr, point);
+ if (device != null)
+ {
+ list.Add(device);
+ }
+ }
+ 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> 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>
+ /// <returns></returns>
+ public int GetDevicesCountByMac(string DeviceAddr)
+ {
+ if (dicDeviceEpoint.ContainsKey(DeviceAddr) == false)
+ {
+ return 0;
+ }
+ return dicDeviceEpoint[DeviceAddr].Count;
+ }
+
+ /// <summary>
/// 鑾峰彇鏈湴鍏ㄩ儴鐨勮澶囨枃浠�
/// </summary>
/// <returns></returns>
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)
{
- if (file.StartsWith(deviceFirstName) == false)
+ if (file.StartsWith("Device_") == false)
{
//濡傛灉涓嶆槸璁惧鏂囦欢
continue;
@@ -803,32 +1301,14 @@
}
/// <summary>
- /// 闄勫姞璁惧鐨勭増鏈唬鍙�(杩斿洖Ver.XXX)
- /// </summary>
- /// <param name="versionValue">鐗堟湰鍙�</param>
- /// <returns></returns>
- public string AppendVersion(int versionValue)
- {
- //杞负16杩涘埗
- string txt64 = Convert.ToString(versionValue, 16).PadLeft(4, '0');
- //杩欎釜鏄皬鏁扮偣鍓嶉潰鐨勫��
- int value1 = Convert.ToInt32(txt64.Substring(0, 2), 16);
- //杩欎釜鏄皬鏁扮偣鍚庨潰鐨勫��
- int value2 = Convert.ToInt32(txt64.Substring(2, 2), 16);
-
- //Ver.
- string ver = Language.StringByID(R.MyInternationalizationString.uVersionAbbreviation);
- return ver + value1 + "." + value2.ToString().PadLeft(3, '0');
- }
-
- /// <summary>
/// 鑾峰彇OTA璁惧(200绔彛鐨�)
/// </summary>
/// <param name="macAdrr"></param>
+ /// <param name="ePoint"></param>
/// <returns></returns>
- public OTADevice GetOTADevice(string macAdrr)
+ public OTADevice GetOTADevice(string macAdrr, int ePoint = 200)
{
- string mainkeys = this.GetDeviceMainKeys(macAdrr, 200);
+ string mainkeys = this.GetDeviceMainKeys(macAdrr, ePoint);
if (this.dicOTADevice.ContainsKey(mainkeys) == false)
{
return null;
@@ -836,682 +1316,241 @@
return this.dicOTADevice[mainkeys];
}
- #endregion
-
- #region 鈻� 璁惧闀滃儚(绉佹湁绫诲瀷)_________________
-
/// <summary>
- /// OTA璁惧鑾峰彇闀滃儚鍚庣殑鍥炶皟鍑芥暟
+ /// 鑾峰彇鐗规畩鐨�,娌℃湁鍏朵粬鍥炶矾,鍗曠函鍙湁200绔偣鐨凮TA璁惧
/// </summary>
- private Dictionary<string, Action<CommonDevice, CommonDevice.DeviceStatusReportData>> dicOtaBackAction = new Dictionary<string, Action<CommonDevice, CommonDevice.DeviceStatusReportData>>();
-
- /// <summary>
- /// 璁剧疆璁惧鍏ㄩ儴鐨勯暅鍍忎俊鎭�(鍙嶅璋冪敤璇蜂娇鐢ㄣ�怐eviceAttributeLogic.Current.SetFirmwareVersionComand銆戝嚱鏁�)
- /// </summary>
- /// <param name="tADevice"></param>
- /// <param name="backAction"></param>
- public void SetAllImageInfoToOtaDevice(OTADevice tADevice, Action<CommonDevice, CommonDevice.DeviceStatusReportData> backAction = null)
+ /// <param name="gwId">缃戝叧ID</param>
+ /// <returns></returns>
+ public List<OTADevice> GetSpecialOtaDevice(string gwId)
{
- if (tADevice == null)
+ var list = new List<OTADevice>();
+ foreach (var ota in this.dicOTADevice.Values)
{
- return;
- }
- lock (objLock)
- {
- if (backAction != null)
+ if (ota.CurrentGateWayId != gwId)
{
- this.dicOtaBackAction[tADevice.DeviceAddr] = backAction;
+ //涓嶆槸鍚屼竴涓綉鍏�
+ continue;
}
- //璁剧疆璁惧鐨勫浐浠剁増鏈彿(闇�瑕佺瓑寰呮帹閫佸悗鎵嶄細鏇存敼)
- this.SetFirmwareVersionToOtaDevice(tADevice);
- }
- }
-
- /// <summary>
- /// 璁剧疆璁惧鐨勫浐浠剁増鏈彿(闇�瑕佺瓑寰呮帹閫佸悗鎵嶄細鏇存敼)
- /// </summary>
- /// <param name="tADevice"></param>
- private void SetFirmwareVersionToOtaDevice(OTADevice tADevice)
- {
- if (DeviceAttributeLogic.Current.IsEsixt("DeviceAutoGetFirmwareVersion") == false)
- {
- //娣诲姞浜嬩欢
- DeviceAttributeLogic.Current.AddFirmwareVersionEvent("DeviceAutoGetFirmwareVersion", this.SetFirmwareVersionByInterfaceResult);
- }
- //鍙戦�佸懡浠�
- DeviceAttributeLogic.Current.SetFirmwareVersionComand(tADevice);
- }
-
- /// <summary>
- /// 鏍规嵁鎺ュ彛鎺ㄩ�佺殑淇℃伅锛岃缃浐浠剁増鏈彿
- /// </summary>
- /// <param name="device"></param>
- private void SetFirmwareVersionByInterfaceResult(CommonDevice device)
- {
- string mainKeys = this.GetDeviceMainKeys(device);
- if (this.dicOTADevice.ContainsKey(mainKeys) == false)
- {
- return;
- }
-
- //璁剧疆鍥轰欢鐗堟湰淇℃伅
- DeviceAttributeLogic.Current.SetFirmwareVersion(device.DeviceStatusReport, this.dicOTADevice[mainKeys]);
- this.dicOTADevice[mainKeys].ReSave();
-
- lock (objLock)
- {
- if (this.dicOtaBackAction.ContainsKey(device.DeviceAddr) == true)
+ //娌℃湁鍏朵粬鍥炶矾
+ if (dicDeviceEpoint.ContainsKey(ota.DeviceAddr) == false
+ || dicDeviceEpoint[ota.DeviceAddr].Count == 0)
{
- //璋冪敤鍥炶皟鍑芥暟
- this.dicOtaBackAction[device.DeviceAddr](device, device.DeviceStatusReport);
- //鐒跺悗绉婚櫎
- this.dicOtaBackAction.Remove(device.DeviceAddr);
+ //鐩墠鍙拡瀵逛腑澶┖璋�
+ if (ota.ModelIdentifier == "MAC/GW-ZB.10")
+ {
+ list.Add(ota);
+ }
}
}
+ return list;
}
#endregion
- #region 鈻� 璇诲彇浠ュ強璁剧疆璁惧纭欢淇℃伅___________
+ #region 鈻� 鑾峰彇璁惧淇℃伅_______________________
/// <summary>
- /// 璁惧鑾峰彇纭欢淇℃伅鍚庣殑鍥炶皟鍑芥暟
+ /// 浠庣綉鍏宠鍙栧崟涓鐐瑰洖璺澶囦俊鎭�
/// </summary>
- private Dictionary<string, Action<CommonDevice, CommonDevice.DeviceStatusReportData>> dicDeviceHardInfoBackAction = new Dictionary<string, Action<CommonDevice, CommonDevice.DeviceStatusReportData>>();
- /// 鑾峰彇纭欢淇℃伅鐨勫璞¤澶�
- /// </summary>
- private HashSet<string> hsGetHardInfoDevice = new HashSet<string>();
+ /// <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;
+ }
/// <summary>
- /// 璇诲彇浠ュ強璁剧疆璁惧纭欢淇℃伅
+ /// 浠庣綉鍏宠鍙栨寚瀹歁ac涓嬬殑璁惧鍒楄〃(杩斿洖鐨勬槸缃戝叧鍥炲鐨勮澶嘕son,璋冪敤ConvertJObjectToDevice鏂规硶杞负Device瀵硅薄)
+ /// </summary>
+ /// <param name="realGateway">鐪熷疄缃戝叧瀵硅薄</param>
+ /// <param name="i_deviceMac">璁惧Mac</param>
+ /// <param name="useLocalConnect">鏄惁浣跨敤鏈湴杩炴帴鍙戦��</param>
+ /// <param name="listFucDevice">闇�瑕佸彉鏇村姛鑳界被鍨嬬殑鍥炶矾</param>
+ /// <param name="statu">鐘舵��-> -1:寮傚父,浼氳繑鍥瀗ull, 1锛氭病鏈夊紓甯�, 2:鏁版嵁鎺ユ敹涓嶅叏</param>
+ /// <returns></returns>
+ public List<Newtonsoft.Json.Linq.JObject> ReadDeviceListByMacFromGateway(string gatewayId, string i_deviceMac, bool useLocalConnect, ref int statu)
+ {
+ //鏄惁杈炬垚涓柇鐨勬椂鏈�
+ bool canBreak = false;
+ //瓒呮椂鏃堕棿
+ int TimeOut = 0;
+ //璁惧鎬绘暟
+ int deviceCount = -1;
+ //鎺ユ敹鏁�
+ int receiveCount = 0;
+ //璁惧鍒楄〃
+ var listDeviceJson = new List<Newtonsoft.Json.Linq.JObject>();
+
+ HdlGatewayReceiveLogic.Current.AddGatewayReceiveEvent(gatewayId, (topic, message) =>
+ {
+ if (topic == gatewayId + "/GetStatusRecord_Respon")
+ {
+ lock (listDeviceJson)
+ {
+ //璁惧鎺ユ敹鏁�
+ receiveCount++;
+ TimeOut = 0;
+ var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
+ var totalNum = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["TotalNum"].ToString());
+ if (totalNum == 0)
+ {
+ //杩欎釜缃戝叧娌℃湁璁惧
+ canBreak = true;
+ return;
+ }
+ if (deviceCount == -1)
+ {
+ //璁剧疆闇�瑕佹帴鏀跺灏戜釜璁惧
+ deviceCount = totalNum;
+ }
+ listDeviceJson.Add(jobject);
+ }
+
+ if (receiveCount == deviceCount && deviceCount != -1)
+ {
+ //璁惧鍏ㄩ儴鎺ユ敹瀹屾垚
+ canBreak = true;
+ }
+ }
+ });
+
+ var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", i_deviceMac }, { "Epoint", 255 }, { "Cluster_ID", 0 }, { "Command", 80 } };
+ HdlGatewayLogic.Current.SendJobjectData(gatewayId, "GetStatusRecord", jObject.ToString(), useLocalConnect);
+
+ while (canBreak == false && TimeOut <= 150)
+ {
+ System.Threading.Thread.Sleep(20);
+ TimeOut++;
+ }
+ //绉婚櫎鐩戝惉
+ HdlGatewayReceiveLogic.Current.RemoveGatewayReceiveEvent();
+
+ if (TimeOut > 150)
+ {
+ statu = listDeviceJson.Count == 0 ? -1 : 2;
+ }
+ else
+ {
+ statu = 1;
+ }
+ return listDeviceJson;
+ }
+
+ /// <summary>
+ /// 灏嗚澶囩殑Json杞崲涓鸿澶囧璞�
+ /// </summary>
+ /// <param name="listIObjects">璁惧Json</param>
+ /// <param name="gwId">缃戝叧id</param>
+ /// <param name="listFucDevice">闇�瑕佸彉鏇村姛鑳界被鍨嬬殑鍥炶矾</param>
+ /// <returns></returns>
+ public List<CommonDevice> ConvertJObjectToDevice(List<Newtonsoft.Json.Linq.JObject> listIObjects, string gwId, ref List<CommonDevice> listFucDevice)
+ {
+ //璁惧鍒楄〃
+ var listDevice = new List<CommonDevice>();
+ //缃戝叧閲岄潰鏈夊彲鑳戒細鏈夐噸澶嶇殑鍥炶矾
+ var listCheck = new HashSet<string>();
+
+ foreach (var jobject in listIObjects)
+ {
+ var deviceID = (DeviceType)jobject.Value<int>("Device_ID");
+ //鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
+ var device = this.NewDeviceObjectByDeviceId(deviceID, jobject, gwId);
+ if (device != null)
+ {
+ string mainkeys = this.GetDeviceMainKeys(device);
+ //缃戝叧閲岄潰鏈夊彲鑳戒細鏈夐噸澶嶇殑鍥炶矾
+ 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;
+ }
+ }
+ }
+ }
+ return listDevice;
+ }
+
+ #endregion
+
+ #region 鈻� 璁剧疆璁惧鍔熻兘绫诲瀷___________________
+
+ /// <summary>
+ /// 璁剧疆璁惧鍔熻兘绫诲瀷鍒扮綉鍏�
/// </summary>
/// <param name="device">璁惧鍥炶矾</param>
- /// <param name="Reset">鏄惁閲嶇疆(涓嶉噸缃殑鎯呭喌鏃讹紝濡傛灉宸茬粡鏈夊�间簡锛屽垯涓嶅啀鑾峰彇)</param>
- /// <param name="backAction">鍥炶皟鍑芥暟</param>
- public void SetAllHardFirmwareInfoToDevice(CommonDevice device, bool Reset = false, Action<CommonDevice, CommonDevice.DeviceStatusReportData> backAction = null)
+ /// <param name="functionType">鍔熻兘绫诲瀷</param>
+ /// <returns></returns>
+ public bool SendDeviceFunctionTypeToGateway(CommonDevice device, DeviceFunctionType functionType)
{
- if (device == null)
+ //濡傛灉鏄櫄鎷熶綇瀹�
+ if (Common.Config.Instance.Home.IsVirtually == true)
{
- return;
+ device.DfunctionType = functionType;
+ return true;
}
- if (Reset == false)
+ //鑾峰彇鍛戒护瀛楃
+ var sendCommond = this.GetDeviceFunctionTypeCommandText(device, functionType);
+ var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "Device/SetEPDeviceFunctionType", sendCommond, "Device/SetEPDeviceFunctionTypeRespon");
+ if (result.ErrorMsg != null || result.ErrorMsgDiv == 0)
{
- if (device.ModelIdentifier != string.Empty)
- {
- return;
- }
+ return false;
}
-
- lock (objLock)
+ var resultData = Newtonsoft.Json.Linq.JObject.Parse(result.ReceiptData);
+ if (resultData.Property("Result") != null)
{
- string mainkeys = this.GetDeviceMainKeys(device);
- this.hsGetHardInfoDevice.Add(mainkeys);
-
- if (backAction != null)
- {
- this.dicDeviceHardInfoBackAction[mainkeys] = backAction;
- }
- //璁剧疆璁惧鐨勭‖浠朵俊鎭�(闇�瑕佺瓑寰呮帹閫佸悗鎵嶄細鏇存敼)
- this.SetHardFirmwareInfoToDevice(device);
+ //0:淇敼鎴愬姛 1:淇敼澶辫触
+ return resultData["Result"].ToString() == "0";
}
+ return false;
}
/// <summary>
- /// 璁剧疆璁惧鐨勭‖浠朵俊鎭�(闇�瑕佺瓑寰呮帹閫佸悗鎵嶄細鏇存敼)
+ /// 鑾峰彇鏇存敼璁惧鍔熻兘绫诲瀷鐨勫懡浠ゆ枃鏈�
/// </summary>
/// <param name="device"></param>
- private void SetHardFirmwareInfoToDevice(CommonDevice device)
- {
- if (DeviceAttributeLogic.Current.IsEsixt("DeviceGetHardFirmwareInfo") == false)
- {
- //娣诲姞浜嬩欢
- DeviceAttributeLogic.Current.AddFirmwareVersionEvent("DeviceGetHardFirmwareInfo", this.SetHardFirmwareInfoByInterfaceResult);
- }
- //鍙戦�佸懡浠�
- DeviceAttributeLogic.Current.SetHardFirmwareInfoComand(device);
- }
-
- /// <summary>
- /// 鏍规嵁鎺ュ彛鎺ㄩ�佺殑淇℃伅锛岃缃澶囩‖浠朵俊鎭�
- /// </summary>
- /// <param name="device"></param>
- private void SetHardFirmwareInfoByInterfaceResult(CommonDevice device)
- {
- string mainKeys = this.GetDeviceMainKeys(device);
- if (this.hsGetHardInfoDevice.Contains(mainKeys) == false)
- {
- return;
- }
- //璁剧疆璁惧纭欢淇℃伅
- var localDevice = this.GetDevice(mainKeys);
- if (localDevice == null)
- {
- return;
- }
- lock (objLock)
- {
- DeviceAttributeLogic.Current.SetHardFirmwareInfo(device.DeviceStatusReport, localDevice);
- localDevice.ReSave();
-
- this.hsGetHardInfoDevice.Remove(mainKeys);
- if (this.dicDeviceHardInfoBackAction.ContainsKey(mainKeys) == true)
- {
- //璋冪敤鍥炶皟鍑芥暟
- this.dicDeviceHardInfoBackAction[mainKeys](device, device.DeviceStatusReport);
- //鐒跺悗绉婚櫎
- this.dicDeviceHardInfoBackAction.Remove(mainKeys);
- }
- }
- }
-
- /// <summary>
- /// 绉婚櫎鑾峰彇璁惧纭欢淇℃伅鐨勭洃鍚嚎绋�
- /// </summary>
- /// <param name="device"></param>
- public void RemoveDeviceHardInfoThread(CommonDevice device)
- {
- lock (objLock)
- {
- string mainKeys = this.GetDeviceMainKeys(device);
- this.hsGetHardInfoDevice.Remove(mainKeys);
- if (this.dicDeviceHardInfoBackAction.ContainsKey(mainKeys) == true)
- {
- //鐒跺悗绉婚櫎
- this.dicDeviceHardInfoBackAction.Remove(mainKeys);
- }
- }
- }
-
- #endregion
-
- #region 鈻� 璁剧疆鍥炬爣___________________________
-
- /// <summary>
- /// 鍙樻洿璁惧鐨勫浘鏍�
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <param name="unSelPath">鍥剧墖鍦板潃(闈為�夋嫨)</param>
- public void ChangedDeviceIcon(CommonDevice device, string unSelPath)
- {
- if (unSelPath == string.Empty)
- {
- return;
- }
- DeviceUI deviceUI = this.GetDeviceUI(device);
- deviceUI.IconPath = unSelPath;
- deviceUI.IsCustomizeImage = true;
- deviceUI.ReSave();
-
- HdlAutoBackupLogic.AddOrEditorFile(deviceUI.FileName);
- }
-
- /// <summary>
- /// 璁剧疆璁惧銆愬浘鏍囥�戝埌鎸囧畾鐨勬帶浠�
- /// </summary>
- /// <param name="btnIcon">鎺т欢瀵硅薄</param>
- /// <param name="device">璁惧瀵硅薄</param>
+ /// <param name="functionType"></param>
/// <returns></returns>
- public void SetDeviceIconToControl(ButtonCommon btnIcon, CommonDevice device)
+ public string GetDeviceFunctionTypeCommandText(CommonDevice device, DeviceFunctionType functionType)
{
- //鑾峰彇杩欎釜璁惧鐨刄I鏂囦欢
- DeviceUI deviceUI = this.GetDeviceUI(device);
- if (deviceUI == null)
- {
- return;
- }
- if (string.IsNullOrEmpty(deviceUI.IconPath) == true)
- {
- return;
- }
- btnIcon.UnSelectedImagePath = deviceUI.IconPath;
-
- string selPath = deviceUI.OnlineIconPath;
- if (string.IsNullOrEmpty(selPath) == false)
- {
- btnIcon.SelectedImagePath = selPath;
- }
- }
-
- /// <summary>
- /// 璁剧疆璁惧鐨勩�愬ぇ鍥炬爣銆戝埌鎸囧畾鐨勬帶浠�
- /// </summary>
- /// <param name="btnIcon">鎺т欢瀵硅薄</param>
- /// <param name="device">璁惧瀵硅薄</param>
- public void SetDeviceBigIconToControl(ButtonCommon btnIcon, CommonDevice device)
- {
- //鑾峰彇杩欎釜璁惧鐨刄I鏂囦欢
- DeviceUI deviceUI = this.GetDeviceUI(device);
- if (deviceUI == null)
- {
- return;
- }
- string deviceIcon = deviceUI.OnlineIconPath;
- if (string.IsNullOrEmpty(deviceIcon) == true)
- {
- return;
- }
-
- //鎸夐敭闈㈡澘鐨勫洖璺浘鏍�
- if (deviceIcon == "Device/DryContactSelected.png")
- {
- //鍥犱负鎸夐敭闈㈡澘鏄竴涓偣锛屾墍浠ラ渶瑕佺壒娈婂鐞�
- this.SetDeviceBeloneIconToControl(btnIcon, new List<CommonDevice>() { device });
- btnIcon.UnSelectedImagePath = btnIcon.SelectedImagePath;
- btnIcon.SelectedImagePath = null;
- }
- else
- {
- //杩欓噷鏄嚜瀹氫箟鍥炬爣
- btnIcon.UnSelectedImagePath = deviceIcon;
- }
- }
-
- /// <summary>
- /// 璁剧疆璁惧鐨勭湡瀹炲浘鐗囧埌鎸囧畾鐨勬帶浠�
- /// </summary>
- /// <param name="btnIcon">鎺т欢瀵硅薄</param>
- /// <param name="listdevice">璁惧瀵硅薄</param>
- public void SetRealDeviceIconToControl(ButtonCommon btnIcon, List<CommonDevice> listdevice)
- {
- //鑾峰彇瀹冨睘浜庝粈涔堢被鍨嬬殑璁惧
- var myDeviceType = this.GetMyDeviceEnumInfo(listdevice);
- string strConcrete = Enum.GetName(typeof(DeviceConcreteType), myDeviceType.ConcreteType);
- string strType = strConcrete.Replace("_", string.Empty);
- //灏嗙被鍨嬭浆涓哄浘鐗囧湴鍧�
- string imageFilePath = "RealDevice/" + strType + ".png";
- //杩欎釜鍥剧墖鏈湴鏄惁瀛樺湪锛�
- if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(imageFilePath)) == true)
- {
- //涓嶅瓨鍦ㄥ垯浣跨敤鍏遍�氬浘鐗�
- string[] arry = strConcrete.Split(new string[] { "_" }, StringSplitOptions.None);
- if (arry.Length == 1)
- {
- //濡傛灉瀹冭嚜宸卞氨鏄叡閫氬浘鐗囩殑璇濓紝涓嶅啀澶勭悊
- return;
- }
- imageFilePath = "RealDevice/" + arry[1] + ".png";
- }
- btnIcon.UnSelectedImagePath = imageFilePath;
- }
-
- /// <summary>
- /// 璁剧疆銆愯澶囨墍灞炵被鍨嬨�戠殑鍥炬爣鍒版寚瀹氱殑鎺т欢
- /// </summary>
- /// <param name="btnIcon">鎺т欢瀵硅薄</param>
- /// <param name="listdevice">璁惧瀵硅薄</param>
- /// <returns></returns>
- public void SetDeviceBeloneIconToControl(ButtonCommon btnIcon, List<CommonDevice> listdevice)
- {
- //鑾峰彇鑷畾涔夎澶囩被鍨�
- var myDeviceType = this.GetMyDeviceEnumInfo(listdevice);
-
- string imageUnSelectFilePath = string.Empty;
- string imageSelectFilePath = string.Empty;
-
- //鑾峰彇銆愯澶囨墍灞炵被鍨嬨�戠殑鍥炬爣
- this.GetDeviceBeloneIcon(myDeviceType.ConcreteType, ref imageUnSelectFilePath, ref imageSelectFilePath);
-
- //璁剧疆鍥剧墖
- btnIcon.UnSelectedImagePath = imageUnSelectFilePath;
- btnIcon.SelectedImagePath = imageSelectFilePath;
- }
-
- /// <summary>
- /// 鑾峰彇銆愯澶囨墍灞炵被鍨嬨�戠殑鍥炬爣
- /// </summary>
- /// <param name="listdevice">璁惧瀵硅薄</param>
- /// <param name="unSelectPath">鍥剧墖鍦板潃</param>
- /// <param name="selectPath">鍥剧墖鍦板潃</param>
- /// <returns></returns>
- public void GetDeviceBeloneIcon(List<CommonDevice> listdevice, ref string unSelectPath, ref string selectPath)
- {
- //鑾峰彇鑷畾涔夎澶囩被鍨�
- var myDeviceType = this.GetMyDeviceEnumInfo(listdevice);
-
- //鑾峰彇銆愯澶囨墍灞炵被鍨嬨�戠殑鍥炬爣
- this.GetDeviceBeloneIcon(myDeviceType.ConcreteType, ref unSelectPath, ref selectPath);
- }
-
- /// <summary>
- /// 鑾峰彇銆愯澶囨墍灞炵被鍨嬨�戠殑鍥炬爣
- /// </summary>
- /// <param name="specificType">鑷畾涔夎澶囩被鍨�</param>
- /// <param name="unSelectPath">鍥剧墖鍦板潃</param>
- /// <param name="selectPath">鍥剧墖鍦板潃</param>
- /// <returns></returns>
- private void GetDeviceBeloneIcon(DeviceConcreteType specificType, ref string unSelectPath, ref string selectPath)
- {
- //灏嗗叿浣撶被鍨嬭浆瀛楃涓�
- string strSpecific = Enum.GetName(typeof(DeviceConcreteType), specificType);
- string strType = strSpecific.Replace("_", string.Empty);
- //灏嗙被鍨嬭浆涓哄浘鐗囧湴鍧�
- string imageFilePath = "Device/" + strType + ".png";
- string imageSelectFilePath = "Device/" + strType + "Selected.png";
-
- //杩欎釜鍥剧墖鏈湴鏄惁瀛樺湪锛�
- if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(imageFilePath)) == true)
- {
- //涓嶅瓨鍦ㄥ垯浣跨敤鍏遍�氬浘鐗�
- string[] arry = strSpecific.Split(new string[] { "_" }, StringSplitOptions.None);
- if (arry.Length == 1)
- {
- //濡傛灉瀹冭嚜宸卞氨鏄叡閫氬浘鐗囩殑璇濓紝涓嶅啀澶勭悊
- return;
- }
- imageFilePath = "Device/" + arry[1] + ".png";
- imageSelectFilePath = "Device/" + arry[1] + "Selected.png";
- }
- //璁剧疆鍥剧墖
- unSelectPath = imageFilePath;
- selectPath = imageSelectFilePath;
- }
-
- #endregion
-
- #region 鈻� 璁惧UI鐩稿叧_________________________
-
- /// <summary>
- /// 鑾峰彇璁惧鎵�鍖归厤鐨勮澶嘦I瀵硅薄
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- public DeviceUI GetDeviceUI(CommonDevice device)
- {
- return this.GetDeviceUI("DeviceUI_" + device.FilePath);
- }
-
- /// <summary>
- /// 鑾峰彇璁惧鎵�鍖归厤鐨勮澶嘦I瀵硅薄
- /// </summary>
- /// <param name="filePath"></param>
- /// <returns></returns>
- public DeviceUI GetDeviceUI(string filePath)
- {
- if (this.dicAllDeviceUI.ContainsKey(filePath) == true)
- {
- return this.dicAllDeviceUI[filePath];
- }
-
- var deviceUi = new DeviceUI();
- deviceUi.DeviceFileName = filePath.Replace("DeviceUI_", string.Empty);
- deviceUi.ReSave();
- this.dicAllDeviceUI[filePath] = deviceUi;
- return deviceUi;
- }
-
- /// <summary>
- /// 浠庢枃浠朵腑鑾峰彇鎸囧畾璁惧鐨刄I瀵硅薄(鏈夊彲鑳借繑鍥瀗ull)
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <returns></returns>
- private DeviceUI GetDeviceUIFromLocalFile(CommonDevice device)
- {
- DeviceUI deviceUI = new DeviceUI();
- deviceUI.DeviceFileName = device.FilePath;
-
- if (Global.IsExistsByHomeId(deviceUI.FileName) == false)
- {
- return null;
- }
- var jsonInfo = Encoding.UTF8.GetString(Global.ReadFileByHomeId(deviceUI.FileName));
- var tempCommon = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceUI>(jsonInfo);
- return tempCommon;
- }
-
- #endregion
-
- #region 鈻� 鑾峰彇鑷畾涔夌殑璁惧绫诲瀷_______________
-
- /// <summary>
- /// 鑾峰彇銆愯嚜瀹氫箟鐨勮澶囩被鍨嬨��,涓ょ绫诲瀷閮借缃簡
- /// </summary>
- /// <param name="listdevice">璁惧瀵硅薄</param>
- /// <returns></returns>
- public DeviceEnumInfo GetMyDeviceEnumInfo(List<CommonDevice> listdevice)
- {
- //鑾峰彇娌充笢璁惧鐨勮澶囩被鍨�
- DeviceEnumInfo info = this.GetHdlMyDeviceEnumInfo(listdevice[0]);
- if (info != null)
- {
- return info;
- }
- //鑾峰彇绗笁鏂硅澶囩殑銆愯澶囩被鍨嬨��
- return this.GetNotHdlMyDeviceEnumInfo(listdevice);
- }
-
- /// <summary>
- /// 鑾峰彇璁惧鐨勩�愯澶囩被鍨嬨�戠殑缈昏瘧鏂囨湰(浼樺厛闀滃儚)
- /// </summary>
- /// <param name="listDevice"></param>
- /// <param name="ApendFalge">绗笁鏂规垨鑰呰櫄鎷熻澶囩殑鏃跺�欙紝鏄惁娣诲姞鏍囪瘑</param>
- /// <returns></returns>
- public string GetDeviceObjectText(List<CommonDevice> listDevice, bool ApendFalge = true)
- {
- string strName = string.Empty;
- if (this.dicDeviceModelIdEnum.ContainsKey(listDevice[0].ModelIdentifier) == true)
- {
- //鏍规嵁妯″潡ID锛岃幏鍙栬澶囧悕瀛�
- strName = this.GetNameByModelId(listDevice[0]);
- }
- else
- {
- //鑾峰彇绗笁鏂硅澶囩殑銆愯澶囩被鍨嬨��
- var myDeviceType = this.GetNotHdlMyDeviceEnumInfo(listDevice);
- strName = Language.StringByID(myDeviceType.TextId);
- }
- if (ApendFalge == true && listDevice[0].DriveCode > 0)
- {
- //铏氭嫙璁惧鍔犱釜鏍囪瘑
- strName += "鉁�";
- }
- else if (ApendFalge == true && this.IsHdlDevice(listDevice[0]) == false)
- {
- //绗笁鏂硅澶囧姞涓爣璇�
- strName += "鈽�";
- }
- return strName;
- }
-
- #endregion
-
- #region 鈻� 鑾峰彇娌充笢璁惧鐨勮澶囩被鍨媉____________
-
- /// <summary>
- /// 鑾峰彇Hdl璁惧鐨勩�愯嚜瀹氫箟鐨勮澶囩被鍨嬨��
- /// </summary>
- /// <param name="device">闅忎究鏌愪竴鍥炶矾</param>
- /// <returns></returns>
- private DeviceEnumInfo GetHdlMyDeviceEnumInfo(CommonDevice device)
- {
- //璁惧鍏蜂綋绫诲瀷
- var info = new DeviceEnumInfo();
- info.IsHdlDevice = this.IsHdlDevice(device);
- if (device.ModelIdentifier == string.Empty)
- {
- return null;
- }
- string modelKeys = device.ModelIdentifier;
- 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]);
-
- //璁惧鍏蜂綋绫诲瀷
- info.ConcreteType = (DeviceConcreteType)ConcreteValue;
- if (info.ConcreteType.ToString() == ConcreteValue.ToString())
- {
- info.ConcreteType = DeviceConcreteType.UnKownDevice;
- return info;
- }
-
- //璁剧疆璁惧鐨勩�愯澶囨墍灞炵被鍨嬨��
- info.BeloneType = (DeviceBeloneType)BeloneValue;
-
- return info;
- }
-
- #endregion
-
- #region 鈻� 鑾峰彇绗笁鏂硅澶囩殑璁惧绫诲瀷___________
-
- /// <summary>
- /// 鑾峰彇绗笁鏂硅澶囩殑銆愯澶囩被鍨嬨��
- /// </summary>
- /// <param name="listdevice"></param>
- /// <returns></returns>
- private DeviceEnumInfo GetNotHdlMyDeviceEnumInfo(List<CommonDevice> listdevice)
- {
- var dicType = new Dictionary<DeviceType, CommonDevice>();
- foreach (CommonDevice device in listdevice)
- {
- if (dicType.ContainsKey(device.Type) == false)
- {
- dicType[device.Type] = device;
- }
- }
- var info = new DeviceEnumInfo();
- info.IsHdlDevice = false;
- //1鍖呭惈闈㈡澘鐨勮瘽,褰撻潰鏉垮鐞�
- if (dicType.ContainsKey(DeviceType.OnOffSwitch) == true)
- {
- info.TextId = R.MyInternationalizationString.uButtonControl;
- info.BeloneType = DeviceBeloneType.A鎸夐敭闈㈡澘;
- info.ConcreteType = DeviceConcreteType.ButtonPanel;
- }
- //2鍖呭惈浼犳劅鍣ㄧ殑璇�,褰撲紶鎰熷櫒澶勭悊
- else if (dicType.ContainsKey(DeviceType.IASZone) == true)
- {
- //璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
- info.BeloneType = DeviceBeloneType.A浼犳劅鍣�;
- this.SetSensorDeviceSpecificType(ref info, listdevice);
- }
- //3鍖呭惈绐楀笜鐨勮瘽,褰撶獥甯樺鐞�
- else if (dicType.ContainsKey(DeviceType.WindowCoveringDevice) == true)
- {
- info.TextId = R.MyInternationalizationString.uCurtain;
- info.BeloneType = DeviceBeloneType.A绐楀笜;
- info.ConcreteType = DeviceConcreteType.Curtain;
- }
- //4绌烘皵寮�鍏�
- else if (dicType.ContainsKey(DeviceType.AirSwitch) == true)
- {
- info.TextId = R.MyInternationalizationString.uAirSwitch;
- info.BeloneType = DeviceBeloneType.A绌烘皵寮�鍏�;
- info.ConcreteType = DeviceConcreteType.AirSwitch;
- }
- //5缁х數鍣�
- else if (dicType.ContainsKey(DeviceType.OnOffOutput) == true)
- {
- info.TextId = R.MyInternationalizationString.uRelay;
- info.BeloneType = DeviceBeloneType.A缁х數鍣�;
- info.ConcreteType = DeviceConcreteType.Relay;
- }
- //6璋冨厜鍣�
- else if (dicType.ContainsKey(DeviceType.DimmableLight) == true)
- {
- info.TextId = R.MyInternationalizationString.uDimmableLight;
- info.BeloneType = DeviceBeloneType.A璋冨厜鍣�;
- info.ConcreteType = DeviceConcreteType.DimmableLight;
- }
- //7褰╃伅
- else if (dicType.ContainsKey(DeviceType.ColorDimmableLight) == true)
- {
- info.TextId = R.MyInternationalizationString.uColorDimmableLight;
- info.BeloneType = DeviceBeloneType.A褰╃伅;
- info.ConcreteType = DeviceConcreteType.ColorDimmableLight;
- }
- //8绌鸿皟
- else if (dicType.ContainsKey(DeviceType.Thermostat) == true)
- {
- info.TextId = R.MyInternationalizationString.Thermostat;
- info.BeloneType = DeviceBeloneType.A绌鸿皟;
- info.ConcreteType = DeviceConcreteType.AirConditioner;
- }
- //9涓户鍣�
- else if (dicType.ContainsKey(DeviceType.Repeater) == true)
- {
- info.TextId = R.MyInternationalizationString.Repeater;
- info.BeloneType = DeviceBeloneType.A涓户鍣�;
- info.ConcreteType = DeviceConcreteType.Repeater;
- }
- //10杞崲鍣�
- else if (dicType.ContainsKey(DeviceType.Transverter) == true)
- {
- info.TextId = R.MyInternationalizationString.uConverter;
- info.BeloneType = DeviceBeloneType.A杞崲鍣�;
- info.ConcreteType = DeviceConcreteType.Converter;
- }
- return info;
- }
-
- #endregion
-
- #region 鈻� 浼犳劅鍣ㄥ叿浣撶殑绫诲瀷___________________
-
- /// <summary>
- /// 璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
- /// </summary>
- /// <param name="info">鑷畾涔夎澶囨灇涓句俊鎭�</param>
- /// <param name="listdevice">璁惧瀵硅薄</param>
- private void SetSensorDeviceSpecificType(ref DeviceEnumInfo info, List<CommonDevice> listdevice)
- {
- //榛樿鍚嶅瓧:浼犳劅鍣�
- info.ConcreteType = DeviceConcreteType.Sensor;
- info.TextId = R.MyInternationalizationString.uSensor;
-
- //濡傛灉杩欎釜璁惧鎷ユ湁澶氫釜鍥炶矾鐨勮瘽,鎴戜篃涓嶇煡閬撴�庝箞鍛藉悕,鍙兘缁欎釜榛樿鍚嶅瓧
- if (listdevice.Count > 1)
- {
- return;
- }
- var iasZone = (IASZone)listdevice[0];
- if (iasZone.IasDeviceType == 13)
- {
- //杩愬姩浼犳劅鍣�
- info.ConcreteType = DeviceConcreteType.Motion_Sensor;
- info.TextId = R.MyInternationalizationString.uMotionSensor;
- }
- else if (iasZone.IasDeviceType == 40)
- {
- //鐑熼浘浼犳劅鍣�
- info.ConcreteType = DeviceConcreteType.Fire_Sensor;
- info.TextId = R.MyInternationalizationString.uDeviceDefultName1302;
- }
- else if (iasZone.IasDeviceType == 42)
- {
- //姘翠镜浼犳劅鍣�
- info.ConcreteType = DeviceConcreteType.Water_Sensor;
- info.TextId = R.MyInternationalizationString.uDeviceDefultName1304;
- }
- else if (iasZone.IasDeviceType == 43)
- {
- //鐕冩皵浼犳劅鍣�
- info.ConcreteType = DeviceConcreteType.CarbonMonoxide_Sensor;
- info.TextId = R.MyInternationalizationString.uDeviceDefultName1300;
- }
- else if (iasZone.IasDeviceType == 44)
- {
- //绱ф�ユ寜閽�
- info.ConcreteType = DeviceConcreteType.EmergencyButton_Sensor;
- info.TextId = R.MyInternationalizationString.uDeviceDefultName1305;
- }
- else if (iasZone.IasDeviceType == 277)
- {
- //閽ュ寵鎵�
- info.ConcreteType = DeviceConcreteType.Keyfob_Sensor;
- info.TextId = R.MyInternationalizationString.uKeyfob;
- }
- else if (iasZone.IasDeviceType == 21 || iasZone.IasDeviceType == 22)
- {
- //闂ㄧ獥浼犳劅鍣�
- info.ConcreteType = DeviceConcreteType.DoorWindowSensor_Sensor;
- info.TextId = R.MyInternationalizationString.uDeviceDefultName1301;
- }
+ 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
@@ -1530,18 +1569,104 @@
{
return dName;
}
- //鏍规嵁璁惧绫诲瀷鑾峰彇鍚嶇О
- dName = this.GetDeviceObjectText(new List<CommonDevice>() { device }, false);
- //濡傛灉鏄櫄鎷熻澶�
- if (device.DriveCode > 0
- || (this.dicDeviceCount.ContainsKey(device.DeviceAddr) == true && this.dicDeviceCount[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瀹樻柟鍚嶅瓧 + epointNo : 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 (deviceInfoType.BeloneType == DeviceBeloneType.A绌烘皵璐ㄩ噺)
+ {
+
+ //绌烘皵璐ㄩ噺浼犳劅鍣ㄧ殑娓╁害鎺㈠ご鍙┖姘旇川閲忎紶鎰熷櫒+娓╁害
+ return deviceInfoType.DeviceDefultName + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
+ }
+ 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>
@@ -1556,76 +1681,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.TextId);
- }
- }
-
- /// <summary>
- /// 鍦ㄧ鐐瑰悕瀛楃殑鍚庨潰闄勫姞銆愬洖璺�戝瓧鏍�,杩斿洖鏍煎紡锛歑XXX(NN鍥炶矾),濡傛灉娌℃湁鍚嶅瓧锛屽垯杩斿洖锛歂N鍥炶矾
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <returns></returns>
- public string AppendRoadTextToEpointName(CommonDevice device)
- {
- string pName = this.GetSimpleEpointName(device);
- //鍥炶矾
- string txtValue = Language.StringByID(R.MyInternationalizationString.uDeviceCircuit);
- if (string.IsNullOrEmpty(pName) == true)
- {
- //NN鍥炶矾
- return device.DeviceEpoint + txtValue;
- }
- else if (pName.Trim().EndsWith(txtValue) == true)
- {
- return pName;
- }
- //XXXX(NN鍥炶矾)
- return pName + "(" + device.DeviceEpoint + txtValue + ")";
- }
-
- /// <summary>
- /// 鏍规嵁妯″潡ID锛岃幏鍙栫炕璇戝悕瀛�
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- public 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 = deviceDefultNameFlag + 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>
@@ -1634,7 +1698,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;
}
@@ -1645,7 +1709,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;
}
@@ -1670,29 +1734,767 @@
return device.DeviceEpointName;
}
+ #endregion
+
+ #region 鈻� 璁剧疆鍥炬爣___________________________
+
/// <summary>
- /// 鍒濆鍖朢鏂囦欢閲岄潰璁惧榛樿鍚嶅瓧鐨処D
+ /// 鍙樻洿璁惧鐨勫浘鏍�
/// </summary>
- private void InitDeviceDefultNameIDList()
+ /// <param name="device">璁惧瀵硅薄</param>
+ /// <param name="unSelPath">鍥剧墖鍦板潃(闈為�夋嫨)</param>
+ public void ChangedDeviceIcon(CommonDevice device, string unSelPath)
{
- if (this.dicDeviceDefultNameID != null)
+ if (unSelPath == string.Empty)
{
return;
}
- this.dicDeviceDefultNameID = new Dictionary<string, int>();
- Type type = typeof(R.MyInternationalizationString);
+ device.IconPath = unSelPath;
+ device.IsCustomizeImage = true;
+ device.ReSave();
- var PropertyList = type.GetFields();
- foreach (var item in PropertyList)
+ HdlAutoBackupLogic.AddOrEditorFile(device.FilePath);
+ }
+
+ /// <summary>
+ /// 璁剧疆璁惧銆愬浘鏍囥�戝埌鎸囧畾鐨勬帶浠�
+ /// </summary>
+ /// <param name="btnIcon">鎺т欢瀵硅薄</param>
+ /// <param name="device">璁惧瀵硅薄</param>
+ /// <returns></returns>
+ public void SetDeviceIconToControl(Button btnIcon, CommonDevice device)
+ {
+ if (device == null)
{
- if (item.Name.StartsWith(deviceDefultNameFlag) == true)
+ btnIcon.UnSelectedImagePath = "Device/ThirdPartyDevice.png";
+ return;
+ }
+ string unSelectFilePath = string.Empty;
+ string selectFilePath = string.Empty;
+
+ //鑾峰彇璁惧銆愬浘鏍囥��
+ this.GetDeviceIcon(device, ref unSelectFilePath, ref selectFilePath);
+ if (btnIcon.UnSelectedImagePath != unSelectFilePath)
+ {
+ btnIcon.UnSelectedImagePath = unSelectFilePath;
+ }
+ if (btnIcon.SelectedImagePath != selectFilePath)
+ {
+ 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>
+ /// 鑾峰彇璁惧銆愬浘鏍囥��
+ /// </summary>
+ /// <param name="listdevice">璁惧瀵硅薄</param>
+ /// <param name="unSelectPath">鍥剧墖鍦板潃</param>
+ /// <param name="selectPath">鍥剧墖鍦板潃</param>
+ /// <returns></returns>
+ public void GetDeviceIcon(CommonDevice device, ref string unSelectPath, ref string selectPath)
+ {
+ if (string.IsNullOrEmpty(device.IconPath) == true)
+ {
+ return;
+ }
+ unSelectPath = device.IconPath;
+
+ string selPath = device.OnlineIconPath;
+ if (string.IsNullOrEmpty(selPath) == false)
+ {
+ selectPath = selPath;
+ }
+ }
+
+ /// <summary>
+ /// 璁剧疆璁惧鐨勭湡瀹炲浘鐗囧埌鎸囧畾鐨勬帶浠�
+ /// </summary>
+ /// <param name="btnIcon">鎺т欢瀵硅薄</param>
+ /// <param name="listdevice">璁惧瀵硅薄</param>
+ public void SetRealDeviceIconToControl(Button btnIcon, List<CommonDevice> listdevice)
+ {
+ //鑾峰彇璁惧鐨勭湡瀹炲浘鐗�
+ string imagePath = this.GetRealDeviceIcon(listdevice);
+ btnIcon.UnSelectedImagePath = imagePath;
+ }
+
+ /// <summary>
+ /// 鑾峰彇璁惧鐨勭湡瀹炲浘鐗�
+ /// </summary>
+ /// <param name="listdevice">璁惧瀵硅薄</param>
+ public string GetRealDeviceIcon(List<CommonDevice> listdevice)
+ {
+ //鑾峰彇瀹冨睘浜庝粈涔堢被鍨嬬殑璁惧
+ var myDeviceType = this.GetMyDeviceEnumInfo(listdevice);
+ string strConcrete = Enum.GetName(typeof(DeviceConcreteType), myDeviceType.ConcreteType);
+
+ //鍥剧墖鍏辨湁
+ if (this.dicPictrueShard.ContainsKey(strConcrete) == true)
+ {
+ strConcrete = this.dicPictrueShard[strConcrete];
+ }
+
+ string strType = strConcrete.Replace("_", string.Empty);
+ //灏嗙被鍨嬭浆涓哄浘鐗囧湴鍧�
+ string imageFilePath = "RealDevice/" + strType + ".png";
+ //杩欎釜鍥剧墖鏈湴鏄惁瀛樺湪锛�
+ if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(imageFilePath)) == true)
+ {
+ //涓嶅瓨鍦ㄥ垯浣跨敤鍏遍�氬浘鐗�
+ string[] arry = strConcrete.Split(new string[] { "_" }, StringSplitOptions.None);
+ if (arry.Length == 1)
{
- this.dicDeviceDefultNameID[item.Name] = Convert.ToInt32(item.GetValue(null));
+ //濡傛灉瀹冭嚜宸卞氨鏄叡閫氬浘鐗囩殑璇濓紝涓嶅啀澶勭悊
+ return "RealDevice/CommonDevice.png";
+ }
+ imageFilePath = "RealDevice/" + arry[0] + ".png";
+ //濡傛灉瀹冭嚜宸辩殑鍏遍�氬浘鐗囪繕鏄笉瀛樺湪鐨勮瘽,鍒欑洿鎺ヤ娇鐢ㄦ墍鏈夎澶囩殑鍏遍�氬浘鐗�
+ if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(imageFilePath)) == true)
+ {
+ imageFilePath = "RealDevice/CommonDevice.png";
+ }
+ }
+ return imageFilePath;
+ }
+
+ /// <summary>
+ /// 璁剧疆銆愯澶囩被鍨嬨�戠殑鍥炬爣鍒版寚瀹氱殑鎺т欢(姝ゆ柟娉曚笉鑳界敤鍦ㄨ澶囧姛鑳界被鍨嬭彍鍗曠殑鍥炬爣)
+ /// </summary>
+ /// <param name="btnIcon">鎺т欢瀵硅薄</param>
+ /// <param name="listdevice">璁惧瀵硅薄</param>
+ /// <returns></returns>
+ public void SetDeviceObjectIconToControl(Button btnIcon, List<CommonDevice> listdevice)
+ {
+ //鑾峰彇鑷畾涔夎澶囩被鍨�
+ var myDeviceType = this.GetMyDeviceEnumInfo(listdevice);
+
+ string imageUnSelectFilePath = string.Empty;
+ string imageSelectFilePath = string.Empty;
+
+ //鑾峰彇銆愯澶囩被鍨嬨�戠殑鍥炬爣
+ this.GetDeviceObjectIcon(myDeviceType.ConcreteType, ref imageUnSelectFilePath, ref imageSelectFilePath);
+
+ //璁剧疆鍥剧墖
+ btnIcon.UnSelectedImagePath = imageUnSelectFilePath;
+ btnIcon.SelectedImagePath = imageSelectFilePath;
+ }
+
+ /// <summary>
+ /// 鑾峰彇銆愯澶囩被鍨嬨�戠殑鍥炬爣(姝ゆ柟娉曚笉鑳界敤鍦ㄨ澶囧姛鑳界被鍨嬭彍鍗曠殑鍥炬爣)
+ /// </summary>
+ /// <param name="listdevice">璁惧瀵硅薄</param>
+ /// <param name="unSelectPath">鍥剧墖鍦板潃</param>
+ /// <param name="selectPath">鍥剧墖鍦板潃</param>
+ /// <returns></returns>
+ public void GetDeviceObjectIcon(List<CommonDevice> listdevice, ref string unSelectPath, ref string selectPath)
+ {
+ //鑾峰彇鑷畾涔夎澶囩被鍨�
+ var myDeviceType = this.GetMyDeviceEnumInfo(listdevice);
+
+ //鑾峰彇銆愯澶囩被鍨嬨�戠殑鍥炬爣
+ this.GetDeviceObjectIcon(myDeviceType.ConcreteType, ref unSelectPath, ref selectPath);
+ }
+
+ /// <summary>
+ /// 鑾峰彇銆愯澶囧姛鑳界被鍨嬨�戠殑鑿滃崟鍥炬爣
+ /// </summary>
+ /// <param name="deviceEnumInfo">鑷畾涔夎澶囩被鍨�</param>
+ /// <param name="unSelectPath">鍥剧墖鍦板潃</param>
+ /// <param name="selectPath">鍥剧墖鍦板潃</param>
+ /// <returns></returns>
+ public void GetDeviceFunctionTypeMenuIcon(DeviceEnumInfo deviceEnumInfo, ref string unSelectPath, ref string selectPath)
+ {
+ //鏂伴灏忔ā鍧�
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_FangyueFreshAirModul)
+ {
+ unSelectPath = "Device/FreshAirEpoint.png";
+ selectPath = "Device/FreshAirEpointSelected.png";
+ return;
+ }
+ //PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Sensor_PMTwoPointFive)
+ {
+ unSelectPath = "Device/AirQualitySensorEpoint.png";
+ selectPath = "Device/AirQualitySensorEpointSelected.png";
+ return;
+ }
+ else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A绐楀笜)
+ {
+ unSelectPath = "ZigeeLogic/curtain.png";
+ selectPath = "ZigeeLogic/selectedcurtain.png";
+ return;
+ }
+ //涓婇潰闇�瑕佺壒娈婂鐞�
+
+ //鑾峰彇銆愯澶囩被鍨嬨�戠殑鍥炬爣
+ this.GetDeviceObjectIcon(deviceEnumInfo.ConcreteType, 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);
+ //鍥剧墖鍏辨湁
+ if (this.dicPictrueShard.ContainsKey(strSpecific) == true)
+ {
+ strSpecific = this.dicPictrueShard[strSpecific];
+ }
+
+ string strType = strSpecific.Replace("_", string.Empty);
+ //灏嗙被鍨嬭浆涓哄浘鐗囧湴鍧�
+ string imageFilePath = "Device/" + strType + ".png";
+ string imageSelectFilePath = "Device/" + strType + "Selected.png";
+
+ //杩欎釜鍥剧墖鏈湴鏄惁瀛樺湪锛�
+ if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(imageFilePath)) == true)
+ {
+ //涓嶅瓨鍦ㄥ垯浣跨敤鍏遍�氬浘鐗�
+ string[] arry = strSpecific.Split(new string[] { "_" }, StringSplitOptions.None);
+ //濡傛灉瀹冭嚜宸卞氨鏄叡閫氬浘鐗囩殑璇濓紝涓嶅啀澶勭悊
+ if (arry.Length > 1)
+ {
+ imageFilePath = "Device/" + arry[0] + ".png";
+ imageSelectFilePath = "Device/" + arry[0] + "Selected.png";
+ }
+ }
+ //濡傛灉閭ｆ璁惧杩炲叡閫氬浘鐗囬兘娌℃湁鐨勮瘽
+ if (string.IsNullOrEmpty(IO.FileUtils.GetImageFilePath(imageFilePath)) == true)
+ {
+ imageFilePath = "Device/ThirdPartyDevice.png";
+ imageSelectFilePath = "Device/ThirdPartyDeviceSelected.png";
+ }
+ //璁剧疆鍥剧墖
+ unSelectPath = imageFilePath;
+ selectPath = imageSelectFilePath;
+ }
+
+ #endregion
+
+ #region 鈻� 鑾峰彇鑷畾涔夌殑璁惧绫诲瀷_______________
+
+ /// <summary>
+ /// 鑾峰彇銆愯嚜瀹氫箟鐨勮澶囩被鍨嬨��,涓ょ绫诲瀷閮借缃簡
+ /// </summary>
+ /// <param name="listdevice">璁惧瀵硅薄</param>
+ /// <returns></returns>
+ public DeviceEnumInfo GetMyDeviceEnumInfo(List<CommonDevice> listdevice)
+ {
+ CommonDevice checkDevice = listdevice[0];
+ foreach (var temp in listdevice)
+ {
+ //鎷挎嫢鏈夋ā鍧桰D鐨勯偅涓洖璺潵鍒ゆ柇
+ if (temp.ModelIdentifier != string.Empty)
+ {
+ checkDevice = temp;
}
}
- //鍒濆鍖栬澶囨灇涓�
- this.InitDeviceModelIdEnum();
+ //鑾峰彇娌充笢璁惧鐨勮澶囩被鍨�
+ DeviceEnumInfo info = this.GetHdlMyDeviceEnumInfo(checkDevice);
+ if (info != null)
+ {
+ return info;
+ }
+ //鑾峰彇绗笁鏂硅澶囩殑銆愯澶囩被鍨嬨��
+ info = this.GetNotHdlMyDeviceEnumInfo(listdevice);
+ //杩欓噷鍐嶆鍒ゆ柇鏄惁鏄渤涓滆澶�,鏈夊彲鑳藉畠鐨勬ā鍧桰D鍐欓敊浜�
+ info.IsHdlDevice = this.IsHdlDevice(checkDevice);
+
+ return info;
+ }
+
+ /// <summary>
+ /// 鑾峰彇璁惧鐨勩�愯澶囩被鍨嬨�戠殑缈昏瘧鏂囨湰(浼樺厛闀滃儚)
+ /// </summary>
+ /// <param name="listDevice"></param>
+ /// <param name="ApendFalge">绗笁鏂规垨鑰呰櫄鎷熻澶囩殑鏃跺�欙紝鏄惁娣诲姞鏍囪瘑</param>
+ /// <returns></returns>
+ public string GetDeviceObjectText(List<CommonDevice> listDevice, bool ApendFalge = true)
+ {
+ CommonDevice checkDevice = listDevice[0];
+ foreach (var temp in listDevice)
+ {
+ //鎷挎嫢鏈夋ā鍧桰D鐨勯偅涓洖璺潵鍒ゆ柇
+ if (temp.ModelIdentifier != string.Empty)
+ {
+ checkDevice = temp;
+ }
+ }
+ //鑾峰彇鑷畾涔夎澶囩被鍨�
+ var myInfoType = this.GetMyDeviceEnumInfo(listDevice);
+ //鑾峰彇璁惧绫诲瀷鐨勭炕璇戝悕瀛�
+ string strName = myInfoType.ObjectTypeName;
+ if (strName == string.Empty)
+ {
+ //鍔犱竴灞備繚闄�,鏈煡璁惧
+ strName = Language.StringByID(R.MyInternationalizationString.UnknowDevice);
+ }
+
+ if (ApendFalge == true)
+ {
+ 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;
+ }
+
+ #endregion
+
+ #region 鈻� 鑾峰彇娌充笢璁惧鐨勮澶囩被鍨媉____________
+
+ /// <summary>
+ /// 鑾峰彇Hdl璁惧鐨勩�愯嚜瀹氫箟鐨勮澶囩被鍨嬨��
+ /// </summary>
+ /// <param name="device">闅忎究鏌愪竴鍥炶矾</param>
+ /// <returns></returns>
+ private DeviceEnumInfo GetHdlMyDeviceEnumInfo(CommonDevice device)
+ {
+ //璁惧鍏蜂綋绫诲瀷
+ var info = new DeviceEnumInfo();
+ info.IsHdlDevice = this.IsHdlDevice(device);
+ if (device.ModelIdentifier == string.Empty)
+ {
+ return null;
+ }
+ string modelKeys = device.ModelIdentifier;
+ //浜ゆ崲涓�涓嬫ā鍧桰D(楹︿箰鍏嬮偅杈圭殑浼犳劅鍣�)
+ this.ChangedDeviceModeId(ref modelKeys);
+
+ if (this.dicDeviceModelIdEnum.ContainsKey(modelKeys) == false)
+ {
+ //娌℃湁鍖归厤鍒版ā鍧桰D锛屽垯鐩存帴璧扮涓夋柟璁惧鐨勫垽鏂�
+ return null;
+ }
+
+ var nameContent = this.dicDeviceModelIdEnum[modelKeys];
+ //璁剧疆璁惧鐨勩�愯澶囨墍灞炵被鍨嬨��
+ info.BeloneType = (DeviceBeloneType)nameContent.BeloneTypeValue;
+ info.BeloneText = nameContent.A鎵�灞炲悕瀛�;
+
+ //璁惧鍏蜂綋绫诲瀷
+ 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;
+ }
+
+ #endregion
+
+ #region 鈻� 鑾峰彇绗笁鏂硅澶囩殑璁惧绫诲瀷___________
+
+ /// <summary>
+ /// 鑾峰彇璁惧鐨勩�愭墍灞炵被鍨嬩俊鎭��,姝ゆ柟娉曚細鎶婃墍鏈夌殑浼犳劅鍣ㄩ兘褰掍负銆愪紶鎰熷櫒銆�(鍖呮嫭娓╂箍搴︿紶鎰熷櫒)
+ /// </summary>
+ /// <param name="device">璁惧鍥炶矾</param>
+ /// <returns></returns>
+ public DeviceEnumInfo GetDeviceBelongEnumInfo(CommonDevice device)
+ {
+ var info = this.GetNotHdlMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ if (info.BeloneType == DeviceBeloneType.A璋冨厜鍣�
+ || info.BeloneType == DeviceBeloneType.A褰╃伅)
+ {
+ //褰掍负鐏厜
+ info.ConcreteType = DeviceConcreteType.Light;
+ 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.FreshAirHumiditySensor)
+ {
+ //浼犳劅鍣ㄥ悎骞�
+ info.ConcreteType = DeviceConcreteType.Sensor;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A402"].A瀹樻柟鍚嶅瓧;
+ info.BeloneType = DeviceBeloneType.A浼犳劅鍣�;
+ info.BeloneText = this.dicDeviceModelIdEnum["A402"].A瀹樻柟鍚嶅瓧;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A402"].A绫诲瀷鍚嶅瓧;//浼犳劅鍣�
+ }
+
+ return info;
+ }
+
+ /// <summary>
+ /// 鑾峰彇绗笁鏂硅澶囩殑銆愯澶囩被鍨嬨��(涓嶅缓璁娇鐢�)
+ /// </summary>
+ /// <param name="listdevice">Mac閮戒竴鏍风殑璁惧鍒楄〃</param>
+ /// <returns></returns>
+ public DeviceEnumInfo GetNotHdlMyDeviceEnumInfo(List<CommonDevice> listdevice)
+ {
+ var dicType = new Dictionary<DeviceType, CommonDevice>();
+ foreach (CommonDevice device in listdevice)
+ {
+ if (dicType.ContainsKey(device.Type) == false)
+ {
+ dicType[device.Type] = device;
+ }
+ }
+ var info = new DeviceEnumInfo();
+ info.IsHdlDevice = false;
+ //1鍖呭惈闈㈡澘鐨勮瘽,褰撻潰鏉垮鐞�
+ if (dicType.ContainsKey(DeviceType.OnOffSwitch) == true)
+ {
+ if (listdevice.Count > 1)
+ {
+ info.ConcreteText = this.dicDeviceModelIdEnum["A401"].A瀹樻柟鍚嶅瓧;
+ info.BeloneType = DeviceBeloneType.A鎸夐敭闈㈡澘;
+ info.ConcreteType = DeviceConcreteType.ButtonPanel;
+ }
+ else
+ {
+ 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.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.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.ConcreteText = this.dicDeviceModelIdEnum["A416"].A瀹樻柟鍚嶅瓧;
+ info.BeloneType = DeviceBeloneType.A寮�鍏�;
+ info.ConcreteType = DeviceConcreteType.Switch;
+ }
+ else if (dicType[DeviceType.AirSwitch].DfunctionType == DeviceFunctionType.A鎻掑骇)
+ {
+ info.ConcreteText = this.dicDeviceModelIdEnum["A417"].A瀹樻柟鍚嶅瓧;
+ info.BeloneType = DeviceBeloneType.A鎻掑骇;
+ info.ConcreteType = DeviceConcreteType.Socket1;
+ }
+ else if (dicType[DeviceType.AirSwitch].DfunctionType == DeviceFunctionType.A鐏厜)
+ {
+ info.ConcreteText = this.dicDeviceModelIdEnum["A418"].A瀹樻柟鍚嶅瓧;
+ info.BeloneType = DeviceBeloneType.A鐏厜;
+ info.ConcreteType = DeviceConcreteType.Light;
+ }
+ }
+ //5缁х數鍣�
+ else if (dicType.ContainsKey(DeviceType.OnOffOutput) == true)
+ {
+ //榛樿鍊�
+ 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.ConcreteText = this.dicDeviceModelIdEnum["A416"].A瀹樻柟鍚嶅瓧;
+ info.BeloneType = DeviceBeloneType.A寮�鍏�;
+ info.ConcreteType = DeviceConcreteType.Switch;
+ }
+ else if (dicType[DeviceType.OnOffOutput].DfunctionType == DeviceFunctionType.A鎻掑骇)
+ {
+ info.ConcreteText = this.dicDeviceModelIdEnum["A417"].A瀹樻柟鍚嶅瓧;
+ info.BeloneType = DeviceBeloneType.A鎻掑骇;
+ info.ConcreteType = DeviceConcreteType.Socket1;
+ }
+ else if (dicType[DeviceType.OnOffOutput].DfunctionType == DeviceFunctionType.A鐏厜)
+ {
+ info.ConcreteText = this.dicDeviceModelIdEnum["A418"].A瀹樻柟鍚嶅瓧;
+ info.BeloneType = DeviceBeloneType.A鐏厜;
+ info.ConcreteType = DeviceConcreteType.Light;
+ }
+ }
+ //6璋冨厜鍣�
+ else if (dicType.ContainsKey(DeviceType.DimmableLight) == true)
+ {
+ 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.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.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.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.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.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.ConcreteText = this.dicDeviceModelIdEnum["A402"].A瀹樻柟鍚嶅瓧;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A402"].A绫诲瀷鍚嶅瓧;//浼犳劅鍣�
+ //璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
+ this.SetSensorDeviceSpecificType(ref info, listdevice);
+ }
+ //13鍖呭惈娓╁害浼犳劅鍣ㄧ殑璇�
+ else if (dicType.ContainsKey(DeviceType.TemperatureSensor) == true)
+ {
+ bool temperatrue = false;
+ bool humidity = false;
+ bool airQualitySensor = false;
+ //鑾峰彇鍏ㄩ儴鐨勫洖璺�
+ var listTemp = this.GetDevicesByMac(listdevice[0].DeviceAddr, false);
+ foreach (var device in listTemp)
+ {
+ if (device is TemperatureSensor)
+ {
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ if (device.isAirQualitySensor(device))
+ {
+ airQualitySensor = true;
+ }
+ //娓╁害浼犳劅鍣�
+ if (((TemperatureSensor)device).SensorDiv == 1)
+ {
+ temperatrue = true;
+ }
+ //婀垮害浼犳劅鍣�
+ else if (((TemperatureSensor)device).SensorDiv == 2)
+ {
+ humidity = true;
+ }
+ }
+ }
+ if (temperatrue == true && humidity == true)
+ {
+ //璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
+ info.BeloneType = DeviceBeloneType.A娓╂箍搴︿紶鎰熷櫒;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A411"].A瀹樻柟鍚嶅瓧;
+ info.ConcreteType = DeviceConcreteType.Sensor_TemperatureHumidity;
+ }
+ else if (temperatrue == true && humidity == false)
+ {
+ //璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
+ info.BeloneType = DeviceBeloneType.A娓╁害浼犳劅鍣�;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A412"].A瀹樻柟鍚嶅瓧;
+ info.ConcreteType = DeviceConcreteType.Sensor_Temperature;
+ }
+ else if (temperatrue == false && humidity == true)
+ {
+ //璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
+ info.BeloneType = DeviceBeloneType.A婀垮害浼犳劅鍣�;
+ info.ConcreteText = this.dicDeviceModelIdEnum["A413"].A瀹樻柟鍚嶅瓧;
+ info.ConcreteType = DeviceConcreteType.Sensor_Humidity;
+ }
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A411"].A绫诲瀷鍚嶅瓧;//浼犳劅鍣�
+
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ if (airQualitySensor == true)
+ {
+ info.ConcreteText = this.dicDeviceModelIdEnum["A422"].A瀹樻柟鍚嶅瓧;
+ info.BeloneType = DeviceBeloneType.A绌烘皵璐ㄩ噺;
+ info.ConcreteType = DeviceConcreteType.AirQualitySensor;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A422"].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绫诲瀷鍚嶅瓧;//璋冨厜妯″潡
+ }
+ //17鏅捐。鏋�
+ else if (dicType.ContainsKey(DeviceType.Airer) == true)
+ {
+ info.ConcreteText = this.dicDeviceModelIdEnum["A421"].A瀹樻柟鍚嶅瓧;
+ info.BeloneType = DeviceBeloneType.A鏅捐。鏋�;
+ info.ConcreteType = DeviceConcreteType.Airer;
+ info.ObjectTypeName = this.dicDeviceModelIdEnum["A421"].A绫诲瀷鍚嶅瓧;
+ }
+
+ //璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
+ info.BeloneText = info.ConcreteText;
+ info.DeviceDefultName = info.ConcreteText;
+
+ return info;
+ }
+
+ #endregion
+
+ #region 鈻� 浼犳劅鍣ㄥ叿浣撶殑绫诲瀷___________________
+
+ /// <summary>
+ /// 璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
+ /// </summary>
+ /// <param name="info">鑷畾涔夎澶囨灇涓句俊鎭�</param>
+ /// <param name="listdevice">璁惧瀵硅薄</param>
+ private void SetSensorDeviceSpecificType(ref DeviceEnumInfo info, List<CommonDevice> listdevice)
+ {
+ //濡傛灉杩欎釜璁惧鎷ユ湁澶氫釜鍥炶矾鐨勮瘽,鎴戜篃涓嶇煡閬撴�庝箞鍛藉悕,鍙兘缁欎釜榛樿鍚嶅瓧
+ if (listdevice.Count > 1)
+ {
+ return;
+ }
+ var iasZone = (IASZone)listdevice[0];
+ if (iasZone.IasDeviceType == 13)
+ {
+ //杩愬姩浼犳劅鍣�
+ info.ConcreteType = DeviceConcreteType.Sensor_Motion;
+ info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uMotionSensor);
+ }
+ else if (iasZone.IasDeviceType == 40)
+ {
+ //鐑熼浘浼犳劅鍣�
+ info.ConcreteType = DeviceConcreteType.Sensor_Fire;
+ info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uSensorFire);
+ }
+ else if (iasZone.IasDeviceType == 42)
+ {
+ //姘翠镜浼犳劅鍣�
+ info.ConcreteType = DeviceConcreteType.Sensor_Water;
+ info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uSensorWater);
+ }
+ else if (iasZone.IasDeviceType == 43)
+ {
+ //鐕冩皵浼犳劅鍣�
+ info.ConcreteType = DeviceConcreteType.Sensor_CarbonMonoxide;
+ info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uSensorCarbonMonoxide);
+ }
+ else if (iasZone.IasDeviceType == 44)
+ {
+ //绱ф�ユ寜閽�
+ info.ConcreteType = DeviceConcreteType.Sensor_EmergencyButton;
+ info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uSensorEmergencyButton);
+ }
+ else if (iasZone.IasDeviceType == 277)
+ {
+ //閽ュ寵鎵�
+ info.ConcreteType = DeviceConcreteType.Sensor_Keyfob;
+ info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uKeyfob);
+ }
+ else if (iasZone.IasDeviceType == 21 || iasZone.IasDeviceType == 22)
+ {
+ //闂ㄧ獥浼犳劅鍣�
+ info.ConcreteType = DeviceConcreteType.Sensor_DoorWindow;
+ info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uSensorDoorWindow);
+ }
}
#endregion
@@ -1702,794 +2504,231 @@
/// <summary>
/// 璁惧鎺掑簭
/// </summary>
- /// <param name="listDevice">璁惧瀵硅薄</param>
+ /// <param name="i_listDevice">璇风‘淇濊繖涓笢瑗垮凡缁忔寜mac鍜岀鐐规帓搴忎簡</param>
/// <returns></returns>
- public List<CommonDevice> SortDeviceList(List<CommonDevice> listDevice)
+ public List<CommonDevice> SortDeviceByBelongType(List<CommonDevice> i_listDevice)
{
- List<CommonDevice> listSort = new List<CommonDevice>();
- var list = this.SortDeviceListByRule(listDevice);
- listSort.AddRange(list);
+ //鑾峰彇鎺掑簭瑙勫垯
+ 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>
- /// <param name="listDevice">璁惧瀵硅薄</param>
- /// <returns></returns>
- private List<CommonDevice> SortDeviceListByRule(List<CommonDevice> listDevice)
- {
- //璁惧鎺掑簭鐨勮鍒�(Keys锛氳澶囩被鍨�(DeviceType) value锛氬瓨鏀捐澶囩殑瀹瑰櫒)
- var dic = this.GetDeviceSortRule();
- dic["瀵硅薄澶�"] = new List<CommonDevice>();
- foreach (CommonDevice device in listDevice)
- {
- if (device is IASZone)
- {
- var iasZone = (IASZone)device;
- //杩愬姩浼犳劅鍣�
- if (iasZone.DeviceInfo.DeviceType == 13)
- {
- dic["杩愬姩浼犳劅鍣�"].Add(device);
- }
- //涓�姘у寲纰充紶鎰熷櫒
- else if (iasZone.DeviceInfo.DeviceType == 43)
- {
- dic["涓�姘у寲纰充紶鎰熷櫒"].Add(device);
- }
- //绱ф�ユ寜閽�
- else if (iasZone.DeviceInfo.DeviceType == 44)
- {
- dic["绱ф�ユ寜閽�"].Add(device);
- }
- else
- {
- dic[DeviceType.IASZone.ToString()].Add(device);
- }
- continue;
- }
-
- string checkKeys = device.Type.ToString();
- if (dic.ContainsKey(checkKeys) == true)
- {
- dic[checkKeys].Add(device);
- }
- else
- {
- dic["瀵硅薄澶�"].Add(device);
- }
- }
- List<CommonDevice> lstSort = new List<CommonDevice>();
- foreach (var list in dic.Values)
- {
- lstSort.AddRange(list);
- }
- return lstSort;
- }
-
- /// <summary>
- /// 鑾峰彇璁惧鎺掑簭鐨勮鍒�(Keys锛氳澶囩被鍨�(DeviceType) value锛氬瓨鏀捐澶囩殑瀹瑰櫒)
+ /// 鑾峰彇璁惧鎵�灞炵被鍨嬬殑鐨勬帓搴忚鍒�
/// </summary>
/// <returns></returns>
- private Dictionary<string, List<CommonDevice>> GetDeviceSortRule()
+ public HashSet<DeviceBeloneType> GetBelongTypeSortRule()
{
- var dic = new Dictionary<string, List<CommonDevice>>();
- //涓�姘у寲纰充紶鎰熷櫒
- dic["涓�姘у寲纰充紶鎰熷櫒"] = new List<CommonDevice>();
- //绱ф�ユ寜閽�
- dic["绱ф�ユ寜閽�"] = new List<CommonDevice>();
- //杩愬姩浼犳劅鍣�
- dic["杩愬姩浼犳劅鍣�"] = new List<CommonDevice>();
- //浼犳劅鍣�
- dic[DeviceType.IASZone.ToString()] = new List<CommonDevice>();
- //鎺у埗闈㈡澘
- dic[DeviceType.OnOffSwitch.ToString()] = new List<CommonDevice>();
- //缁х數鍣�
- dic[DeviceType.OnOffOutput.ToString()] = new List<CommonDevice>();
- //鍗峰笜
- dic[DeviceType.WindowCoveringDevice.ToString()] = new List<CommonDevice>();
- //璋冨厜鐏�
- dic[DeviceType.ColorDimmableLight.ToString()] = new List<CommonDevice>();
- //绌烘皵寮�鍏�
- dic[DeviceType.AirSwitch.ToString()] = new List<CommonDevice>();
+ //璋佸湪鍓嶉潰,璋佸氨浼樺厛鏄剧ず
+ 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浼犳劅鍣�);
- return dic;
+ //鍏朵粬鐨勭湅鐫�鍔炲憲,閮芥槸鎺掑湪鍚庨潰鐨�,閮藉綊涓鸿繖涓睘鎬�
+ list.Add(DeviceBeloneType.A鏈煡璁惧);
+
+ return list;
}
#endregion
- #region 鈻� 璁惧鐩爣缁戝畾_______________________
-
+ #region 鈻� 鏅捐。鏋惰澶囨椂闂撮厤缃甠__________________________
/// <summary>
- /// 鑾峰彇璁惧涓嬮潰缁戝畾鐨勮澶�(閿欒鏃惰繑鍥瀗ull)
+ /// 璁剧疆鏅捐。鏋堕骞诧紝鐑樺共鍜屾秷姣掓椂闂�(璁剧疆澶辫触鏃讹紝浼氭樉绀轰俊鎭�)
+ /// time:璁剧疆鐨勫垎閽�
/// </summary>
- /// <param name="mainDevice">璁惧瀵硅薄</param>
- /// <returns></returns>
- public async Task<List<CommonDevice>> GetBindTargetDevice(CommonDevice mainDevice)
+ /// <param name="litdevice">璁惧瀵硅薄(MAC鍦板潃蹇呴』瑕佺浉鍚�)</param>
+ public async Task<bool> SetAirerTimeDevice(List<CommonDevice> listdevice, Airer airer, int time, int controlEpoint)
{
- var result = (BindObj.GetDeviceBindResponseAllData)await this.LoadDeviceMethodByNameAsync(mainDevice, "GetDeviceBindAsync");
- if (result == null || result.getAllBindResponseData == null)
+ //铏氭嫙浣忓畢鐨勮瘽,涓嶉渶瑕�
+ if (Config.Instance.Home.IsVirtually == false)
{
- //鑾峰彇璁惧鐨勭粦瀹氱洰鏍囧け璐�
- string msg = Language.StringByID(R.MyInternationalizationString.uGetDeviceBindTargetFail);
- //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result.errorMessageBase);
-
- this.ShowErrorMsg(msg);
- return null;
- }
- var listDevice = new List<CommonDevice>();
- foreach (var data in result.getAllBindResponseData.BindList)
- {
- CommonDevice deviceTemp = this.GetDevice(data.BindMacAddr, data.BindEpoint);
- if (deviceTemp == null)
+ foreach (var dev in listdevice)
{
- continue;
- }
- listDevice.Add(deviceTemp);
- }
- return listDevice;
- }
-
- /// <summary>
- /// 缁戝畾璁惧鐨勭洰鏍�(杩斿洖鎴愬姛璁剧疆鐨勮澶�,閿欒鏃讹紝杩斿洖null)
- /// </summary>
- /// <param name="mainDevice">璁惧瀵硅薄</param>
- /// <param name="listDevice">瑕佺粦瀹氱殑鐩爣璁惧</param>
- /// <param name="BindCluster">瑕佺粦瀹氱殑鐩爣璁惧</param>
- /// <returns></returns>
- public async Task<List<CommonDevice>> BindDeviceTarget(CommonDevice mainDevice, List<CommonDevice> listDevice, int BindCluster = 6)
- {
- if (listDevice.Count == 0)
- {
- return new List<CommonDevice>();
- }
-
- var dicDevice = new Dictionary<string, CommonDevice>();
-
- //缁勮鏁版嵁
- var addData = new IASZone.AddBindData();
- addData.DeviceAddr = mainDevice.DeviceAddr;
- addData.Epoint = mainDevice.DeviceEpoint;
- foreach (var device in listDevice)
- {
- var info = new IASZone.AddBindListObj();
- info.BindCluster = BindCluster;
- info.BindMacAddr = device.DeviceAddr;
- info.BindEpoint = device.DeviceEpoint;
- info.BindType = 0;
-
- addData.BindList.Add(info);
-
- //杩斿洖鎴愬姛璁惧鐨勬椂鍊欎娇鐢�
- string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
- dicDevice[mainkeys] = device;
- }
-
- var result = (BindObj.AddedDeviceBindResponseAllData)await this.LoadDeviceMethodByNameAsync(mainDevice, "AddDeviceBindAsync", addData);
- if (result == null || result.addedDeviceBindResponseData == null)
- {
- //缁戝畾鐩爣璁剧疆澶辫触
- string msg = Language.StringByID(R.MyInternationalizationString.uSetBindTargetsFail);
- //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result.errorMessageBase);
-
- this.ShowErrorMsg(msg);
- return null;
- }
-
- var listSuccess = new List<CommonDevice>();
- foreach (var data in result.addedDeviceBindResponseData.BindList)
- {
- string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(data.BindMacAddr, data.BindEpoint);
- //0:娣诲姞鎴愬姛 3:宸茬粡瀛樺湪锛屼篃鍙互浠ｈ〃鎴愬姛
- if (data.Result == 0 || data.Result == 3)
- {
- if (dicDevice.ContainsKey(mainkeys) == true)
+ //璁剧疆灞炴�т俊鎭�
+ CommonDevice.SetWritableValueData dataT = new CommonDevice.SetWritableValueData();
+ dataT.Undivided = 0;
+ dataT.AttributeId = 16385;
+ dataT.AttributeDataType = 33;
+ dataT.AttributeData = time;
+ dev.DeviceEpoint = controlEpoint;//鏆傛椂鎹㈡垚鏅捐。鏋跺搴旂殑鎺у埗绔偣
+ var result = await dev.SetWritableValueAsync(6, dataT);
+ if (result == null || result.setWritableValueResponData == null || result.setWritableValueResponData.Status != 0)
{
- listSuccess.Add(dicDevice[mainkeys]);
- }
- }
- //1锛氬け璐ワ紝鑺傜偣璁惧鎴栧満鏅笉瀛樺湪
- else if (data.Result == 1)
- {
- if (dicDevice.ContainsKey(mainkeys) == true)
- {
- //璁惧鍚嶇О 缁戝畾澶辫触
- string msg = this.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
- msg += Language.StringByID(R.MyInternationalizationString.BindFailed);
- this.ShowTipMsg(msg);
- }
- }
- //2锛氭湭鐭ワ紝鐢辫妭鐐硅澶囧弽棣堝彂閫佲�淏ind/BindResult鈥濅富棰樻秷鎭‘瀹氭槸鍚︽垚鍔�
- else if (data.Result == 2)
- {
- if (result.addBindResultResponseData == null)
- {
- //璁惧鍚嶇О 缁戝畾澶辫触
- string msg = this.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
- msg += Language.StringByID(R.MyInternationalizationString.BindFailed);
- this.ShowTipMsg(msg);
- }
- else
- {
- //娣诲姞鎴愬姛
- if (result.addBindResultResponseData.Result == 0)
+ //璁剧疆澶辫触
+ if (dev.DeviceEpoint == 3)
{
- if (dicDevice.ContainsKey(mainkeys) == true)
+ if (airer.WindTime != 0)
{
- listSuccess.Add(dicDevice[mainkeys]);
+ airer.WindTime = 0;
}
- }
- //璁惧鍚嶇О 缁戝畾鍒楄〃宸叉弧
- else if (result.addBindResultResponseData.Result == 140)
- {
- string msg = this.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
- msg += Language.StringByID(R.MyInternationalizationString.uBindListIsFull);
- this.ShowTipMsg(msg);
- }
- else
- {
- //璁惧鍚嶇О 缁戝畾澶辫触
- string msg = this.GetDeviceEpointName(dicDevice[mainkeys]) + "\r\n";
- msg += Language.StringByID(R.MyInternationalizationString.BindFailed);
- this.ShowTipMsg(msg);
- }
- }
- }
- }
-
- return listSuccess;
- }
-
- /// <summary>
- /// 鍒犻櫎璁惧缁戝畾鐨勭洰鏍�
- /// </summary>
- /// <param name="mainDevice">璁惧瀵硅薄</param>
- /// <param name="deleteDevice">瑕佸垹闄ょ殑缁戝畾鐩爣璁惧</param>
- /// <param name="BindCluster">瑕佺粦瀹氱殑鐩爣璁惧</param>
- /// <returns></returns>
- public async Task<bool> DeleteDeviceTarget(CommonDevice mainDevice, CommonDevice deleteDevice, int BindCluster = 6)
- {
- //缁勮鏁版嵁
- var deleteData = new IASZone.DelDeviceBindData();
- deleteData.DeviceAddr = mainDevice.DeviceAddr;
- deleteData.Epoint = mainDevice.DeviceEpoint;
-
- var info = new IASZone.RemoveBindListObj();
- info.BindCluster = 6;
- info.BindMacAddr = deleteDevice.DeviceAddr;
- info.BindEpoint = deleteDevice.DeviceEpoint;
- info.BindType = 0;
-
- deleteData.RemoveBindList.Add(info);
-
- var result = (BindObj.DelDeviceBindResponseAllData)await this.LoadDeviceMethodByNameAsync(mainDevice, "DelDeviceBindAsync", deleteData);
- if (result == null || result.delDeviceBindResponseData == null)
- {
- //鍒犻櫎缁戝畾鐩爣澶辫触
- string msg = Language.StringByID(R.MyInternationalizationString.uDeleteBindTargetsFail);
- //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result.errorMessageBase);
-
- this.ShowErrorMsg(msg);
- return false;
- }
-
- foreach (var data in result.delDeviceBindResponseData.RemoveBindList)
- {
- //0:鎴愬姛 1:璁惧涓嶅湪缁戝畾鍒楄〃涓� 锛屼篃鍙互浠ｈ〃鎴愬姛
- if (data.Result == 0 || data.Result == 1)
- {
- return true;
- }
- //3:澶辫触锛屽湪绛夊緟鑺傜偣璁惧纭鏄惁瑙ｉ櫎缁戝畾鎴愬姛
- else if (data.Result == 3)
- {
- //鍏朵粬缁戝畾鐩爣姝ｅ湪鍒犻櫎涓紝璇风◢鍚庡啀璇�
- string msg = Language.StringByID(R.MyInternationalizationString.uOtherBindTargetsIsDelettingPleaseWait);
- this.ShowErrorMsg(msg);
- return false;
- }
- //4锛氭湭鐭ワ紝鐢辫妭鐐硅澶囧弽棣堝彂閫佲�淏ind/BindResult鈥濅富棰樻秷鎭‘瀹氭槸鍚︽垚鍔�
- else if (data.Result == 4)
- {
- if (result.removeBindResultResponseData == null)
- {
- //鍒犻櫎缁戝畾鐩爣澶辫触
- string msg = Language.StringByID(R.MyInternationalizationString.uDeleteBindTargetsFail);
- this.ShowErrorMsg(msg);
- return false;
- }
- else
- {
- //鎴愬姛
- if (result.removeBindResultResponseData.Result == 0)
- {
- return true;
- }
- //136锛氭帶鍒惰澶囨湰鍦扮粦瀹氬垪琛ㄤ腑鏃犳缁戝畾
- else if (result.removeBindResultResponseData.Result == 136)
- {
- //杩欎釜鍙互褰撳仛鎴愬姛
- return true;
- }
- else
- {
- //鍒犻櫎缁戝畾鐩爣澶辫触
- string msg = Language.StringByID(R.MyInternationalizationString.uDeleteBindTargetsFail);
+ string msg = Language.StringByID(R.MyInternationalizationString.AirerWindTimeFailed);
+ //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
+ dev.DeviceEpoint = 1;//灏嗘櫨琛ｆ灦瀵瑰簲鐨勬帶鍒剁鐐硅繕鍘熸垚1绔偣
this.ShowErrorMsg(msg);
return false;
}
+ if (dev.DeviceEpoint == 4)
+ {
+ if (airer.DryTime != 0)
+ {
+ airer.DryTime = 0;
+ }
+ string msg = Language.StringByID(R.MyInternationalizationString.AirerDryTimeFailed);
+ //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
+ dev.DeviceEpoint = 1;//灏嗘櫨琛ｆ灦瀵瑰簲鐨勬帶鍒剁鐐硅繕鍘熸垚1绔偣
+ this.ShowErrorMsg(msg);
+ return false;
+ }
+ if (dev.DeviceEpoint == 5)
+ {
+ if (airer.DisinfectTime != 0)
+ {
+ airer.DisinfectTime = 0;
+ }
+ string msg = Language.StringByID(R.MyInternationalizationString.AirerDisinfectTimeFailed);
+ //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
+ this.ShowErrorMsg(msg);
+ dev.DeviceEpoint = 1;//灏嗘櫨琛ｆ灦瀵瑰簲鐨勬帶鍒剁鐐硅繕鍘熸垚1绔偣
+ return false;
+ }
}
+ }
+ }
+ return true;
+ }
+ #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="device">闇�瑕佹墽琛岀殑璁惧鐨勮澶囧璞�</param>
- /// <param name="method">鎸囧畾瑕佸姞杞界殑鏂规硶鍚�</param>
- /// <param name="parameter">鍚姩鍙傛暟</param>
- private async Task<object> LoadDeviceMethodByNameAsync(CommonDevice device, string method, params object[] parameter)
- {
- var task = device.GetType().InvokeMember(method, System.Reflection.BindingFlags.InvokeMethod, null, device, parameter) as Task;
- await task;
-
- var result = task.GetType().GetProperty("Result").GetValue(task, null);
- return result;
- }
-
- #endregion
-
- #region 鈻� PIR浼犳劅鍣╛_________________________
-
- /// <summary>
- /// 鑾峰彇PIR浼犳劅鍣ㄧ殑銆愬厜鎰熺瓑绾ф�诲埢搴︺�戯紝閿欒鏃惰繑鍥�-1
- /// </summary>
- /// <param name="iASZone"></param>
+ /// <param name="i_device"></param>
/// <returns></returns>
- public async Task<int> GetPirLightAbilitySize(IASZone iASZone)
+ public bool CanShowInHomeHomeMainPage(CommonDevice i_device)
{
- var data = await iASZone.GetPIRLightAbilitySizeAsync();
- //鍏遍�氶敊璇娴�
- string error = UserCenterLogic.CheckCommonErrorCode(data);
- if (error != null)
+ if (i_device == null || i_device.Type == DeviceType.OnOffSwitch)//骞叉帴鐐�
{
- this.ShowErrorMsg(error);
- return -1;
- }
-
- if (data == null || data.errorMessageBase != null || data.LightLevelCount == -1)
- {
- //鑾峰彇浼犳劅鍣ㄥ厜鎰熺瓑绾уけ璐�
- string msg = Language.StringByID(R.MyInternationalizationString.uGetPirSensorLightPerceptionRegulationFail);
- //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, data.errorMessageBase);
-
- this.ShowErrorMsg(msg);
- return -1;
- }
-
- return data.LightLevelCount;
- }
-
- /// <summary>
- /// 鑾峰彇PIR浼犳劅鍣ㄧ殑銆愮伅鍏夐厤缃�戯紝閿欒鏃惰繑鍥瀗ull
- /// </summary>
- /// <param name="iASZone"></param>
- /// <returns></returns>
- public async Task<IASZone.ConfigureParamates> GetPirSensorLightSettion(IASZone iASZone)
- {
- var data = await iASZone.GetPIRSensorParamateAsync();
- if (data == null || data.configureParamates == null)
- {
- //鑾峰彇浼犳劅鍣ㄧ伅鍏夎缃俊鎭け璐�
- string msg = Language.StringByID(R.MyInternationalizationString.uGetPirSensorLightSettionFail);
- //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, data.errorMessageBase);
-
- this.ShowErrorMsg(msg);
- return null;
- }
- return data.configureParamates;
- }
-
- /// <summary>
- /// 璁剧疆PIR浼犳劅鍣ㄧ殑銆愮伅鍏夐厤缃��
- /// </summary>
- /// <param name="iASZone">浼犳劅鍣ㄥ璞�</param>
- /// <param name="configure">鐏厜閰嶇疆</param>
- /// <returns></returns>
- public async Task<bool> SetPirSensorLightSettion(IASZone iASZone, IASZone.ConfigureParamates configure)
- {
- var result = await iASZone.SetPIRSensorParamateAsync(configure);
- if (result == null || result.responseData == null)
- {
- //璁剧疆浼犳劅鍣ㄧ伅鍏夐厤缃け璐�
- string msg = Language.StringByID(R.MyInternationalizationString.uSetPirSensorLightSettionFail);
- //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result.errorMessageBase);
-
- this.ShowErrorMsg(msg);
+ //杩欎釜璁惧涓嶈浜�
return false;
}
- if (result.responseData.status != 0)
+ if (i_device.Type == DeviceType.OnOffOutput || i_device.Type == DeviceType.AirSwitch)
{
- //璁剧疆浼犳劅鍣ㄧ伅鍏夐厤缃け璐�
- string msg = Language.StringByID(R.MyInternationalizationString.uSetPirSensorLightSettionFail);
- this.ShowErrorMsg(msg);
+ //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;
}
- //澶囦唤璁剧疆
- await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(iASZone, GatewayBackupEnum.APir鐏厜閰嶇疆, configure);
+ if (((int)i_device.Type).ToString() == i_device.Type.ToString())
+ {
+ //姝よ澶噄d鍦―eviceType閲岄潰杩樻病鏈夋敞鍐�,鍒欎笉鑳芥樉绀哄嚭鏉�
+ 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;
}
-
- #endregion
-
- #region 鈻� 鎸夐敭闈㈡澘鍔熻兘绯籣____________________
-
- #region 棰滆壊璋冭妭
-
- /// <summary>
- /// 鑾峰彇鎸夐敭闈㈡澘鎸囧畾绔偣鐨勩�愭寚绀虹伅寮�鍏抽鑹层�戠殑淇℃伅(鍑洪敊浼氳繑鍥瀗ull)
- /// </summary>
- /// <param name="panel">鎸夐敭闈㈡澘鐨勬煇涓�涓洖璺�</param>
- /// <returns></returns>
- public async Task<Panel.KeyColorData> GetPanelEpointColorInfo(Panel panel)
- {
- Panel.KeyNum keyNum = (Panel.KeyNum)panel.DeviceEpoint;
- var result = await panel.GetPanelColorInfoAsync(keyNum);
- //鍏遍�氶敊璇娴�
- string error = UserCenterLogic.CheckCommonErrorCode(result);
- if (error != null)
- {
- this.ShowErrorMsg(error);
- return null;
- }
-
- if (result == null || result.keyColorData == null)
- {
- //鑾峰彇鎸夐敭闈㈡澘棰滆壊璋冭妭淇℃伅澶辫触
- string msg = Language.StringByID(R.MyInternationalizationString.uGetPanelColorRegulationInfoFail);
- this.ShowErrorMsg(msg);
- return null;
- }
- return result.keyColorData;
- }
-
- /// <summary>
- /// 璁剧疆鎸夐敭闈㈡澘鎸囧畾绔偣鐨勩�愭寚绀虹伅寮�鍏抽鑹层�戠殑淇℃伅
- /// </summary>
- /// <param name="panel">鎸夐敭闈㈡澘鐨勬煇涓�涓洖璺�</param>
- /// <param name="colorData">寮�鍜屽叧鐨勯鑹查兘闇�瑕佷竴璧疯缃�</param>
- /// <returns></returns>
- public async Task<bool> SetPanelEpointColorInfo(Panel panel, Panel.KeyColorData colorData)
- {
- var keyNum = new Panel.KeyNumStatus();
- Type type = keyNum.GetType();
- type.InvokeMember("Key" + panel.DeviceEpoint, System.Reflection.BindingFlags.SetField, null, keyNum, new object[] { true });
-
- var result = await panel.SetPanelColorInfoAsync(colorData, keyNum);
- if (result == null || result.responseData == null)
- {
- //璁剧疆鎸夐敭闈㈡澘鎸囩ず鐏鑹插け璐�
- string msg = Language.StringByID(R.MyInternationalizationString.uSetPanelPilolightSettionFail);
- this.ShowErrorMsg(msg);
- return false;
- }
- if (result.responseData.status != 0)
- {
- //璁剧疆鎸夐敭闈㈡澘鎸囩ず鐏鑹插け璐�
- string msg = Language.StringByID(R.MyInternationalizationString.uSetPanelPilolightSettionFail);
- this.ShowErrorMsg(msg);
- return false;
- }
- //澶囦唤璁惧
- await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(panel, GatewayBackupEnum.A鎸夐敭闈㈡澘棰滆壊璋冭妭, colorData);
- return true;
- }
-
- #endregion
-
- #region 浜害璋冭妭
- /// <summary>
- /// 鑾峰彇鎸夐敭闈㈡澘浜害閰嶇疆锛坲i鍙寒搴﹁皟鑺�,浣跨敤杩斿洖鍊肩殑panelDirectionsLevel锛�
- /// </summary>
- /// <param name="panel">鎸夐敭闈㈡澘鐨勬煇涓�涓洖璺�</param>
- /// <returns></returns>
- public async Task<Panel.PanelSwitchLevelInfo> GetPanelSwitchLightSettion(Panel panel)
- {
- var result = await panel.GetPanelSwitchLevelAsync();
- //鍏遍�氶敊璇娴�
- string error = UserCenterLogic.CheckCommonErrorCode(result);
- if (error != null)
- {
- this.ShowErrorMsg(error);
- return null;
- }
-
- if (result == null || string.IsNullOrEmpty(result.errorMessageBase) == false)
- {
- //鑾峰彇鎸夐敭闈㈡澘浜害璋冭妭淇℃伅澶辫触
- string msg = Language.StringByID(R.MyInternationalizationString.uGetPanelLightRegulationInfoFail);
- this.ShowErrorMsg(msg);
- return null;
- }
- return result;
- }
-
- /// <summary>
- /// 璁剧疆鎸夐敭闈㈡澘浜害锛坲i鍙寒搴﹁皟鑺傦級
- /// </summary>
- /// <param name="panel">鎸夐敭闈㈡澘鐨勬煇涓�涓洖璺�</param>
- /// <param name="directionsLevel">鎸囩ず鐏寒搴� 0-100(鐜伴樁娈典笉鐢ㄨ繖涓�)</param>
- /// <param name="backlightLevel">鑳屽厜鐏寒搴� 0-100(ui鍙寒搴﹁皟鑺�)</param>
- /// <returns></returns>
- public async Task<bool> SetPanelSwitchLightSettion(Panel panel, int directionsLevel, int backlightLevel)
- {
- var result = await panel.SetKeyLevelAsync(directionsLevel, backlightLevel);
- //鍏遍�氶敊璇娴�
- string error = UserCenterLogic.CheckCommonErrorCode(result);
- if (error != null)
- {
- this.ShowTipMsg(error);
- return false;
- }
-
- if (result == null || result.responseData == null)
- {
- //璁剧疆浜害璋冭妭澶辫触
- string msg = Language.StringByID(R.MyInternationalizationString.uSetLightRegulationFail);
- //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result.errorMessageBase);
-
- this.ShowTipMsg(msg);
- return false;
- }
-
- if (result.responseData.status != 0)
- {
- //璁剧疆浜害璋冭妭澶辫触
- string msg = Language.StringByID(R.MyInternationalizationString.uSetLightRegulationFail);
- this.ShowTipMsg(msg);
- return false;
- }
- //澶囦唤璁惧
- var backData = new Newtonsoft.Json.Linq.JObject
- {
- { "directionsLevel",directionsLevel },
- { "backlightLevel", backlightLevel }
- };
- await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(panel, GatewayBackupEnum.A鎸夐敭闈㈡澘浜害璋冭妭, backData);
- return true;
- }
-
- #endregion
-
- #region 鑺傝兘妯″紡
- /// <summary>
- /// 鑾峰彇鎸夐敭闈㈡澘鑺傝兘妯″紡鐨勯厤缃姸鎬�(ui鍙妭鑳芥ā寮�)
- /// </summary>
- /// <param name="panel">鎸夐敭闈㈡澘鐨勬煇涓�涓洖璺�</param>
- /// <returns></returns>
- public async Task<Panel.PanelSaveEnergyModeInfo> GetPanelEnergyConservationMode(Panel panel)
- {
- var result = await panel.GetPanelSaveEnergyModeAsync();
- //鍏遍�氶敊璇娴�
- string error = UserCenterLogic.CheckCommonErrorCode(result);
- if (error != null)
- {
- this.ShowErrorMsg(error);
- return null;
- }
-
- if (result == null || result.panelSaveEnergyModeInfo == null)
- {
- //鑾峰彇鎸夐敭闈㈡澘鑺傝兘妯″紡淇℃伅澶辫触
- string msg = Language.StringByID(R.MyInternationalizationString.uGetPanelEnergyConservationInfoFail);
- //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result.errorMessageBase);
-
- this.ShowErrorMsg(msg);
- return null;
- }
- return result.panelSaveEnergyModeInfo;
- }
-
- /// <summary>
- /// 璁剧疆鎸夐敭闈㈡澘鐨勮妭鑳芥ā寮�(ui鍙妭鑳芥ā寮�)
- /// </summary>
- /// <param name="panel">鎸夐敭闈㈡澘鐨勬煇涓�涓洖璺�</param>
- /// <param name="modeEnable">鑺傝兘妯″紡鏄惁鏈夋晥</param>
- /// <param name="modeTime">鏃犳搷浣滆繘鍏ヨ妭鑳芥ā寮忔椂闂� 0-255</param>
- /// <param name="level">鑺傝兘妯″紡浜害:0-100</param>
- /// <returns></returns>
- public async Task<bool> SetPanelEnergyConservationMode(Panel panel, bool modeEnable, int modeTime, int level)
- {
- var result = await panel.SetKeyModeAsync(modeEnable, modeTime, level);
- //鍏遍�氶敊璇娴�
- string error = UserCenterLogic.CheckCommonErrorCode(result);
- if (error != null)
- {
- this.ShowErrorMsg(error);
- return false;
- }
-
- if (result == null || result.responseData == null)
- {
- //鑺傝兘妯″紡閰嶇疆澶辫触
- string msg = Language.StringByID(R.MyInternationalizationString.uSetEnergyConservationFail);
- //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result.errorMessageBase);
-
- this.ShowTipMsg(msg);
- return false;
- }
-
- if (result.responseData.status != 0)
- {
- //鑺傝兘妯″紡閰嶇疆澶辫触
- string msg = Language.StringByID(R.MyInternationalizationString.uSetEnergyConservationFail);
- this.ShowTipMsg(msg);
- return false;
- }
- //澶囦唤璁惧
- var backData = new Newtonsoft.Json.Linq.JObject
- {
- { "modeEnable",modeEnable },
- { "modeTime", modeTime },
- { "level", level }
- };
- await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(panel, GatewayBackupEnum.A鎸夐敭闈㈡澘鑺傝兘妯″紡, backData);
-
- return true;
- }
-
- #endregion
-
- /// <summary>
- /// 妫�娴嬫帶鍒堕潰鏉�(鐏被)鎵�鎷ユ湁鐨勫姛鑳�,鐜版敮鎸佺殑鏈変互涓嬪嚑绉�(蹇呭畾瀛樺湪閿��,鍑洪敊浼氳繑鍥瀗ull)
- /// <para>閿��1:浜害璋冭妭(ui鍙寒搴﹁皟鑺�,閽堝鏁翠釜璁惧) -> true:鎷ユ湁姝ゅ姛鑳� false:鏃犳鍔熻兘</para>
- /// <para>閿��2:鑺傝兘妯″紡(ui鍙妭鑳芥ā寮�,閽堝鏁翠釜璁惧) -> true:鎷ユ湁姝ゅ姛鑳� false:鏃犳鍔熻兘</para>
- /// <para>閿��3:棰滆壊璋冭妭(ui鍙鑹茶皟鑺�,鍙兘鍗曞洖璺厤缃�) -> true:鎷ユ湁姝ゅ姛鑳� false:鏃犳鍔熻兘</para>
- /// </summary>
- /// <param name="panel">鎸夐敭闈㈡澘鐨勬煇涓�涓洖璺�</param>
- /// <returns></returns>
- public async Task<Dictionary<string, bool>> CheckPanelLightFunctionLevel2(Panel panel)
- {
- var dicCheck = new Dictionary<string, bool>();
- dicCheck["浜害璋冭妭"] = false;
- dicCheck["鑺傝兘妯″紡"] = false;
- dicCheck["棰滆壊璋冭妭"] = false;
-
- //鑾峰彇绗竴绾у姛鑳�
- var result = await this.GetPanelDeviceFunctionLevel1(panel);
- if (result == null)
- {
- return null;
- }
-
- if (result.Contains(1024) == false)
- {
- //姝ゆ帶鍒堕潰鏉挎病鏈夌伅杩欎釜涓滆タ
- return dicCheck;
- }
-
- //鑾峰彇绗簩绾у姛鑳�
- result = await this.GetPanelDeviceFunctionLevel2(panel, 1024);
- if (result == null)
- {
- return null;
- }
-
- if (result.Contains(102) == true)
- {
- //浜害璋冭妭锛�102
- dicCheck["浜害璋冭妭"] = true;
- }
- if (result.Contains(101) == true)
- {
- //棰滆壊璋冭妭锛�101
- dicCheck["棰滆壊璋冭妭"] = true;
- }
- if (result.Contains(0) == true)
- {
- //鑺傝兘妯″紡锛�0
- dicCheck["鑺傝兘妯″紡"] = true;
- }
- return dicCheck;
- }
-
- /// <summary>
- /// 鑾峰彇鎸夐敭闈㈡澘鐨勭涓�绾у埆鍔熻兘鍔熻兘绯�(1024:鐏被锛�256:鎸夐敭绫伙紝768:PIR绫�)
- /// </summary>
- /// <param name="panel">鎸夐敭闈㈡澘鐨勬煇涓�涓洖璺�</param>
- /// <returns></returns>
- public async Task<List<int>> GetPanelDeviceFunctionLevel1(Panel panel)
- {
- var result = await this.GetPanelDeviceFunction(panel);
- if (result == null)
- {
- return null;
- }
- return result.privateFuncTypeLevelFirstList;
- }
-
- /// <summary>
- /// <para>鑾峰彇鎸夐敭闈㈡澘鐨勭浜岀骇鍒姛鑳藉姛鑳界郴(浠ヤ笅涓鸿繑鍥炲��)</para>
- /// <para>100:Switch,寮�鍏筹紙鎸夐敭绫伙級</para>
- /// <para>200:Dimmer,璋冨厜锛堟寜閿被锛�</para>
- /// <para>300:Curtain,绐楀笜锛堟寜閿被锛�</para>
- /// <para>0:EnergySavingMode,鑺傝兘妯″紡锛堢伅绫伙級</para>
- /// <para>1:SleepMode,鐫＄湢妯″紡锛堢伅绫伙級</para>
- /// <para>100:WhiteBalance,鐧藉钩琛★紙鐏被锛�</para>
- /// <para>101:RGBColor,RGB鎸囩ず鐏鑹诧紙鐏被锛�</para>
- /// <para>102:RGBLevel,RGB鎸囩ず鐏寒搴︼紙鐏被锛�</para>
- /// </summary>
- /// <param name="panel">鎸夐敭闈㈡澘鐨勬煇涓�涓洖璺�</param>
- /// <param name="levelNo">绗竴绾у埆鐨処D(1024:鐏被锛�256:鎸夐敭绫伙紝768:PIR绫�)</param>
- /// <returns></returns>
- public async Task<List<int>> GetPanelDeviceFunctionLevel2(Panel panel, int levelNo)
- {
- var result = await this.GetPanelDeviceFunction(panel, new int[] { levelNo });
- if (result == null)
- {
- return null;
- }
- return result.privateFuncTypeLevelSecondList;
- }
-
- /// <summary>
- /// 鑾峰彇鎸夐敭闈㈡澘鐨勫姛鑳�
- /// </summary>
- /// <param name="panel">鎸夐敭闈㈡澘鐨勬煇涓�涓洖璺�</param>
- /// <param name="parameter">
- /// <para>鏂规硶1锛氬綋int[]浼犵┖锛岃繑鍥炲�兼槸鈥滈潰鏉垮叿鏈夌殑鍔熻兘澶х被,鍗宠繑鍥炩�滅涓�绾у埆銆�1024:鐏被锛�256:鎸夐敭绫伙紝768:PIR绫�</para>
- /// <para>鏂规硶2锛氥�佸綋int[]鍊间负绗竴绾у埆PrivateFuncTypeFir涓�夋嫨涓�涓��</para>
- /// <para>杩斿洖鍊兼槸鈥滈潰鎸夐敭鍙戦�佸姛鑳界被鈥濓紝鍗宠繑鍥炩�滅浜岀骇鍒��</para>
- /// <para>100:Switch,寮�鍏筹紙鎸夐敭绫伙級;200:Dimmer,璋冨厜锛堟寜閿被锛�;300:Curtain,绐楀笜锛堟寜閿被锛�</para>
- /// <para>0:EnergySavingMode,鑺傝兘妯″紡锛堢伅绫伙級;1:SleepMode,鐫＄湢妯″紡锛堢伅绫伙級;100:WhiteBalance,鐧藉钩琛★紙鐏被锛�;101:RGBColor,RGB鎸囩ず鐏鑹诧紙鐏被锛�;102:RGBLevel,RGB鎸囩ず鐏寒搴︼紙鐏被锛�</para>
- /// <para>鏂规硶3锛氬綋int[]鍊间负绗竴绾у埆PrivateFuncTypeFir涓�夋嫨涓�涓紝鎺ョ潃鍐嶉�夌浜岀骇鍒玃rivateFunTypeSec涓�夋嫨涓�涓� </para>
- /// <para>杩斿洖鍊兼槸鈥滈潰鎸夐敭鍏蜂綋鍔熻兘閰嶇疆鈥濓紝鍗宠繑鍥炩�滅浜岀骇鍒��</para>
- /// <para>100:SwitchOpen,寮�鍏冲紑锛堟寜閿被锛�;101:SwitchClose,寮�鍏冲叧锛堟寜閿被锛�;102:SwitchChange,寮�鍏冲垏鎹紙鎸夐敭绫伙級</para>
- /// <para>200:DimmerStepUp,澧炲ぇ璋冨厜锛堟寜閿被锛�;201:DimmerStepDown,闄嶄綆璋冨厜锛堟寜閿被锛�;202:DimmerStepChange,璋冨厜鍒囨崲锛堟寜閿被锛�</para>
- /// <para>300:CurtainOpen,绐楀笜寮�锛堟寜閿被锛�;301:CurtainClose,绐楀笜鍏筹紙鎸夐敭绫伙級;302:CurtainStop,绐楀笜鍋�;303:CurtainUpStop,绐楀笜涓婂崌鍋�;304:CurtainDownstop,绐楀笜涓嬮檷鍋�</para>
- /// </param>
- /// <returns></returns>
- private async Task<Panel.PanelPrivateFunctionsResponseInfo> GetPanelDeviceFunction(Panel panel, params int[] parameter)
- {
- var result = await panel.GetPanelPrivateFunctionsAsync(parameter);
- //鍏遍�氶敊璇娴�
- string error = UserCenterLogic.CheckCommonErrorCode(result);
- if (error != null)
- {
- this.ShowErrorMsg(error);
- return null;
- }
-
- if (result == null || result.panelPrivateFunctionsResponseInfo == null)
- {
- //鑾峰彇鎸夐敭闈㈡澘鍔熻兘绫讳俊鎭け璐�
- string msg = Language.StringByID(R.MyInternationalizationString.uGetPanelFunctionInfoFail);
- //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result.errorMessageBase);
-
- this.ShowErrorMsg(msg);
- return null;
- }
-
- return result.panelPrivateFunctionsResponseInfo;
- }
-
- #endregion
-
- #region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
/// 鍒ゆ柇鏄笉鏄渤涓滅殑璁惧
@@ -2502,13 +2741,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>
@@ -2519,7 +2768,62 @@
/// <returns></returns>
public string GetDeviceMainKeys(string DeviceAddr, int DeviceEpoint)
{
- return DeviceAddr + DeviceEpoint;
+ return DeviceAddr + "_" + DeviceEpoint;
+ }
+
+ /// <summary>
+ /// 浜ゆ崲璁惧鐨勬ā鍧桰D
+ /// </summary>
+ /// <param name="modeId">妯″潡ID</param>
+ /// <returns></returns>
+ public bool ChangedDeviceModeId(ref string modeId)
+ {
+ if (this.dicDeviceModelIdChanged.ContainsKey(modeId) == false)
+ {
+ return false;
+ }
+ modeId = this.dicDeviceModelIdChanged[modeId];
+
+ return true;
+ }
+
+ /// <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(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 + "." + value3;
}
/// <summary>
@@ -2528,9 +2832,9 @@
/// <param name="msg"></param>
private void ShowErrorMsg(string msg)
{
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
- var contr = new Phone.UserCenter.ErrorMsgControl(msg);
+ var contr = new ShowMsgControl(Phone.ShowMsgType.Error, msg);
contr.Show();
});
}
@@ -2541,30 +2845,63 @@
/// <param name="msg"></param>
private void ShowTipMsg(string msg)
{
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
- var contr = new Phone.UserCenter.TipViewControl(msg);
- contr.ShowView();
+ var contr = new ShowMsgControl(Phone.ShowMsgType.Tip, msg);
+ contr.Show();
});
}
- #endregion
-
- #region 鈻� 缁撴瀯浣揰____________________________
+ /// <summary>
+ /// 澶勭悊缃戝叧杩斿洖鐨勬箍搴﹀��
+ /// </summary>
+ /// <param name="value">缃戝叧杩斿洖鐨勫睘鎬у��</param>
+ public decimal AdjustHumidityValue(int value)
+ {
+ if (value == 0)
+ {
+ //0%
+ return 0;
+ }
+ //涓嶄細鍑虹幇璐熸暟
+ else
+ {
+ //灏忔暟鐐归渶瑕佷竴浣�
+ string strValue = value.ToString();
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ //璁板綍娓╁害
+ return strValue == string.Empty ? 0m : Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ }
+ }
/// <summary>
- /// 璁惧璁℃暟鐨勪俊鎭�
+ /// 澶勭悊缃戝叧杩斿洖鐨勬俯搴﹀��
/// </summary>
- private class DeviceCountInfo
+ /// <param name="value">缃戝叧杩斿洖鐨勫睘鎬у��</param>
+ public decimal AdjustTemperatrueValue(int value)
{
- /// <summary>
- /// 璁℃暟
- /// </summary>
- public int Count = 0;
- /// <summary>
- /// 绔彛鍙�
- /// </summary>
- public HashSet<int> hsEpoint = new HashSet<int>();
+ if (value == 0)
+ {
+ //0鈩�
+ return 0;
+ }
+ else if (value > 32767)
+ {
+ //璐熸暟(鐗规畩澶勭悊)
+ string strValue = (value - 65536).ToString();
+ //灏忔暟鐐归渶瑕佷竴浣�
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ //璁板綍娓╁害
+ return strValue == string.Empty ? 0m : Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ }
+ else
+ {
+ //灏忔暟鐐归渶瑕佷竴浣�
+ string strValue = value.ToString();
+ strValue = strValue.Substring(0, strValue.Length - 1);
+ //璁板綍娓╁害
+ return strValue == string.Empty ? 0m : Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
+ }
}
#endregion
@@ -2574,118 +2911,300 @@
#region 鈻� 鑾峰彇璁惧鍒楄〃鐨勬帴鍙________________
/// <summary>
- /// 浠庣綉鍏抽噸鏂拌幏鍙栬澶囧垪琛�(鈽呪槄鈽呪槄鈽呪槄鈽呮帴鏀跺埌璁惧鏃剁殑浜嬩欢,璁惧瀵硅薄涓簄ull鏃�,浠ｈ〃鎺ユ敹瀹屾垚鈽呪槄鈽呪槄鈽呪槄鈽�)
+ /// <para>浠庣綉鍏抽噸鏂拌幏鍙栬澶囧垪琛�(杩斿洖鐨勮澶囦负铏氭嫙鍑烘潵鐨�),涓�娆℃�у叏閮ㄨ幏鍙�</para>
+ /// <para>statu鐘舵�� -1:寮傚父,浼氳繑鍥瀗ull, 1锛氭病鏈夊紓甯�, 2:鏁版嵁鎺ユ敹涓嶅叏</para>
/// </summary>
- /// <param name="zbGateway">缃戝叧瀵硅薄</param>
- /// <param name="deviceComingAction">鎺ユ敹鍒拌澶囨椂鐨勪簨浠�,璁惧瀵硅薄涓簄ull鏃�,浠ｈ〃鎺ユ敹瀹屾垚</param>
+ /// <param name="gatewayId">缃戝叧id</param>
+ /// <param name="statu">鐘舵��-> -1:寮傚父,浼氳繑鍥瀗ull, 1锛氭病鏈夊紓甯�, 2:鏁版嵁鎺ユ敹涓嶅叏</param>
+ /// <param name="useLocalConnect">鏄惁浣跨敤鏈湴杩炴帴鍙戦��</param>
/// <param name="mode">鏄惁鏄剧ず閿欒</param>
/// <returns></returns>
- public async Task<List<CommonDevice>> GetDeviceListFromGateway(ZbGateway zbGateway, Action<CommonDevice> deviceComingAction = null, ShowErrorMode mode = ShowErrorMode.YES)
+ public List<CommonDevice> GetDeviceListFromGateway(string gatewayId, ref int statu, bool useLocalConnect, ShowErrorMode mode = ShowErrorMode.YES)
{
- //濡傛灉鍒囨崲鍒颁簡鍒殑鐣岄潰锛屽垯涓嶆樉绀洪敊璇俊鎭�
- string nowFormId = UserCenterResourse.NowActionFormID;
-
- ZbGateway realWay = null;
- if (Common.LocalGateway.Current.GetRealGateway(ref realWay, zbGateway) == false)
- {
- if (nowFormId == UserCenterResourse.NowActionFormID && mode == ShowErrorMode.YES)
- {
- //閿欒:缃戝叧瀵硅薄涓㈠け
- string msg = Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg);
- this.ShowTipMsg(msg);
- }
- return null;
- }
+ //闇�瑕佸彉鏇村姛鑳界被鍨嬬殑鍥炶矾
+ var listFucDevice = new List<CommonDevice>();
//鏄惁杈炬垚涓柇鐨勬椂鏈�
bool canBreak = false;
-
- //缃戝叧ID
- string gatewayID = Common.LocalGateway.Current.GetGatewayId(zbGateway);
//瓒呮椂鏃堕棿
int TimeOut = 0;
+ //褰撳墠璁惧鎺ユ敹鏁�
+ int nowReceiveCount = 0;
+ //璁惧鎬绘暟
+ int deviceCount = -1;
//璁惧鍒楄〃
var listDevice = new List<CommonDevice>();
+ //缃戝叧閲岄潰鏈夊彲鑳戒細鏈夐噸澶嶇殑鍥炶矾
+ var listCheck = new HashSet<string>();
+ ///Mac鐨勭鐐规�绘暟
+ var dicMacPointCount = new Dictionary<string, int>();
- Action<string, string> getDeviceAction = (topic, message) =>
+ HdlGatewayReceiveLogic.Current.AddGatewayReceiveEvent(gatewayId, (topic, message) =>
{
- try
+ if (topic == gatewayId + "/DeviceInfoRespon")
{
- if (topic == gatewayID + "/" + "DeviceInfoRespon")
+ lock (listDevice)
{
TimeOut = 0;
var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
- var totalNum = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["TotalNum"].ToString());
+ var totalNum = Convert.ToInt32(jobject["Data"]["TotalNum"].ToString());
if (totalNum == 0)
{
//杩欎釜缃戝叧娌℃湁璁惧
canBreak = true;
return;
}
+ if (deviceCount == -1)
+ {
+ //璁剧疆闇�瑕佹帴鏀跺灏戜釜璁惧
+ deviceCount = totalNum;
+ }
+ nowReceiveCount++;
+
+ //璁惧鍥炶矾鏁版敹闆�
+ string deviceMac = jobject.Value<string>("DeviceAddr");
+ if (dicMacPointCount.ContainsKey(deviceMac) == false)
+ {
+ dicMacPointCount[deviceMac] = 0;
+ }
+ dicMacPointCount[deviceMac]++;
+
var deviceID = (DeviceType)jobject.Value<int>("Device_ID");
//鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
- var device = this.NewDeviceObjectByDeviceId(deviceID, jobject, zbGateway);
+ var device = this.NewDeviceObjectByDeviceId(deviceID, jobject, gatewayId);
if (device != null)
{
- //鍥炶皟鍑芥暟
- deviceComingAction?.Invoke(device);
+ string mainkeys = this.GetDeviceMainKeys(device);
+ //缃戝叧閲岄潰鏈夊彲鑳戒細鏈夐噸澶嶇殑鍥炶矾
+ if (listCheck.Contains(mainkeys) == false)
+ {
+ listDevice.Add(device);
+ listCheck.Add(mainkeys);
+ //鍒锋柊涓�涓嬫湰鍦扮紦瀛�
+ var localDevice = this.GetDevice(mainkeys);
+ var tempDevice = localDevice == null ? device : localDevice;
- listDevice.Add(device);
+ //濡傛灉杩欎釜璁惧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;
+ }
+ }
}
}
- else if (topic == gatewayID + "/" + "DeviceInfoResponEnd")
+
+ if (nowReceiveCount >= deviceCount)
{
+ //璁惧鍏ㄩ儴鎺ユ敹瀹屾垚
canBreak = true;
}
}
- catch { }
- };
+ });
+ //鍙戦�佸懡浠�
+ var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 93 } };
+ HdlGatewayLogic.Current.SendJobjectData(gatewayId, "GetDeviceInfo", jObject.ToString(), useLocalConnect);
- realWay.Actions += getDeviceAction;
- try
+ while (canBreak == false && TimeOut <= 30)
{
- var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 93 } };
- await realWay.Send("GetDeviceInfo", jObject.ToString());
- }
- catch { canBreak = true; }
-
- while (canBreak == false && TimeOut < 60)
- {
- await Task.Delay(100);
+ System.Threading.Thread.Sleep(100);
TimeOut++;
}
+ //绉婚櫎缃戝叧鐩戝惉浜嬩欢
+ HdlGatewayReceiveLogic.Current.RemoveGatewayReceiveEvent();
- realWay.Actions -= getDeviceAction;
- if (TimeOut >= 60)
+ if (TimeOut > 30)
{
- if (listDevice.Count == 0)
+ if (listDevice.Count > 0)
{
- if (nowFormId == UserCenterResourse.NowActionFormID && mode == ShowErrorMode.YES)
- {
- //鑾峰彇璁惧鍒楄〃澶辫触
- //[XXXX]缃戝叧鍥炲瓒呮椂,璇风◢鍚庡啀璇�
- string msg = Language.StringByID(R.MyInternationalizationString.uGetDeviceListFail);
- msg += "\r\n[" + Common.LocalGateway.Current.GetGatewayName(zbGateway).ToString() + "]";
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, "鍥炲瓒呮椂", false);
- this.ShowErrorMsg(msg);
- }
- return null;
- }
- else
- {
- if (nowFormId == UserCenterResourse.NowActionFormID && mode == ShowErrorMode.YES)
+ //缃戠粶涓嶇ǔ瀹氾紝璁惧鍒楄〃淇℃伅缂烘崯,鍒欓噰鐢ㄦ寜搴忓彿鑾峰彇璁惧
+ statu = this.GetDeviceListFromGatewayByMac(gatewayId, ref listDevice, ref listFucDevice, dicMacPointCount, useLocalConnect);
+ if (statu == 2)
{
//缃戠粶涓嶇ǔ瀹氾紝璁惧鍒楄〃淇℃伅缂烘崯
string msg = Language.StringByID(R.MyInternationalizationString.uNetworkUnStableAndDeviceInfoIsNotFull);
this.ShowTipMsg(msg);
}
}
+ else
+ {
+ if (mode == ShowErrorMode.YES)
+ {
+ //鑾峰彇璁惧鍒楄〃澶辫触
+ //[XXXX]缃戝叧鍥炲瓒呮椂,璇风◢鍚庡啀璇�
+ string msg = Language.StringByID(R.MyInternationalizationString.uGetDeviceListFail);
+ var localGw = HdlGatewayLogic.Current.GetLocalGateway(gatewayId);
+ if (localGw != null)
+ {
+ msg += "\r\n[" + HdlGatewayLogic.Current.GetGatewayName(localGw).ToString() + "]";
+ }
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "鍥炲瓒呮椂", false);
+ this.ShowTipMsg(msg);
+ }
+ statu = -1;
+ return null;
+ }
+ }
+ 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);
+ }
+ });
}
- //鍥炶皟鍑芥暟(鎺ユ敹瀹屾垚)
- deviceComingAction?.Invoke(null);
-
return listDevice;
+ }
+
+ /// <summary>
+ /// 鏍规嵁搴忓彿鑾峰彇璁惧鍒楄〃淇℃伅(鍙湁鍦ㄨ澶囩己鎹熺殑鏃跺�欐墠璋冪敤杩欎釜鍑芥暟) 1:姝ｅ父 2:璁惧缂烘崯
+ /// </summary>
+ /// <param name="gatewayId">缃戝叧id</param>
+ /// <param name="listDevice">瀛樺偍鐨勮澶囧璞￠泦鍚�</param>
+ /// <param name="listFucDevice">闇�瑕佸彉鏇村姛鑳界被鍨嬬殑鍥炶矾</param>
+ /// <param name="dicNowPointCount">褰撳墠宸茬粡鑾峰彇鐨凪ac鐨勭鐐规�绘暟</param>
+ /// <param name="useLocalConnect">鏄惁浣跨敤鏈湴杩炴帴鍙戦��</param>
+ /// <returns></returns>
+ public int GetDeviceListFromGatewayByMac(string gatewayId, ref List<CommonDevice> listDevice, ref List<CommonDevice> listFucDevice, Dictionary<string, int> dicNowPointCount, bool useLocalConnect)
+ {
+ //棣栧厛鍏堣幏鍙栬澶囩殑mac鍒楄〃
+ var jObject33 = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 87 } };
+ var result = HdlGatewayLogic.Current.SendJobjectDataToGateway(gatewayId, "GetStatusRecord", jObject33.ToString(), "DeviceMACDeviceListRespon", 3, useLocalConnect);
+ if (result.ErrorMsgDiv == -1 || result.ErrorMsgDiv == 0)
+ {
+ //濡傛灉缃戝叧娌℃湁瀵硅繖涓富棰樺仛鍑哄洖搴旂殑璇�,鍒欒鏄庡畠鏄竴涓棫缃戝叧
+ return 2;
+ }
+ var resultMac = Newtonsoft.Json.JsonConvert.DeserializeObject<ReceiptMacResult>(result.ReceiptData);
+
+ //璁惧鍒楄〃
+ var listDeviceJson = new List<Newtonsoft.Json.Linq.JObject>();
+
+ int statu = 0;
+ foreach (var macInfo in resultMac.MACDeviceList)
+ {
+ if (dicNowPointCount.ContainsKey(macInfo.MacAddr) == true
+ && dicNowPointCount[macInfo.MacAddr] == macInfo.EPTotalNum)
+ {
+ //濡傛灉杩欎釜mac鐨勭鐐规暟涓�鑷�,鍒欒鏄庡凡缁忔帴鏀堕綈浜�,涓嶉渶瑕佸啀娆℃帴鏀�
+ continue;
+ }
+ //浠庣綉鍏宠鍙栨寚瀹歁ac涓嬬殑璁惧鍒楄〃
+ var jsonData = this.ReadDeviceListByMacFromGateway(gatewayId, macInfo.MacAddr, useLocalConnect, ref statu);
+ foreach (var myData in jsonData)
+ {
+ listDeviceJson.Add(myData);
+ }
+ if (statu != 1)
+ {
+ //娌℃湁姝ｅ父瀹屾垚,鍒欎腑鏂�
+ break;
+ }
+ }
+ //杞寲涓鸿澶囧垪琛�
+ var listTempDevice = this.ConvertJObjectToDevice(listDeviceJson, gatewayId, ref listFucDevice);
+ for (int i = 0; i < listTempDevice.Count; i++)
+ {
+ listDevice.Add(listTempDevice[i]);
+ }
+ return statu == 1 ? 1 : 2;
+ }
+
+ /// <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((int)newDeviceType, 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;
+ }
+
+ /// <summary>
+ /// 鎺ユ敹璁惧Mac鍒楄〃鐨勭被
+ /// </summary>
+ private class ReceiptMacResult
+ {
+ /// <summary>
+ /// mac鎬绘暟
+ /// </summary>
+ public int MACDeviceTotalNum = 0;
+ /// <summary>
+ /// 璁惧mac鍒楄〃
+ /// </summary>
+ public List<MacResult> MACDeviceList = new List<MacResult>();
+ }
+
+ /// <summary>
+ /// 璁惧Mac鐨勫唴瀹�
+ /// </summary>
+ private class MacResult
+ {
+ /// <summary>
+ /// 璁惧Mac
+ /// </summary>
+ public string MacAddr = string.Empty;
+ /// <summary>
+ /// mac绔偣鐨勬�绘暟
+ /// </summary>
+ public int EPTotalNum = 0;
}
#endregion
@@ -2693,18 +3212,16 @@
#region 鈻� 鍒涘缓鏂拌澶囧璞＄浉鍏砡________________
/// <summary>
- /// 鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
+ /// 鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�(鏁版嵁鍦―eviceInfo涓�)
/// </summary>
/// <param name="deviceType">璁惧绫诲瀷</param>
/// <param name="jobject">涓婚Data</param>
- /// <param name="zbGateway">缃戝叧瀵硅薄</param>
+ /// <param name="gwid">缃戝叧id</param>
/// <returns></returns>
- private CommonDevice NewDeviceObjectByDeviceId(DeviceType deviceType, Newtonsoft.Json.Linq.JObject jobject, ZbGateway zbGateway)
+ private CommonDevice NewDeviceObjectByDeviceId(DeviceType deviceType, Newtonsoft.Json.Linq.JObject jobject, string gwid)
{
- string gwId = Common.LocalGateway.Current.GetGatewayId(zbGateway);
-
//鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
- CommonDevice device = this.NewDeviceObjectByDeviceId(deviceType);
+ CommonDevice device = this.NewDeviceObjectByDeviceId(deviceType, jobject.Value<int>("Epoint"));
if (device == null)
{
return null;
@@ -2716,15 +3233,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);
+ device.CurrentGateWayId = gwid;
return device;
}
@@ -2736,48 +3248,104 @@
/// <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.ImgVersion = device.DeviceInfo.ImgVersion;
- mainDevice.HwVersion = device.DeviceInfo.HwVersion;
+ 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;
+ //纭欢鐗堟湰
+ mainDevice.HwVersion = device.DeviceInfo.HwVersion;
+ //闀滃儚ID
mainDevice.ImgTypeId = device.DeviceInfo.ImgTypeId;
- mainDevice.InClusterList = device.DeviceInfo.InClusterList;
- mainDevice.OutClusterList = device.DeviceInfo.OutClusterList;
- mainDevice.AttributeStatus = device.DeviceInfo.AttributeStatus;
+ //鍘傚晢鍚嶇О
+ mainDevice.ManufacturerName = device.DeviceInfo.ManufacturerName;
+ //妯″潡ID
+ 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);
+ mainDevice.OutClusterList.Clear();
+ mainDevice.OutClusterList.AddRange(device.DeviceInfo.OutClusterList);
+ mainDevice.AttributeStatus.Clear();
+ mainDevice.AttributeStatus.AddRange(device.DeviceInfo.AttributeStatus);
+
+ //濡傛灉鏄俯搴︿紶鎰熷櫒
+ if (mainDevice.Type == DeviceType.TemperatureSensor)
+ {
+ //杈撳嚭鏃� 1026:娓╁害浼犳劅鍣� 1029:婀垮害浼犳劅鍣�
+ foreach (var data in mainDevice.OutClusterList)
+ {
+ if (data.OutCluster == 1029)
+ {
+ ((TemperatureSensor)mainDevice).SensorDiv = 2;
+ }
+ else if (data.OutCluster == 1026)
+ {
+ ((TemperatureSensor)mainDevice).SensorDiv = 1;
+ }
+ }
+ if (((TemperatureSensor)mainDevice).SensorDiv == 1)
+ {
+ //鍙樻洿涓�涓嬫俯搴︾殑鍊�
+ foreach (var data in mainDevice.AttributeStatus)
+ {
+ if (data.ClusterId == 1026
+ && data.AttributeId == (int)AttriButeId.MeasuredValue)
+ {
+ //澶勭悊缃戝叧杩斿洖鐨勬俯搴﹀��
+ decimal temperatrue = this.AdjustTemperatrueValue(data.AttributeData);
+ ((TemperatureSensor)mainDevice).currentTemperature = temperatrue;
+ }
+ }
+ }
+ else if (((TemperatureSensor)mainDevice).SensorDiv == 2)
+ {
+ //鍙樻洿涓�涓嬫箍搴︾殑鍊�
+ foreach (var data in mainDevice.AttributeStatus)
+ {
+ if (data.ClusterId == 1029
+ && data.AttributeId == (int)AttriButeId.MeasuredValue)
+ {
+ //澶勭悊缃戝叧杩斿洖鐨勬俯搴﹀��
+ decimal humidity = this.AdjustHumidityValue(data.AttributeData);
+ ((TemperatureSensor)mainDevice).currentHumidity = humidity;
+ }
+ }
+ }
+ }
}
/// <summary>
/// 鏍规嵁璁惧Type鍒涘缓瀵瑰簲鐨勮澶囧璞�
/// </summary>
/// <param name="deviceType">璁惧Type</param>
+ /// <param name="DeviceEpoint">璁惧绔偣(娌℃湁浠�涔堢壒娈婇渶姹傜殑璇�,濉�0鍗冲彲)</param>
/// <returns></returns>
- public CommonDevice NewDeviceObjectByDeviceId(DeviceType deviceType)
+ public CommonDevice NewDeviceObjectByDeviceId(DeviceType deviceType, int DeviceEpoint)
{
- CommonDevice device = null;
-
//鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
- if (deviceType == DeviceType.ColorDimmableLight) { device = new ColorDimmableLight(); }
- else if (deviceType == DeviceType.DimmableLight) { device = new DimmableLight(); }
- 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.IASZone) { device = new IASZone(); }
- else if (deviceType == DeviceType.Repeater) { device = new Repeater(); }
- else if (deviceType == DeviceType.Thermostat) { device = new AC(); }
- else if (deviceType == DeviceType.OtaDevice || deviceType == DeviceType.OtaPanelDevice) { device = new OTADevice(); }
- else { return null; }
+ var device = CommonDevice.CommonDeviceByByteString((int)deviceType, "{\"DeviceID\":" + (int)deviceType + ",\"DeviceEpoint\":" + DeviceEpoint + "}");
+ if (device == null)
+ {
+ return null;
+ }
device.DeviceEpointName = string.Empty;
device.DeviceName = string.Empty;
@@ -2793,11 +3361,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 != null && 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 != null && 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 != null && 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 != null && 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 != null && 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
@@ -2811,57 +3510,559 @@
/// </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
+ 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;
+ }
- //=========鈽呪槄寮�鍚堝笜绫�(100-199)鈽呪槄=========
- this.dicDeviceModelIdEnum["MWM65B-ZB.20"] = "100-100";//鏅鸿兘寮�鍚堝笜鐢垫満
- this.dicDeviceModelIdEnum["MVSM35B-ZB.20"] = "101-100";//鏅鸿兘绠＄姸鐢垫満
+ //鉁┾湬鉁┾湬鉁╅渶瑕佷氦鎹㈢殑妯″潡ID鉁┾湬鉁┾湬鉁�
+ this.dicDeviceModelIdChanged = new Dictionary<string, string>();
+ //=========鈽呪槄瀹夐槻绫讳紶鎰熷櫒绫烩槄鈽�=========
+ this.dicDeviceModelIdChanged["MULTI-GASE--EA07"] = "MSG01/M-ZB.10";//鐕冩皵浼犳劅鍣�
+ this.dicDeviceModelIdChanged["MULTI-MECI--EA01"] = "MSDC01/M-ZB.10";//闂ㄧ獥纾佷紶鎰熷櫒
+ this.dicDeviceModelIdChanged["MULTI-FIRE--EA05"] = "MSS01/M-ZB.10";//鐑熼浘浼犳劅鍣�
+ this.dicDeviceModelIdChanged["MULTI-MOTI--EA04"] = "MSPIR01/M-ZB.10";//绾㈠浼犳劅鍣�
+ this.dicDeviceModelIdChanged["MULTI-WATE--EA02"] = "MSW01/M-ZB.10";//姘存蹈浼犳劅鍣�
+ this.dicDeviceModelIdChanged["MULTI-BURO--EA06"] = "MBU01/M-ZB.10";//绱ф�ユ寜閿�
- //=========鈽呪槄鎸夐敭闈㈡澘绫�(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鎸夐敭瑙︽懜闈㈡澘(鍙甫鐢垫簮搴曞骇)
+ //鉁┾湬鉁┾湬鉁╅渶瑕佸叡鏈夌殑鍥剧墖瀵硅薄鉁┾湬鉁┾湬鉁�
+ //涓よ�呴兘鏄疍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 Pro鐨勯棬閿佸浘鐗� 娌跨敤 H06C鐨勫浘鏍�
+ this.dicPictrueShard["IntelligentLocks_AT1TF"] = "IntelligentLocks_H06C";//鍏ㄨ嚜鍔ㄦ櫤鑳介棬閿� AT-1TF鍥剧墖 娌跨敤 H06C鐨勫浘鏍�
+ this.dicPictrueShard["IntelligentLocks_AT1F"] = "IntelligentLocks_H06C";//鍏ㄨ嚜鍔ㄦ櫤鑳介棬閿� AT-1F鍥剧墖 娌跨敤 H06C鐨勫浘鏍�
+ this.dicPictrueShard["IntelligentLocks_AT1T"] = "IntelligentLocks_H06C";//鍏ㄨ嚜鍔ㄦ櫤鑳介棬閿� AT-1T鍥剧墖 娌跨敤 H06C鐨勫浘鏍�
+ this.dicPictrueShard["IntelligentLocks_HAT1B"] = "IntelligentLocks_H06C";//鏅鸿兘闂ㄩ攣 HAT-1B鍥剧墖 娌跨敤 H06C鐨勫浘鏍�
+ this.dicPictrueShard["IntelligentLocks_HAT1T"] = "IntelligentLocks_H06C";//鏅鸿兘闂ㄩ攣 HAT-1T鍥剧墖 娌跨敤 H06C鐨勫浘鏍�
+ this.dicPictrueShard["IntelligentLocks_ATFT"] = "IntelligentLocks_H06C";//鏅鸿兘闂ㄩ攣 HAT-1T鍥剧墖 娌跨敤 H06C鐨勫浘鏍�
+ this.dicPictrueShard["Relay_FangyueFreshAirModul"] = "Relay_ThreeLoad";//鏂规偊鏂伴灏忔ā鍧楀浘鐗� 娌跨敤 3璺户鐢靛櫒鐨勫浘鏍�
+ this.dicPictrueShard["ButtonPanel_FourButtonScene"] = "ButtonPanel_Four";//绠�绾�4鎸夐敭鍦烘櫙闈㈡澘 娌跨敤 4鎸夐敭闈㈡澘鐨勫浘鏍�
+ }
- //=========鈽呪槄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璺皟鍏夊櫒灏忔ā鍧�
-
- //=========鈽呪槄绌鸿皟绫�(3600-3899)鈽呪槄=========
- this.dicDeviceModelIdEnum["MAC/GW-ZB.431"] = "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杞�485鍗忚杞崲鍣�
- this.dicDeviceModelIdEnum["M485/GW-ZB.10"] = "4201-4200";//zigbee杞琤uspro鍗忚杞崲鍣�
+ /// <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
}
-}
\ No newline at end of file
+
+ #region 鈻� 鑷畾涔夎澶囩被鍨媉________________________
+
+ /// <summary>
+ /// <para>璁惧鐨勫叿浣撱�愯澶囩被鍨嬨��,鍙橀噺鍚嶅彲浠ヤ綔涓恒�愯澶囩被鍨嬨�戝浘鐗�,杩欎釜鍊兼槸鐬庡啓鐨�,娌′粈涔堢壒娈婃剰涔�</para>
+ /// </summary>
+ public enum DeviceConcreteType
+ {
+ /// <summary>
+ /// 鏈煡璁惧
+ /// </summary>
+ UnKownDevice = -1,
+
+ //=========鈽呪槄绐楀笜绫�(100-199)鈽呪槄=========
+ /// <summary>
+ /// 绐楀笜
+ /// </summary>
+ Curtain = -100,
+ /// <summary>
+ /// 鏅鸿兘寮�鍚堝笜鐢垫満 闀滃儚id锛�100
+ /// </summary>
+ Curtain_AutoOpen = 100,
+ /// <summary>
+ /// 鏅鸿兘绠＄姸鐢垫満 闀滃儚id锛�101
+ /// </summary>
+ Curtain_Siphonate = 101,
+
+ //=========鈽呪槄鎸夐敭闈㈡澘绫�(200-1199)鈽呪槄=========
+ /// <summary>
+ /// 鎸夐敭闈㈡澘
+ /// </summary>
+ ButtonPanel = -200,
+ /// <summary>
+ /// 4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�4璺户鐢靛櫒搴曞骇) 闀滃儚id锛�200
+ /// </summary>
+ ButtonPanel_Four = 200,
+ /// <summary>
+ /// 3鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�3璺户鐢靛櫒搴曞骇) 闀滃儚id锛�201
+ /// </summary>
+ ButtonPanel_Three = 201,
+ /// <summary>
+ /// 2鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�2璺户鐢靛櫒搴曞骇) 闀滃儚id锛�202
+ /// </summary>
+ ButtonPanel_Two = 202,
+ /// <summary>
+ /// 12鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�1璺户鐢靛櫒搴曞骇) 闀滃儚id锛�203
+ /// </summary>
+ ButtonPanel_Twelve = 203,
+ /// <summary>
+ /// 4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉匡紙鍙甫鐢垫簮搴曞骇锛� 闀滃儚id锛�210
+ /// </summary>
+ ButtonPanel_FourNotPower = 210,
+ /// <summary>
+ /// 绠�绾�4鎸夐敭闈㈡澘 闀滃儚id锛�220
+ /// </summary>
+ ButtonPanel_SimpleFour = 220,
+ /// <summary>
+ /// 绠�绾�3鎸夐敭闈㈡澘 闀滃儚id锛�221
+ /// </summary>
+ ButtonPanel_SimpleThree = 221,
+ /// <summary>
+ /// 绠�绾�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>
+ /// 浼犳劅鍣�
+ /// </summary>
+ Sensor = -1200,
+ /// <summary>
+ /// pir浼犳劅鍣�220 闀滃儚id锛�1200
+ /// </summary>
+ Sensor_Pir = 1200,
+ /// <summary>
+ /// 鐞冨舰绉诲姩浼犳劅鍣� 闀滃儚id锛�1205
+ /// </summary>
+ Sensor_SphericalMotion = 1205,
+
+ //=========鈽呪槄瀹夐槻绫讳紶鎰熷櫒绫�(1300-2299)鈽呪槄=========
+ /// <summary>
+ /// 鐕冩皵浼犳劅鍣�
+ /// </summary>
+ Sensor_CarbonMonoxide = 1300,
+ /// <summary>
+ /// 闂ㄧ獥浼犳劅鍣�
+ /// </summary>
+ Sensor_DoorWindow = 1301,
+ /// <summary>
+ /// 鐑熼浘浼犳劅鍣�
+ /// </summary>
+ Sensor_Fire = 1302,
+ /// <summary>
+ /// 绾㈠浼犳劅鍣�
+ /// </summary>
+ Sensor_Infrared = 1303,
+ /// <summary>
+ /// 姘翠镜浼犳劅鍣�
+ /// </summary>
+ Sensor_Water = 1304,
+ /// <summary>
+ /// 绱ф�ユ寜閽�
+ /// </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,
+ /// <summary>
+ /// 閽ュ寵鎵�
+ /// </summary>
+ Sensor_Keyfob = -1307,
+ /// <summary>
+ /// 娓╁害浼犳劅鍣�(杩欎釜鍗曡瘝鎷奸敊浜�,浣嗘槸閿欎簡灏遍敊浜嗗憲,灏辫繖鏍蜂簡)
+ /// </summary>
+ Sensor_Temperature = -1309,
+ /// <summary>
+ /// 婀垮害浼犳劅鍣�
+ /// </summary>
+ Sensor_Humidity = -1310,
+
+ //=========鈽呪槄缁х數鍣ㄧ被(2300-2499)鈽呪槄=========
+ /// <summary>
+ /// 缁х數鍣�
+ /// </summary>
+ Relay = -2300,
+ /// <summary>
+ /// 涓夎矾缁х數鍣� 闀滃儚id锛�2300
+ /// </summary>
+ Relay_ThreeLoad = 2300,
+ /// <summary>
+ /// 鏂规偊鏂伴灏忔ā鍧� 闀滃儚id锛�2310
+ /// </summary>
+ Relay_FangyueFreshAirModul = 2310,
+ /// <summary>
+ /// 鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 闀滃儚id锛�2301
+ /// </summary>
+ Relay_NationalThreeLoadTenA = 2301,
+ /// <summary>
+ /// 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 闀滃儚id锛�2315
+ /// </summary>
+ Relay_EuropeanTwoLoadFiveA = 2315,
+ /// <summary>
+ /// 7璺共鎺ョ偣杈撳叆杈撳嚭妯″潡 闀滃儚id锛�2320
+ /// </summary>
+ Relay_SevenLoadInOutPutDryContact = 2320,
+
+ //=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
+ /// <summary>
+ /// 璋冨厜鍣�
+ /// </summary>
+ DimmableLight = -2500,
+ /// <summary>
+ /// 1璺皟鍏夊櫒灏忔ā鍧�
+ /// </summary>
+ DimmableLight_OneLoad = 2500,
+
+ //=========鈽呪槄鏅鸿兘闂ㄩ攣绫�(2800-????)鈽呪槄=========
+ /// <summary>
+ /// 鏅鸿兘闂ㄩ攣
+ /// </summary>
+ IntelligentLocks = -2800,
+ /// <summary>
+ /// H06C
+ /// </summary>
+ IntelligentLocks_H06C = 2800,
+ /// <summary>
+ /// S-One Pro
+ /// </summary>
+ IntelligentLocks_Sone = 2802,
+ /// <summary>
+ /// AT-1TF
+ /// </summary>
+ IntelligentLocks_AT1TF = 2803,
+ /// <summary>
+ /// AT-1F
+ /// </summary>
+ IntelligentLocks_AT1F = 2804,
+ /// <summary>
+ /// AT-1T
+ /// </summary>
+ IntelligentLocks_AT1T = 2805,
+ /// <summary>
+ /// HAT-1B
+ /// </summary>
+ IntelligentLocks_HAT1B = 2806,
+ /// <summary>
+ /// HAT-1T
+ /// </summary>
+ IntelligentLocks_HAT1T = 2807,
+ /// <summary>
+ /// AT-FT
+ /// </summary>
+ IntelligentLocks_ATFT = 2808,
+
+ //=========鈽呪槄褰╃伅绫�(????-????)鈽呪槄=========
+ /// <summary>
+ /// 褰╃伅
+ /// </summary>
+ ColorLight = -10,
+ /// <summary>
+ /// 鑹叉俯鐏�(瀹冪殑闀滃儚ID鏈畾,鏆傚畾20000)
+ /// </summary>
+ ColorLight_Temperature = 20000,
+
+ //=========鈽呪槄绌鸿皟(3600-3899)鈽呪槄=========
+ /// <summary>
+ /// 绌鸿皟
+ /// </summary>
+ AirConditioner = -3600,
+ /// <summary>
+ /// zigbee绌鸿皟缃戝叧妯″潡
+ /// </summary>
+ AirConditioner_ZbGateway = 3600,
+
+ //=========鈽呪槄涓户鍣�(3900-3999)鈽呪槄=========
+ /// <summary>
+ /// 涓户鍣�
+ /// </summary>
+ Repeater = -3900,
+ /// <summary>
+ /// zigbee涓户鍣� 闀滃儚id锛�3900
+ /// </summary>
+ Repeater_Zigbee = 3900,
+
+ //=========鈽呪槄绌烘皵寮�鍏崇被(4100-????)鈽呪槄=========
+ /// <summary>
+ /// 鏅鸿兘绌哄紑
+ /// </summary>
+ AirSwitch = -4100,
+ /// <summary>
+ /// 鏅鸿兘绌哄紑 闀滃儚id锛�4100
+ /// </summary>
+ AirSwitch_CloudContr = 4100,
+
+ //=========鈽呪槄杞崲鍣ㄧ被(4200-4699)鈽呪槄=========
+ /// <summary>
+ /// 杞崲鍣�
+ /// </summary>
+ Converter = -4200,
+ /// <summary>
+ /// zigbee杞�485鍗忚杞崲鍣�
+ /// </summary>
+ Converter_Zb485 = 4200,
+ /// <summary>
+ /// zigbee杞琤uspro鍗忚杞崲鍣�
+ /// </summary>
+ Converter_ZbBuspro = 4201,
+
+ //=========鈽呪槄鏅捐。鏋剁被(5000-5199)鈽呪槄=========
+ /// <summary>
+ /// 鏅捐。鏋�
+ /// </summary>
+ Airer = 5000,
+
+ //=========鈽呪槄绌烘皵璐ㄩ噺浼犳劅鍣ㄧ被(5200-5399)鈽呪槄=========
+ /// <summary>
+ /// 绌烘皵璐ㄩ噺浼犳劅鍣�
+ /// </summary>
+ AirQualitySensor = 5200,
+
+ //=========鈽呪槄鍏朵粬绫�(????-????)鈽呪槄=========
+ /// <summary>
+ /// 骞叉帴鐐�(娉ㄦ剰,瀹冨睘浜庡叾浠栫被,涓嶆槸璁惧绫诲瀷)
+ /// </summary>
+ DryContact = -10000,
+ /// <summary>
+ /// 鐏厜(娉ㄦ剰,瀹冨睘浜庡叾浠栫被,涓嶆槸璁惧绫诲瀷)
+ /// </summary>
+ Light = -10001,
+ /// <summary>
+ /// 鎻掑骇(娉ㄦ剰,瀹冨睘浜庡叾浠栫被,涓嶆槸璁惧绫诲瀷)
+ /// </summary>
+ Socket1 = -10002,
+ /// <summary>
+ /// 寮�鍏�(娉ㄦ剰,瀹冨睘浜庡叾浠栫被,涓嶆槸璁惧绫诲瀷)
+ /// </summary>
+ Switch = -10003,
+ }
+
+ /// <summary>
+ /// <para>璁惧鎵�灞炴灇涓�,杩欎釜鍊兼槸鐬庡啓鐨�,娌′粈涔堢壒娈婃剰涔�</para>
+ /// </summary>
+ public enum DeviceBeloneType
+ {
+ /// <summary>
+ /// 鏈煡璁惧
+ /// </summary>
+ A鏈煡璁惧 = 0,
+ /// <summary>
+ /// 绐楀笜(100-199)
+ /// </summary>
+ A绐楀笜 = 100,
+ /// <summary>
+ /// 鎸夐敭闈㈡澘(200-1199)
+ /// </summary>
+ A鎸夐敭闈㈡澘 = 200,
+ /// <summary>
+ /// 浼犳劅鍣�(1200-2299)
+ /// </summary>
+ A浼犳劅鍣� = 1200,
+ /// <summary>
+ /// PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+ /// </summary>
+ APM2鐐�5绌烘皵璐ㄩ噺浼犳劅鍣� = 1307,
+ /// <summary>
+ /// 缁х數鍣�(2300-2499)
+ /// </summary>
+ A缁х數鍣� = 2300,
+ /// <summary>
+ /// 鏂伴
+ /// </summary>
+ A鏂伴 = 2310,
+ /// <summary>
+ /// 璋冨厜鍣�(2500-2799)
+ /// </summary>
+ A璋冨厜鍣� = 2500,
+ /// <summary>
+ /// 鏅鸿兘闂ㄩ攣(2800-????)
+ /// </summary>
+ A鏅鸿兘闂ㄩ攣 = 2800,
+ /// <summary>
+ /// 绌鸿皟(3600-3899)
+ /// </summary>
+ A绌鸿皟 = 3600,
+ /// <summary>
+ /// 涓户鍣�(3900-3999)
+ /// </summary>
+ A涓户鍣� = 3900,
+ /// <summary>
+ /// 鏅鸿兘绌哄紑(4100-4199)
+ /// </summary>
+ A鏅鸿兘绌哄紑 = 4100,
+ /// <summary>
+ /// 杞崲鍣�(4200-4699)
+ /// </summary>
+ A杞崲鍣� = 4200,
+ /// <summary>
+ /// 鏅捐。鏋�(4200-4699)
+ /// </summary>
+ A鏅捐。鏋� = 5000,
+ /// <summary>
+ /// 绌烘皵璐ㄩ噺浼犳劅鍣�(5200-5399)
+ /// </summary>
+ A绌烘皵璐ㄩ噺 = 5200,
+ /// <summary>
+ /// 褰╃伅
+ /// </summary>
+ A褰╃伅 = 9,
+ /// <summary>
+ /// 娓╂箍搴︿紶鎰熷櫒
+ /// </summary>
+ A娓╂箍搴︿紶鎰熷櫒 = 10,
+ /// <summary>
+ /// 娓╁害浼犳劅鍣�
+ /// </summary>
+ A娓╁害浼犳劅鍣� = 11,
+ /// <summary>
+ /// 婀垮害浼犳劅鍣�
+ /// </summary>
+ A婀垮害浼犳劅鍣� = 12,
+ /// <summary>
+ /// 寮�鍏�
+ /// </summary>
+ A寮�鍏� = 13,
+ /// <summary>
+ /// 鎻掑骇
+ /// </summary>
+ A鎻掑骇 = 14,
+ /// <summary>
+ /// 鐏厜
+ /// </summary>
+ A鐏厜 = 15,
+ /// <summary>
+ /// 骞叉帴鐐�
+ /// </summary>
+ A骞叉帴鐐� = 16,
+ }
+
+ #endregion
+}
--
Gitblit v1.8.0