合并完成代码

黄学彪

2019-10-28 8b4d79ca03495e522a1953e04ca17527f33c853a

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

@@ -12,6 +12,10 @@
        #region ■ 变量声明___________________________



        /// <summary>

        /// 完成添加房间的事件

        /// </summary>

        public Action FinishEditorEvent = null;

        /// <summary>

        /// 列表控件

        /// </summary>

        private VerticalListControl listview = null;

@@ -85,6 +89,9 @@
            //底线

            txtRoomName.AddBottomLine();



            //该APP为有楼层的模式才开启这个菜单

            if (floorKeys != string.Empty)

            {

            //【所属楼层】

            var btnBelone = new FrameCaptionViewControl(Language.StringByID(R.MyInternationalizationString.uBelongeFloor), Common.Config.Instance.Home.FloorDics[this.floorKeys], this.listview.rowSpace / 2);

            listview.AddChidren(btnBelone);

@@ -98,6 +105,7 @@
                //楼层选择

                this.ShowSelectFloor(btnBelone);

            };

            }



            //【温度】

            var rowTemperature = new FrameRowControl(this.listview.rowSpace / 2);

@@ -152,6 +160,8 @@
                }

                else

                {

                    this.FinishEditorEvent?.Invoke();



                    this.CloseForm();

                }

            };

@@ -379,6 +389,8 @@
        /// </summary>

        public override void CloseForm()

        {

            this.FinishEditorEvent = null;



            HdlDeviceAttributeLogic.Current.RemoveEvent("TemperatrueDevice");

            HdlDeviceAttributeLogic.Current.RemoveEvent("HumidityDevice");



@@ -405,7 +417,7 @@
            {

                if (Shared.Common.Room.Lists.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)

                {

                    this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.HadSameRoom));

                    this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uRoomNameIsExist));

                    return false;

                }

            }

@@ -414,7 +426,7 @@
                var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(this.floorKeys);

                if (listRoom.Find((obj) => obj.Name == this.newRoom.Name && obj.Id != this.newRoom.Id) != null)

                {

                    this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.HadSameRoom));

                    this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uRoomNameIsExist));

                    return false;

                }

            }