~wxr/HDL_APP_Project.git

old mode 100644 new mode 100755

			@@ -67,10 +67,20 @@
			{
			tVs = new List<TV>();
			}
			if (airCleaners == null)
			{
			airCleaners = new List<AirCleaner>();
			}
			if (weepRobots == null)
			{
			weepRobots = new List<WeepRobot>();
			}
			var list = new List<Function>();
			list.AddRange(fans);
			list.AddRange(switchSockets);
			list.AddRange(tVs);
			list.AddRange(tVs);
			list.AddRange(airCleaners);
			list.AddRange(weepRobots);
			return list;
			}
			}
			@@ -85,12 +95,25 @@
			/// <summary>
			/// 家电列表
			/// </summary>
			public List<SwitchSocket> switchSockets = new List<SwitchSocket>();
			public List<SwitchSocket> switchSockets = new List<SwitchSocket>();
			/// <summary>
			/// 空气净化器列表
			/// </summary>
			public List<AirCleaner> airCleaners = new List<AirCleaner>();
			/// <summary>
			/// 扫地机器人列表
			/// </summary>
			public List<WeepRobot> weepRobots = new List<WeepRobot>();

			#endregion
			/// <summary>
			/// 环境传感器列表
			/// </summary>
			public List<Sensor> sensorsEnvironmentalScience = new List<Sensor>();
			/// <summary>
			/// 安防设备列表
			/// </summary>
			public List<Sensor> sensorsArm = new List<Sensor>();

			public List<Scene> scenes = new List<Scene>();
			/// <summary>
			@@ -182,9 +205,31 @@
			deviceFunctionList.Add(tv);
			break;
			case SPK.ElectricFan:
			var fan = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString);
			var fan = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString);
			List.fans.Add(fan);
			deviceFunctionList.Add(fan);
			break;
			case SPK.ElectricTuyaAirCleaner:
			var airCleaner = Newtonsoft.Json.JsonConvert.DeserializeObject<AirCleaner>(functionDataString);
			List.airCleaners.Add(airCleaner);
			deviceFunctionList.Add(airCleaner);
			break;
			case SPK.ElectricTuyaFan:
			var tuyaFan = Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString);
			List.fans.Add(tuyaFan);
			deviceFunctionList.Add(tuyaFan);
			break;
			case SPK.ElectricTuyaWeepRobot:
			var tuyaWeepRobot = Newtonsoft.Json.JsonConvert.DeserializeObject<WeepRobot>(functionDataString);
			List.weepRobots.Add(tuyaWeepRobot);
			deviceFunctionList.Add(tuyaWeepRobot);
			break;
			case SPK.SensorSmoke:
			case SPK.SensorWater:
			case SPK.SensorGas:
			var ser = Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString);
			List.sensorsArm.Add(ser);
			deviceFunctionList.Add(ser);
			break;
			}
			}
			@@ -212,6 +257,7 @@
			deviceFunctionList.AddRange(floorHeatings);
			deviceFunctionList.AddRange(electricals);
			deviceFunctionList.AddRange(sensorsEnvironmentalScience);
			deviceFunctionList.AddRange(sensorsArm);
			deviceFunctionList.AddRange(UI.Music.A31MusicModel.A31MusicModelList);
			}
			try
			@@ -350,7 +396,7 @@
			}
			break;
			case FunctionCategory.Sensor:
			switch(f.spk)
			switch (f.spk)
			{
			case SPK.SensorTVOC:
			case SPK.SensorCO2:
			@@ -359,6 +405,17 @@
			case SPK.SensorTemperature:
			List.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(obj.ToString()));
			break;
			case SPK.SensorWater:
			case SPK.SensorSmoke:
			case SPK.SensorGas:
			case SPK.SensorDryContact:
			case SPK.SensorShanLan:
			case SPK.SensorDuiShe:
			case SPK.SensorPir:
			case SPK.SensorDoorWindow:
			case SPK.SensoruUtrasonic:
			List.sensorsArm.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(obj.ToString()));
			break;
			}
			break;
			}