2020-07-10-01

陈嘉乐

2020-07-10 48ba446936b51fffafa7c3600c0dadc6ac0e8c20

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

@@ -87,13 +87,13 @@
            var btnHomeName = rowHome.frameTable.AddLeftCaption(Common.Config.Instance.Home.Name, 700, 60);

            btnHomeName.TextSize = 15;

            btnHomeName.Y = Application.GetRealHeight(35);

            rowHome.frameTable.AddChidren(btnHomeName, ChidrenBindMode.BindEventOnly);

            rowHome.frameTable.AddChidren(btnHomeName, ChidrenBindMode.BindEvent);

            //当前住宅

            var btnNowView = rowHome.frameTable.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uNowResidence), 700, 49);

            btnNowView.TextSize = 12;

            btnNowView.Y = Application.GetRealHeight(95);

            btnNowView.TextColor = UserCenterColor.Current.TextGrayColor1;

            rowHome.frameTable.AddChidren(btnNowView, ChidrenBindMode.BindEventOnly);

            rowHome.frameTable.AddChidren(btnNowView, ChidrenBindMode.BindEvent);

            //主人或者管理员才会出现这个菜单

            if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)

            {

@@ -102,6 +102,8 @@
            }

            //经纬度

            var btnLocation = rowHome.frameTable.AddMostRightView(string.Empty, 500);

            btnLocation.IsMoreLines = true;

            btnLocation.TextSize = 10;

            btnLocation.Text = Common.Config.Instance.Home.ResidenceAddressName;



            //主人或者管理员才会出现这个菜单

@@ -384,11 +386,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 +422,8 @@
                            //调整桌布高度

                            this.AdjustContrlTableHeight();

                        }

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

                        UserView.UserPage.Instance.RefreshForm = true;

                    });

                };

            }

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

                        this.InitFrameTableByMode();

                    }

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

                    UserView.UserPage.Instance.RefreshForm = true;

                }

            });

        }

@@ -612,11 +613,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 +645,8 @@
                        //调整桌布高度

                        this.AdjustContrlTableHeight();

                    }

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

                    UserView.UserPage.Instance.RefreshForm = true;

                });

            };

        }

@@ -720,7 +718,7 @@
                }

            }



            var myHouse = Common.House.GetHouseByFilePath(Common.Config.Instance.HomeFilePathList[index]);

            var myHouse = HdlResidenceLogic.Current.GetHouseByFilePath(Common.Config.Instance.HomeFilePathList[index]);

            //切换住宅

            Common.Config.Instance.HomeId = myHouse.Id;

            Common.Global.CreateHomeDirectory(myHouse.Id);

@@ -730,7 +728,7 @@
            await UserCenterLogic.InitUserCenterMenmoryAndThread(false);



            //删除住宅

            Common.House.DeleteHouseByHouseId(deleteId);

            HdlResidenceLogic.Current.DeleteHouseMemmory(deleteId);



            Application.RunOnMainThread(() =>

            {