Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs

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



        /// <summary>

        /// 界面关闭事件

        /// </summary>

        public Action FormCloseEvent = null;

        /// <summary>

        /// 添加到 的背景图控件

        /// </summary>

        private FrameLayoutStatuControl frameAddBackGroud = null;

@@ -530,19 +534,24 @@
            frameAddBackGroud.AddChidren(btnAdd, ChidrenBindMode.BindEvent);

            frameAddBackGroud.ButtonClickEvent += (sender, e) =>

            {

                var selectZone = new SelectZone();
                selectZone.title = Language.StringByID(R.MyInternationalizationString.AddTo);
                selectZone.Init();
                selectZone.ZoneAction += (selectRoom) =>
                HdlControlLogic.Current.ShowBottomListRoomView(string.Empty, Language.StringByID(R.MyInternationalizationString.AddTo), (selectId, selectName) =>
                {
                    if (selectId == string.Empty)

                    {

                        //选择的是未分配

                        return;

                    }
                    //变更了当前房间的东西,主页需要刷新
                    if (HdlRoomLogic.Current.NowMainPageRoom.Id == selectRoom.Id)

                    if (HdlRoomLogic.Current.NowMainPageRoom.Id == selectId)

                    {

                        this.dataHadChanged = true;

                    }
                    //保存选择的设备和场景
                    this.SaveSelectDeviceAndScene(selectRoom);
                };

                    var room = HdlRoomLogic.Current.GetRoomById(selectId);
                    this.SaveSelectDeviceAndScene(room);

                    //分类界面需要刷新

                    UserPage.Instance.RefreshCategoryForm = true;
                });

            };

        }



@@ -654,6 +663,10 @@
        /// </summary>

        public override void CloseFormBefore()

        {

            //调用回调事件

            this.FormCloseEvent?.Invoke();

            this.FormCloseEvent = null;



            if (this.dataHadChanged == true)

            {

                HdlThreadLogic.Current.RunMainInThread(() =>