2020-05-28-1

陈嘉乐

2020-05-28 f759dc1e6f49c53733eafda82207c85af18f9931

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

@@ -384,11 +384,6 @@
                                listDeleteId.Add(listAllRoom[i].Id);

                            }

                        }

                        //如果当前选择的房间是删除对象的话

                        if (HdlRoomLogic.Current.CurrentRoom.FloorId == keys)

                        {

                            HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();

                        }

                        //删除房间

                        foreach (string roomId in listDeleteId)

                        {

@@ -425,6 +420,8 @@
                            //调整桌布高度

                            this.AdjustContrlTableHeight();

                        }

                        //删除楼层的话,主页需要重新刷新

                        UserView.UserPage.Instance.RefreshForm = true;

                    });

                };

            }

@@ -495,6 +492,8 @@
                        //根据指定模式,初始化桌布控件

                        this.InitFrameTableByMode();

                    }

                    //创建或者修改楼层的话,主页需要重新刷新

                    UserView.UserPage.Instance.RefreshForm = true;

                }

            });

        }

@@ -612,11 +611,6 @@
                //确认删除房间?

                this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uDeleteRoomMsg), () =>

                {

                    if (HdlRoomLogic.Current.CurrentRoom.Id == room.Id)

                    {

                        //如果删除的是当前房间的话

                        HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();

                    }

                    HdlRoomLogic.Current.RemoveRoom(room.Id);

                    //保存顺序

                    this.listRoomSort.Remove(room.Id);

@@ -649,6 +643,8 @@
                        //调整桌布高度

                        this.AdjustContrlTableHeight();

                    }

                    //删除房间的话,主页需要重新刷新

                    UserView.UserPage.Instance.RefreshForm = true;

                });

            };

        }

@@ -728,7 +724,6 @@


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

            await UserCenterLogic.InitUserCenterMenmoryAndThread(false);

            HdlRoomLogic.Current.InitAllRoom();



            //删除住宅

            Common.House.DeleteHouseByHouseId(deleteId);

@@ -753,45 +748,49 @@
        /// <param name="addresName">位置名称</param>

        private async void SaveResidenceAdrress(NormalViewControl btnLocation, double latitude, double longitude, string addresName)

        {

            //开启进度条

            this.ShowProgressBar();



            var Pra = new EditorResidencePra();

            Pra.HomeId = Common.Config.Instance.Home.Id;

            Pra.Name = Common.Config.Instance.Home.Name;

            Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();

            Pra.Latitude = latitude;

            Pra.Longitude = longitude;



            //编辑住宅

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

            if (flage == false)

            //如果不是虚拟住宅,才更新云端

            if (Common.Config.Instance.Home.IsVirtually == false)

            {

                //关闭进度条

                this.CloseProgressBar();

                return;

            }

            //设置全部网关的住宅地址

            var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();

            foreach (var gateway in listGateway)

            {

                ZigBee.Device.ZbGateway realWay = null;

                if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, gateway) == false)

                {

                    //错误:网关对象丢失

                    continue;

                }

                var result = HdlGatewayLogic.Current.SetGatewaySite(gateway, longitude, latitude, ShowErrorMode.YES);

                if (result == false)

                //开启进度条

                this.ShowProgressBar();



                var Pra = new EditorResidencePra();

                Pra.HomeId = Common.Config.Instance.Home.Id;

                Pra.Name = Common.Config.Instance.Home.Name;

                Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();

                Pra.Latitude = latitude;

                Pra.Longitude = longitude;



                //编辑住宅

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

                if (flage == false)

                {

                    //关闭进度条

                    this.CloseProgressBar();

                    return;

                }

                //设置全部网关的住宅地址

                var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();

                foreach (var gateway in listGateway)

                {

                    ZigBee.Device.ZbGateway realWay = null;

                    if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, gateway) == false)

                    {

                        //错误:网关对象丢失

                        continue;

                    }

                    var result = HdlGatewayLogic.Current.SetGatewaySite(gateway, longitude, latitude, ShowErrorMode.YES);

                    if (result == false)

                    {

                        //关闭进度条

                        this.CloseProgressBar();

                        return;

                    }

                }

                //关闭进度条

                this.CloseProgressBar();

            }



            //关闭进度条

            this.CloseProgressBar();

            //保存缓存

            Common.Config.Instance.Home.Longitude = longitude;

            Common.Config.Instance.Home.Latitude = latitude;