2019.12.25

gxc

2019-12-25 944b87b6bcccb095cd73f13f4410fb20faf48f74

 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;

            }

            //更改

@@ -264,7 +264,7 @@
        private void ShowEditorNameForm(Common.ResponseEntity.ResidenceObj info, NormalViewControl btnHome)

        {

            //生成一个弹窗画面

            var dialogForm = new DialogInputFrameControl(this, DialogFrameMode.OnlyInput);

            var dialogForm = new DialogInputControl();

            //编辑住宅

            dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uChangedName));

            //请输入住宅名称

@@ -340,7 +340,7 @@
        private void ShowAddNameForm()

        {

            //生成一个弹窗画面

            var dialogForm = new DialogInputFrameControl(this, DialogFrameMode.OnlyInput);

            var dialogForm = new DialogInputControl();

            //创建住宅

            dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uCreatResidence));

            //请输入住宅名称

@@ -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(() =>

@@ -542,29 +545,6 @@
            /// ZigbeeHomeGuid

            /// </summary>

            public string Id = string.Empty;

        }



        /// <summary>

        ///  编辑住宅的启动参数

        /// </summary>

        public class EditorResidencePra : IfacePraCommon

        {

            /// <summary>

            /// RequestVersion

            /// </summary>

            public string RequestVersion = Common.CommonPage.RequestVersion;

            /// <summary>

            /// LoginAccessToken

            /// </summary>

            public string LoginAccessToken = Common.Config.Instance.Token;

            /// <summary>

            /// ZigbeeHomeId

            /// </summary>

            public string HomeId = "";

            /// <summary>

            /// Name

            /// </summary>

            public string Name = string.Empty;

        }



        #endregion