~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -72,6 +72,10 @@
			/// </summary>
			private Dictionary<string, string> dicDeviceModelIdChanged = null;
			/// <summary>
			/// 图片共有(keys:指定设备的具体类型 value:指定共有对象的具体类型)
			/// </summary>
			private Dictionary<string, string> dicPictrueShard = null;
			/// <summary>
			/// 本地所有设备的缓存(非公开)
			/// </summary>
			private Dictionary<string, CommonDevice> dicAllDevice = new Dictionary<string, CommonDevice>();
			@@ -109,7 +113,7 @@
			{
			CommonDevice device = null;
			//反序列化为指定的类，不然数据会丢失而导致无法强转
			try
			try
			{
			device = CommonDevice.CommonDeviceByFilePath(file);
			}
			@@ -257,7 +261,7 @@
			//添加缓存
			this.AddDeviceToMemory(ref device);

			//移除存在的设备内存
			//移除存在的设备内存
			string maikey = this.GetDeviceMainKeys(device);
			if (dicExist.ContainsKey(maikey) == true)
			{
			@@ -539,6 +543,14 @@
			/// <param name="deleteRoom">是否从房间删除</param>
			public void DeleteMemmoryDevice(CommonDevice device, bool deleteRoom = true)
			{
			if (deleteRoom == true && Room.CurrentRoom != null)
			{
			//从房间中删除
			Room.CurrentRoom.DeleteDevice(device);
			//删除我的喜爱的设备
			Room.CurrentRoom.DeleteLoveDevice(device);
			}

			//删除缓存
			string mainKeys = this.GetDeviceMainKeys(device);
			lock (dicAllDevice)
			@@ -588,12 +600,6 @@
			}
			}
			this.dicOTADevice.Remove(otaKeys);
			}

			if (deleteRoom == true && Room.CurrentRoom != null)
			{
			//从房间中删除
			Room.CurrentRoom.DeleteDevice(device);
			}
			}

			@@ -721,11 +727,12 @@
			}

			/// <summary>
			/// 根据MAC地址,获取全部回路的设备对象(已经排序)
			/// 根据MAC地址,获取全部回路的设备对象
			/// </summary>
			/// <param name="DeviceAddr">Mac地址</param>
			/// <param name="sort">是否排序</param>
			/// <returns></returns>
			public List<CommonDevice> GetDevicesByMac(string DeviceAddr)
			public List<CommonDevice> GetDevicesByMac(string DeviceAddr, bool sort = true)
			{
			var list = new List<CommonDevice>();
			if (dicDeviceEpoint.ContainsKey(DeviceAddr) == false)
			@@ -740,6 +747,11 @@
			list.Add(device);
			}
			}
			if (sort == false)
			{
			return list;
			}

			//排序
			list.Sort((obj1, obj2) =>
			{
			@@ -1036,9 +1048,27 @@
			/// <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";
			@@ -1050,7 +1080,7 @@
			if (arry.Length == 1)
			{
			//如果它自己就是共通图片的话，不再处理
			return;
			return "RealDevice/CommonDevice.png";
			}
			imageFilePath = "RealDevice/" + arry[0] + ".png";
			//如果它自己的共通图片还是不存在的话,则直接使用所有设备的共通图片
			@@ -1059,16 +1089,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);
			@@ -1076,8 +1106,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;
			@@ -1085,32 +1115,38 @@
			}

			/// <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);
			//图片共有
			if (this.dicPictrueShard.ContainsKey(strSpecific) == true)
			{
			strSpecific = this.dicPictrueShard[strSpecific];
			}

			string strType = strSpecific.Replace("_", string.Empty);
			//将类型转为图片地址
			string imageFilePath = "Device/" + strType + ".png";
			@@ -1199,7 +1235,7 @@
			return info;
			}
			//获取第三方设备的【设备类型】
			return this.GetNotHdlMyDeviceEnumInfo(listdevice);
			return this.GetNotHdlMyDeviceEnumInfo(listdevice, false);
			}

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

			/// <summary>
			/// 获取第三方设备的【设备类型】
			/// 获取设备的【所属类型信息】,此方法会把所有的传感器都归为【传感器】(包括温湿度传感器)
			/// </summary>
			/// <param name="listdevice"></param>
			/// <param name="device">设备回路</param>
			/// <returns></returns>
			public DeviceEnumInfo GetNotHdlMyDeviceEnumInfo(List<CommonDevice> listdevice)
			public DeviceEnumInfo GetDeviceBelongEnumInfo(CommonDevice device)
			{
			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>
			/// <returns></returns>
			public DeviceEnumInfo GetNotHdlMyDeviceEnumInfo(CommonDevice device, bool margeSensor = true)
			{
			return this.GetNotHdlMyDeviceEnumInfo(new List<CommonDevice>() { device }, margeSensor);
			}

			/// <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)
			{
			var dicType = new Dictionary<DeviceType, CommonDevice>();
			foreach (CommonDevice device in listdevice)
			@@ -1314,9 +1407,18 @@
			//1包含面板的话,当面板处理
			if (dicType.ContainsKey(DeviceType.OnOffSwitch) == true)
			{
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId200;
			info.BeloneType = DeviceBeloneType.A按键面板;
			info.ConcreteType = DeviceConcreteType.ButtonPanel;
			if (listdevice.Count > 1)
			{
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId200;
			info.BeloneType = DeviceBeloneType.A按键面板;
			info.ConcreteType = DeviceConcreteType.ButtonPanel;
			}
			else
			{
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId16;
			info.BeloneType = DeviceBeloneType.A干接点;
			info.ConcreteType = DeviceConcreteType.DryContact;
			}
			}
			//3包含窗帘的话,当窗帘处理
			else if (dicType.ContainsKey(DeviceType.WindowCoveringDevice) == true)
			@@ -1328,16 +1430,56 @@
			//4空气开关
			else if (dicType.ContainsKey(DeviceType.AirSwitch) == true)
			{
			//默认值
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId4100;
			info.BeloneType = DeviceBeloneType.A空气开关;
			info.BeloneType = DeviceBeloneType.A智能空开;
			info.ConcreteType = DeviceConcreteType.AirSwitch;

			if (dicType[DeviceType.AirSwitch].DfunctionType == DeviceFunctionType.A开关)
			{
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId13;
			info.BeloneType = DeviceBeloneType.A开关;
			info.ConcreteType = DeviceConcreteType.Switch;
			}
			else if (dicType[DeviceType.AirSwitch].DfunctionType == DeviceFunctionType.A插座)
			{
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId14;
			info.BeloneType = DeviceBeloneType.A插座;
			info.ConcreteType = DeviceConcreteType.Socket1;
			}
			else if (dicType[DeviceType.AirSwitch].DfunctionType == DeviceFunctionType.A灯光)
			{
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId15;
			info.BeloneType = DeviceBeloneType.A灯光;
			info.ConcreteType = DeviceConcreteType.Light;
			}
			}
			//5继电器
			else if (dicType.ContainsKey(DeviceType.OnOffOutput) == true)
			{
			//默认值
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId2300;
			info.BeloneType = DeviceBeloneType.A继电器;
			info.ConcreteType = DeviceConcreteType.Relay;

			if (dicType[DeviceType.OnOffOutput].DfunctionType == DeviceFunctionType.A开关)
			{
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId13;
			info.BeloneType = DeviceBeloneType.A开关;
			info.ConcreteType = DeviceConcreteType.Switch;
			}
			else if (dicType[DeviceType.OnOffOutput].DfunctionType == DeviceFunctionType.A插座)
			{
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId14;
			info.BeloneType = DeviceBeloneType.A插座;
			info.ConcreteType = DeviceConcreteType.Socket1;
			}
			else if (dicType[DeviceType.OnOffOutput].DfunctionType == DeviceFunctionType.A灯光)
			{
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId15;
			info.BeloneType = DeviceBeloneType.A灯光;
			info.ConcreteType = DeviceConcreteType.Light;
			}
			}
			//6调光器
			else if (dicType.ContainsKey(DeviceType.DimmableLight) == true)
			@@ -1384,8 +1526,10 @@
			//12包含传感器的话,当传感器处理
			else if (dicType.ContainsKey(DeviceType.IASZone) == true)
			{
			//设置传感器具体的类型
			info.BeloneType = DeviceBeloneType.A传感器;
			info.ConcreteType = DeviceConcreteType.Sensor;
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId1200;
			//设置传感器具体的类型
			this.SetSensorDeviceSpecificType(ref info, listdevice);
			}
			//13包含温度传感器的话
			@@ -1393,7 +1537,9 @@
			{
			bool temperatrue = false;
			bool humidity = false;
			foreach (var device in listdevice)
			//获取全部的回路
			var listTemp = this.GetDevicesByMac(listdevice[0].DeviceAddr, false);
			foreach (var device in listTemp)
			{
			if (device is TemperatureSensor)
			{
			@@ -1414,14 +1560,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)
			{
			@@ -1453,10 +1599,6 @@
			/// <param name="listdevice">设备对象</param>
			private void SetSensorDeviceSpecificType(ref DeviceEnumInfo info, List<CommonDevice> listdevice)
			{
			//默认名字:传感器
			info.ConcreteType = DeviceConcreteType.Sensor;
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId1200;

			//如果这个设备拥有多个回路的话,我也不知道怎么命名,只能给个默认名字
			if (listdevice.Count > 1)
			{
			@@ -2041,6 +2183,14 @@
			//定义规则：模块ID(已翻译)=设备具体类型值-设备所属类型值(自定义的值,嘛,只要不重复就可以)
			//第一个值是:DeviceConcreteType 第二个值是:DeviceBeloneType

			//*********************************************************************
			//新设备添加方法：
			//1、在这里填写上模块ID，然后是 DeviceConcreteType ，然后是 DeviceBeloneType
			//2、然后在最下面添加【设备的具体类型】，【设备的所属类型】
			//3、已设备的具体类型为名字(去掉【-】)添加设备的【所属图片】，【真实物理图片】。回路图片需要特殊处理
			//4、添加R文件,添加Language文件
			//*********************************************************************

			//=========★★开合帘类(100-199)★★=========
			this.dicDeviceModelIdEnum["MWM65B-ZB.20"] = "100-100";//智能开合帘电机
			this.dicDeviceModelIdEnum["MVSM35B-ZB.20"] = "101-100";//智能管状电机
			@@ -2088,7 +2238,7 @@
			this.dicDeviceModelIdEnum["MBUS/GW-ZB.10"] = "4200-4200";//zigbee转buspro协议转换器
			this.dicDeviceModelIdEnum["M485/GW-ZB.10"] = "4201-4200";//zigbee转485协议转换器

			//需要交换的模块ID
			//✩✩✩✩✩需要交换的模块ID✩✩✩✩✩
			this.dicDeviceModelIdChanged = new Dictionary<string, string>();
			//=========★★安防类传感器类★★=========
			this.dicDeviceModelIdChanged["MULTI-GASE--EA07"] = "MSG01/M-ZB.10";//燃气传感器
			@@ -2097,6 +2247,12 @@
			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>();
			this.dicPictrueShard["ButtonPanel_SimpleFour"] = "ButtonPanel_Four";//简约4按键面板沿用 4按键的图标
			this.dicPictrueShard["ButtonPanel_SimpleThree"] = "ButtonPanel_Three";//简约3按键面板沿用 3按键的图标
			this.dicPictrueShard["ButtonPanel_SimpleTwo"] = "ButtonPanel_Two";//简约2按键面板沿用 2按键的图标
			}

			#endregion
			@@ -2215,11 +2371,11 @@
			/// <summary>
			/// 温湿度传感器
			/// </summary>
			Sensor_TemperatrueHumidity = -1308,
			Sensor_TemperatureHumidity = -1308,
			/// <summary>
			/// 温度传感器
			/// </summary>
			Sensor_Temperatrue = -1309,
			Sensor_Temperature = -1309,
			/// <summary>
			/// 湿度传感器
			/// </summary>
			@@ -2283,7 +2439,7 @@

			//=========★★空气开关类(4100-????)★★=========
			/// <summary>
			/// 智能空气开关
			/// 智能空开
			/// </summary>
			AirSwitch = -4100,
			/// <summary>
			@@ -2304,6 +2460,24 @@
			/// zigbee转buspro协议转换器
			/// </summary>
			Converter_ZbBuspro = 4201,

			//=========★★其他类(????-????)★★=========
			/// <summary>
			/// 干接点
			/// </summary>
			DryContact = -10000,
			/// <summary>
			/// 灯光(注意,它输入其他类,不是设备类型)
			/// </summary>
			Light = -10001,
			/// <summary>
			/// 插座
			/// </summary>
			Socket1 = -10002,
			/// <summary>
			/// 开关
			/// </summary>
			Switch = -10003,
			}

			/// <summary>
			@@ -2349,9 +2523,9 @@
			/// </summary>
			A中继器 = 3900,
			/// <summary>
			/// 空气开关(4100-4199)
			/// 智能空开(4100-4199)
			/// </summary>
			A空气开关 = 4100,
			A智能空开 = 4100,
			/// <summary>
			/// 转换器(4200-4699)
			/// </summary>
			@@ -2371,7 +2545,23 @@
			/// <summary>
			/// 湿度传感器
			/// </summary>
			A湿度传感器 = 12
			A湿度传感器 = 12,
			/// <summary>
			/// 开关
			/// </summary>
			A开关 = 13,
			/// <summary>
			/// 插座
			/// </summary>
			A插座 = 14,
			/// <summary>
			/// 灯光
			/// </summary>
			A灯光 = 15,
			/// <summary>
			/// 干接点
			/// </summary>
			A干接点 = 16
			}

			#endregion