~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)
			@@ -292,9 +280,9 @@
			//在端点名字的后面附加【回路】字样
			dName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";

			HdlThreadLogic.Current.RunThread(async () =>
			HdlThreadLogic.Current.RunThread(() =>
			{
			await this.ReName(device, dName, ShowErrorMode.NO);
			this.ReName(device, dName, ShowErrorMode.NO);
			});
			}
			}
			@@ -431,7 +419,7 @@
			/// <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);
			@@ -441,6 +429,8 @@
			//如果住宅为虚拟住宅
			if (Common.Config.Instance.Home.IsVirtually == true)
			{
			//修改设备名字的话,主页需要重新刷新
			Phone.UserView.UserPage.Instance.RefreshForm = true;
			return true;
			}

			@@ -448,7 +438,7 @@
			//成员只能修改自己本地的名字
			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)
			{
			//设备名称修改失败
			@@ -462,9 +452,9 @@
			}
			return false;
			}
			//备份数据
			await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(device, GatewayBackupEnum.A端点名称, newName);
			}
			//修改设备名字的话,主页需要重新刷新
			Phone.UserView.UserPage.Instance.RefreshForm = true;
			return true;
			}

			@@ -474,7 +464,7 @@
			/// <param name="listDevice">设备对象</param>
			/// <param name="newMacName">新名字</param>
			/// <param name="mode">是否显示错误</param>
			public async Task<bool> ReMacName(List<CommonDevice> listDevice, string newMacName, ShowErrorMode mode = ShowErrorMode.YES)
			public bool ReMacName(List<CommonDevice> listDevice, string newMacName, ShowErrorMode mode = ShowErrorMode.YES)
			{
			if (listDevice.Count == 0)
			{
			@@ -502,7 +492,7 @@
			if (UserCenterResourse.UserInfo.AuthorityNo != 3)
			{
			//修改物理名字
			var result = await device.RenameDeviceMacNameAsync(device.DeviceAddr, device.DeviceEpoint, newMacName);
			var result = this.RenameDeviceMacNameAsync(device, newMacName);
			if (result == null \|\| result.renameDeviceMacNameData == null \|\| result.renameDeviceMacNameData.Result != 0)
			{
			//设备名称修改失败
			@@ -515,15 +505,13 @@
			}
			return false;
			}
			//备份数据
			await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(device, GatewayBackupEnum.AMac名称, newMacName);
			//如果它只有一个回路,则更改端点名字
			if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == true)
			{
			//只有一个端点
			if (this.dicDeviceEpoint[device.DeviceAddr].Count == 1)
			{
			return await this.ReName(device, newMacName);
			return this.ReName(device, newMacName);
			}
			//如果它有两个端点时,pir传感器特殊处理
			else if (this.dicDeviceEpoint[device.DeviceAddr].Count == 2)
			@@ -535,7 +523,7 @@
			{
			if (myDevice.Type == DeviceType.IASZone)
			{
			return await this.ReName(myDevice, newMacName);
			return this.ReName(myDevice, newMacName);
			}
			}
			}
			@@ -543,6 +531,100 @@
			}
			}
			return true;
			}

			///<summary >
			/// 修改设备mac名称
			/// <para>macName:设备名称</para>
			/// </summary>
			private CommonDevice.RenameDeviceMacNameAllData RenameDeviceMacNameAsync(CommonDevice device, string macName)
			{
			//如果当前是虚拟住宅
			if (Common.Config.Instance.Home.IsVirtually == true)
			{
			return Phone.ModelData.DeviceModelDataLogic.Current.ReDeviceMacName(device, macName, "MacRename");
			}

			//获取编辑设备Mac名字的命令字符
			var sendData = this.GetReDeviceMacNameCommandText(device.DeviceAddr, device.DeviceEpoint, macName);
			var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "MacRename", sendData, "MacRename_Respon");
			if (result.ErrorMsg != null \|\| result.ErrorMsgDiv == 0)
			{
			return null;
			}
			//加缓存
			Phone.ModelData.DeviceModelDataLogic.Current.ReDeviceMacName(device, macName, "MacRename");

			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.ModelData.DeviceModelDataLogic.Current.ReDeviceEpointName(device, deviceName, "DeviceRename");
			}
			//获取编辑设备端点名字的命令字符
			var sendData = this.GetReDeviceEpointNameCommandText(device.DeviceAddr, device.DeviceEpoint, deviceName);
			var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "DeviceRename", sendData, "DeviceRenameRespon");
			if (result.ErrorMsg != null \|\| result.ErrorMsgDiv == 0)
			{
			return null;
			}
			//加缓存
			Phone.ModelData.DeviceModelDataLogic.Current.ReDeviceEpointName(device, deviceName, "DeviceRename");

			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>
			@@ -586,22 +668,26 @@
			/// <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);

			//删一次的时候，它会把MAC地址下面全部的设备都删除
			var result = await listdevice[0].DeleteDeviceAsync(data);
			if (result == null \|\| result.removeDeviceResponseData == null \|\| result.removeDeviceResponseData.Result != 0)
			//虚拟住宅的话,不需要删除网关的设备
			if (Config.Instance.Home.IsVirtually == false)
			{
			//设备删除失败
			string msg = Language.StringByID(R.MyInternationalizationString.uDeviceDeleteFail);
			//拼接上【网关回复超时】的Msg
			msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
			var data = new CommonDevice.RemoveDeviceData();
			var info = new CommonDevice.RemoveDeviceListInfo();
			info.DeviceAddr = listdevice[0].DeviceAddr;
			data.DeviceAddrList.Add(info);

			this.ShowErrorMsg(msg);
			return false;
			//删一次的时候，它会把MAC地址下面全部的设备都删除
			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;
			}
			}

			//删除缓存的Ota设备
			@@ -628,6 +714,9 @@
			/// <param name="deleteRoom">是否从房间删除</param>
			public void DeleteMemmoryDevice(CommonDevice device, bool deleteRoom = true)
			{
			//删除缓存设备的话,主页需要重新刷新
			Phone.UserView.UserPage.Instance.RefreshForm = true;

			if (deleteRoom == true)
			{
			//从房间中删除
			@@ -725,7 +814,7 @@
			/// <returns></returns>
			public bool DeviceIsCanFixedPosition(CommonDevice device)
			{
			if (device.Type == DeviceType.DoorLock)
			if (device.Type == DeviceType.DoorLock \|\| device.Type == DeviceType.PMSensor)
			{
			//门锁没有定位功能
			return false;
			@@ -882,6 +971,47 @@
			}

			/// <summary>
			/// 根据MAC地址,获取简约面板全部回路的设备对象
			/// </summary>
			/// <param name="listDevice"></param>
			/// <returns></returns>
			public List<CommonDevice> GetMutilfunctionPanelByMac(List<CommonDevice> listDevice, bool sort = true)
			{
			//和彪哥、设备和产品部同事确认：
			//简约多功能面板[不显示多余的回路，只显示携带的2个继电器和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.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="DeviceAddr">Mac地址</param>
			@@ -1010,6 +1140,12 @@
			{
			return dName;
			}
			if (this.IsMiniLight(device) == true)
			{
			//Mini夜灯
			return Language.StringByID(R.MyInternationalizationString.uMiniNightLight);
			}

			//如果这个设备只有一个回路的话,返回Mac名字给它
			if (this.GetDevicesCountByMac(device.DeviceAddr) <= 1)
			{
			@@ -1034,7 +1170,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;
			@@ -1098,6 +1236,11 @@
			if (string.IsNullOrEmpty(dName) == false)
			{
			return dName;
			}
			if (this.IsMiniLight(device) == true)
			{
			//Mini夜灯
			return Language.StringByID(R.MyInternationalizationString.uMiniNightLight);
			}

			//获取设备类型
			@@ -1324,7 +1467,7 @@
			}

			/// <summary>
			/// 设置【设备类型】的图标到指定的控件
			/// 设置【设备类型】的图标到指定的控件(此方法不能用在设备功能类型菜单的图标)
			/// </summary>
			/// <param name="btnIcon">控件对象</param>
			/// <param name="listdevice">设备对象</param>
			@@ -1346,7 +1489,7 @@
			}

			/// <summary>
			/// 获取【设备类型】的图标
			/// 获取【设备类型】的图标(此方法不能用在设备功能类型菜单的图标)
			/// </summary>
			/// <param name="listdevice">设备对象</param>
			/// <param name="unSelectPath">图片地址</param>
			@@ -1362,13 +1505,42 @@
			}

			/// <summary>
			/// 获取【设备类型】的图标
			/// 获取【设备功能类型】的菜单图标
			/// </summary>
			/// <param name="specificType">自定义设备类型</param>
			/// <param name="unSelectPath">图片地址</param>
			/// <param name="selectPath">图片地址</param>
			/// <returns></returns>
			public void GetDeviceObjectIcon(DeviceConcreteType specificType, ref string unSelectPath, ref string selectPath)
			public void GetDeviceFunctionTypeMenuIcon(DeviceConcreteType specificType, ref string unSelectPath, ref string selectPath)
			{
			//新风小模块
			if (specificType == DeviceConcreteType.Relay_FangyueFreshAirModul)
			{
			unSelectPath = "Device/FreshAirEpoint.png";
			selectPath = "Device/FreshAirEpointSelected.png";
			return;
			}
			//PM2.5空气质量传感器
			else if (specificType == DeviceConcreteType.Sensor_PMTwoPointFive)
			{
			unSelectPath = "Device/AirQualitySensorEpoint.png";
			selectPath = "Device/AirQualitySensorEpointSelected.png";
			return;
			}
			//上面需要特殊处理

			//获取【设备类型】的图标
			this.GetDeviceObjectIcon(specificType, ref unSelectPath, ref selectPath);
			}

			/// <summary>
			/// 获取【设备类型】的图标 2020.05.13:次函数不再公开
			/// </summary>
			/// <param name="specificType">自定义设备类型</param>
			/// <param name="unSelectPath">图片地址</param>
			/// <param name="selectPath">图片地址</param>
			/// <returns></returns>
			private void GetDeviceObjectIcon(DeviceConcreteType specificType, ref string unSelectPath, ref string selectPath)
			{
			//将具体类型转字符串
			string strSpecific = Enum.GetName(typeof(DeviceConcreteType), specificType);
			@@ -1811,6 +1983,22 @@
			info.ConcreteType = DeviceConcreteType.Relay_FangyueFreshAirModul;
			info.ObjectTypeNameId = 60011;//新风
			}
			//15 PM2.5传感器设备
			else if (dicType.ContainsKey(DeviceType.PMSensor) == true)
			{
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1307;
			info.BeloneType = DeviceBeloneType.APM2点5空气质量传感器;
			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)
			@@ -1909,26 +2097,10 @@
			/// <param name="saveRoadDevice">如果只有一个回路,是否把回路的房间一起修改</param>
			public void SaveRealDeviceRoomId(List<CommonDevice> listDevice, string roomId, bool saveRoadDevice = true)
			{
			if (listDevice != null)
			if (listDevice == null)
			{
			if (roomId == string.Empty)
			{
			//选择的是未分配
			this.dicDeviceRoomId.Remove(listDevice[0].DeviceAddr);
			}
			else
			{
			this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
			}
			return;
			}

			//保存记录
			string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
			UserCenterLogic.SaveFileContent(fullName, this.dicDeviceRoomId);

			//添加自动备份
			HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);

			//如果设备只有一个回路，如果改变了真实设备区域，则它的回路的区域也一起改了
			if (saveRoadDevice == true && listDevice != null && listDevice.Count == 1)
			{
			@@ -1938,6 +2110,41 @@
			return;
			}
			HdlRoomLogic.Current.ChangedRoom(listDevice[0], roomId, false);
			}
			bool save = false;
			if (roomId == string.Empty)
			{
			//选择的是未分配
			this.dicDeviceRoomId.Remove(listDevice[0].DeviceAddr);
			save = true;
			}
			else
			{
			if (this.dicDeviceRoomId.ContainsKey(listDevice[0].DeviceAddr) == false)
			{
			this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
			save = true;
			}
			else
			{
			//2020.05.18追加:如果记录的房间ID是不存在的话,则重新覆盖
			var room = HdlRoomLogic.Current.GetRoomById(this.dicDeviceRoomId[listDevice[0].DeviceAddr]);
			if (room == null \|\| this.dicDeviceRoomId[listDevice[0].DeviceAddr] != roomId)
			{
			this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
			save = true;
			}
			}
			}

			if (save == true)
			{
			//保存记录
			string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
			UserCenterLogic.SaveFileContent(fullName, this.dicDeviceRoomId);

			//添加自动备份
			HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
			}
			}

			@@ -2007,6 +2214,25 @@

			//添加自动备份
			HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
			}

			/// <summary>
			/// 根据房间ID,移除指定的真实物理设备的所属房间记录
			/// </summary>
			/// <param name="i_RoomId"></param>
			public void DeleteRealDeviceByRoomId(string i_RoomId)
			{
			var listDeleteKey = new List<string>();
			foreach (var deviceAddr in this.dicDeviceRoomId.Keys)
			{
			if (this.dicDeviceRoomId[deviceAddr] == i_RoomId
			&& listDeleteKey.Contains(deviceAddr) == false)
			{
			listDeleteKey.Add(deviceAddr);
			}
			}
			//将真实物理设备从房间中移除
			this.DeleteRealDeviceFromRoom(listDeleteKey);
			}

			#endregion
			@@ -2086,6 +2312,39 @@

			#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>
			@@ -2095,8 +2354,18 @@
			/// <returns></returns>
			public bool CheckDeviceIsOnline(CommonDevice i_device)
			{
			//0:离线 1:在线 2:正在刷新状态
			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>
			@@ -2114,7 +2383,8 @@
			if (i_device.Type == DeviceType.OnOffOutput \|\| i_device.Type == DeviceType.AirSwitch)
			{
			//2020.03.23追加式样:未指定类型的继电器,不显示
			if (i_device.DfunctionType == DeviceFunctionType.A未定义)
			if (i_device.DfunctionType == DeviceFunctionType.A未定义
			\|\| i_device.DfunctionType == DeviceFunctionType.A不指定)
			{
			return false;
			}
			@@ -2137,6 +2407,11 @@
			return false;
			}
			}
			else if (i_device.Type == DeviceType.FreshAirHumiditySensor)
			{
			//新风的湿度传感器不显示
			return false;
			}
			return true;
			}

			@@ -2148,6 +2423,16 @@
			public bool IsHdlDevice(CommonDevice device)
			{
			return device.ManufacturerName == "HDL";
			}

			/// <summary>
			/// 是否是Mini夜灯
			/// </summary>
			/// <param name="device"></param>
			/// <returns></returns>
			public bool IsMiniLight(CommonDevice device)
			{
			return device.DriveCode != 0 && device.Type == DeviceType.ColorTemperatureLight;
			}

			/// <summary>
			@@ -2194,16 +2479,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>
			@@ -2255,7 +2546,7 @@
			{
			//不无视时间,返回本地设备列表
			statu = 1;
			return this.GetDeviceByGatewayID(HdlGatewayLogic.Current.GetGatewayId(zbGateway));
			return this.GetDeviceByGatewayID(zbGateway.GwId);
			}
			}
			zbGateway.LastDateTime = DateTime.Now;
			@@ -2279,7 +2570,7 @@
			//是否达成中断的时机
			bool canBreak = false;
			//网关ID
			string gatewayID = HdlGatewayLogic.Current.GetGatewayId(zbGateway);
			string gatewayID = zbGateway.GwId;
			//超时时间
			int TimeOut = 0;
			//设备总数
			@@ -2326,8 +2617,14 @@
			if (listCheck.Contains(mainkeys) == false)
			{
			listDevice.Add(device);

			listCheck.Add(mainkeys);
			//刷新一下本地缓存
			var localDevice = this.GetDevice(mainkeys);
			if (localDevice != null)
			{
			//刷新属性
			this.SetDeviceInfoToMain(localDevice, device);
			}
			}
			}
			}
			@@ -2410,7 +2707,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);
			@@ -2454,6 +2751,7 @@
			mainDevice.DeviceEpointName = device.DeviceInfo.DeviceName;
			}
			mainDevice.CurrentGateWayId = device.CurrentGateWayId;
			mainDevice.ZigbeeType = device.DeviceInfo.ZigbeeType;
			mainDevice.IsOnline = device.DeviceInfo.IsOnline;
			mainDevice.DriveCode = device.DeviceInfo.DriveCode;
			mainDevice.IasDeviceType = device.DeviceInfo.DeviceType;
			@@ -2477,8 +2775,6 @@
			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)
			@@ -2505,11 +2801,21 @@
			mainDevice.IconPath = "Device/Light.png";
			}
			}
			//如果是色温灯
			else if (mainDevice.Type == DeviceType.ColorTemperatureLight)
			{
			mainDevice.DfunctionType = DeviceFunctionType.A灯光;
			if (mainDevice.IsCustomizeImage == false)
			{
			mainDevice.IconPath = "Device/ColorLightTemperature.png";
			}
			}
			//如果是三路继电器的回路的话,默认为灯光
			else if (mainDevice.Type == DeviceType.OnOffOutput)
			{
			var myType = this.GetHdlMyDeviceEnumInfo(mainDevice);
			if (myType != null && myType.ConcreteType == DeviceConcreteType.Relay_ThreeLoad)
			//2020.05.13变更:继电器都默认为灯光
			//var myType = this.GetHdlMyDeviceEnumInfo(mainDevice);
			//if (myType != null && myType.ConcreteType == DeviceConcreteType.Relay_ThreeLoad)
			{
			if (mainDevice.DfunctionType == DeviceFunctionType.A未定义)
			{
			@@ -2567,7 +2873,10 @@
			else if (deviceType == DeviceType.FreshAir) { device = new FreshAir(); }
			else if (deviceType == DeviceType.DoorLock) { device = new DoorLock(); }
			else if (deviceType == DeviceType.TemperatureSensor) { device = new TemperatureSensor(); }
			else if (deviceType == DeviceType.PMSensor) { device = new PMSensor(); }
			else if (deviceType == DeviceType.FreshAirHumiditySensor) { device = new HumiditySensor(); }
			else if (deviceType == DeviceType.ColorTemperatureLight) { device = new ColorTemperatureLight(); }
			else if (deviceType == DeviceType.Buzzer) { device = new Buzzer(); }
			else if (deviceType == DeviceType.OtaDevice \|\| deviceType == DeviceType.OtaPanelDevice) { device = new OTADevice(); }
			else { return null; }

			@@ -2585,11 +2894,9 @@
			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
			@@ -2652,6 +2959,9 @@
			this.dicDeviceModelIdEnum["MPFA/TILE-ZB.18"] = "250-200-60003";//方悦新风面板
			this.dicDeviceModelIdEnum["MPTE3/TILE-ZB.18"] = "253-200-60003";//方悦环境面板
			this.dicDeviceModelIdEnum["MP2W/TILE-ZB.18"] = "256-200-60003";//窗帘面板
			this.dicDeviceModelIdEnum["MPTL4C/S-ZB.18"] = "212-200-60003";//简约多功能面板
			this.dicDeviceModelIdEnum["MPTE3/S-ZB.18"] = "230-200-60003";//简约环境面板


			//=========★★PIR传感器类(1200-1299)★★=========
			this.dicDeviceModelIdEnum["MSPIR01-ZB.10"] = "1200-1200-60000";//pir传感器220
			@@ -2671,7 +2981,10 @@
			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空气质量传感器

			//=========★★继电器类(2300-2499)★★=========
			this.dicDeviceModelIdEnum["MPR0310-ZB.10"] = "2300-2300-60001";//3路继电器小模块
			@@ -2823,6 +3136,14 @@
			/// 窗帘面板镜像id：256
			/// </summary>
			ButtonPanel_Curtain = 256,
			/// <summary>
			/// 简约多功能面板镜像ID：212
			/// </summary>
			ButtonPanel_SimpleMultifunction = 212,
			/// <summary>
			/// 简约环境面板
			/// </summary>
			ButtonPanel_SimpleEnvironment = 230,

			//=========★★PIR传感器类(1200-1299)★★=========
			/// <summary>
			@@ -2863,6 +3184,11 @@
			/// 吸顶燃气传感器
			/// </summary>
			Sensor_CeilingGas = 1306,
			/// <summary>
			/// PM2.5空气质量传感器
			/// </summary>
			Sensor_PMTwoPointFive = 1307,

			/// <summary>
			/// 运动传感器
			/// </summary>
			@@ -2927,6 +3253,10 @@
			/// 彩灯
			/// </summary>
			ColorLight = -10,
			/// <summary>
			/// 色温灯(它的镜像ID未定,暂定20000)
			/// </summary>
			ColorLight_Temperature = 20000,

			//=========★★空调(3600-3899)★★=========
			/// <summary>
			@@ -3014,6 +3344,10 @@
			/// </summary>
			A传感器 = 1200,
			/// <summary>
			/// PM2.5空气质量传感器
			/// </summary>
			APM2点5空气质量传感器 = 1307,
			/// <summary>
			/// 继电器(2300-2499)
			/// </summary>
			A继电器 = 2300,