~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -115,7 +115,7 @@
			{
			CommonDevice device = null;
			//反序列化为指定的类，不然数据会丢失而导致无法强转
			try
			try
			{
			device = CommonDevice.CommonDeviceByFilePath(file);
			}
			@@ -271,7 +271,7 @@
			//添加缓存
			this.AddDeviceToMemory(ref device);

			//移除存在的设备内存
			//移除存在的设备内存
			string maikey = this.GetDeviceMainKeys(device);
			if (dicExist.ContainsKey(maikey) == true)
			{
			@@ -1987,9 +1987,19 @@
			/// <param name="listMac">设备Mac地址</param>
			public void DeleteRealDeviceFromRoom(List<string> listMac)
			{
			bool save = false;
			foreach (var deviceMacAddr in listMac)
			{
			this.dicDeviceRoomId.Remove(deviceMacAddr);
			if (this.dicDeviceRoomId.ContainsKey(deviceMacAddr) == true)
			{
			this.dicDeviceRoomId.Remove(deviceMacAddr);
			save = true;
			}
			}
			if (save == false)
			{
			//没有改变,不需要保存
			return;
			}
			//保存记录
			string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
			@@ -2070,13 +2080,24 @@

			//其他的看着办呗,都是排在后面的,都归为这个属性
			list.Add(DeviceBeloneType.A未知设备);


			return list;
			}

			#endregion

			#region ■ 一般方法___________________________

			/// <summary>
			/// 从缓存变量检测设备是否在线
			/// </summary>
			/// <param name="i_device"></param>
			/// <returns></returns>
			public bool CheckDeviceIsOnline(CommonDevice i_device)
			{
			//0:离线 1:在线 2:正在刷新状态
			return i_device.IsOnline == 1 \|\| i_device.IsOnline == 2;
			}

			/// <summary>
			/// 判断该设备是否可以显示在主页
			@@ -2637,19 +2658,20 @@

			//=========★★安防类传感器类(1300-2299)★★=========
			//这里是麦乐克的
			this.dicDeviceModelIdEnum["MULTI-GASE--EA07"] = "1300-1300-60000";//燃气传感器
			this.dicDeviceModelIdEnum["MULTI-MECI--EA01"] = "1301-1300-60000";//门窗磁传感器
			this.dicDeviceModelIdEnum["MULTI-FIRE--EA05"] = "1302-1300-60000";//烟雾传感器
			this.dicDeviceModelIdEnum["MULTI-MOTI--EA04"] = "1303-1300-60000";//红外传感器
			this.dicDeviceModelIdEnum["MULTI-WATE--EA02"] = "1304-1300-60000";//水浸传感器
			this.dicDeviceModelIdEnum["MULTI-BURO--EA06"] = "1305-1300-60000";//紧急按键
			this.dicDeviceModelIdEnum["MULTI-GASE--EA07"] = "1300-1200-60000";//燃气传感器
			this.dicDeviceModelIdEnum["MULTI-MECI--EA01"] = "1301-1200-60000";//门窗磁传感器
			this.dicDeviceModelIdEnum["MULTI-FIRE--EA05"] = "1302-1200-60000";//烟雾传感器
			this.dicDeviceModelIdEnum["MULTI-MOTI--EA04"] = "1303-1200-60000";//红外传感器
			this.dicDeviceModelIdEnum["MULTI-WATE--EA02"] = "1304-1200-60000";//水浸传感器
			this.dicDeviceModelIdEnum["MULTI-BURO--EA06"] = "1305-1200-60000";//紧急按键
			//这里是河东的
			this.dicDeviceModelIdEnum["MSG01/M-ZB.10"] = "1300-1300-60000";//燃气传感器
			this.dicDeviceModelIdEnum["MSDC01/M-ZB.10"] = "1301-1300-60000";//门窗磁传感器
			this.dicDeviceModelIdEnum["MSS01/M-ZB.10"] = "1302-1300-60000";//烟雾传感器
			this.dicDeviceModelIdEnum["MSPIR01/M-ZB.10"] = "1303-1300-60000";//红外传感器
			this.dicDeviceModelIdEnum["MSW01/M-ZB.10"] = "1304-1300-60000";//水浸传感器
			this.dicDeviceModelIdEnum["MBU01/M-ZB.10"] = "1305-1300-60000";//紧急按键
			this.dicDeviceModelIdEnum["MSG01/M-ZB.10"] = "1300-1200-60000";//燃气传感器
			this.dicDeviceModelIdEnum["MSDC01/M-ZB.10"] = "1301-1200-60000";//门窗磁传感器
			this.dicDeviceModelIdEnum["MSS01/M-ZB.10"] = "1302-1200-60000";//烟雾传感器
			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";//吸顶燃气传感器

			//=========★★继电器类(2300-2499)★★=========
			this.dicDeviceModelIdEnum["MPR0310-ZB.10"] = "2300-2300-60001";//3路继电器小模块
			@@ -2696,9 +2718,8 @@
			this.dicPictrueShard["ButtonPanel_SimpleFour"] = "ButtonPanel_Four";//简约4按键面板沿用 4按键的图标
			this.dicPictrueShard["ButtonPanel_SimpleThree"] = "ButtonPanel_Three";//简约3按键面板沿用 3按键的图标
			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["IntelligentLocks_Sone"] = "IntelligentLocks_H06C";//S-one的门锁图片沿用 H06C的图标
			this.dicPictrueShard["Relay_FangyueFreshAirModul"] = "Relay_ThreeLoad";//方悦新风小模块图片沿用 3路继电器的图标
			}

			#endregion
			@@ -2839,6 +2860,10 @@
			/// </summary>
			Sensor_EmergencyButton = 1305,
			/// <summary>
			/// 吸顶燃气传感器
			/// </summary>
			Sensor_CeilingGas = 1306,
			/// <summary>
			/// 运动传感器
			/// </summary>
			Sensor_Motion = -1306,
			@@ -2872,7 +2897,7 @@
			/// 方悦新风小模块镜像id：2310
			/// </summary>
			Relay_FangyueFreshAirModul = 2310,


			//=========★★调光器类(2500-2799)★★=========
			/// <summary>
			/// 调光器