~wxr/HDL_APP_Project.git

			@@ -17,7 +17,7 @@
			/// <param name="function"></param>
			public static void UpdataInfo(Function function)
			{
			Application.RunOnMainThread((Action)(() => {
			Application.RunOnMainThread(() => {
			if (bodyView == null)
			return;
			try
			@@ -48,7 +48,12 @@
			case SPK.ElectricTuyaFan:
			case SPK.ElectricTuyaWaterValve:
			case SPK.ElectricTuyaWeepRobot:
			case SPK.ClothesHanger:
			vv = ShowFunction.Electric;
			break;
			case SPK.AirFreshJinmao:
			case SPK.AirFreshStandard:
			vv = ShowFunction.FreshAir;
			break;
			}
			UpdataFunctionOnCount(vv, function.spk);
			@@ -57,7 +62,7 @@
			catch
			{
			}
			}));
			});
			}

			/// <summary>
			@@ -99,51 +104,35 @@
			var btn = view3.GetChildren(o) as Button;
			if (btn.Tag != null)
			{
			string btnText = "0";
			switch (functionCategory)
			{
			case ShowFunction.FloorHeating:
			btnText = FunctionList.List.GetFloorHeatingList().FindAll((obj) => obj.trait_on_off.state.ToString() == "on").Count.ToString();
			break;
			case ShowFunction.AC:
			btnText = FunctionList.List.GetAcList().FindAll((obj) => obj.trait_on_off.state.ToString() == "on").Count.ToString();
			break;
			case ShowFunction.Curtain:
			btnText = FunctionList.List.GetCurtainList().FindAll((obj) => obj.trait_on_off.state.ToString() == "on").Count.ToString();
			break;
			case ShowFunction.Light:
			btnText = FunctionList.List.GetLightList().FindAll((obj) => obj.trait_on_off.state.ToString() == "on").Count.ToString();
			break;
			case ShowFunction.Electric:
			btnText = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.state.ToString() == "on").Count.ToString();
			break;
			case ShowFunction.FreshAir:
			btnText = FunctionList.List.GetAirFreshList().FindAll((obj) => obj.trait_on_off.state.ToString() == "on").Count.ToString();
			break;
			}
			if (btn.Tag.ToString() == functionCategory + "_onCount")
			{
			string btnText = "0";
			switch (functionCategory)
			{
			case ShowFunction.FloorHeating:
			btnText = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
			break;
			case ShowFunction.AC:
			btnText = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
			break;
			case ShowFunction.Curtain:
			btnText = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
			break;
			case ShowFunction.Light:
			btnText = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
			break;
			case ShowFunction.Electric:
			btnText = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
			break;
			}
			btn.Text = btnText;
			}
			else if (btn.Tag.ToString() == functionCategory + "_AllControl")
			{
			var openCount = 0;
			switch (functionCategory)
			{
			case ShowFunction.FloorHeating:
			openCount = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			break;
			case ShowFunction.AC:
			openCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			break;
			case ShowFunction.Curtain:
			openCount = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			break;
			case ShowFunction.Light:
			openCount = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			break;
			case ShowFunction.Electric:
			openCount = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			break;
			}
			btn.IsSelected = openCount != 0;
			btn.IsSelected = btnText != "0";
			}
			}
			}
			@@ -179,7 +168,7 @@
			var btn = view1.GetChildren(j) as Button;
			if (btn.Tag != null && btn.Tag.ToString() == "AllClose")
			{
			if (function.trait_on_off.curValue.ToString() == "on")
			if (function.trait_on_off.state.ToString() == "on")
			{
			btn.Visible = true;
			}
			@@ -196,7 +185,7 @@
			{
			continue;
			}
			var ssd = r.GetRoomFunctions(false).FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on");
			var ssd = r.GetRoomFunctions(false).FindAll((obj) => obj.trait_on_off.state.ToString() == "on");
			var sss = ssd.Count;
			if (sss == 0)
			{
			@@ -226,9 +215,9 @@
			{
			foreach (var f in room.GetRoomFunctions(false))
			{
			f.trait_on_off.curValue = "off";
			f.trait_on_off.state = "off";
			Dictionary<string, string> d = new Dictionary<string, string>();
			d.Add("on_off", f.trait_on_off.curValue.ToString());
			d.Add("on_off", f.trait_on_off.state.ToString());
			Control.Ins.SendWriteCommand(f, d);
			}

			@@ -248,7 +237,7 @@
			};
			foreach (var f in room.GetRoomFunctions(false))
			{
			if (f.trait_on_off.curValue.ToString() == "on")
			if (f.trait_on_off.state.ToString() == "on")
			{
			btn.Visible = true;
			break;
			@@ -342,50 +331,64 @@
			{
			try
			{
			//全开全关
			//if (DB_ResidenceData.Instance.GatewayType == 0 && !Control.Ins.IsRemote)
			//休眠时间(ms)
			int sleepTime = 100;
			if(DB_ResidenceData.Instance.GatewayType == 0)
			{
			sleepTime = 200;
			}
			if (Control.Ins.GatewayOnline_Local)
			{
			switch (functionCategory)
			{
			case ShowFunction.AC:
			foreach (var f in FunctionList.List.aCs)
			foreach (var f in FunctionList.List.GetAcList())
			{
			f.trait_on_off.curValue = onoff;
			f.trait_on_off.state = onoff;
			Dictionary<string, string> d = new Dictionary<string, string>();
			d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
			d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.state.ToString());
			Control.Ins.SendWriteCommand(f, d);
			System.Threading.Thread.Sleep(100);
			System.Threading.Thread.Sleep(sleepTime);
			}
			break;
			case ShowFunction.FloorHeating:
			foreach (var f in FunctionList.List.floorHeatings)
			foreach (var f in FunctionList.List.GetFloorHeatingList())
			{
			f.trait_on_off.curValue = onoff;
			f.trait_on_off.state = onoff;
			Dictionary<string, string> d = new Dictionary<string, string>();
			d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
			d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.state.ToString());
			Control.Ins.SendWriteCommand(f, d);
			System.Threading.Thread.Sleep(100);
			System.Threading.Thread.Sleep(sleepTime);
			}
			break;
			case ShowFunction.Light:
			foreach (var f in FunctionList.List.lights)
			foreach (var f in FunctionList.List.GetLightList())
			{
			f.trait_on_off.curValue = onoff;
			f.trait_on_off.state = onoff;
			Dictionary<string, string> d = new Dictionary<string, string>();
			d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
			d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.state.ToString());
			Control.Ins.SendWriteCommand(f, d);
			System.Threading.Thread.Sleep(100);
			System.Threading.Thread.Sleep(sleepTime);
			}
			break;
			case ShowFunction.Electric:
			foreach (var f in FunctionList.List.electricals)
			foreach (var f in FunctionList.List.GetElectricals())
			{
			f.trait_on_off.curValue = onoff;
			f.trait_on_off.state = onoff;
			Dictionary<string, string> d = new Dictionary<string, string>();
			d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
			d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.state.ToString());
			Control.Ins.SendWriteCommand(f, d);
			System.Threading.Thread.Sleep(100);
			System.Threading.Thread.Sleep(sleepTime);
			}
			break;
			case ShowFunction.FreshAir:
			foreach (var f in FunctionList.List.GetAirFreshList())
			{
			f.trait_on_off.state = onoff;
			Dictionary<string, string> d = new Dictionary<string, string>();
			d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.state.ToString());
			Control.Ins.SendWriteCommand(f, d);
			System.Threading.Thread.Sleep(sleepTime);
			}
			break;
			}
			@@ -396,7 +399,7 @@
			{
			case ShowFunction.AC:
			List<Function> acList = new List<Function>();
			foreach(var f in FunctionList.List.aCs)
			foreach(var f in FunctionList.List.GetAcList())
			{
			acList.Add(f);
			}
			@@ -404,7 +407,7 @@
			break;
			case ShowFunction.FloorHeating:
			List<Function> fhList = new List<Function>();
			foreach (var f in FunctionList.List.floorHeatings)
			foreach (var f in FunctionList.List.GetFloorHeatingList())
			{
			fhList.Add(f);
			}
			@@ -412,7 +415,7 @@
			break;
			case ShowFunction.Light:
			List<Function> lightList = new List<Function>();
			foreach (var f in FunctionList.List.lights)
			foreach (var f in FunctionList.List.GetLightList())
			{
			lightList.Add(f);
			}
			@@ -420,7 +423,7 @@
			break;
			case ShowFunction.Electric:
			List<Function> eleList = new List<Function>();
			foreach (var f in FunctionList.List.electricals)
			foreach (var f in FunctionList.List.GetElectricals())
			{
			eleList.Add(f);
			}
			@@ -467,12 +470,12 @@
			{
			try
			{
			foreach (var f in FunctionList.List.curtains)
			foreach (var f in FunctionList.List.GetCurtainList())
			{
			f.trait_on_off.curValue = "on";
			f.percent = 100;
			f.trait_on_off.state = "on";
			f.SetAttrState(FunctionAttributeKey.Percent, "100");
			Dictionary<string, string> d = new Dictionary<string, string>();
			d.Add("on_off", f.trait_on_off.curValue.ToString());
			d.Add("on_off", f.trait_on_off.state.ToString());
			Control.Ins.SendWriteCommand(f, d);
			System.Threading.Thread.Sleep(100);
			}
			@@ -498,12 +501,12 @@
			DB_ResidenceData.Instance.GlobalCurtainStatus = false;
			btnClose.IsSelected = true;
			btnOpen.IsSelected = false;
			foreach (var f in FunctionList.List.curtains)
			foreach (var f in FunctionList.List.GetCurtainList())
			{
			f.trait_on_off.curValue = "off";
			f.percent = 0;
			f.trait_on_off.state = "off";
			f.SetAttrState(FunctionAttributeKey.Percent, "0");
			Dictionary<string, string> d = new Dictionary<string, string>();
			d.Add("on_off", f.trait_on_off.curValue.ToString());
			d.Add("on_off", f.trait_on_off.state.ToString());
			Control.Ins.SendWriteCommand(f, d);
			}
			};