wxr
2023-05-18 dbae982b5f97a12d49279e87aa3d167ae0c71a09
HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -22,6 +22,38 @@
                Application.HideSoftInput();
            };
            pm = new HttpServerRequest();
#if __ANDROID__
            BaseActivity.HideKeyboardEvent = () => {
                Application.RunOnMainThread(() =>
                {
                    this.Y = 0;
                });
            };
            BaseActivity.SmsAction = (message) => {
                Console.WriteLine($"接收到短信:"+ message);
                string pattern = @"【HDL】.*(\d{6}).*";
                Regex regex = new Regex(pattern);
                Match match = regex.Match(message);
                if (match.Success)
                {
                    string code = match.Groups[1].Value;
                    Console.WriteLine("验证码为:" + code);
                    if(loginType==0 && logintMode == 1)
                    {
                        etPassword.Text = code;
                    }
                    smsCode = code;
                }
                else
                {
                    Console.WriteLine("未找到验证码!");
                }
            };
#endif
        }
        public override void RemoveFromParent()
@@ -33,13 +65,19 @@
                waitPage = null;
            }
#if __ANDROID__
            BaseActivity.HideKeyboardEvent = () => {
            };
            BaseActivity.SmsAction = (sms) => { };
#endif
            base.RemoveFromParent();
            //2020-12-22 增加点击隐藏键盘事件
            //Application.HideSoftInput();
        }
        #region 局部变量
#region 局部变量
        /// <summary>
        /// 登录类型
        /// 0:手机
@@ -54,9 +92,13 @@
        int logintMode = 0;
        string account = "";
        string password = "";
        #endregion
        /// <summary>
        /// 短信验证码
        /// </summary>
        string smsCode = "";
#endregion
        #region 控件列表
#region 控件列表
        /// <summary>
        /// 等待提示
        /// </summary>
@@ -149,7 +191,7 @@
        /// 服务器请求对象
        /// </summary>
        HttpServerRequest pm;
        #endregion
#endregion
        string verAccount = "";
@@ -190,6 +232,9 @@
                UnSelectedImagePath = "Public/Logo-bg.png"
            };
            bodyView.AddChidren(btnIcon_bg);
            btnIcon_bg.MouseDownEventHandler += (sender, e) => {
                Application.HideSoftInput();
            };
#if DEBUG
            btnIcon_bg.MouseUpEventHandler += (sender, e) =>
@@ -218,7 +263,6 @@
                    //etAccount.Text = "tf@smarttech.com.ua";
                    //etAccount.Text = "455740454@qq.com";
                    //etAccount.Text = "18688565449";
                    etAccount.Text = "support7@hdlautomation.com";
                    //etAccount.Text = "18570064522";
                    //etAccount.Text = "18718417827";
                    //etAccount.Text = "18188019284";
@@ -235,7 +279,9 @@
                    //etAccount.Text = "18100573477";
                    //etAccount.Text = "18321091245";
                    //etAccount.Text = "13751916353";
                    etAccount.Text = "a18903011008@163.com";
                    etAccount.Text = "13549566666";
                    etAccount.Text = "18316672920";
                    etAccount.Text = "support7@hdlautomation.com";
                }
                else
                {
@@ -287,16 +333,16 @@
                else if (etAccount.Text == "18100573477")
                {
                    etPassword.Text = "huang12345";
                }else if(etAccount.Text == "13751916353")
                }else if(etAccount.Text == "13549566666")
                {
                    etPassword.Text = "hdl1985";
                    etPassword.Text = "12345678";
                }
                //etPassword.Text = "Hdl85521566";
                btnLogin.IsSelected = true;
            };
#endif
            #region 登录方式选择
#region 登录方式选择
            btnPhoneLogin = new Button()
            {
                X = Application.GetRealWidth(28),
@@ -1091,7 +1137,7 @@
                //        new AttrKeyConfig (){
                //            key = "pm2.5",
                //            type = "interval" ,
                //            unit = "ug/m²",
                //            unit = "ug/m³",
                //            configs = new List<AttrKeyInfo>(){
                //               new AttrKeyInfo(){ start = "0",end = "75",color = "0xFFADE764", desc = "良好"},
                //               new AttrKeyInfo(){ start = "76",end = "150",color = "0xFFFFD154",desc = "轻/中度污染"},
@@ -1249,8 +1295,8 @@
#endif
                #endregion
                #region 场景
#endregion
#region 场景
                var scene1 = new Scene()
                {
                    sid = "scene1",
@@ -1569,7 +1615,7 @@
                //    collect = false,
                //};
                //scene6.SaveSceneFile();
                #endregion
#endregion
                var lightSwitch6 = new Function()
@@ -1632,11 +1678,11 @@
#region 隐私政策
            AddServiceAgreementControl(bodyView);
            #endregion
#endregion
        }
        #region ■ 服务协议___________________________
#region ■ 服务协议___________________________
        bool isAgreePrivacyPolicy = false;
        /// <summary>
        /// 添加服务协议控件
@@ -1758,12 +1804,12 @@
                OpenWebViewPage(true);
            };
            #if __ANDROID__
#if __ANDROID__
            //if(OnAppConfig.Instance.FirstRunApp || !OnAppConfig.Instance.isAgreePrivacyPolicy)
            //{
            //    HDL_ON_Android.HDLONUtils.StartSplashActivity();    
            //}
            #endif
#endif
        }
        /// <summary>