~wxr/HDL_APP_Project.git

			@@ -53,6 +53,7 @@
			/// </summary>
			public void LoadFunctionDiv()
			{
			//todo 增加设备，增加功能列表卡片
			if (function == null)
			{
			this.RemoveFromParent();
			@@ -60,24 +61,65 @@
			}
			LoadDiv();

			if (function.functionCategory == FunctionCategory.Curtain \|\| function.functionCategory == FunctionCategory.Music \|\| function.functionCategory == FunctionCategory.Scene)//窗帘没有开关按钮
			if (function.Spk_Prefix == FunctionCategory.Curtain//窗帘没有开关按钮
			\|\| function.Spk_Prefix == FunctionCategory.Music//音乐没有开关按钮
			\|\| function.Spk_Prefix == FunctionCategory.Sensor//传感器没有开关按钮
			)
			{
			switch (function.functionCategory)
			switch (function.Spk_Prefix)
			{
			case FunctionCategory.Curtain:
			switch(function.functionType)
			switch (function.spk)
			{
			case FunctionType.Curtain:
			case SPK.CurtainSwitch:
			btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainThinIcon.png";
			break;
			case FunctionType.MotorCurtain:
			case SPK.CurtainTrietex:
			btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/MotorCurtainIcon.png";
			break;
			case FunctionType.RollingShutter:
			case SPK.CurtainRoller:
			btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/RollingShutterIcon.png";
			break;
			}
			CurtainFragment();
			break;
			case FunctionCategory.Sensor:
			switch (function.spk)
			{
			case SPK.SensorPir:
			btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorPirIcon.png";
			break;
			case SPK.SensorWater:
			btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorWaterImmersionIcon.png";
			break;
			case SPK.SensorSmoke:
			btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorSmokeIcon.png";
			break;
			case SPK.SensorDoorWindow:
			btnIcon.UnSelectedImagePath = "FunctionIcon/ArmSensor/ArmSensorDoorIcon.png";
			break;
			default:

			break;
			}
			var powerLowTipAttr = function.attributes.Find((obj) => obj.key == FunctionAttributeKey.BatteryState);
			if (powerLowTipAttr != null)
			{
			if (powerLowTipAttr.state.ToLower() == "low")
			{
			Button btnTipPowerLow = new Button()
			{
			X = Application.GetRealWidth(307),
			Y = Application.GetRealHeight(25),
			Width = Application.GetRealWidth(24),
			Height = Application.GetRealWidth(24),
			UnSelectedImagePath = "FunctionIcon/ArmSensor/PowerLowIcon.png",
			SelectedImagePath = "FunctionIcon/ArmSensor/PowerLowIcon.png",
			};
			this.AddChidren(btnTipPowerLow);
			}
			}

			break;
			case FunctionCategory.Music:
			btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicThinIcon.png";
			@@ -88,95 +130,110 @@
			}
			else
			{
			#region 加载开关按钮
			/// <summary>
			/// 开关按钮
			/// </summary>
			Button btnSwitch;
			if (function.functionType == FunctionType.RGB \|\| function.functionType == FunctionType.Dimmer)
			if (function.spk == SPK.ClothesHanger)//晾衣架
			{
			btnSwitch = new Button()
			{
			X = Application.GetRealWidth(303),
			Y = Application.GetRealHeight(78),
			Width = Application.GetMinRealAverage(32),
			Height = Application.GetMinRealAverage(32),
			UnSelectedImagePath = "Public/PowerClose.png",
			SelectedImagePath = "Public/PowerOpen.png",
			IsSelected = function.trait_on_off.curValue.ToString() == "on",
			Tag = function.sid + "_Switch",
			};
			bodyDiv.AddChidren(btnSwitch);
			//加载开关按钮事件
			LoadEvent_SwitchFunction(btnSwitch,function.attributes.Find((obj)=> obj.key == FunctionAttributeKey.FadeTime ));
			btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerGrayIcon.png";
			ClothesHangerFragment();
			}
			else
			{
			btnSwitch = new Button()
			#region 加载开关按钮

			/// <summary>
			/// 开关按钮
			/// </summary>
			Button btnSwitch;
			if (function.spk == SPK.LightRGB \|\| function.spk == SPK.LightDimming)
			{
			X = Application.GetRealWidth(303),
			Y = Application.GetRealHeight(58),
			Width = Application.GetMinRealAverage(32),
			Height = Application.GetMinRealAverage(32),
			UnSelectedImagePath = "Public/PowerClose.png",
			SelectedImagePath = "Public/PowerOpen.png",
			IsSelected = function.trait_on_off.curValue.ToString() == "on",
			Tag = function.sid + "_Switch",
			};
			bodyDiv.AddChidren(btnSwitch);
			//加载开关按钮事件
			LoadEvent_SwitchFunction(btnSwitch);
			}
			btnSwitch = new Button()
			{
			X = Application.GetRealWidth(303),
			Y = Application.GetRealHeight(78),
			Width = Application.GetMinRealAverage(32),
			Height = Application.GetMinRealAverage(32),
			UnSelectedImagePath = "Public/PowerClose.png",
			SelectedImagePath = "Public/PowerOpen.png",
			IsSelected = function.trait_on_off.curValue.ToString() == "on",
			Tag = function.sid + "_Switch",
			};
			bodyDiv.AddChidren(btnSwitch);
			//加载开关按钮事件
			LoadEvent_SwitchFunction(btnSwitch, function.attributes.Find((obj) => obj.key == FunctionAttributeKey.FadeTime));
			}
			else
			{
			btnSwitch = new Button()
			{
			X = Application.GetRealWidth(303),
			Y = Application.GetRealHeight(58),
			Width = Application.GetMinRealAverage(32),
			Height = Application.GetMinRealAverage(32),
			UnSelectedImagePath = "Public/PowerClose.png",
			SelectedImagePath = "Public/PowerOpen.png",
			IsSelected = function.trait_on_off.curValue.ToString() == "on",
			Tag = function.sid + "_Switch",
			};
			bodyDiv.AddChidren(btnSwitch);
			//加载开关按钮事件
			LoadEvent_SwitchFunction(btnSwitch);
			}

			switch (function.functionCategory)
			{
			case FunctionCategory.Thermostat:
			switch (function.functionType)
			{
			case FunctionType.AC:
			btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png";
			LoadLastStatesButton();
			break;
			case FunctionType.FloorHeating:
			btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png";
			LoadLastStatesButton();
			break;
			}
			break;
			case FunctionCategory.Light:
			btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png";
			btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on";
			LoadLightControl();
			break;
			case FunctionCategory.SwitchDevice:
			switch (function.functionType)
			{
			case FunctionType.Socket:
			btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketThinIcon.png";
			break;
			}
			btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on";
			break;
			case FunctionCategory.Electrical:
			switch (function.functionType)
			{
			case FunctionType.Fan:
			btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanThinIcon.png";
			break;
			case FunctionType.TV:
			btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVThinIcon.png";
			break;
			}
			btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on";
			break;
			switch (function.Spk_Prefix)
			{
			case FunctionCategory.AC:
			switch (function.spk)
			{
			case SPK.AcStandard:
			btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png";
			LoadLastStatesButton();
			break;
			}
			break;
			case FunctionCategory.FloorHeat:
			switch (function.spk)
			{
			case SPK.FloorHeatStandard:
			btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png";
			LoadLastStatesButton();
			break;
			}
			break;
			case FunctionCategory.Light:
			btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png";
			btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on";
			LoadLightControl();
			break;
			case FunctionCategory.Electric:
			switch (function.spk)
			{
			case SPK.ElectricSocket:
			btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketThinIcon.png";
			break;
			case SPK.ElectricFan:
			case SPK.ElectricTuyaFan:
			btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanThinIcon.png";
			break;
			case SPK.ElectricTV:
			btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVThinIcon.png";
			break;
			case SPK.ElectricTuyaAirCleaner:
			btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/AirCleanerThiinIcon.png";
			break;
			case SPK.ElectricTuyaWeepRobot:
			btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WeepRobotThinIcon.png";
			break;
			case SPK.ElectricTuyaWaterValve:
			btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WaterValve/WaterValveIcon.png";
			break;
			}
			btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on";
			break;
			}
			#endregion
			}
			#endregion
			}

			if (function.functionCategory != FunctionCategory.Scene)
			{
			LoadEvent_DivSkipEvent();
			}
			LoadEvent_DivSkipEvent();
			LoadEvent_FunctionCollection();
			}

			@@ -232,7 +289,7 @@
			};
			//bodyDiv.AddChidren(btnCollectionIcon);
			//2020-12-16 如果是成员隐藏收藏功能
			if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
			if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare && function.Spk_Prefix != FunctionCategory.Sensor)
			{
			bodyDiv.AddChidren(btnCollectionIcon);
			}
			@@ -243,10 +300,10 @@
			/// </summary>
			void LoadLightControl()
			{
			switch (function.functionType)
			switch (function.spk)
			{
			case FunctionType.Dimmer:
			case FunctionType.RGB:
			case SPK.LightDimming:
			case SPK.LightRGB:
			#region Dimmer
			var btnDimmerMinValues = new Button()
			{
			@@ -274,7 +331,7 @@
			ProgressTextColor = CSS_Color.FirstLevelTitleColor,
			ProgressTextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
			MaxValue = 100,
			Progress = (function as Light).brightness,
			Progress = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.BatteryState)),
			Tag = function.sid + "_DimmerBar",
			SeekBarPadding = Application.GetRealWidth(20),
			};
			@@ -313,7 +370,7 @@
			Height = Application.GetMinRealAverage(32),
			UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
			SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
			IsSelected = function.trait_on_off.curValue.ToString() == "off",
			IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) == "0",
			Tag = function.sid + "_off"
			};
			bodyDiv.AddChidren(btnCurtainClose);
			@@ -327,7 +384,6 @@
			UnSelectedImagePath = "FunctionIcon/Curtain/CurtainStopIcon.png",
			SelectedImagePath = "FunctionIcon/Curtain/CurtainStopOnIcon.png",
			Tag = function.sid + "_stop",
			IsSelected = function.trait_on_off.curValue.ToString() == "stop"
			};
			bodyDiv.AddChidren(btnCurtainStop);

			@@ -340,11 +396,43 @@
			UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
			SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
			Tag = function.sid + "_on",
			IsSelected = function.trait_on_off.curValue.ToString() == "on"
			IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) != "0"
			};
			bodyDiv.AddChidren(btnCurtainOpen);
			LoadEvent_ControlCurtain(btnCurtainStop, btnCurtainOpen, btnCurtainClose, function as Curtain);
			LoadEvent_ControlCurtain(btnCurtainStop, btnCurtainOpen, btnCurtainClose, function);
			#endregion
			}
			/// <summary>
			/// 加载晾衣架功能控制卡片
			/// </summary>
			void ClothesHangerFragment()
			{
			#region ClothesHanger
			var btnClothesHangerUp = new Button()
			{
			X = Application.GetRealWidth(233),
			Y = Application.GetRealHeight(58),
			Width = Application.GetMinRealAverage(32),
			Height = Application.GetMinRealAverage(32),
			UnSelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerUpIcon1.png",
			SelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerUpIcon1On.png",
			};
			bodyDiv.AddChidren(btnClothesHangerUp);

			var btnClothesHangerDown = new Button()
			{
			X = Application.GetRealWidth(303),
			Y = Application.GetRealHeight(58),
			Width = Application.GetMinRealAverage(32),
			Height = Application.GetMinRealAverage(32),
			UnSelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerDownIcon1.png",
			SelectedImagePath = "FunctionIcon/Electrical/ClothesHanger/ClothesHangerDownIcon1On.png",
			};
			bodyDiv.AddChidren(btnClothesHangerDown);
			LoadEvent_ControlClothesHanger(function, btnClothesHangerUp, btnClothesHangerDown);
			#endregion


			}

			/// <summary>
			@@ -373,7 +461,7 @@
			UnSelectedImagePath = "MusicIcon/pause.png",
			SelectedImagePath = "MusicIcon/play.png",
			IsSelected = (function as A31MusicModel).A31PlayStatus.status == "play" ,
			Tag = function.functionType + "_State_" + function.sid
			Tag = function.spk + "_State_" + function.sid
			};
			bodyDiv.AddChidren(btnPlay);

			@@ -390,7 +478,6 @@
			LoadEvent_ControlMusic(btnPlay, btnNext, btnPrev, function as A31MusicModel);
			#endregion
			}


			/// <summary>
			/// 加载功能状态信息按钮
			@@ -412,7 +499,7 @@
			SelectedTextColor = CSS_Color.PromptingColor1,
			TextColor = 0x00000000,
			TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
			Tag = function.functionType + "_laststates_" + function.sid,
			Tag = function.spk + "_laststates_" + function.sid,
			IsSelected = function.trait_on_off.curValue.ToString() == "on"
			};
			bodyDiv.AddChidren(btnLastStates);