~wxr/OnPro.git - Gitblit

			@@ -291,13 +291,8 @@
			};

			bool b = false;
			btnIcon.MouseUpEventHandler += (sender, e) =>
			btnIcon.MouseUpEventHandler = (sender, e) =>
			{


			//ESOnVideo.Current.Test(false);

			//return;
			if (b)
			{
			//etAccount.Text = "18022428438";//wjc
			@@ -308,7 +303,6 @@
			//etAccount.Text = "455740454@qq.com";
			//etAccount.Text = "13288623489";//罗晓东
			//etAccount.Text = "18688414428";//天河3楼
			//etAccount.Text = "pjh@hdlchina.com.cn";
			//etAccount.Text = "12345678904";//2.0 测试萤石
			//etAccount.Text = "1272061968@qq.com";//万科城市之光E区8栋206
			//etAccount.Text = "marketing@australindo.co.id";
			@@ -317,9 +311,12 @@
			etAccount.Text = "13336018868";
			etAccount.Text = "649362315@qq.com";//蔡淑娴
			//etAccount.Text = "18402017839";
			//etAccount.Text = "18620993214";
			//etAccount.Text = "13414984501";//吴晓聪

			etAccount.Text = "13682244600";
			etAccount.Text = "pjh@hdlchina.com.cn";
			etAccount.Text = "13580507523";
			etAccount.Text = "18475593023";
			//etAccount.Text = "13960905167";
			}
			else
			{
			@@ -336,13 +333,14 @@
			etAccount.Text = "15626203746";

			}
			//etAccount.Text = "13580507523";
			b = !b;
			etPassword.Text = "123456";
			if (etAccount.Text == "18620993214")
			if (etAccount.Text == "13682244600")
			{
			etPassword.Text = "hdl1985.";
			etPassword.Text = "asd123456789123";
			}
			else if (etAccount.Text == "13414984501")
			else if (etAccount.Text == "18475593023")
			{
			etPassword.Text = "a123456";
			}
			@@ -362,11 +360,10 @@
			{
			etPassword.Text = "aa123456";
			}
			else if (etAccount.Text == "dcai.assist@gmail.com")
			else if (etAccount.Text == "13580507523")
			{
			etPassword.Text = "GraniteTileS57";
			etPassword.Text = "a123456";
			}
			//etPassword.Text = "Hdl85521566";
			btnLogin.IsSelected = true;
			};
			#endif
			@@ -913,21 +910,7 @@


			#if DEBUG
			var hesTv = new Function()
			{
			sid = "hisense000000000001",
			deviceId = "hisense000000000001",
			name = "海信电视",
			spk = SPK.ElectricalTvHisense,

			roomIds = new List<string>() { "1405771024583090178" },
			attributes = new List<FunctionAttributes>()
			{
			new FunctionAttributes() { key = "on_off",value =new List<string>(){ "off" }, curValue="on",state = "on" },
			new FunctionAttributes() { key = "wol",value =new List<string>(){ "on" }, curValue="on",state = "on" },
			}
			};
			hesTv.SaveFunctionFile();



			var airSwitchP3 = new Function()
			@@ -1063,6 +1046,7 @@
			FunctionList.List.Functions.Add(new Function
			{
			name = "测试-金茂光伏储能",
			extend = "jinmaot1rue",
			spk = SPK.InverterJinmao,
			collect = true,
			attributes = new List<FunctionAttributes>()
			@@ -1080,9 +1064,9 @@
			new FunctionAttributes(){key = InverterJinmao_AttrEnum.load_electricity_today.ToString(),value = new List<string>(){ "0" },curValue ="100",state = "100"},
			new FunctionAttributes(){key = InverterJinmao_AttrEnum.load_electricity_month.ToString(),value = new List<string>(){ "0" },curValue ="200",state = "200"},
			new FunctionAttributes(){key = InverterJinmao_AttrEnum.load_electricity.ToString(),value = new List<string>(){ "0" },curValue ="1000",state = "1000"},
			new FunctionAttributes(){key = InverterJinmao_AttrEnum.coal.ToString(),value = new List<string>(){ "0" },curValue ="100",state = "100"},
			new FunctionAttributes(){key = InverterJinmao_AttrEnum.co2.ToString(),value = new List<string>(){ "0" },curValue ="1000",state = "1000"},
			new FunctionAttributes(){key = InverterJinmao_AttrEnum.trees.ToString(),value = new List<string>(){ "0" },curValue ="10",state = "10"},
			new FunctionAttributes(){key = InverterJinmao_AttrEnum.coal.ToString(),value = new List<string>(){ "0" },curValue ="1021210",state = "1021210"},
			new FunctionAttributes(){key = InverterJinmao_AttrEnum.co2.ToString(),value = new List<string>(){ "0" },curValue ="1031300",state = "1031300"},
			new FunctionAttributes(){key = InverterJinmao_AttrEnum.trees.ToString(),value = new List<string>(){ "0" },curValue ="121310",state = "121310"},
			}
			});

			@@ -1090,6 +1074,7 @@
			{
			name = "测试-空调科技系统总控",
			spk = SPK.AcstParent,
			extend = "jinmaotrue",
			collect = true,
			attributes = new List<FunctionAttributes>()
			{
			@@ -1200,15 +1185,15 @@
			attributes = new List<FunctionAttributes>()
			{
			new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
			new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.co2.ToString(),curValue = "52",state = "52" },
			new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.energy_electricity.ToString(),curValue = "100",state = "100" },
			new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.co2.ToString(),curValue = "522222",state = "522222" },
			new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.energy_electricity.ToString(),curValue = "144400",state = "144400" },
			new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.flow.ToString(),curValue = "2",state = "2" },
			new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.mode.ToString(),curValue = "economic",state = "economic" },
			new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.mode_free.ToString(),curValue = "true",state = "true" },
			new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.recycl_volume.ToString(),curValue = "10",state = "10" },
			new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.set_temp.ToString(),curValue = "25",state = "25" },
			new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.temp.ToString(),curValue = "23",state = "23" },
			new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.trees.ToString(),curValue = "8",state = "8" },
			new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.trees.ToString(),curValue = "11228",state = "11228" },
			new FunctionAttributes(){ key = WaterHeaterJinmao_AttrEnum.volume.ToString(),curValue = "100",state = "100" },

			},