Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs

@@ -78,7 +78,7 @@
        /// <param name="div">1:先读取云端,无法联网,再读取本地  2:只读云端  3:只读本地</param>

        private void SetResidenceInfo(int div)

        {

            HdlThreadLogic.Current.RunThread(async () =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                //虚拟住宅的话,只读本地

                if (div == 3 || Config.Instance.Home.IsVirtually == true)

@@ -91,7 +91,7 @@
                    //开启进度条

                    this.ShowProgressBar();

                    //设置住宅信息(有网情况)

                    var result = await this.SetResidenceInfoByOnline();

                    var result = this.SetResidenceInfoByOnline();

                    if (result == true)

                    {

                        //云端读取成功

@@ -120,13 +120,12 @@
        /// <summary>

        /// 设置住宅信息(有网情况)

        /// </summary>

        private async System.Threading.Tasks.Task<bool> SetResidenceInfoByOnline()

        private bool SetResidenceInfoByOnline()

        {

            //获取住宅信息

            var Pra = new GetResidenceInfoPra();

            var listNotCheck = new List<string>() { "NotSetAgain" };

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

            if (resultData == null)

            string resultData = UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomePager", false, Pra, new List<string> { "NotCheck" });

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

            {

                return false;

            }

@@ -224,7 +223,7 @@
                    }

                    this.ShowMassage(ShowMsgType.Confirm, msg, () =>

                    {

                        HdlThreadLogic.Current.RunThread(async () =>

                        HdlThreadLogic.Current.RunThread(() =>

                        {

                            //开启进度条

                            this.ShowProgressBar();

@@ -232,7 +231,7 @@
                            //检测本地有没有这个住宅

                            this.CheckIsExsitResidence(info);



                            await HdlResidenceLogic.Current.SwitchResidence(info.Id);

                            HdlResidenceLogic.Current.SwitchResidence(info.Id);



                            HdlThreadLogic.Current.RunMain(() =>

                            {

@@ -354,9 +353,9 @@
                    }

                    this.ShowMassage(ShowMsgType.Confirm, msg, () =>

                    {

                        HdlThreadLogic.Current.RunThread(async () =>

                        HdlThreadLogic.Current.RunThread(() =>

                        {

                            await HdlResidenceLogic.Current.SwitchResidence(i_home.Id);

                            HdlResidenceLogic.Current.SwitchResidence(i_home.Id);



                            HdlThreadLogic.Current.RunMain(() =>

                            {

@@ -424,7 +423,10 @@
                    if (info != null)

                    {

                        //编辑云端的住宅名称

                        this.EditorResidenceName(textValue, info, btnHome);

                        HdlThreadLogic.Current.RunThread(() =>

                        {

                            this.EditorResidenceName(textValue, info, btnHome);

                        });

                    }

                    else

                    {

@@ -448,7 +450,7 @@
        /// <param name="ResidenceName"></param>

        /// <param name="info"></param>

        /// <returns></returns>

        private async void EditorResidenceName(string ResidenceName, Common.ResponseEntity.ResidenceObj info, NormalViewControl btnHome)

        private void EditorResidenceName(string ResidenceName, Common.ResponseEntity.ResidenceObj info, NormalViewControl btnHome)

        {

            //检测能否保存住宅

            if (this.CheckIsCanSaveResidence(info.Id, ResidenceName, true) == false)

@@ -465,17 +467,20 @@
            Pra.LoginAccessToken = Config.Instance.Token;



            //编辑住宅

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

            bool flage = UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", false, Pra, new List<string> { "NotCheck" });

            //关闭进度条

            this.CloseProgressBar();



            if (flage == true)

            {

                //刷新内存的住宅名

                HdlResidenceLogic.Current.EditorHouseByHouseId(info.Id, ResidenceName);

                //更改显示的名字

                btnHome.Text = ResidenceName;

                info.Name = ResidenceName;

                HdlThreadLogic.Current.RunMain(() =>

                {

                    //刷新内存的住宅名

                    HdlResidenceLogic.Current.EditorHouseByHouseId(info.Id, ResidenceName);

                    //更改显示的名字

                    btnHome.Text = ResidenceName;

                    info.Name = ResidenceName;

                });

            }

        }



@@ -508,7 +513,10 @@
                dialogForm.CloseDialog();



                //保存住宅

                this.AddNewResidence(textValue);

                HdlThreadLogic.Current.RunThread(() =>

                {

                    this.AddNewResidence(textValue);

                });

            });

        }



@@ -517,7 +525,7 @@
        /// </summary>

        /// <param name="ResidenceName"></param>

        /// <returns></returns>

        private async void AddNewResidence(string ResidenceName)

        private void AddNewResidence(string ResidenceName)

        {

            //检测能否保存住宅

            if (this.CheckIsCanSaveResidence(string.Empty, ResidenceName, false) == false)

@@ -530,8 +538,8 @@
            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)

            {

                //关闭进度条

                this.CloseProgressBar();

@@ -541,9 +549,14 @@
            var newInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<NewResidenceInfo>>(resultData);



            HdlResidenceLogic.Current.AddHouseToMemmory(newInfo[0].Id, ResidenceName);

            //重新刷新列表

            this.listView.RemoveAll();

            this.SetResidenceInfo(2);



            HdlThreadLogic.Current.RunMain(() =>

            {

                //重新刷新列表

                this.listView.RemoveAll();

                this.SetResidenceInfo(2);

            });



        }



        #endregion