Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -24,10 +24,42 @@
            pm = new HttpServerRequest();
#if __ANDROID__
            BaseActivity.HideKeyboardEvent = () => {
                Application.RunOnMainThread(() =>
                if (this.Y != 0)
                {
                    this.Y = 0;
                });
                    Application.RunOnMainThread(() =>
                    {
                        try
                        {
                            this.Y = 0;
                        }
                        catch { }
                    });
                }
            };
            BaseActivity.ShowKeyboardEvent = () => {
                try
                {
                    if (etPassword.Foucs)
                    {
                        new Thread(() =>
                        {
                            for (var i = 0; i < 10; i++)
                            {
                                Application.RunOnMainThread(() =>
                                {
                                    try
                                    {
                                        this.Y = 0 - Application.GetRealHeight(10 * i);
                                    }
                                    catch { }
                                });
                                Thread.Sleep(10);
                            }
                        })
                        { IsBackground = true }.Start();
                    }
                }
                catch { }
            };
            BaseActivity.SmsAction = (message) => {
                Console.WriteLine($"接收到短信："+ message);
@@ -69,6 +101,7 @@
            BaseActivity.HideKeyboardEvent = () => {

            };
            BaseActivity.ShowKeyboardEvent = () => { };
            BaseActivity.SmsAction = (sms) => { };
#endif
            base.RemoveFromParent();
@@ -253,7 +286,6 @@
                //return;
                if (b)
                {
                    //etAccount.Text = "13375012446";//测试服务器
                    //etAccount.Text = "1033326940@qq.com";
                    //etAccount.Text = "18022428438";//wjc
                    //etAccount.Text = "13602944661";//kx
@@ -282,6 +314,7 @@
                    etAccount.Text = "13549566666";
                    etAccount.Text = "18316672920";
                    etAccount.Text = "support7@hdlautomation.com";
                    etAccount.Text = "13375012446";//测试服务器
                }
                else
                {
@@ -867,6 +900,7 @@
                        new FunctionAttributes() { key = "mode",value =new List<string>(){ "day", "night", "away", "normal", "timer" }, curValue="day",state = "day"   },
                        new FunctionAttributes() { key = "set_temp",value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 35,min = 5  },
                        new FunctionAttributes() { key = "room_temp",value =new List<string>(){ "" }, curValue="26",state = "26"   },
                        new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "°F", "°C" }, curValue = "°F", state = "°F" },
                    },
                };
                fh.SaveFunctionFile();
@@ -1590,6 +1624,7 @@
                        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" },
                        new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "°F", "°C" }, curValue = "°F", state = "°F" },
                    }
                };
                ac2.SaveFunctionFile();