~wjc/HomeApp.git

			@@ -1331,7 +1331,7 @@
			}

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

			/// <summary>
			/// 获取【设备类型】的图标
			/// 获取【设备类型】的图标(此方法不能用在设备功能类型菜单的图标)
			/// </summary>
			/// <param name="listdevice">设备对象</param>
			/// <param name="unSelectPath">图片地址</param>
			@@ -1369,13 +1369,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);
			@@ -1412,6 +1441,7 @@
			unSelectPath = imageFilePath;
			selectPath = imageSelectFilePath;
			}


			#endregion

			@@ -1818,6 +1848,14 @@
			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;//传感器
			}

			int value = (int)info.BeloneType;
			if (dicDeviceAllNameID.ContainsKey("uDeviceBelongId" + value) == true)
			@@ -1916,26 +1954,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)
			{
			@@ -1945,6 +1967,31 @@
			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;
			}
			}

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

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

			@@ -2111,26 +2158,15 @@
			listDevice = this.GetDeviceByGatewayID(gwId);
			}

			var dicDevice = new Dictionary<string, CommonDevice>();
			var listCheck = new HashSet<string>();
			var listReturn = new List<CommonDevice>();
			foreach (var device in listDevice)
			{
			if (dicDevice.ContainsKey(device.DeviceAddr) == false)
			if (listCheck.Contains(device.DeviceAddr) == false)
			{
			dicDevice[device.DeviceAddr] = device;
			continue;
			listCheck.Add(device.DeviceAddr);
			listReturn.Add(device);
			}
			//设备是否处于在线状态
			bool online = this.CheckDeviceIsOnline(device);
			if (online == true)
			{
			//如果设备回路在线,则优先使用在线的回路,后来的直接覆盖
			dicDevice[device.DeviceAddr] = device;
			}
			}
			var listReturn = new List<CommonDevice>();
			foreach (var device in dicDevice.Values)
			{
			listReturn.Add(device);
			}
			return listReturn;
			}
			@@ -2146,8 +2182,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>
			@@ -2377,8 +2423,14 @@
			if (listCheck.Contains(mainkeys) == false)
			{
			listDevice.Add(device);

			listCheck.Add(mainkeys);
			//刷新一下本地缓存
			var localDevice = this.GetDevice(mainkeys);
			if (localDevice != null)
			{
			//刷新属性
			this.SetDeviceInfoToMain(localDevice, device);
			}
			}
			}
			}
			@@ -2505,6 +2557,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;
			@@ -2528,8 +2581,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)
			@@ -2559,8 +2610,9 @@
			//如果是三路继电器的回路的话,默认为灯光
			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未定义)
			{
			@@ -2618,6 +2670,7 @@
			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.OtaDevice \|\| deviceType == DeviceType.OtaPanelDevice) { device = new OTADevice(); }
			else { return null; }
			@@ -2636,11 +2689,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
			@@ -3073,6 +3124,10 @@
			/// </summary>
			A传感器 = 1200,
			/// <summary>
			/// PM2.5空气质量传感器
			/// </summary>
			APM2点5空气质量传感器 = 1307,
			/// <summary>
			/// 继电器(2300-2499)
			/// </summary>
			A继电器 = 2300,