去掉了访问外网的异步

黄学彪

2020-07-06 f23ad1b3f9f6193f35f72104d690b21dc67d5c1f

 ZigbeeApp/Shared/Phone/UserView/HomePage.cs

@@ -56,16 +56,17 @@
                this.ShowLoginLoadView();
                CommonPage.Loading.Start();

                UserCenter.HdlThreadLogic.Current.RunThread(async () =>
                UserCenter.HdlThreadLogic.Current.RunThread(() =>
                {

                    //登录

                    var loginSuccess = await LoginByPWDAsync(Config.Instance.Account, Config.Instance.Password);

                    var loginSuccess = LoginByPWDAsync(Config.Instance.Account, Config.Instance.Password);



                    //登录成功,或者没有网络都可以登录

                    if (loginSuccess == 1 || loginSuccess == 2)

                    {

                        var homes = await UserCenter.HdlResidenceLogic.Current.GetHomeListsFromDb();

                        var homes = UserCenter.HdlResidenceLogic.Current.GetHomeListsFromDb();

                        //刷新个人中心的内存及线程

                        await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();

                        UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();

                        //启动ZigBee

                        ZigBee.Common.Application.Init();



@@ -121,7 +122,7 @@
        /// <param name="password">Password.</param>
        /// <param name="source">Source.</param>
        /// <param name="company">Company.</param>
        public async System.Threading.Tasks.Task<int> LoginByPWDAsync(string account, string password, string source = "", int company = 0)
        public int LoginByPWDAsync(string account, string password, string source = "", int company = 0)
        {
            var isLoginSuccess = -1;

            var requestObj = new SendDataToServer.LoginObj

@@ -132,7 +133,8 @@
                Company = company

            };

            var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);

            var revertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/Login", System.Text.Encoding.UTF8.GetBytes(requestJson));

            //登陆接口特殊,需要快一点访问,设置3秒超时

            var revertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/Login", System.Text.Encoding.UTF8.GetBytes(requestJson), 3);

            if (revertObj == null)

            {

                return 2;

@@ -152,7 +154,7 @@
                Config.Instance.LoginDateTime = DateTime.Now;

                Config.Instance.LoginToken = revertData.Token;

                //上报设备ID

                await CommonPage.Instance.PushRegID();

                CommonPage.Instance.PushRegID();

                isLoginSuccess = 1;

            }

            else if (stateCodeStr == "YOUDATANOISLOCALREGION")

@@ -161,7 +163,7 @@
                var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginLocalRegionRes>(revertObj.ResponseData.ToString());

                CommonPage.RequestHttpsHost = responseDataObj.RegionServer;

                //再次登录

                return await this.LoginByPWDAsync(account, password, source, company);

                return this.LoginByPWDAsync(account, password, source, company);

            }

            if (stateCodeStr == "NOTVERIFY")

            {