~wxr/OnPro.git - Gitblit

			@@ -323,6 +323,7 @@
			etAccount.Text = "18316672920";
			etAccount.Text = "support7@hdlautomation.com";
			etAccount.Text = "13375012446";//测试服务器
			etAccount.Text = "15855403939";
			}
			else
			{
			@@ -367,9 +368,9 @@
			}else if(etAccount.Text == "18688414428")
			{
			etPassword.Text = "HDL1985000";
			}else if (etAccount.Text == "13138683659")
			}else if (etAccount.Text == "15855403939")
			{
			etPassword.Text = "wsad123321";
			etPassword.Text = "yyr123456";
			}
			else if (etAccount.Text == "18100573477")
			{
			@@ -780,8 +781,12 @@
			new FunctionAttributes() { key = "on_off",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
			new FunctionAttributes() { key = "brightness",value =new List<string>(){ "0","100" }, curValue="100",state = "100" },
			new FunctionAttributes() { key = "rgb",value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" },
			//new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
			new FunctionAttributes() { key = "fade_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
			new FunctionAttributes() { key = "delay",value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
			new FunctionAttributes() { key = "colorful",value =new List<string>(){ "on","off" }, curValue="on",state = "on" },
			new FunctionAttributes() { key = FunctionAttributeKey.ColorfulBegin,value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" },
			new FunctionAttributes() { key = FunctionAttributeKey.ColorfulEnd,value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0" },
			new FunctionAttributes() { key = FunctionAttributeKey.ColorfulTime,value =new List<string>(){ "0","100" }, curValue="0",state = "0" },
			},
			};
			lightRgb1.SaveFunctionFile();
			@@ -1338,6 +1343,36 @@


			#endregion

			if (FunctionList.List.groupControls.Count == 0)
			{
			FunctionList.List.groupControls.Add(new GroupControl()
			{
			name = "群控测试",
			collect = true,
			uids = new List<string>()
			{
			"1405771024583090178",
			"9191a3a2-026f-4667-a0b1-e3af699e7295",
			},
			roomIds = new List<string>()
			{
			"1405771024583090178",
			"9191a3a2-026f-4667-a0b1-e3af699e7295",
			},
			sids = new List<GroupControlFunction>()
			{
			new GroupControlFunction(){
			sid = "light1",
			spk = SPK.LightRGB,
			},
			new GroupControlFunction(){
			sid = "light2",
			spk = SPK.LightRGB,
			},
			}
			});
			}
			#region 场景
			var scene1 = new Scene()
			{
			@@ -1695,29 +1730,6 @@
			LoadEventList();
			account = etAccount.Text.Trim();

			#if DEBUG1211
			//本地模式
			Button btnLocalMode = new Button()
			{
			Y = Application.GetRealHeight(600),
			Height = Application.GetRealHeight(67),
			Text = "Local Mode",
			TextAlignment = TextAlignment.Center,
			BackgroundColor = CSS_Color.MainColor,
			TextColor = CSS_Color.TextualColor,
			};
			bodyView.AddChidren(btnLocalMode);

			btnLocalMode.MouseUpEventHandler = (sender, e) =>
			{
			MainPage.LocalMode = true;
			UserInfo.Current = new UserInfo();
			MainPage.GoUserPage();
			};

			MainPage.Log("etAccount.TextAlignment : " + etAccount.TextAlignment.ToString());

			#endif

			#region 隐私政策
			AddServiceAgreementControl(bodyView);