~wjc/HomeApp.git

			@@ -123,12 +123,6 @@

			if (device == null \|\| device.CurrentGateWayId == null)
			{
			#if DEBUG
			//调查,为什么它会把全部设备删掉？
			string file1 = UserCenterLogic.CombinePath(file);
			string file2 = UserCenterLogic.CombinePath("Back_" + file);
			System.IO.File.Copy(file1, file2, true);
			#endif
			//失效的文件，没有网关id的都删除掉
			Global.DeleteFilebyHomeId(file);
			continue;
			@@ -143,12 +137,6 @@
			}
			else
			{
			#if DEBUG
			//调查,为什么它会把全部设备删掉？
			string file1 = UserCenterLogic.CombinePath(file);
			string file2 = UserCenterLogic.CombinePath("Back_" + file);
			System.IO.File.Copy(file1, file2, true);
			#endif
			//如果是主人,或者管理员,那么这个文件是非法的,直接删除
			Global.DeleteFilebyHomeId(file);
			continue;
			@@ -211,7 +199,7 @@
			var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();
			foreach (var gateway in listGateway)
			{
			string gwId = HdlGatewayLogic.Current.GetGatewayId(gateway);
			string gwId = gateway.GwId;
			if (listId.Contains(gwId) == false)
			{
			//这个网关对于当前这个成员来说是非法的
			@@ -242,7 +230,7 @@
			listDevice.AddRange(list);

			//获取这个网关的本地所有设备
			string gwID = HdlGatewayLogic.Current.GetGatewayId(zbGateway);
			string gwID = zbGateway.GwId;
			List<CommonDevice> listLocalDevices = this.GetDeviceByGatewayID(gwID);
			//获取ota设备
			foreach (var ota in this.dicOTADevice.Values)
			@@ -261,6 +249,7 @@
			}

			//添加设备的缓存
			var listDriveDevice = new List<CommonDevice>();
			for (int i = 0; i < listDevice.Count; i++)
			{
			var device = listDevice[i];
			@@ -279,24 +268,27 @@
			}
			//获取设备的固定属性
			HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device);
			}

			for (int i = 0; i < listDevice.Count; i++)
			{
			var device = listDevice[i];
			//对未命名的虚拟设备重新命名
			if (device.DriveCode > 0 && this.GetSimpleEpointName(device) == string.Empty)
			{
			//根据设备类型获取名称
			var dName = this.GetDeviceObjectText(new List<CommonDevice>() { device }, false);
			//在端点名字的后面附加【回路】字样
			dName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";

			HdlThreadLogic.Current.RunThread(() =>
			{
			this.ReName(device, dName, ShowErrorMode.NO);
			});
			listDriveDevice.Add(device);
			}
			}
			if (listDriveDevice.Count > 0)
			{
			//如果虚拟设备还没有名字的话
			HdlThreadLogic.Current.RunThread(() =>
			{
			//如果不这样放在一个线程里,有可能对Dictionary产生影响
			foreach (var myDevice in listDriveDevice)
			{
			//根据设备类型获取名称
			var dName = this.GetDeviceObjectText(new List<CommonDevice>() { myDevice }, false);
			//在端点名字的后面附加【回路】字样
			dName += "(" + myDevice.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
			this.ReName(myDevice, dName, ShowErrorMode.NO);
			}
			});
			}

			//只有完全获取的时候,才会去处理删除的问题
			@@ -442,7 +434,7 @@
			if (Common.Config.Instance.Home.IsVirtually == true)
			{
			//修改设备名字的话,主页需要重新刷新
			Phone.UserView.UserPage.Instance.RefreshForm = true;
			Phone.UserView.UserPage.Instance.RefreshAllForm = true;
			return true;
			}

			@@ -466,7 +458,7 @@
			}
			}
			//修改设备名字的话,主页需要重新刷新
			Phone.UserView.UserPage.Instance.RefreshForm = true;
			Phone.UserView.UserPage.Instance.RefreshAllForm = true;
			return true;
			}

			@@ -559,7 +551,7 @@

			//获取编辑设备Mac名字的命令字符
			var sendData = this.GetReDeviceMacNameCommandText(device.DeviceAddr, device.DeviceEpoint, macName);
			var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "MacRename", sendData, "MacRename_Respon");
			var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "MacRename", sendData, "MacRename_Respon", 8);
			if (result.ErrorMsg != null \|\| result.ErrorMsgDiv == 0)
			{
			return null;
			@@ -586,7 +578,7 @@
			}
			//获取编辑设备端点名字的命令字符
			var sendData = this.GetReDeviceEpointNameCommandText(device.DeviceAddr, device.DeviceEpoint, deviceName);
			var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "DeviceRename", sendData, "DeviceRenameRespon");
			var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "DeviceRename", sendData, "DeviceRenameRespon", 8);
			if (result.ErrorMsg != null \|\| result.ErrorMsgDiv == 0)
			{
			return null;
			@@ -727,7 +719,7 @@
			public void DeleteMemmoryDevice(CommonDevice device, bool deleteRoom = true)
			{
			//删除缓存设备的话,主页需要重新刷新
			Phone.UserView.UserPage.Instance.RefreshForm = true;
			Phone.UserView.UserPage.Instance.RefreshAllForm = true;

			if (deleteRoom == true)
			{
			@@ -804,6 +796,35 @@

			#endregion

			#region ■ 同步设备___________________________
			/// <summary>
			/// 同步设备并且刷新缓存(同步失败时，会显示信息)
			/// </summary>
			/// <param name="litdevice">设备对象(MAC地址必须要相同)</param>
			public async Task<bool> SynchronizationDevice(List<CommonDevice> listdevice)
			{
			//虚拟住宅的话,不需要删除网关的设备
			if (Config.Instance.Home.IsVirtually == false)
			{
			//同步
			var result = await listdevice[0].SyncMsgToBindSource(listdevice[0].DeviceAddr, listdevice[0].DeviceEpoint);
			if (result == null \|\| result.result != 0)
			{
			//同步删除失败
			string msg = Language.StringByID(R.MyInternationalizationString.SynchronizationFailed);
			//拼接上【网关回复超时】的Msg
			msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);

			this.ShowErrorMsg(msg);
			return false;
			}
			}
			return true;
			}
			#endregion



			#region ■ 测试设备___________________________

			/// <summary>
			@@ -839,6 +860,11 @@
			//传感器除了Pir都没有定位功能
			return true;
			}
			else if (myTypeInfo.ConcreteType == DeviceConcreteType.Sensor_SphericalMotion)
			{
			//球型移动传感器虽然是电池设备,但是它有定位功能
			return true;
			}
			return false;
			}

			@@ -849,6 +875,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;
			}
			@@ -990,13 +1032,20 @@
			public List<CommonDevice> GetMutilfunctionPanelByMac(List<CommonDevice> listDevice, bool sort = true)
			{
			//和彪哥、设备和产品部同事确认：
			//简约多功能面板[不显示多余的回路，只显示携带的2个继电器和1个温湿度传感器
			//简约多功能面板[不显示多余的回路，只显示携带的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);
			}
			@@ -1020,6 +1069,41 @@
			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;
			}

			@@ -1077,7 +1161,7 @@
			public List<string> GetAllDeviceFile()
			{
			List<string> listDeviceFile = new List<string>();
			List<string> listAllFile = Global.FileListByHomeId();
			List<string> listAllFile = HdlFileLogic.Current.GetRootPathListFile();

			foreach (string file in listAllFile)
			{
			@@ -1138,6 +1222,56 @@

			#endregion

			#region ■ 获取设备信息_______________________

			/// <summary>
			/// 读取单个端点回路设备信息
			/// </summary>
			/// <param name="device">设备对象</param>
			/// <returns></returns>
			public CommonDevice.DeviceInfoData ReadDeviceEpointDeviceInfo(CommonDevice device)
			{
			var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", device.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 80 } };
			var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "GetStatusRecord", jObject.ToString(), "GetStatusRecord_Respon");
			if (result.ErrorMsg != null \|\| result.ErrorMsgDiv == 0)
			{
			return null;
			}
			var info = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceInfoData>(result.ReceiptData);
			return info;
			}

			#endregion

			#region ■ 设置设备功能类型___________________

			/// <summary>
			/// 设置设备功能类型到网关
			/// </summary>
			/// <param name="device">设备回路</param>
			/// <param name="functionType">功能类型</param>
			/// <returns></returns>
			public bool SendDeviceFunctionTypeToGateway(CommonDevice device, DeviceFunctionType functionType)
			{
			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 (result.ErrorMsg != null \|\| result.ErrorMsgDiv == 0)
			{
			return false;
			}
			var resultData = Newtonsoft.Json.Linq.JObject.Parse(result.ReceiptData);
			if (resultData.Property("Result") != null)
			{
			//0:修改成功 1:修改失败
			return resultData["Result"].ToString() == "0";
			}
			return false;
			}

			#endregion

			#region ■ 获取设备名称_______________________

			/// <summary>
			@@ -1182,7 +1316,9 @@
			}

			if (device.Type == DeviceType.OnOffOutput
			\|\| device.Type == DeviceType.DimmableLight \|\| device.Type == DeviceType.ColorDimmableLight)
			\|\| device.Type == DeviceType.DimmableLight
			\|\| device.Type == DeviceType.ColorDimmableLight
			\|\| device.Type == DeviceType.ColorTemperatureLight)
			{
			//继电器,掉光器都叫回路
			return Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + epointNo;
			@@ -1191,17 +1327,7 @@
			{
			//空调都叫室内机
			return Language.StringByID(R.MyInternationalizationString.uIndoorUnit) + epointNo;
			}
			else if (device.Type == DeviceType.FreshAir)
			{
			//新风面板中的按键叫新风
			return Language.StringByID(R.MyInternationalizationString.FreshAir);
			}
			else if (device.Type == DeviceType.FreshAirHumiditySensor)
			{
			//新风面板湿度传感器
			return Language.StringByID(R.MyInternationalizationString.HumiditySensor);
			}
			}

			//获取设备类型
			var deviceInfoType = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
			@@ -1218,12 +1344,19 @@
			return Language.StringByID(R.MyInternationalizationString.uDeviceBelongId16) + epointNo;
			}
			}
			else if (device.Type == DeviceType.FreshAirHumiditySensor)
			{
			//新风面板/简约多功能/简约环境面板湿度传感器
			return Language.StringByID(deviceInfoType.DefultNameId) + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
			}
			else if (device.Type == DeviceType.TemperatureSensor)
			{
			if (deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
			if (deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir
			\|\| deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment
			\|\| deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
			{
			//新风面板中的Thermostat为温度传感器
			return Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
			//新风面板/简约多功能/简约环境面板温度传感器
			return Language.StringByID(deviceInfoType.DefultNameId) + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
			}
			else if (deviceInfoType.BeloneType == DeviceBeloneType.A按键面板)
			{
			@@ -1246,6 +1379,11 @@
			if (string.IsNullOrEmpty(dName) == false)
			{
			return dName;
			}
			if (this.IsMiniLight(device) == true)
			{
			//Mini夜灯
			return Language.StringByID(R.MyInternationalizationString.uMiniNightLight);
			}

			//获取设备类型
			@@ -1996,6 +2134,14 @@
			info.ConcreteType = DeviceConcreteType.Sensor_PMTwoPointFive;
			info.ObjectTypeNameId = 60000;//传感器
			}
			//16色温灯
			else if (dicType.ContainsKey(DeviceType.ColorTemperatureLight) == true)
			{
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId20000;
			info.BeloneType = DeviceBeloneType.A彩灯;
			info.ConcreteType = DeviceConcreteType.ColorLight_Temperature;
			info.ObjectTypeNameId = 60007;//调光模块
			}

			int value = (int)info.BeloneType;
			if (dicDeviceAllNameID.ContainsKey("uDeviceBelongId" + value) == true)
			@@ -2066,6 +2212,12 @@
			info.ConcreteType = DeviceConcreteType.Sensor_DoorWindow;
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1301;
			}
			else if (iasZone.IasDeviceType == 541)
			{
			//球型移动传感器
			info.ConcreteType = DeviceConcreteType.Sensor_SphericalMotion;
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1205;
			}
			}

			#endregion
			@@ -2078,12 +2230,21 @@
			private void InitRealDeviceRoomId()
			{
			this.dicDeviceRoomId = new Dictionary<string, string>();
			string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
			var strData = UserCenterLogic.LoadFileContent(fullName);
			string fullName = DirNameResourse.DeviceRoomIdFile;
			var strData = HdlFileLogic.Current.ReadFileTextContent(fullName);
			if (strData != null)
			{
			this.dicDeviceRoomId = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(strData);
			}
			}

			/// <summary>
			/// 获取全部物理设备所属房间的记录
			/// </summary>
			/// <returns></returns>
			public Dictionary<string, string> GetAllRealDeviceRoomData()
			{
			return this.dicDeviceRoomId;
			}

			/// <summary>
			@@ -2137,8 +2298,7 @@
			if (save == true)
			{
			//保存记录
			string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
			UserCenterLogic.SaveFileContent(fullName, this.dicDeviceRoomId);
			HdlFileLogic.Current.SaveFileContent(DirNameResourse.DeviceRoomIdFile, this.dicDeviceRoomId);

			//添加自动备份
			HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
			@@ -2158,7 +2318,7 @@
			return Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
			}
			var room = HdlRoomLogic.Current.GetRoomById(this.dicDeviceRoomId[device.DeviceAddr]);
			return HdlRoomLogic.Current.GetFloorRoomName(room);
			return HdlRoomLogic.Current.GetRoomName(room);
			}

			/// <summary>
			@@ -2206,8 +2366,7 @@
			return;
			}
			//保存记录
			string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
			UserCenterLogic.SaveFileContent(fullName, this.dicDeviceRoomId);
			HdlFileLogic.Current.SaveFileContent(DirNameResourse.DeviceRoomIdFile, this.dicDeviceRoomId);

			//添加自动备份
			HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
			@@ -2309,39 +2468,6 @@

			#endregion

			#region ■ 获取设备在线状态列表_______________

			/// <summary>
			/// 获取设备在线状态列表(注意,一个设备只返回一个回路)
			/// </summary>
			/// <param name="gwId">网关id</param>
			/// <returns></returns>
			public List<CommonDevice> GetDeviceOnlineList(string gwId)
			{
			var zbway = HdlGatewayLogic.Current.GetLocalGateway(gwId);
			int statu = 0;
			var listDevice = this.GetDeviceListFromGateway(zbway, ref statu, false, ShowErrorMode.NO);
			if (statu == -1)
			{
			//当出现异常时,使用后备操作,直接获取本地的设备列表
			listDevice = this.GetDeviceByGatewayID(gwId);
			}

			var listCheck = new HashSet<string>();
			var listReturn = new List<CommonDevice>();
			foreach (var device in listDevice)
			{
			if (listCheck.Contains(device.DeviceAddr) == false)
			{
			listCheck.Add(device.DeviceAddr);
			listReturn.Add(device);
			}
			}
			return listReturn;
			}

			#endregion

			#region ■ 一般方法___________________________

			/// <summary>
			@@ -2380,16 +2506,8 @@
			if (i_device.Type == DeviceType.OnOffOutput \|\| i_device.Type == DeviceType.AirSwitch)
			{
			//2020.03.23追加式样:未指定类型的继电器,不显示
			if (i_device.DfunctionType == DeviceFunctionType.A未定义)
			{
			return false;
			}
			}
			//如果是新风面板的新风设备,则不显示
			else if (i_device.Type == DeviceType.FreshAir)
			{
			var myInfoType = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { i_device });
			if (myInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
			if (i_device.DfunctionType == DeviceFunctionType.A未定义
			\|\| i_device.DfunctionType == DeviceFunctionType.A不指定)
			{
			return false;
			}
			@@ -2399,6 +2517,25 @@
			{
			var myInfoType = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { i_device });
			if (myInfoType.BeloneType == DeviceBeloneType.A按键面板)
			{
			return false;
			}
			}
			else if (i_device.Type == DeviceType.FreshAirHumiditySensor)
			{
			//新风的湿度传感器不显示
			return false;
			}

			//如果是新风面板或环境面板,则都不显示任何回路
			var myInfoTypeTemp = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { i_device });
			if (myInfoTypeTemp.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir \|\| myInfoTypeTemp.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
			{
			return false;
			}
			else if (myInfoTypeTemp.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
			{
			if (i_device.Type != DeviceType.OnOffOutput)
			{
			return false;
			}
			@@ -2423,7 +2560,7 @@
			/// <returns></returns>
			public bool IsMiniLight(CommonDevice device)
			{
			return device.DeviceAddr == "3737363534333231";
			return device.DriveCode != 0 && device.Type == DeviceType.ColorTemperatureLight;
			}

			/// <summary>
			@@ -2470,16 +2607,22 @@
			/// <returns></returns>
			public string AppendVersion(int versionValue)
			{
			//10101 3个byte 显示为：ver.1.01.01
			//中间那个byte为奇数时，代表是测试版本,在显示最新版本时,不需要显示，但是在历史版本那里可以显示
			//中间那个byte为偶数时, 代表是正式版本

			//直接是10进制
			string txt10 = Convert.ToString(versionValue).PadLeft(4, '0');
			//这个是小数点前面的值
			int value1 = Convert.ToInt32(txt10.Substring(0, txt10.Length - 2));
			//这个是小数点后面的值
			int value2 = Convert.ToInt32(txt10.Substring(txt10.Length - 2, 2));
			string txt10 = Convert.ToString(versionValue).PadLeft(6, '0');
			//这个是第一位
			int value1 = Convert.ToInt32(txt10.Substring(0, 2));
			//这个是第二位
			string value2 = txt10.Substring(2, 2);
			//这个是第三位
			string value3 = txt10.Substring(4, 2);

			//Ver.
			string ver = Language.StringByID(R.MyInternationalizationString.uVersionAbbreviation);
			return ver + value1 + "." + value2.ToString().PadLeft(2, '0');
			return ver + value1 + "." + value2 + "." + value3;
			}

			/// <summary>
			@@ -2531,7 +2674,7 @@
			{
			//不无视时间,返回本地设备列表
			statu = 1;
			return this.GetDeviceByGatewayID(HdlGatewayLogic.Current.GetGatewayId(zbGateway));
			return this.GetDeviceByGatewayID(zbGateway.GwId);
			}
			}
			zbGateway.LastDateTime = DateTime.Now;
			@@ -2555,7 +2698,7 @@
			//是否达成中断的时机
			bool canBreak = false;
			//网关ID
			string gatewayID = HdlGatewayLogic.Current.GetGatewayId(zbGateway);
			string gatewayID = zbGateway.GwId;
			//超时时间
			int TimeOut = 0;
			//设备总数
			@@ -2692,7 +2835,7 @@
			/// <returns></returns>
			private CommonDevice NewDeviceObjectByDeviceId(DeviceType deviceType, Newtonsoft.Json.Linq.JObject jobject, ZbGateway zbGateway)
			{
			string gwId = HdlGatewayLogic.Current.GetGatewayId(zbGateway);
			string gwId = zbGateway.GwId;

			//根据设备类型创建设备对象的实例
			CommonDevice device = this.NewDeviceObjectByDeviceId(deviceType);
			@@ -2755,6 +2898,8 @@
			mainDevice.ModelIdentifier = device.DeviceInfo.ModelIdentifier;
			//序列号
			mainDevice.SerialNumber = device.DeviceInfo.ProductCode;
			//设备功能类型
			mainDevice.DfunctionType = (DeviceFunctionType)device.DeviceInfo.FunctionType;

			mainDevice.InClusterList.Clear();
			mainDevice.InClusterList.AddRange(device.DeviceInfo.InClusterList);
			@@ -2781,32 +2926,45 @@
			else if (mainDevice.Type == DeviceType.DimmableLight)
			{
			mainDevice.DfunctionType = DeviceFunctionType.A灯光;
			if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A灯光)
			{
			//调光器固定灯光
			this.SendDeviceFunctionTypeToGateway(mainDevice, DeviceFunctionType.A灯光);
			}
			if (mainDevice.IsCustomizeImage == false)
			{
			mainDevice.IconPath = "Device/Light.png";
			if (this.IsMiniLight(mainDevice) == true)
			{
			//mini夜灯
			mainDevice.IconPath = "Device/MiniNightLight.png";
			}
			}
			}
			//如果是色温灯
			else if (mainDevice.Type == DeviceType.ColorTemperatureLight)
			{
			mainDevice.DfunctionType = DeviceFunctionType.A灯光;
			if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A灯光)
			{
			//色温灯固定灯光
			this.SendDeviceFunctionTypeToGateway(mainDevice, DeviceFunctionType.A灯光);
			}
			if (mainDevice.IsCustomizeImage == false)
			{
			mainDevice.IconPath = "Device/ColorLightTemperature.png";
			}
			}
			//如果是三路继电器的回路的话,默认为灯光
			else if (mainDevice.Type == DeviceType.OnOffOutput)
			{
			//2020.05.13变更:继电器都默认为灯光
			//var myType = this.GetHdlMyDeviceEnumInfo(mainDevice);
			//if (myType != null && myType.ConcreteType == DeviceConcreteType.Relay_ThreeLoad)
			if (mainDevice.DfunctionType == DeviceFunctionType.A未定义)
			{
			if (mainDevice.DfunctionType == DeviceFunctionType.A未定义)
			mainDevice.DfunctionType = DeviceFunctionType.A灯光;
			if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A灯光)
			{
			mainDevice.DfunctionType = DeviceFunctionType.A灯光;
			}
			if (mainDevice.IsCustomizeImage == false)
			{
			mainDevice.IconPath = "Device/Light.png";
			//继电器默认为灯光
			this.SendDeviceFunctionTypeToGateway(mainDevice, DeviceFunctionType.A灯光);
			}
			}
			//根据功能类型,重新设置设备回路图标
			this.ResetIconPathByDeviceFunctionType(mainDevice);
			}
			//如果是空气开关的话
			else if (mainDevice.Type == DeviceType.AirSwitch)
			@@ -2815,20 +2973,52 @@
			if (mainDevice.DfunctionType == DeviceFunctionType.A未定义)
			{
			mainDevice.DfunctionType = DeviceFunctionType.A开关;
			if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A开关)
			{
			//空气开关默认为开关
			this.SendDeviceFunctionTypeToGateway(mainDevice, DeviceFunctionType.A开关);
			}
			}
			if (mainDevice.IsCustomizeImage == false)
			{
			mainDevice.IconPath = "Device/Switch.png";
			}
			//根据功能类型,重新设置设备回路图标
			this.ResetIconPathByDeviceFunctionType(mainDevice);
			}
			//如果是彩灯的话
			else if (mainDevice.Type == DeviceType.ColorDimmableLight)
			{
			mainDevice.DfunctionType = DeviceFunctionType.A灯光;
			if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A灯光)
			{
			//彩灯默认为开关
			this.SendDeviceFunctionTypeToGateway(mainDevice, DeviceFunctionType.A灯光);
			}
			if (mainDevice.IsCustomizeImage == false)
			{
			mainDevice.IconPath = "Device/ColorLight.png";
			}
			}
			}

			/// <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";
			}
			}

			@@ -2844,10 +3034,13 @@
			//根据设备类型创建设备对象的实例
			if (deviceType == DeviceType.ColorDimmableLight) { device = new ColorDimmableLight(); }
			else if (deviceType == DeviceType.DimmableLight) { device = new DimmableLight(); }
			else if (deviceType == DeviceType.ColorDimmerSwitch) { device = new ColorDimmerSwitch(); }
			else if (deviceType == DeviceType.LevelControlSwitch) { device = new LevelControlSwitch(); }
			else if (deviceType == DeviceType.OnOffSwitch) { device = new Panel(); }
			else if (deviceType == DeviceType.OnOffOutput) { device = new ToggleLight(); }
			else if (deviceType == DeviceType.AirSwitch) { device = new AirSwitch(); }
			else if (deviceType == DeviceType.WindowCoveringDevice) { device = new Rollershade(); }
			else if (deviceType == DeviceType.WindowCoveringController) { device = new WindowCoveringController(); }
			else if (deviceType == DeviceType.IASZone) { device = new IASZone(); }
			else if (deviceType == DeviceType.Repeater) { device = new Repeater(); }
			else if (deviceType == DeviceType.Thermostat) { device = new AC(); }
			@@ -2856,6 +3049,8 @@
			else if (deviceType == DeviceType.TemperatureSensor) { device = new TemperatureSensor(); }
			else if (deviceType == DeviceType.PMSensor) { device = new PMSensor(); }
			else if (deviceType == DeviceType.FreshAirHumiditySensor) { device = new HumiditySensor(); }
			else if (deviceType == DeviceType.ColorTemperatureLight) { device = new ColorTemperatureLight(); }
			else if (deviceType == DeviceType.Buzzer) { device = new Buzzer(); }
			else if (deviceType == DeviceType.OtaDevice \|\| deviceType == DeviceType.OtaPanelDevice) { device = new OTADevice(); }
			else { return null; }

			@@ -2944,6 +3139,7 @@

			//=========★★PIR传感器类(1200-1299)★★=========
			this.dicDeviceModelIdEnum["MSPIR01-ZB.10"] = "1200-1200-60000";//pir传感器220
			this.dicDeviceModelIdEnum["MSPIRB-ZB.10"] = "1205-1200-60000";//球型移动传感器

			//=========★★安防类传感器类(1300-2299)★★=========
			//这里是麦乐克的
			@@ -2960,7 +3156,7 @@
			this.dicDeviceModelIdEnum["MSPIR01/M-ZB.10"] = "1303-1200-60000";//红外传感器
			this.dicDeviceModelIdEnum["MSW01/M-ZB.10"] = "1304-1200-60000";//水浸传感器
			this.dicDeviceModelIdEnum["MBU01/M-ZB.10"] = "1305-1200-60000";//紧急按键
			this.dicDeviceModelIdEnum["MGCD01/ZB.10"] = "1306-1200-60000";//吸顶燃气传感器
			this.dicDeviceModelIdEnum["MGCD01/M-ZB.10"] = "1306-1200-60000";//吸顶燃气传感器

			//PM2.5空气质量传感器【该设备属于第三方设备，没有镜像ID】
			this.dicDeviceModelIdEnum["MSPM25/M-ZB.10"] = "1307-1200-60000";//PM2.5空气质量传感器
			@@ -3123,6 +3319,7 @@
			/// 简约环境面板
			/// </summary>
			ButtonPanel_SimpleEnvironment = 230,

			//=========★★PIR传感器类(1200-1299)★★=========
			/// <summary>
			/// 传感器
			@@ -3132,6 +3329,10 @@
			/// pir传感器220 镜像id：1200
			/// </summary>
			Sensor_Pir = 1200,
			/// <summary>
			/// 球形移动传感器镜像id：1205
			/// </summary>
			Sensor_SphericalMotion = 1205,

			//=========★★安防类传感器类(1300-2299)★★=========
			/// <summary>
			@@ -3231,6 +3432,10 @@
			/// 彩灯
			/// </summary>
			ColorLight = -10,
			/// <summary>
			/// 色温灯(它的镜像ID未定,暂定20000)
			/// </summary>
			ColorLight_Temperature = 20000,

			//=========★★空调(3600-3899)★★=========
			/// <summary>