Merge remote-tracking branch 'origin/wxr4' into WJC

JLChen

2021-06-06 4d6c9858844d1545a9b253c1b31842fa89695c1d

 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs

@@ -27,18 +27,6 @@
            {
                Action<string> callBack = (str) =>
                {
                    if (string.IsNullOrEmpty(str))
                    {
                        new Tip()
                        {
                            CloseTime = 1,
                            Text = Language.StringByID(StringId.HouseNameCannotBeEmpty),
                            Direction = AMPopTipDirection.None,
                        }.Show(bodyView);
                        return;
                    }
                    //DB_ResidenceData.residenceData.residecenInfo.Name = str;

                    var waitPage = new Loading();
                    bodyView.AddChidren(waitPage);
                    waitPage.Start(Language.StringByID(StringId.PleaseWait));
@@ -52,11 +40,10 @@
                            {
                                Application.RunOnMainThread(() =>
                                {
                                    // UserInfo.Current.regionList.Find((obj) => obj.Name == btnResidenceName.Text.Trim()).Name = str;
                                    btnResidenceName.Text = str;
                                    upateResidenceName();
                                });
                                DB_ResidenceData.Instance.CurrentRegion.Name = str;
                                DB_ResidenceData.Instance.CurrentRegion.homeName = str;
                                DB_ResidenceData.Instance.SaveResidenceData();
                            }
                            else
@@ -83,7 +70,7 @@
                    })
                    { IsBackground = true }.Start();
                };
                new PublicAssmebly().LoadDialog_EditParater(StringId.ResidenceName, DB_ResidenceData.Instance.CurrentRegion.Name, callBack,StringId.HouseNameCannotBeEmpty,0,new List<string>());
                new PublicAssmebly().LoadDialog_EditParater(StringId.ResidenceName, DB_ResidenceData.Instance.CurrentRegion.homeName, callBack,StringId.HouseNameCannotBeEmpty,0,new List<string>());
            };
            btnResidenceName.MouseUpEventHandler = eventHandler;
            btnEditResidenceNameIcon.MouseUpEventHandler = eventHandler;
@@ -104,7 +91,7 @@
                    if (responsePack.Code.ToUpper() == StateCode.SUCCESS)
                    {
                        btnResidenceAddress.Text = str;
                        DB_ResidenceData.Instance.CurrentRegion.Address = str;
                        DB_ResidenceData.Instance.CurrentRegion.homeAddress = str;
                        DB_ResidenceData.Instance.SaveResidenceData();
                        //OnAppConfig.Instance.SaveUserConfig();
                    }
@@ -113,7 +100,7 @@
                        IMessageCommon.Current.ShowErrorInfoAlter(responsePack.Code);
                    }
                };
                new PublicAssmebly().LoadDialog_EditParater(StringId.ResidenceAddress, DB_ResidenceData.Instance.CurrentRegion.Name, callBack, StringId.HouseAddressCannotBeEmpty, 0, new List<string>());
                new PublicAssmebly().LoadDialog_EditParater(StringId.ResidenceAddress, DB_ResidenceData.Instance.CurrentRegion.homeAddress, callBack, StringId.HouseAddressCannotBeEmpty, 0, new List<string>());
            };
            btnResidenceAddress.MouseUpEventHandler = eventHandler;
            btnLocationAddressIcon.MouseUpEventHandler = eventHandler;