~wjc/HomeApp.git

			@@ -223,20 +223,19 @@
			#region ■ 添加设备___________________________

			/// <summary>
			/// 将指定网关的设备存入缓存中(从新获取镜像)
			/// <para>将指定网关的设备存入缓存中(从新获取镜像)</para>
			/// <para>-1:异常 1:正常 2:设备信息缺损</para>
			/// </summary>
			/// <param name="zbGateway">网关对象</param>
			/// <param name="deviceComingAction">接收到设备时的事件,设备对象为null时,代表接收完成</param>
			/// <returns>一直返回true</returns>
			public bool SetDeviceToMemmoryByGateway(ZbGateway zbGateway, Action<CommonDevice> deviceComingAction = null)
			public int SetDeviceToMemmoryByGateway(ZbGateway zbGateway)
			{
			//从网关获取全部的设备
			int statu = 0;
			List<CommonDevice> listDevice = new List<CommonDevice>();
			List<CommonDevice> list = this.GetDeviceListFromGateway(zbGateway, true, deviceComingAction);

			List<CommonDevice> list = this.GetDeviceListFromGateway(zbGateway, ref statu, true);
			if (list == null)
			{
			return false;
			return -1;
			}
			listDevice.AddRange(list);

			@@ -301,14 +300,17 @@
			}
			}

			//如果本地和网关的设备不一致的时候，暂时删除本地的设备
			//注意：只是删除设备文件，房间内容什么的还存在着
			foreach (var device in dicExist.Values)
			//只有完全获取的时候,才会去处理删除的问题
			if (statu == 1)
			{
			this.DeleteMemmoryDevice(device, false);
			//如果本地和网关的设备不一致的时候，删除本地的设备
			foreach (var device in dicExist.Values)
			{
			this.DeleteMemmoryDevice(device, true);
			}
			}

			return true;
			return statu;
			}

			/// <summary>
			@@ -547,6 +549,8 @@
			{
			//从房间中删除
			Room.CurrentRoom.DeleteDevice(device);
			//删除我的喜爱的设备
			Room.CurrentRoom.DeleteLoveDevice(device);
			}

			//删除缓存
			@@ -1046,10 +1050,21 @@
			/// <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)
			{
			@@ -1067,7 +1082,7 @@
			if (arry.Length == 1)
			{
			//如果它自己就是共通图片的话，不再处理
			return;
			return "RealDevice/CommonDevice.png";
			}
			imageFilePath = "RealDevice/" + arry[0] + ".png";
			//如果它自己的共通图片还是不存在的话,则直接使用所有设备的共通图片
			@@ -1076,16 +1091,16 @@
			imageFilePath = "RealDevice/CommonDevice.png";
			}
			}
			btnIcon.UnSelectedImagePath = imageFilePath;
			return imageFilePath;
			}

			/// <summary>
			/// 设置【设备所属类型】的图标到指定的控件
			/// 设置【设备类型】的图标到指定的控件
			/// </summary>
			/// <param name="btnIcon">控件对象</param>
			/// <param name="listdevice">设备对象</param>
			/// <returns></returns>
			public void SetDeviceBeloneIconToControl(Button btnIcon, List<CommonDevice> listdevice)
			public void SetDeviceObjectIconToControl(Button btnIcon, List<CommonDevice> listdevice)
			{
			//获取自定义设备类型
			var myDeviceType = this.GetMyDeviceEnumInfo(listdevice);
			@@ -1093,8 +1108,8 @@
			string imageUnSelectFilePath = string.Empty;
			string imageSelectFilePath = string.Empty;

			//获取【设备所属类型】的图标
			this.GetDeviceBeloneIcon(myDeviceType.ConcreteType, ref imageUnSelectFilePath, ref imageSelectFilePath);
			//获取【设备类型】的图标
			this.GetDeviceObjectIcon(myDeviceType.ConcreteType, ref imageUnSelectFilePath, ref imageSelectFilePath);

			//设置图片
			btnIcon.UnSelectedImagePath = imageUnSelectFilePath;
			@@ -1102,29 +1117,29 @@
			}

			/// <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)
			public void GetDeviceObjectIcon(List<CommonDevice> listdevice, ref string unSelectPath, ref string selectPath)
			{
			//获取自定义设备类型
			var myDeviceType = this.GetMyDeviceEnumInfo(listdevice);

			//获取【设备所属类型】的图标
			this.GetDeviceBeloneIcon(myDeviceType.ConcreteType, ref unSelectPath, ref selectPath);
			//获取【设备类型】的图标
			this.GetDeviceObjectIcon(myDeviceType.ConcreteType, ref unSelectPath, ref selectPath);
			}

			/// <summary>
			/// 获取【设备所属类型】的图标
			/// 获取【设备类型】的图标
			/// </summary>
			/// <param name="specificType">自定义设备类型</param>
			/// <param name="unSelectPath">图片地址</param>
			/// <param name="selectPath">图片地址</param>
			/// <returns></returns>
			public void GetDeviceBeloneIcon(DeviceConcreteType specificType, ref string unSelectPath, ref string selectPath)
			public void GetDeviceObjectIcon(DeviceConcreteType specificType, ref string unSelectPath, ref string selectPath)
			{
			//将具体类型转字符串
			string strSpecific = Enum.GetName(typeof(DeviceConcreteType), specificType);
			@@ -1144,13 +1159,18 @@
			{
			//不存在则使用共通图片
			string[] arry = strSpecific.Split(new string[] { "_" }, StringSplitOptions.None);
			if (arry.Length == 1)
			//如果它自己就是共通图片的话，不再处理
			if (arry.Length > 1)
			{
			//如果它自己就是共通图片的话，不再处理
			return;
			imageFilePath = "Device/" + arry[0] + ".png";
			imageSelectFilePath = "Device/" + arry[0] + "Selected.png";
			}
			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;
			@@ -1222,7 +1242,7 @@
			return info;
			}
			//获取第三方设备的【设备类型】
			return this.GetNotHdlMyDeviceEnumInfo(listdevice, false);
			return this.GetNotHdlMyDeviceEnumInfo(listdevice);
			}

			/// <summary>
			@@ -1252,7 +1272,7 @@
			else
			{
			//获取第三方设备的【设备类型】
			var myDeviceType = this.GetNotHdlMyDeviceEnumInfo(listDevice, false);
			var myDeviceType = this.GetNotHdlMyDeviceEnumInfo(listDevice);
			strName = Language.StringByID(myDeviceType.ConcreteTextId);
			}
			if (ApendFalge == true && listDevice[0].DriveCode > 0)
			@@ -1318,31 +1338,53 @@
			#region ■ 获取第三方设备的设备类型___________

			/// <summary>
			/// 获取第三方设备的【设备类型】
			/// 获取设备的【所属类型信息】,此方法会把所有的传感器都归为【传感器】(包括温湿度传感器)
			/// </summary>
			/// <param name="device">设备回路</param>
			/// <param name="margeSensor">
			/// <para>是否将所有类型的传感器都归为【传感器】,</para>
			/// <para>false的时候：【ConcreteType】和【ConcreteTextId】可能会有不同的值</para>
			/// <para>true的时候：【ConcreteType】统一为Sensor,【ConcreteTextId】统一为传感器</para>
			/// </param>
			/// <returns></returns>
			public DeviceEnumInfo GetNotHdlMyDeviceEnumInfo(CommonDevice device, bool margeSensor = true)
			public DeviceEnumInfo GetDeviceBelongEnumInfo(CommonDevice device)
			{
			return this.GetNotHdlMyDeviceEnumInfo(new List<CommonDevice>() { device }, margeSensor);
			var info = this.GetNotHdlMyDeviceEnumInfo(new List<CommonDevice>() { device });
			if (info.BeloneType == DeviceBeloneType.A调光器
			\|\| info.BeloneType == DeviceBeloneType.A彩灯)
			{
			//归为灯光
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId15;
			info.BeloneType = DeviceBeloneType.A灯光;
			info.ConcreteType = DeviceConcreteType.Light;

			int value = (int)info.BeloneType;
			if (dicDeviceDefultNameID.ContainsKey("uDeviceBelongId" + value) == true)
			{
			//设备所属类型的翻译名字
			info.BeloneTextId = dicDeviceDefultNameID["uDeviceBelongId" + value];
			}
			}
			else if (info.BeloneType == DeviceBeloneType.A传感器
			\|\| device.Type == DeviceType.TemperatureSensor)
			{
			//传感器合并
			info.BeloneType = DeviceBeloneType.A传感器;
			info.ConcreteType = DeviceConcreteType.Sensor;
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId1200;

			int value = (int)info.BeloneType;
			if (dicDeviceDefultNameID.ContainsKey("uDeviceBelongId" + value) == true)
			{
			//设备所属类型的翻译名字
			info.BeloneTextId = dicDeviceDefultNameID["uDeviceBelongId" + value];
			}
			}

			return info;
			}

			/// <summary>
			/// 获取第三方设备的【设备类型】(不建议使用)
			/// </summary>
			/// <param name="listdevice">Mac都一样的设备列表</param>
			/// <param name="margeSensor">
			/// <para>是否将所有类型的传感器都归为【传感器】,</para>
			/// <para>false的时候：【ConcreteType】和【ConcreteTextId】可能会有不同的值</para>
			/// <para>true的时候：【ConcreteType】统一为Sensor,【ConcreteTextId】统一为传感器</para>
			/// </param>
			/// <returns></returns>
			public DeviceEnumInfo GetNotHdlMyDeviceEnumInfo(List<CommonDevice> listdevice, bool margeSensor = true)
			public DeviceEnumInfo GetNotHdlMyDeviceEnumInfo(List<CommonDevice> listdevice)
			{
			var dicType = new Dictionary<DeviceType, CommonDevice>();
			foreach (CommonDevice device in listdevice)
			@@ -1479,11 +1521,8 @@
			info.BeloneType = DeviceBeloneType.A传感器;
			info.ConcreteType = DeviceConcreteType.Sensor;
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId1200;
			if (margeSensor == false)
			{
			//设置传感器具体的类型
			this.SetSensorDeviceSpecificType(ref info, listdevice);
			}
			//设置传感器具体的类型
			this.SetSensorDeviceSpecificType(ref info, listdevice);
			}
			//13包含温度传感器的话
			else if (dicType.ContainsKey(DeviceType.TemperatureSensor) == true)
			@@ -1513,14 +1552,14 @@
			//设置传感器具体的类型
			info.BeloneType = DeviceBeloneType.A温湿度传感器;
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId10;
			info.ConcreteType = DeviceConcreteType.Sensor_TemperatrueHumidity;
			info.ConcreteType = DeviceConcreteType.Sensor_TemperatureHumidity;
			}
			else if (temperatrue == true && humidity == false)
			{
			//设置传感器具体的类型
			info.BeloneType = DeviceBeloneType.A温度传感器;
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId11;
			info.ConcreteType = DeviceConcreteType.Sensor_Temperatrue;
			info.ConcreteType = DeviceConcreteType.Sensor_Temperature;
			}
			else if (temperatrue == false && humidity == true)
			{
			@@ -1785,36 +1824,23 @@
			#region ■ 获取设备列表的接口_________________

			/// <summary>
			/// 从网关重新获取设备列表(★★★★★★★接收到设备时的事件★★★★★★★)
			/// <para>从网关重新获取设备列表(返回的设备为虚拟出来的)</para>
			/// <para>statu状态 -1:异常,会返回null, 1：没有异常, 2:数据接收不全</para>
			/// </summary>
			/// <param name="zbGateway">网关对象</param>
			/// <param name="ignoreTime">是否无视时间,true:每次调用都去网关获取,false:3分钟内返回的是本地的设备</param>
			/// <param name="deviceComingAction">接收到设备时的事件</param>
			/// <param name="statu">状态-> -1:异常,会返回null, 1：没有异常, 2:数据接收不全</param>
			/// <param name="ignoreTime">是否无视时间(此变量是给获取在线状态用的),true:每次调用都去网关获取,false:3分钟内返回的是本地的设备</param>
			/// <param name="mode">是否显示错误</param>
			/// <returns></returns>
			public List<CommonDevice> GetDeviceListFromGateway(ZbGateway zbGateway, bool ignoreTime, Action<CommonDevice> deviceComingAction = null, ShowErrorMode mode = ShowErrorMode.YES)
			public List<CommonDevice> GetDeviceListFromGateway(ZbGateway zbGateway, ref int statu, bool ignoreTime, ShowErrorMode mode = ShowErrorMode.YES)
			{
			if (ignoreTime == false)
			{
			if ((DateTime.Now - zbGateway.LastDateTime).TotalMilliseconds < 3 * 60 * 1000)
			{
			//不无视时间,返回本地设备列表
			var listTemp = this.GetDeviceByGatewayID(HdlGatewayLogic.Current.GetGatewayId(zbGateway));
			if (deviceComingAction != null)
			{
			for (int i = 0; i < listTemp.Count; i++)
			{
			try
			{
			//回调函数
			deviceComingAction.Invoke(listTemp[i]);
			}
			//Log出力
			catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex); }
			}
			}
			deviceComingAction = null;
			return listTemp;
			statu = 1;
			return this.GetDeviceByGatewayID(HdlGatewayLogic.Current.GetGatewayId(zbGateway));
			}
			}
			zbGateway.LastDateTime = DateTime.Now;
			@@ -1831,6 +1857,7 @@
			string msg = Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg);
			this.ShowTipMsg(msg);
			}
			statu = -1;
			return null;
			}

			@@ -1883,8 +1910,6 @@
			//网关里面有可能会有重复的回路
			if (listCheck.Contains(mainkeys) == false)
			{
			//回调函数
			deviceComingAction?.Invoke(device);
			listDevice.Add(device);

			listCheck.Add(mainkeys);
			@@ -1933,6 +1958,7 @@
			msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "回复超时", false);
			this.ShowTipMsg(msg);
			}
			statu = -1;
			return null;
			}
			else
			@@ -1943,12 +1969,9 @@
			string msg = Language.StringByID(R.MyInternationalizationString.uNetworkUnStableAndDeviceInfoIsNotFull);
			this.ShowTipMsg(msg);
			}
			statu = 2;
			}
			}

			//回调函数(接收完成)
			deviceComingAction = null;

			}
			return listDevice;
			}

			@@ -2154,9 +2177,9 @@
			this.dicDeviceModelIdEnum["MPT2/R2-ZB.18"] = "202-200";//2按键触摸面板
			this.dicDeviceModelIdEnum["MPT1/R1-ZB.18"] = "203-200";//12按键触摸面板
			this.dicDeviceModelIdEnum["MPT4-ZB.18"] = "210-200";//4按键触摸面板(只带电源底座)
			this.dicDeviceModelIdEnum["MPT4R4L/S-ZB1.8"] = "220-200";//简约4按键面板
			this.dicDeviceModelIdEnum["MPT3R3L/S-ZB1.8"] = "221-200";//简约3按键面板
			this.dicDeviceModelIdEnum["MPT2R2L/S-ZB1.8"] = "222-200";//简约2按键面板
			this.dicDeviceModelIdEnum["MPT4R4L/S-ZB.18"] = "220-200";//简约4按键面板
			this.dicDeviceModelIdEnum["MPT3R3L/S-ZB.18"] = "221-200";//简约3按键面板
			this.dicDeviceModelIdEnum["MPT2R2L/S-ZB.18"] = "222-200";//简约2按键面板

			//=========★★PIR传感器类(1200-1299)★★=========
			this.dicDeviceModelIdEnum["MSPIR01-ZB.10"] = "1200-1200";//pir传感器220
			@@ -2191,6 +2214,8 @@
			this.dicDeviceModelIdEnum["MBUS/GW-ZB.10"] = "4200-4200";//zigbee转buspro协议转换器
			this.dicDeviceModelIdEnum["M485/GW-ZB.10"] = "4201-4200";//zigbee转485协议转换器



			//✩✩✩✩✩需要交换的模块ID✩✩✩✩✩
			this.dicDeviceModelIdChanged = new Dictionary<string, string>();
			//=========★★安防类传感器类★★=========
			@@ -2200,6 +2225,8 @@
			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";//紧急按键



			//✩✩✩✩✩需要共有的图片对象✩✩✩✩✩
			this.dicPictrueShard = new Dictionary<string, string>();
			@@ -2324,11 +2351,11 @@
			/// <summary>
			/// 温湿度传感器
			/// </summary>
			Sensor_TemperatrueHumidity = -1308,
			Sensor_TemperatureHumidity = -1308,
			/// <summary>
			/// 温度传感器
			/// </summary>
			Sensor_Temperatrue = -1309,
			Sensor_Temperature = -1309,
			/// <summary>
			/// 湿度传感器
			/// </summary>