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

wjc

2022-01-19 07b0239f824ddb5a0cadf93f20ff6247f72baca2

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -168,6 +168,9 @@
        /// </summary>
        public void LoadView(UserInfo userInfo = null)
        {
#if __Android__
            OnAppConfig.Instance.isAgreePrivacyPolicy = true;
#endif
            var btnIcon = new Button()
            {
                X = Application.GetRealWidth(28),
@@ -204,16 +207,15 @@
                //return;
                if (b)
                {
                    //etAccount.Text = "tf@smarttech.com.ua";//国外账号，有住宅，登录无法显示
                    //etAccount.Text = "13375012446";//测试服务器
                    //etAccount.Text = "1033326940@qq.com";
                    //etAccount.Text = "18022428438";//wjc
                    //etAccount.Text = "13602944661";//kx
                    etAccount.Text = "13226233133";//豆豆
                    //etAccount.Text = "13226233133";//豆豆
                    etAccount.Text = "18316672920";
                    //etAccount.Text = "18316120654";//tujie
                    etAccount.Text = "15626203746";
                    //etAccount.Text = "13450425807";//黄竹溪 knx项目
                    //etAccount.Text = "18140004933";
                }
                else
                {
@@ -230,22 +232,24 @@
                    //etAccount.Text = "15971583093";//高胜
                    //etAccount.Text = "15217626103";//昆明金茂项目
                    //etAccount.Text = "18598273624";
                    //etAccount.Text = "tf@smarttech.com.ua";
                    etAccount.Text = "tf@smarttech.com.ua";
                    //etAccount.Text = "18814122445";//董泽斌 天河办公室
                    etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568
                    //etAccount.Text = "18402017839";//wjc
                    etAccount.Text = "18402017839";//wjc
                    //etAccount.Text = "13430286286";//cwc
                    //etAccount.Text = "13709260805";
                    //etAccount.Text = "support5@hdlchina.com.cn";
                    //etAccount.Text = "13375012441";
                    //etAccount.Text = "info@smartlife-ks.com";
                    //etAccount.Text = "551775569@qq.com";//wcf
                    etAccount.Text = "15626203746";
                    etAccount.Text = "zhangquansongjava@163.com";
                }
                b = !b;
                etPassword.Text = "123456";
                if(etAccount.Text == "fslcjm5@163.com")
                if(etAccount.Text == "zhangquansongjava@163.com")
                {
                    etPassword.Text = "a123456";
                    etPassword.Text = "BVVEAAMZ";
                }
                //etPassword.Text = "Hdl85521566";
                btnLogin.IsSelected = true;
@@ -1129,6 +1133,11 @@
        private void AddServiceAgreementControl(FrameLayout frameLayout)
        {
            isAgreePrivacyPolicy = OnAppConfig.Instance.isAgreePrivacyPolicy;





            var frameRow = new FrameLayout()
            {
                Height = Application.GetRealHeight(28),
@@ -1155,7 +1164,7 @@
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/ChooseIcon.png",
                SelectedImagePath = "Public/ChooseOnIcon.png",
                IsSelected = isAgreePrivacyPolicy,
                IsSelected = OnAppConfig.Instance.isAgreePrivacyPolicy,
                Gravity = Gravity.Center
            };
            agreeView.AddChidren(agreeBtn);
@@ -1235,6 +1244,13 @@
            {
                OpenWebViewPage(true);
            };

            #if __ANDROID__
            //if(OnAppConfig.Instance.FirstRunApp || !OnAppConfig.Instance.isAgreePrivacyPolicy)
            //{
            //    HDL_ON_Android.HDLONUtils.StartSplashActivity();    
            //}
            #endif
        }

        /// <summary>