1127最新合并代码，合并嘉乐更新

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

 HDL_ON/UI/UI1-Login/LoginPageBLL.cs

@@ -93,36 +93,13 @@
                        if (result.Code != StateCode.SUCCESS)
                        {
                            IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
                            ShowBtnAccountViewBottomLineError();
                            return;
                        }
                        else
                        {
                            //检测当前配置域名是否一致，不一致则替换
                            CheckAndSetUserRequestHost(result);
                            //
                            Application.RunOnMainThread(() =>
                            {
                                btnGetVerificationCode.IsSelected = false;
                                btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
                            });
                            new Thread(() =>
                            {
                                while (time > 0)
                                {
                                    time--;
                                    Application.RunOnMainThread(() =>
                                    {
                                        btnGetVerificationCode.Text = time.ToString() + "s";
                                    });
                                    Thread.Sleep(1000);
                                }
                                Application.RunOnMainThread(() =>
                                {
                                    btnGetVerificationCode.IsSelected = true;
                                    btnGetVerificationCode.TextID = StringId.GetVerificationCode;
                                });
                            })
                            { IsBackground = true }.Start();

                            //2.1请求获取验证码
                            var resultObj = pm.VerificationCodeSend(VerifyType.VERIFY_LOGIN, account, true, phoneZoneCode);
@@ -137,87 +114,38 @@
                                // 提示错误
                                IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
                            }
                            else
                            {
                                Application.RunOnMainThread(() =>
                                {
                                    btnGetVerificationCode.IsSelected = false;
                                    btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
                                });

                                new Thread(() =>
                                {
                                    while (time > 0)
                                    {
                                        time--;
                                        Application.RunOnMainThread(() =>
                                        {
                                            btnGetVerificationCode.Text = time.ToString() + "s";
                                        });
                                        Thread.Sleep(1000);
                                    }
                                    Application.RunOnMainThread(() =>
                                    {
                                        btnGetVerificationCode.IsSelected = true;
                                        btnGetVerificationCode.TextID = StringId.GetVerificationCode;
                                    });
                                })
                                { IsBackground = true }.Start();
                            }
                        }

                    })
                    { IsBackground = true }.Start();

                    //    btnGetVerificationCode.IsSelected = false ;
                    //    btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
                    //    int time = 60;
                    //    new Thread(() =>
                    //    {
                    //        while (time > 0)
                    //        {
                    //            time--;
                    //            Application.RunOnMainThread(() =>
                    //            {
                    //                btnGetVerificationCode.Text = time.ToString() + "s";
                    //            });
                    //            Thread.Sleep(1000);
                    //        }
                    //        Application.RunOnMainThread(() =>
                    //        {
                    //            btnGetVerificationCode.IsSelected = true;
                    //            btnGetVerificationCode.TextID = StringId.GetVerificationCode;
                    //        });
                    //    })
                    //    { IsBackground = true }.Start();
                    //    new Thread(() =>
                    //    {
                    //        //获取验证码
                    //        var result = pm.GetLoginVerCode(phoneNumber);
                    //        if (result.StateCode.ToUpper() == StateCode.SUCCESS_CODE)
                    //        {
                    //        }
                    //        //登录失败
                    //        else
                    //        {
                    //            string tipStr = "Sever erorr";
                    //            switch (result.StateCode.ToUpper())
                    //            {
                    //                case "USERNAMEORPWDERROR":
                    //                    tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
                    //                    Application.RunOnMainThread(() =>
                    //                    {
                    //                        btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                    //                        btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
                    //                    });
                    //                    break;
                    //                case "ACCOUNTNOEXISTS":
                    //                    tipStr = Language.StringByID(StringId.ACCOUNTNOEXISTS);
                    //                    Application.RunOnMainThread(() =>
                    //                    {
                    //                        btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                    //                        btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
                    //                    });
                    //                    break;
                    //                case "SENDFAIL":
                    //                    tipStr = Language.StringByID(StringId.FailedToSendVerificationCode);
                    //                    Application.RunOnMainThread(() =>
                    //                    {
                    //                        btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                    //                        btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
                    //                    });
                    //                    break;
                    //                case "Self:Net_Error":
                    //                    tipStr = Language.StringByID(StringId.NetworkAnomaly);
                    //                    break;
                    //            }
                    //            Application.RunOnMainThread(() =>
                    //            {
                    //                //提示原因
                    //                var tip = new Tip()
                    //                {
                    //                    Text = tipStr,
                    //                    CloseTime = 1,
                    //                    Direction = AMPopTipDirection.None
                    //                };
                    //                tip.Show(bodyView);
                    //            });
                    //        }
                    //    })
                    //    { IsBackground = true }.Start();
                }
            };
        }
