Merge branch 'dev-hxb' into Dev-Wxr-1.8.1

wxr

2023-06-14 313e9339114e672eb2b281ee323f9f480f980679

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -37,16 +37,18 @@
                }
            };
            BaseActivity.ShowKeyboardEvent = () => {
                if(this.Y != 0)
                {
                    return;
                }
                try
                {
                    if (etPassword.Foucs)
                    {
                     
                        new Thread(() =>
                        {
                            Thread.Sleep(100);
                            if (this.Y < 0)
                            {
                                return;
                            }
                            for (var i = 0; i < 10; i++)
                            {
                                Application.RunOnMainThread(() =>
@@ -100,7 +102,6 @@
                waitPage.RemoveFromParent();
                waitPage = null;
            }
            Application.HideSoftInput();

#if __ANDROID__
            BaseActivity.HideKeyboardEvent = () => {
@@ -252,6 +253,7 @@
            OnAppConfig.Instance.isAgreePrivacyPolicy = true;
#endif
            this.BackgroundColor = CSS_Color.MainBackgroundColor;

            var btnIcon = new Button()
            {
                X = Application.GetRealWidth(28),
@@ -319,8 +321,8 @@
                    //etAccount.Text = "13751916353";
                    etAccount.Text = "13549566666";
                    etAccount.Text = "18316672920";
                    etAccount.Text = "13375012446";//测试服务器
                    etAccount.Text = "support7@hdlautomation.com";
                    etAccount.Text = "13375012446";//测试服务器
                }
                else
                {
@@ -778,13 +780,8 @@
                        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 = "colorful_begin",value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0"   },
                        //new FunctionAttributes() { key = "colorful_end",value =new List<string>(){ "0","100" }, curValue="0,0,0",state = "0,0,0"   },
                        //new FunctionAttributes() { key = "colorful_time",value =new List<string>(){ "0","100" }, curValue="0",state = "0"   },
                        
                    },
                };
                lightRgb1.SaveFunctionFile();