去掉了访问外网的异步

黄学彪

2020-07-06 f23ad1b3f9f6193f35f72104d690b21dc67d5c1f

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs

@@ -39,13 +39,13 @@
        /// 创建新的住宅(返回住宅id,null代表失败)

        /// </summary>

        /// <param name="residenceName">住宅名称</param>

        public async System.Threading.Tasks.Task<string> CreatNewResidence(string residenceName)

        public string CreatNewResidence(string residenceName)

        {

            var Pra = new AddResidencePra();

            Pra.Name = residenceName;

            //添加住宅

            string resultData = await UserCenterLogic.GetResponseDataByRequestHttps("App/AddHome", false, Pra);

            if (resultData == null)

            string resultData = UserCenterLogic.GetResponseDataByRequestHttps("App/AddHome", false, Pra);

            if (string.IsNullOrEmpty(resultData) == true)

            {

                return null;

            }

@@ -96,7 +96,7 @@
        /// </summary>

        /// <param name="residenceId"></param>

        /// <returns></returns>

        public async System.Threading.Tasks.Task SwitchResidence(string residenceId)

        public void SwitchResidence(string residenceId)

        {

            //打开进度条

            ProgressBar.Show();

@@ -106,7 +106,7 @@
            Config.Instance.Home = this.GetHouseByHouseId(residenceId);

            Config.Instance.Save();

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

            await UserCenterLogic.InitUserCenterMenmoryAndThread(false);

            UserCenterLogic.InitUserCenterMenmoryAndThread(false);



            //关闭进度条

            ProgressBar.Close();

@@ -122,7 +122,7 @@
        /// <param name="residenceId">住宅id</param>

        /// <param name="residenceName">住宅名称</param>

        /// <returns></returns>

        public async System.Threading.Tasks.Task<bool> EditorResidenceName(string residenceId, string residenceName)

        public bool EditorResidenceName(string residenceId, string residenceName)

        {

            var Pra = new EditorResidencePra();

            Pra.HomeId = residenceId;

@@ -131,7 +131,7 @@
            Pra.LoginAccessToken = Config.Instance.Token;



            //编辑住宅

            bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", false, Pra);

            bool flage = UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", false, Pra);

            if (flage == true)

            {

                //刷新内存的住宅名

@@ -206,27 +206,26 @@
        /// <summary>

        /// 获取云端住宅列表

        /// </summary>

        public async System.Threading.Tasks.Task<List<string>> GetHomeListsFromDb()

        public List<string> GetHomeListsFromDb()

        {

            var pageSetting = new SendDataToServer.ResidenceListPageSettingObj()

            if (HdlWifiLogic.Current.CanAccessHttp == false)

            {

                PageSize = CommonPage.PageSize

            };



            var reqDto = new SendDataToServer.ResidenceListObj()

            {

                LoginAccessToken = Config.Instance.Token,

                PageSetting = pageSetting

            };

                //当前无法联网

                return Config.Instance.HomeFilePathList;

            }

            var requestObj = new SendDataToServer.ResidenceListReqDto()

            {

                ReqDto = reqDto,

                RequestVersion = CommonPage.RequestVersion,

                ReqDto = new SendDataToServer.ResidenceListObj()

                {

                    LoginAccessToken = Config.Instance.Token,

                    PageSetting = new SendDataToServer.ResidenceListPageSettingObj { PageSize = 999 }

                }

            };

            try

            {

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

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

                var revertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("App/GetHomePager", System.Text.Encoding.UTF8.GetBytes(requestJson));

                if (revertObj == null)

                {

                    return null;

@@ -234,7 +233,7 @@
                if (revertObj.StateCode.ToUpper() == "SUCCESS")

                {

                    var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.ResidenceRes>(revertObj.ResponseData.ToString());

                    if(responseDataObj.TotalCount>0)

                    if (responseDataObj.TotalCount > 0)

                    {

                        //清空当前住宅列表

                        Config.Instance.HomeFilePathList.Clear();

@@ -317,7 +316,7 @@
            var listHome = new List<Common.House>();

            foreach (var housePath in Common.Config.Instance.HomeFilePathList)

            {

                var home =this.GetHouseByFilePath(housePath);

                var home = this.GetHouseByFilePath(housePath);

                if (home == null)

                {

                    continue;