2020.06.12

lss

2020-06-12 9c16d3614d9b88c637f967518a329f239fcd3aaf

 ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs

@@ -159,8 +159,8 @@
            //场景图片

            this.btnScenePic = new ImageView();

            btnScenePic.Y = Application.GetRealHeight(46);

            btnScenePic.Width = Application.GetMinRealAverage(887);

            btnScenePic.Height = Application.GetMinRealAverage(444);

            btnScenePic.Width = this.GetPictrueRealSize(887);

            btnScenePic.Height = this.GetPictrueRealSize(444);

            btnScenePic.Radius = (uint)Application.GetRealHeight(17);

            btnScenePic.Gravity = Gravity.CenterHorizontal;

            if (this.editorScene == null)

@@ -259,7 +259,7 @@
        /// </summary>

        private void InitAddTargetControl()

        {

            if (this.frameTargetTableControl == null)

            if (this.frameTargetTableControl == null || this.frameTargetTableControl.Parent == null)

            {

                //添加目标的的容器控件

                this.frameTargetTableControl = new FrameListControl();

@@ -295,8 +295,11 @@
            {

                //从网关获取场景的执行目标

                var result = await this.GetSceneTargetList();

                //添加【执行目标行】

                this.AddTargetRow();

                if (result == true)

                {

                    //添加【执行目标行】

                    this.AddTargetRow();

                }

            });

        }



@@ -636,6 +639,7 @@
            {

                return true;

            }



            //打开进度条

            this.ShowProgressBar();

            //获取执行目标列表

@@ -672,7 +676,7 @@
            //那个特殊的控件

            this.frameBottomTemp = new FrameLayout();

            frameBottomTemp.Height = bodyFrameLayout.Height - btnTemp.Yaxis + Application.GetRealHeight(23);

            this.listBodyControl.AddChidrenFrame(frameBottomTemp);

            this.listBodyControl.AddChidren(frameBottomTemp);

        }



        #endregion

@@ -818,6 +822,9 @@
            this.editorScene.IconPath = this.cloneScene.IconPath;

            this.editorScene.Save();



            //新建场景,主页需要重新刷新

            UserView.UserPage.Instance.RefreshForm = true;



            HdlThreadLogic.Current.RunMain(() =>

            {

                //调用回调函数

@@ -857,6 +864,15 @@
                //变更房间

                HdlSceneLogic.Current.ChangedSceneRoom(this.editorScene, this.nowRoomId);

            }

            else

            {

                //移除出房间

                var room = HdlRoomLogic.Current.GetRoomBySceneId(this.editorScene.Id);

                if (room != null)

                {

                    HdlSceneLogic.Current.DeleteSceneFromRoom(room, this.editorScene);

                }

            }



            //图片改变了

            if (isScenePictrueChanged == true)

@@ -885,6 +901,9 @@
            this.editorScene.IconPath = this.cloneScene.IconPath;

            this.editorScene.Save();



            //编辑场景,主页需要重新刷新

            UserView.UserPage.Instance.RefreshForm = true;



            HdlThreadLogic.Current.RunMain(() =>

            {

                //调用回调函数