合并了代码

黄学彪

2019-10-28 1f5636d69332170ea3a41c76c9519f6ff6f0a8d9

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

@@ -121,7 +121,7 @@
            string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ResidenceSortFile);

            UserCenterLogic.SaveFileContent(fullName, listResidenceSort);



            Application.RunOnMainThread(() =>

            HdlThreadLogic.Current.RunMain(() =>

            {

                if (this.Parent == null)

                {

@@ -215,7 +215,7 @@


                            Room.InitAllRoom();



                            Application.RunOnMainThread(() =>

                            HdlThreadLogic.Current.RunMain(() =>

                            {

                                //重新刷新列表

                                this.listView.RemoveAll();

@@ -233,9 +233,9 @@
                }

            };



            if (info.IsOthreShare == true && info.AccountType != 1)

            if (info.IsOthreShare == true)

            {

                //分享的，又不拥有管理员权限的,不能更改

                //分享的,不能更改

                return;

            }

            //更改

@@ -462,7 +462,10 @@
            {

                if (Config.Instance.HomeFilePathList.Contains($"House_{keys}.json") == false)

                {

                    //保存顺序

                    listResidenceSort.Remove(keys);

                    Room.CurrentRoom.SaveFloorSort(listResidenceSort);



                    this.listView.RemoveAll();

                    //数据已经变更

                    HdlThreadLogic.Current.RunThread(() =>