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;
@@ -278,9 +282,9 @@
                TextSize = CSS_FontSize.TextFontSize,
            };
            bodyView.AddChidren(btnEmailLogin);
            #endregion
#endregion

            #region 账号填写
#region 账号填写
            accountView = new FrameLayout()
            {
                X = Application.GetRealWidth(28),
@@ -368,9 +372,9 @@
                accountView.AddChidren(btnAccountIcon);
            }

            #endregion
#endregion

            #region 密码填写
#region 密码填写
            passwordView = new FrameLayout()
            {
                X = Application.GetRealWidth(28),
@@ -414,7 +418,7 @@
            };
            passwordView.AddChidren(etPassword);

            #region 密码登录-控件加载
#region 密码登录-控件加载
            btnVisiblePassword = new Button()
            {
                X = Application.GetRealWidth(223),
@@ -446,9 +450,9 @@
                TextSize = 12,
            };
            passwordView.AddChidren(btnForgetPassword);
            #endregion
#endregion

            #region 验证码登录-控件加载
#region 验证码登录-控件加载
            btnGetVerificationCode = new Button()
            {
                X = Application.GetRealWidth(219),
@@ -462,7 +466,7 @@
                IsSelected = false,
            };
            passwordView.AddChidren(btnGetVerificationCode);
            #endregion
#endregion

            btnPasswordViewBottomLine = new Button()
            {
@@ -473,9 +477,9 @@
            };
            passwordView.AddChidren(btnPasswordViewBottomLine);

            #endregion
#endregion

            #region 注册与快捷登录
#region 注册与快捷登录
            btnRegister = new Button()
            {
                X = Application.GetRealWidth(28),
@@ -502,7 +506,7 @@
            };
            bodyView.AddChidren(btnSwitchLoginMode);

            #endregion
#endregion

            btnLogin = new Button()
            {
@@ -547,7 +551,7 @@
                //楼层房间列表
                var floor1 = new SpatialInfo("FLOOR") { roomName = "F1", parentId = DB_ResidenceData.Instance.CurrentRegion.id };
                floor1.SaveRoomFile();
                #region 房间一 -- 客厅
#region 房间一 -- 客厅
                //处理房间列表

                var room1 = new Room()
@@ -627,8 +631,8 @@
                SpatialInfo.CurrentSpatial.RoomList.Add(room4);


                #region 客厅
                #region 功能
#region 客厅
#region 功能
                var lightRgb1 = new Function()
                {
                    sid = "light1",
@@ -754,8 +758,8 @@
                    },
                };
                fh.SaveFunctionFile();
                #endregion
                #region 场景
#endregion
#region 场景
                var scene1 = new Scene()
                {
                    sid = "scene1",
@@ -907,9 +911,9 @@

                };
                scene2.SaveSceneFile();
                #endregion
                #endregion
                #region 餐厅
#endregion
#endregion
#region 餐厅
                var lightSwitch3 = new Function()
                {
                    sid = "light6",
@@ -1013,8 +1017,8 @@
                    }
                };
                scene4.SaveSceneFile();
                #endregion
                #region 卧室
#endregion
#region 卧室
                var ac = new Function()
                {
                    sid = "ac1",
@@ -1053,7 +1057,7 @@
                //    collect = false,
                //};
                //scene6.SaveSceneFile();
                #endregion
#endregion


                var lightSwitch6 = new Function()
@@ -1071,7 +1075,7 @@
                };
                lightSwitch6.SaveFunctionFile();

                #endregion
#endregion

                var fileList = Common.FileUtlis.Files.ReadFiles();
                foreach(var file in fileList)
@@ -1090,7 +1094,7 @@
            LoadEventList();
            account = etAccount.Text.Trim();

            #if DEBUG1211
#if DEBUG1211
            //本地模式
            Button btnLocalMode = new Button()
            {
@@ -1112,9 +1116,9 @@

            MainPage.Log("etAccount.TextAlignment : " + etAccount.TextAlignment.ToString());

            #endif
#endif

            #region 隐私政策
#region 隐私政策
            AddServiceAgreementControl(bodyView);
            #endregion

@@ -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>
@@ -1263,6 +1279,6 @@
            return true;
        }

        #endregion
#endregion
    }
}