@@ -319,8 +247,8 @@

                //if (btnGetVerificationCode.Parent != null)
                //{
                    //btnGetVerificationCode.RemoveFromParent();
                    btnGetVerificationCode.Visible = false;
                //btnGetVerificationCode.RemoveFromParent();
                btnGetVerificationCode.Visible = false;
                //}
                //隐藏密码
                etPassword.SecureTextEntry = true;
@@ -351,8 +279,8 @@
                    btnPasswordIcon.IsSelected = false;
                    //if (btnGetVerificationCode.Parent != null)
                    //{
                        //btnGetVerificationCode.RemoveFromParent();
                        btnGetVerificationCode.Visible = false;
                    //btnGetVerificationCode.RemoveFromParent();
                    btnGetVerificationCode.Visible = false;
                    //}
                    //隐藏密码
                    etPassword.SecureTextEntry = true;
@@ -568,7 +496,7 @@
                {
                    btnLogin.IsSelected = false;
                }
                if (Regex.IsMatch(account, @"^[1]+\d{10}") )//&& account.Length == 11)
                if (Regex.IsMatch(account, @"^[1]+\d{10}"))//&& account.Length == 11)
                {
                    btnGetVerificationCode.IsSelected = true;
                    btnGetVerificationCode.TextColor = CSS_Color.MainBackgroundColor;
@@ -610,6 +538,7 @@
                        if (result.Code != StateCode.SUCCESS)
                        {
                            IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
                            ShowBtnAccountViewBottomLineError();
                            return;
                        }
                        else
@@ -621,7 +550,7 @@

                    //登录
                    var loginResult = LoadMethod_Login();
                    if( !string.IsNullOrEmpty (verAccount))//验证登录账号
                    if (!string.IsNullOrEmpty(verAccount))//验证登录账号
                    {
                        Application.RunOnMainThread(() =>
                        {
@@ -657,7 +586,7 @@
                                OnAppConfig.Instance.RefreshUserConfig();
                                DB_ResidenceData.InitRoomFunction();
                            }
                            if ( UserInfo.Current.userEmailInfo == "464027401@qq.com")
                            if (UserInfo.Current.userEmailInfo == "464027401@qq.com")
                            {
                                DB_ResidenceData.residenceData.floors.Add(new Floor() { name = "1F", sid = "09888" });
                                var r111 = new Room() { sid = "0001", name = "Room-1", floorId = "09888", backgroundImage = "Classification/Room/Roombg.png" };
@@ -668,11 +597,11 @@
                                {
                                    sid = "030101123456780604010001ABCD",
                                    name = "空调",
                                    function = new List<Trait>() {
                                                                new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
                                                                new Trait { name="mode", max = 2,min =0,value_key = new List<string>{ "auto", "heat", "cool","dry" } },
                                                                new Trait { name = "fan",max = 3,min =0,value_key = new List<string>{ "low", "medium", "high" ,"auto"} },
                                                                new Trait { name = "set_temperature", max = 32,min=16,value_key = new List<string>{"up","down" } },
                                    function = new List<FunctionAttributes>() {
                                                                new FunctionAttributes { key="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
                                                                new FunctionAttributes { key="mode", max = 2,min =0,value = new List<string>{ "auto", "heat", "cool","dry" } },
                                                                new FunctionAttributes { key = "fan",max = 3,min =0,value = new List<string>{ "low", "medium", "high" ,"auto"} },
                                                                new FunctionAttributes { key = "set_temperature", max = 32,min=16,value = new List<string>{"up","down" } },
                                                            },
                                    roomIdList = new List<string>() { "0001" },
                                    lastState = "制冷 中风 18°C",
@@ -687,8 +616,8 @@
                                {
                                    sid = "030101123456780202020002ABCD",
                                    name = "调光灯",
                                    function = new List<Trait>() {
                                                                new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "up","down"} },
                                    function = new List<FunctionAttributes>() {
                                                                new FunctionAttributes { key="brightness", max=100,min = 0, value= new List<string> { "up","down"} },
                                                            },//"brightness",
                                    roomIdList = new List<string>() { "0001" },
                                    lastState = "20%",
@@ -705,8 +634,8 @@
                                    sid = "030101123456780303010003ABCD",
                                    name = "窗帘模块",
                                    roomIdList = new List<string>() { "0001" },
                                    function = new List<Trait>() {
                                                                new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
                                    function = new List<FunctionAttributes>() {
                                                                new FunctionAttributes { key="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
                                                            },// "curtain",
                                    lastState = "开",
                                    bus_Data = new BusData
@@ -721,8 +650,8 @@
                                    sid = "030101123456780303030011ABCD",
                                    name = "开合帘",
                                    roomIdList = new List<string>() { "0001" },
                                    function = new List<Trait>() {
                                                                new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off","stop"} },
                                    function = new List<FunctionAttributes>() {
                                                                new FunctionAttributes { key="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
                                                            },//"curtaintype",
                                    lastState = "20%",
                                    bus_Data = new BusData
@@ -737,9 +666,9 @@
                                    sid = "030101123456780503040012ABCD",
                                    name = "卷帘",
                                    roomIdList = new List<string>() { "0001" },
                                    function = new List<Trait>() {
                                                                new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
                                                                new Trait { name="percent", max=100,min = 0, value_key= new List<string> { "percent" } },
                                    function = new List<FunctionAttributes>() {
                                                                new FunctionAttributes { key="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
                                                                new FunctionAttributes { key="percent", max=100,min = 0, value= new List<string> { "percent" } },

                                                            },// "rollingshutter",
                                    lastState = "20%",
@@ -755,10 +684,10 @@
                                    sid = "030101123456780404020004ABCD",
                                    name = "地热",
                                    roomIdList = new List<string>() { "0001" },
                                    function = new List<Trait>() {
                                                                new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
                                                                new Trait { name="mode", max = 2,min =0,value_key = new List<string>{ "normal", "day", "night","timer","away" } },
                                                                new Trait { name = "set_temperature", max = 32,min=5,value_key = new List<string>{"up","down" } },
                                    function = new List<FunctionAttributes>() {
                                                                new FunctionAttributes { key="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
                                                                new FunctionAttributes { key="mode", max = 2,min =0,value = new List<string>{ "normal", "day", "night","timer","away" } },
                                                                new FunctionAttributes { key = "set_temperature", max = 32,min=5,value = new List<string>{"up","down" } },
                                                            },//
                                    lastState = "自动 25°C",
                                    bus_Data = new BusData
@@ -772,8 +701,8 @@
                                {
                                    sid = "030101123456780202010005ABCD",
                                    name = "吊灯",
                                    function = new List<Trait>() {
                                                                new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off"} },
                                    function = new List<FunctionAttributes>() {
                                                                new FunctionAttributes { key="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
                                                            },//"on_off",
                                    roomIdList = new List<string>() { "0001" },
                                    bus_Data = new BusData
@@ -787,9 +716,9 @@
                                {
                                    sid = "030101123456780202040006ABCD",
                                    name = "RGB灯",
                                    function = new List<Trait>() {
                                                                new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "on","off"} },
                                                                new Trait { name="color", max=100,min = 0, value_key= new List<string> { "255", "255", "255" } },
                                    function = new List<FunctionAttributes>() {
                                                                new FunctionAttributes { key="brightness", max=100,min = 0, value= new List<string> { "on","off"} },
                                                                new FunctionAttributes { key="color", max=100,min = 0, value= new List<string> { "255", "255", "255" } },
                                                            },
                                    roomIdList = new List<string>() { "0001" },
                                    bus_Data = new BusData
@@ -803,9 +732,9 @@
                                {
                                    sid = "030101123456781010020006ABCD",
                                    name = "风扇",
                                    function = new List<Trait>() {
                                                            new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
                                                            new Trait { name="percent", max=7,min = 0, value_key= new List<string> { "percent" } },
                                    function = new List<FunctionAttributes>() {
                                                            new FunctionAttributes { key="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
                                                            new FunctionAttributes { key="percent", max=7,min = 0, value= new List<string> { "percent" } },
                                                        },
                                    roomIdList = new List<string>() { "0001" },
                                    bus_Data = new BusData
@@ -819,8 +748,8 @@
                                {
                                    sid = "030101123456781010020006ABCD",
                                    name = "电视",
                                    function = new List<Trait>() {
                                                            new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
                                    function = new List<FunctionAttributes>() {
                                                            new FunctionAttributes { key="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
                                                        },
                                    roomIdList = new List<string>() { "0001" },
                                    bus_Data = new BusData
@@ -834,8 +763,8 @@
                                {
                                    sid = "030101123456780101020006ABCD",
                                    name = "插座",
                                    function = new List<Trait>() {
                                                            new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
                                    function = new List<FunctionAttributes>() {
                                                            new FunctionAttributes { key="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
                                                        },
                                    roomIdList = new List<string>() { "0001" },
                                    bus_Data = new BusData
@@ -850,8 +779,8 @@
                                    sid = "030101123456781005060006ABCD",
                                    name = "PM2.5",
                                    roomIdList = new List<string>() { "0001" },
                                    function = new List<Trait>() {
                                                            new Trait { name="values", max=1,min = 0, value_key= new List<string> { "22"} },
                                    function = new List<FunctionAttributes>() {
                                                            new FunctionAttributes { key="values", max=1,min = 0, value= new List<string> { "22"} },
                                                        },
                                    bus_Data = new BusData
                                    {
@@ -865,8 +794,8 @@
                                    sid = "030101123456781005070006ABCD",
                                    name = "CO2",
                                    roomIdList = new List<string>() { "0001" },
                                    function = new List<Trait>() {
                                                            new Trait { name="values", max=1,min = 0, value_key= new List<string> { "1352"} },
                                    function = new List<FunctionAttributes>() {
                                                            new FunctionAttributes { key="values", max=1,min = 0, value= new List<string> { "1352"} },
                                                        },
                                    bus_Data = new BusData
                                    {
@@ -880,8 +809,8 @@
                                    sid = "030101123456781005020006ABCD",
                                    name = "温度",
                                    roomIdList = new List<string>() { "0001" },
                                    function = new List<Trait>() {
                                                            new Trait { name="values", max=1,min = 0, value_key= new List<string> { "28"} },
                                    function = new List<FunctionAttributes>() {
                                                            new FunctionAttributes { key="values", max=1,min = 0, value= new List<string> { "28"} },
                                                        },
                                    bus_Data = new BusData
                                    {
@@ -895,8 +824,8 @@
                                    sid = "030101123456781005050006ABCD",
                                    name = "TVOC",
                                    roomIdList = new List<string>() { "0001" },
                                    function = new List<Trait>() {
                                                            new Trait { name="values", max=1,min = 0, value_key= new List<string> { "0.3"} },
                                    function = new List<FunctionAttributes>() {
                                                            new FunctionAttributes { key="values", max=1,min = 0, value= new List<string> { "0.3"} },
                                                        },
                                    bus_Data = new BusData
                                    {
@@ -910,8 +839,8 @@
                                    sid = "030101123456781005030006ABCD",
                                    name = "湿度",
                                    roomIdList = new List<string>() { "0001" },
                                    function = new List<Trait>() {
                                                            new Trait { name="values", max=1,min = 0, value_key= new List<string> { "15"} },
                                    function = new List<FunctionAttributes>() {
                                                            new FunctionAttributes { key="values", max=1,min = 0, value= new List<string> { "15"} },
                                                        },
                                    bus_Data = new BusData
                                    {
@@ -1011,54 +940,30 @@
            //登录失败
            else
            {
                //2020-11-13 待修改
                string tipStr = "Sever erorr";
                switch (loginResult.Code)
                {
                    case "ValidCodeAndPhoneNoEqual":
                        tipStr = Language.StringByID(StringId.VerificationCodeError);
                        Application.RunOnMainThread(() =>
                        {
                            btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                            btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
                        });
                        break;
                    case "USERNAMEORPWDERROR":
                        tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
                        Application.RunOnMainThread(() =>
                        {
                            btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                            btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
                        });
                        break;
                    case "ACCOUNTNOEXISTS":
                        tipStr = Language.StringByID(StringId.ACCOUNTNOEXISTS);
                        Application.RunOnMainThread(() =>
                        {
                            btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                            btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
                        });
                        break;
                    case "NoRecord":
                        tipStr = Language.StringByID(StringId.PlsGetTheVerificationCode);
                        break;
                    case "Self:Net_Error":
                        tipStr = Language.StringByID(StringId.NetworkAnomaly);
                        break;
                }
                //账号或者密码错误
                Application.RunOnMainThread(() =>
                {
                    waitPage.Hide();
                    //提示原因
                    var tip = new Tip()
                    if (loginResult.Code == "10008")
                    {
                        Text = tipStr,
                        CloseTime = 1,
                        Direction = AMPopTipDirection.None
                    };
                    tip.Show(bodyView);
                        //用户名或密码错误
                        btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                        btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
                    }
                    else if (loginResult.Code == "10010")
                    {
                        //用户不存在
                        btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                        btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
                    }
                    else if (loginResult.Code == "14")
                    {
                        btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                        btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
                    }
                    waitPage.Hide();
                });

                IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
            }
            return result;
        }
@@ -1073,7 +978,8 @@
            if (responsePack == StateCode.SUCCESS)
            {
                //2020-11-13 待确认，没有住宅，不算登录成功
                if ( UserInfo.Current.regionList != null &&  UserInfo.Current.regionList.Count > 0){
                if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
                {
                    result = true;
                }
                //result = true;
@@ -1108,6 +1014,9 @@
                //    });
                //};

                //判断是否同意了隐私政策
                if (CheckPrivacyPolicy() == false) return;

                var registerPage = new RegisterPage();
                registerPage.Show();
                registerPage.ShowDialog();
@@ -1141,5 +1050,18 @@

            };
        }

        /// <summary>
        /// 用户不存在
        /// </summary>
        void ShowBtnAccountViewBottomLineError()
        {
            Application.RunOnMainThread(() =>
            {
                //用户不存在
                btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
                btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
            });
        }
    }
}