gxc
2019-11-15 05ce435c3b58e53eeab04c672affdeeab75f3036
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,8 @@
        private void ShowEditorNameForm(Common.ResponseEntity.ResidenceObj info, NormalViewControl btnHome)
        {
            //生成一个弹窗画面
            var dialogForm = new DialogInputFrameControl(this, DialogFrameMode.OnlyInput);
            var dialogForm = new DialogInputForm();
            dialogForm.AddForm(DialogFrameMode.OnlyInput);
            //编辑住宅
            dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uChangedName));
            //请输入住宅名称
@@ -282,7 +283,7 @@
                    return;
                }
                //画面关闭
                dialogForm.CloseDialog();
                dialogForm.CloseForm();
                if (info.Name != textValue)
                {
@@ -340,7 +341,8 @@
        private void ShowAddNameForm()
        {
            //生成一个弹窗画面
            var dialogForm = new DialogInputFrameControl(this, DialogFrameMode.OnlyInput);
            var dialogForm = new DialogInputForm();
            dialogForm.AddForm(DialogFrameMode.OnlyInput);
            //创建住宅
            dialogForm.SetTitleText(Language.StringByID(R.MyInternationalizationString.uCreatResidence));
            //请输入住宅名称
@@ -356,7 +358,7 @@
                    return;
                }
                //画面关闭
                dialogForm.CloseDialog();
                dialogForm.CloseForm();
                //保存住宅
                this.AddNewResidence(textValue);
@@ -462,7 +464,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 +547,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