Merge remote-tracking branch 'origin/release0123' into wjc

wjc

2023-02-14 c88a3777ab456af4ecf01604f4b2ae4762852148

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -221,11 +221,17 @@
                    //etAccount.Text = "support7@hdlautomation.com";
                    //etAccount.Text = "18570064522";
                    //etAccount.Text = "18718417827";
                    //etAccount.Text = "ablis-nn@yandex.ru";
                    etAccount.Text = "18188019284";
                    //etAccount.Text = "13143792049";
                    //etAccount.Text = "13288623489";//罗晓东
                    //etAccount.Text = "18244942707";
                    etAccount.Text = "13143792049";
                    //etAccount.Text = "13143792049";
                    etAccount.Text = "18688414428";//天河3楼
                    //etAccount.Text = "18244942707";
                    //etAccount.Text = "12345678904";
                    //etAccount.Text = "13418062953";
                    etAccount.Text = "13138683659";
                    //etAccount.Text = "15217626103";
                }
                else
                {
@@ -259,9 +265,9 @@
                }
                b = !b;
                etPassword.Text = "123456";
                if(etAccount.Text == "ablis-nn@yandex.ru")
                if(etAccount.Text == "18188019284")
                {
                    etPassword.Text = "07112001Ulyna";
                    etPassword.Text = "CEZUJHSZ";
                }
                else if(etAccount.Text == "13143792049")
                {
@@ -269,9 +275,12 @@
                }else if(etAccount.Text == "13288623489")
                {
                    etPassword.Text = "luoxiaodong";
                }else if(etAccount.Text == "13143792049")
                }else if(etAccount.Text == "18688414428")
                {
                    etPassword.Text = "BVVBQATD";
                    etPassword.Text = "HDL1985000";
                }else if (etAccount.Text == "13138683659")
                {
                    etPassword.Text = "wsad123321";
                }
                //etPassword.Text = "Hdl85521566";
                btnLogin.IsSelected = true;
@@ -1504,12 +1513,33 @@
                        new FunctionAttributes() { key = "on_off", value = new List<string>() { "on", "off" }, curValue = "on", state = "on" },
                        new FunctionAttributes() { key = "mode", value = new List<string>() { "cool", "heat", "fan", "auto", "dry" }, curValue = "cool", state = "cool" },
                        new FunctionAttributes() { key = "fan", value = new List<string>() { "high", "medium", "low", "auto" }, curValue = "auto", state = "auto" },
                        new FunctionAttributes() { key = "set_temp", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 },
                        new FunctionAttributes() { key = "set_temp",step = "1", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 },
                        new FunctionAttributes() { key = "room_temp", value = new List<string>() { }, curValue = "20", state = "20" },
                        new FunctionAttributes() { key = "swing", value = new List<string>() {"up_down", "left_right", "stop" }, curValue = "20", state = "20" },
                    }
                };
                ac.SaveFunctionFile();

                var ac2 = new Function()
                {
                    sid = "ac2",
                    deviceId = "ac2",
                    name = Language.CurrentLanguage == "Chinese" ? "客厅空调" : "AC",
                    spk = SPK.AcStandard,
                    roomIds = new List<string>() { room4.roomId },
                    attributes = new List<FunctionAttributes>()
                    {
                        new FunctionAttributes() { key = "on_off", value = new List<string>() { "on", "off" }, curValue = "on", state = "on" },
                        new FunctionAttributes() { key = "mode", value = new List<string>() { "cool", "heat", "fan", "auto", "dry" }, curValue = "cool", state = "cool" },
                        new FunctionAttributes() { key = "fan", value = new List<string>() { "high", "medium", "low", "auto" }, curValue = "auto", state = "auto" },
                        new FunctionAttributes() { key = "set_temp",step = "0.5", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 },
                        new FunctionAttributes() { key = "room_temp", value = new List<string>() { }, curValue = "20", state = "20" },
                        new FunctionAttributes() { key = "swing", value = new List<string>() {"up_down", "left_right", "stop" }, curValue = "20", state = "20" },
                    }
                };
                ac2.SaveFunctionFile();


                //var scene5 = new Scene()
                //{
                //    sid = "scene5",
@@ -1530,7 +1560,7 @@
                //    collect = false,
                //};
                //scene6.SaveSceneFile();
#endregion
                #endregion


                var lightSwitch6 = new Function()