全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

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

@@ -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);

@@ -545,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