From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Common/Device.cs | 219 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 190 insertions(+), 29 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index 1e86a70..ec7fb84 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -165,6 +165,14 @@
this.DeleteGatewayFileByMemberModel();
//鍒濆鍖栫墿鐞嗚澶囨墍灞炴埧闂寸殑璁板綍
this.InitRealDeviceRoomId();
+
+#if DEBUG
+ if (UserCenterResourse.HideOption.CenterHideMenu == 1)
+ {
+ //妫�娴嬩竴浜涗唬鐮侀厤缃�(debug)
+ this.CheckOhtherSettion();
+ }
+#endif
}
/// <summary>
@@ -196,6 +204,38 @@
{
//杩欎釜缃戝叧瀵逛簬褰撳墠杩欎釜鎴愬憳鏉ヨ鏄潪娉曠殑
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);
+ string strMsg = string.Empty;
+ if (device == null)
+ {
+ strMsg = itemName + "娌℃湁瀹炶(1)";
+ }
+ device = CommonDevice.CommonDeviceByByteString(itemName, "{}");
+ if (device == null)
+ {
+ strMsg += "\r\n" + itemName + "娌℃湁瀹炶(2)";
+ }
+ if (strMsg != string.Empty)
+ {
+ this.ShowErrorMsg(strMsg);
+ return;
}
}
}
@@ -260,7 +300,10 @@
dicExist.Remove(maikey);
}
//鑾峰彇璁惧鐨勫浐瀹氬睘鎬�
- HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device);
+ if (HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device) == true)
+ {
+ System.Threading.Thread.Sleep(200);
+ }
//瀵规湭鍛藉悕鐨勮櫄鎷熻澶囬噸鏂板懡鍚�
if (device.DriveCode > 0 && this.GetSimpleEpointName(device) == string.Empty)
{
@@ -382,6 +425,12 @@
public void AddVirtualDeviceToMemory(CommonDevice device)
{
string mainKeys = this.GetDeviceMainKeys(device);
+ if (device is OTADevice)
+ {
+ this.dicOTADevice[mainKeys] = (OTADevice)device;
+ device.ReSave();
+ return;
+ }
this.dicAllDevice[mainKeys] = device;
//璁惧鍥炶矾鏀堕泦
@@ -762,6 +811,8 @@
this.dicDeviceEpoint[device.DeviceAddr].Remove(device.DeviceEpoint);
}
}
+ //鍒犻櫎妯℃澘鏁版嵁
+ Phone.TemplateData.TemplateCommonLogic.Current.DeleteDevice(device);
//鍒犻櫎璁惧鏂囦欢
string filePath = device.FilePath;
@@ -847,13 +898,25 @@
/// <summary>
/// 鍙戦�佸畾浣嶆寚浠ゅ埌璁惧
/// </summary>
- /// <param name="device"></param>
- public void SetFixedPositionCommand(CommonDevice device)
+ /// <param name="device">璁惧鍥炶矾</param>
+ /// <param name="isRealDevice">鏄惁鏄畾浣嶇湡瀹炶澶�</param>
+ public void SetFixedPositionCommand(CommonDevice device, bool isRealDevice = false)
{
//濡傛灉褰撳墠浣忓畢涓嶆槸铏氭嫙浣忓畢
if (Common.Config.Instance.Home.IsVirtually == false)
{
- device.IdentifyControl(device.DeviceAddr, device.DeviceEpoint, 5);
+ 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);
}
}
@@ -1275,10 +1338,15 @@
/// <returns></returns>
public bool SendDeviceFunctionTypeToGateway(CommonDevice device, DeviceFunctionType functionType)
{
- var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", device.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 110 } };
- var data = new Newtonsoft.Json.Linq.JObject { { "FunctionType", (int)functionType } };
- jObject.Add("Data", data);
- var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "Device/SetEPDeviceFunctionType", jObject.ToString(), "Device/SetEPDeviceFunctionTypeRespon");
+ //濡傛灉鏄櫄鎷熶綇瀹�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ device.DfunctionType = functionType;
+ return true;
+ }
+ //鑾峰彇鍛戒护瀛楃
+ var sendCommond = this.GetDeviceFunctionTypeCommandText(device, functionType);
+ var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "Device/SetEPDeviceFunctionType", sendCommond, "Device/SetEPDeviceFunctionTypeRespon");
if (result.ErrorMsg != null || result.ErrorMsgDiv == 0)
{
return false;
@@ -1290,6 +1358,20 @@
return resultData["Result"].ToString() == "0";
}
return false;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏇存敼璁惧鍔熻兘绫诲瀷鐨勫懡浠ゆ枃鏈�
+ /// </summary>
+ /// <param name="device"></param>
+ /// <param name="functionType"></param>
+ /// <returns></returns>
+ public string GetDeviceFunctionTypeCommandText(CommonDevice device, DeviceFunctionType functionType)
+ {
+ var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", device.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 110 } };
+ var data = new Newtonsoft.Json.Linq.JObject { { "FunctionType", (int)functionType } };
+ jObject.Add("Data", data);
+ return jObject.ToString();
}
#endregion
@@ -1364,7 +1446,7 @@
else
{
var infoContent = this.GetDeviceModelIdNameInfo("A419");
- return infoContent != null ? infoContent.A瀹樻柟鍚嶅瓧 : string.Empty;
+ return infoContent != null ? infoContent.A瀹樻柟鍚嶅瓧 + epointNo : string.Empty;
}
}
else if (device.Type == DeviceType.FreshAirHumiditySensor)
@@ -1376,9 +1458,10 @@
{
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鎸夐敭闈㈡澘)
@@ -1657,30 +1740,36 @@
/// <summary>
/// 鑾峰彇銆愯澶囧姛鑳界被鍨嬨�戠殑鑿滃崟鍥炬爣
/// </summary>
- /// <param name="specificType">鑷畾涔夎澶囩被鍨�</param>
+ /// <param name="deviceEnumInfo">鑷畾涔夎澶囩被鍨�</param>
/// <param name="unSelectPath">鍥剧墖鍦板潃</param>
/// <param name="selectPath">鍥剧墖鍦板潃</param>
/// <returns></returns>
- public void GetDeviceFunctionTypeMenuIcon(DeviceConcreteType specificType, ref string unSelectPath, ref string selectPath)
+ public void GetDeviceFunctionTypeMenuIcon(DeviceEnumInfo deviceEnumInfo, ref string unSelectPath, ref string selectPath)
{
//鏂伴灏忔ā鍧�
- if (specificType == DeviceConcreteType.Relay_FangyueFreshAirModul)
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_FangyueFreshAirModul)
{
unSelectPath = "Device/FreshAirEpoint.png";
selectPath = "Device/FreshAirEpointSelected.png";
return;
}
//PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
- else if (specificType == DeviceConcreteType.Sensor_PMTwoPointFive)
+ 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(specificType, ref unSelectPath, ref selectPath);
+ this.GetDeviceObjectIcon(deviceEnumInfo.ConcreteType, ref unSelectPath, ref selectPath);
}
/// <summary>
@@ -2235,19 +2324,18 @@
/// <param name="saveRoadDevice">濡傛灉鍙湁涓�涓洖璺�,鏄惁鎶婂洖璺殑鎴块棿涓�璧蜂慨鏀�</param>
public void SaveRealDeviceRoomId(List<CommonDevice> listDevice, string roomId, bool saveRoadDevice = true)
{
- if (listDevice == null)
+ if (listDevice == null || listDevice.Count == 0)
{
return;
}
//濡傛灉璁惧鍙湁涓�涓洖璺紝濡傛灉鏀瑰彉浜嗙湡瀹炶澶囧尯鍩燂紝鍒欏畠鐨勫洖璺殑鍖哄煙涔熶竴璧锋敼浜�
- if (saveRoadDevice == true && listDevice != null && listDevice.Count == 1)
+ if (saveRoadDevice == true && listDevice.Count == 1)
{
- if (listDevice[0] is OTADevice)
+ if ((listDevice[0] is OTADevice) == false)
{
- //鍗曠函鍙槸Ota璁惧鍒欎笉澶勭悊
- return;
+ //ota璁惧涓嶉渶瑕佸鐞�
+ HdlRoomLogic.Current.ChangedRoom(listDevice[0], roomId, false);
}
- HdlRoomLogic.Current.ChangedRoom(listDevice[0], roomId, false);
}
bool save = false;
if (roomId == string.Empty)
@@ -2633,7 +2721,7 @@
{
HdlThreadLogic.Current.RunMain(() =>
{
- var contr = new ShowMsgControl(ShowMsgType.Error, msg);
+ var contr = new ShowMsgControl(Phone.ShowMsgType.Error, msg);
contr.Show();
});
}
@@ -2646,7 +2734,7 @@
{
HdlThreadLogic.Current.RunMain(() =>
{
- var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
+ var contr = new ShowMsgControl(Phone.ShowMsgType.Tip, msg);
contr.Show();
});
}
@@ -2741,12 +2829,30 @@
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;
}
}
}
@@ -2838,6 +2944,45 @@
return listDevice;
}
+ /// <summary>
+ /// 鍦ㄨ澶嘥ype鍙樻洿鏃�,閲嶆柊New杩欎釜璁惧瀵硅薄(浠呴檺鍦ㄥ埛鏂拌澶囧垪琛ㄤ娇鐢�,骞朵笖鏈湴闇�瑕佸瓨鍦�)
+ /// </summary>
+ /// <param name="oldLocalDevice">鍘熸潵鐨勬湰鍦板璞�</param>
+ /// <param name="newDeviceType">鏂扮殑璁惧Type</param>
+ private bool ReNewDeviceOnTypeIsChanged(CommonDevice oldLocalDevice, DeviceType newDeviceType)
+ {
+ //鍏堣幏鍙栨湰鍦拌繖涓棫璁惧瀵硅薄鐨刯son
+ string oldFile = System.IO.Path.Combine(Config.Instance.FullPath, oldLocalDevice.FilePath);
+ var deviceData = HdlFileLogic.Current.ReadFileTextContent(oldFile);
+ if (deviceData == null)
+ {
+ //搴旇涓嶄細
+ return false;
+ }
+ //鏍规嵁鏂癟ype閲嶆柊New瀵硅薄
+ var newDevice = CommonDevice.CommonDeviceByByteString(newDeviceType.ToString(), deviceData);
+ if (newDevice == null)
+ {
+ //濂藉儚鏈夌偣鍙兘
+ return false;
+ }
+ //鍒犻櫎鏈湴鏂囦欢
+ HdlFileLogic.Current.DeleteFile(oldFile);
+ HdlAutoBackupLogic.DeleteFile(oldLocalDevice.FilePath);
+
+ //閲嶆柊鐢熸垚鏂囦欢
+ if (newDevice.IsCustomizeImage == false)
+ {
+ newDevice.IconPath = string.Empty;
+ }
+ string mainkey = this.GetDeviceMainKeys(newDevice);
+ lock (dicAllDevice)
+ {
+ this.dicAllDevice[mainkey] = newDevice;
+ }
+ return true;
+ }
+
#endregion
#region 鈻� 鍒涘缓鏂拌澶囧璞＄浉鍏砡________________
@@ -2890,6 +3035,7 @@
mainDevice.IasDeviceType = device.DeviceInfo.DeviceType;
mainDevice.Profile = device.DeviceInfo.Profile;
mainDevice.Type = device.Type;
+ mainDevice.DeviceID = (int)device.Type;
//鍥轰欢鐗堟湰
mainDevice.ImgVersion = device.DeviceInfo.ImgVersion;
@@ -2965,6 +3111,8 @@
else if (deviceType == DeviceType.FreshAirHumiditySensor) { device = new HumiditySensor(); }
else if (deviceType == DeviceType.ColorTemperatureLight) { device = new ColorTemperatureLight(); }
else if (deviceType == DeviceType.Buzzer) { device = new Buzzer(); }
+ else if (deviceType == DeviceType.Transverter) { device = new Transverter(); }
+ else if (deviceType == DeviceType.DimmerSwitch) { device = new DimmerSwitch(); }
else if (deviceType == DeviceType.OtaDevice || deviceType == DeviceType.OtaPanelDevice) { device = new OTADevice(); }
else { return null; }
@@ -3007,7 +3155,7 @@
mainDevice.IconPath = "Device/Light.png";
}
mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
- if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
+ if (device.DeviceInfo != null && device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
{
//璋冨厜鍣ㄥ浐瀹氱伅鍏�
if (sendFucType == true)
@@ -3025,7 +3173,7 @@
mainDevice.IconPath = "Device/ColorLightTemperature.png";
}
mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
- if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
+ if (device.DeviceInfo != null && device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
{
//鑹叉俯鐏浐瀹氱伅鍏�
if (sendFucType == true)
@@ -3044,7 +3192,7 @@
if (mainDevice.DfunctionType == DeviceFunctionType.A鏈畾涔�)
{
mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
- if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
+ if (device.DeviceInfo != null && device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
{
//缁х數鍣ㄩ粯璁や负鐏厜
if (sendFucType == true)
@@ -3064,7 +3212,7 @@
if (mainDevice.DfunctionType == DeviceFunctionType.A鏈畾涔�)
{
mainDevice.DfunctionType = DeviceFunctionType.A寮�鍏�;
- if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A寮�鍏�)
+ if (device.DeviceInfo != null && device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A寮�鍏�)
{
//绌烘皵寮�鍏抽粯璁や负寮�鍏�
if (sendFucType == true)
@@ -3083,7 +3231,7 @@
mainDevice.IconPath = "Device/ColorLight.png";
}
mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
- if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
+ if (device.DeviceInfo != null && device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
{
//褰╃伅榛樿涓哄紑鍏�
if (sendFucType == true)
@@ -3194,6 +3342,7 @@
this.dicPictrueShard["ButtonPanel_SimpleTwo"] = "ButtonPanel_Two";//绠�绾�2鎸夐敭闈㈡澘 娌跨敤 2鎸夐敭鐨勫浘鏍�
this.dicPictrueShard["IntelligentLocks_Sone"] = "IntelligentLocks_H06C";//S-one鐨勯棬閿佸浘鐗� 娌跨敤 H06C鐨勫浘鏍�
this.dicPictrueShard["Relay_FangyueFreshAirModul"] = "Relay_ThreeLoad";//鏂规偊鏂伴灏忔ā鍧楀浘鐗� 娌跨敤 3璺户鐢靛櫒鐨勫浘鏍�
+ this.dicPictrueShard["ButtonPanel_FourButtonScene"] = "ButtonPanel_Four";//绠�绾�4鎸夐敭鍦烘櫙闈㈡澘 娌跨敤 4鎸夐敭闈㈡澘鐨勫浘鏍�
}
/// <summary>
@@ -3433,7 +3582,19 @@
/// 鏂规偊鏂伴灏忔ā鍧� 闀滃儚id锛�2310
/// </summary>
Relay_FangyueFreshAirModul = 2310,
-
+ /// <summary>
+ /// 鍥芥爣3璺�10A缁х數鍣ㄥ皬妯″潡 闀滃儚id锛�2311(涓存椂)
+ /// </summary>
+ Relay_NationalThreeLoadTenA = 2311,
+ /// <summary>
+ /// 娆ф爣2璺�5A缁х數鍣ㄥ皬妯″潡 闀滃儚id锛�2312(涓存椂)
+ /// </summary>
+ Relay_EuropeanTwoLoadFiveA = 2312,
+ /// <summary>
+ /// 娆ф爣14璺共鎺ョ偣灏忔ā鍧� 闀滃儚id锛�2313(涓存椂)
+ /// </summary>
+ Relay_EuropeanFourteenLoadDryContact = 2313,
+
//=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
/// <summary>
/// 璋冨厜鍣�
--
Gitblit v1.8.0