新版本

黄学彪

2020-09-18 c7df85937f73fb347ee0b19e9c052d2d00a6df6c

 ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs

@@ -120,18 +120,31 @@
            //初始化添加目标

            this.InitAddTargetControl();



            //分享的场景不能保存

            if (this.editorScene == null || this.editorScene.IsSharedScene == false)

            //完成

            var btnSave = new BottomClickButton();

            btnSave.TextID = R.MyInternationalizationString.uFinish;

            bodyFrameLayout.AddChidren(btnSave);

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

            {

                //完成

                var btnSave = new BottomClickButton();

                btnSave.TextID = R.MyInternationalizationString.uFinish;

                bodyFrameLayout.AddChidren(btnSave);

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

                {

                    //保存场景数据

                    this.SaveSceneData();

                };

                //保存场景数据

                this.SaveSceneData();

            };



            //分享的场景不能保存

            if (this.editorScene != null && this.editorScene.IsSharedScene == true)

            {

                btnSave.CanClick = false;

            }

            else if (Config.Instance.Home.IsShowTemplate == true)

            {

                //模板场景不能保存

                btnSave.CanClick = false;

            }

            //如果是有模板,有设备的时候,在没有发送成功之前

            else if (Common.Config.Instance.Home.TemplateMode == 2

               && Common.Config.Instance.Home.SendTemplateSuccess == false)

            {

                btnSave.CanClick = false;

            }

        }



@@ -189,6 +202,11 @@
            //分享的场景不能编辑

            if (this.editorScene == null || this.editorScene.IsSharedScene == false)

            {

                if (Config.Instance.Home.IsShowTemplate == true)

                {

                    //模板场景不允许编辑

                    return;

                }

                btnZhezhao.MouseUpEventHandler += (sender, e) =>

                {

                    //房间图片选择

@@ -249,6 +267,11 @@
                    this.nowRoomId = selectId;

                };

            }

            if (Config.Instance.Home.IsShowTemplate == true)

            {

                //模板场景不允许编辑

                rowBelong.CanClick = false;

            }

        }



        #endregion

@@ -291,6 +314,17 @@
                //显示添加目标菜单

                this.ShowAddTargetMenu();

            };

            if (Config.Instance.Home.IsShowTemplate == true)

            {

                //模板场景不允许编辑

                rowAddTarget.CanClick = false;

            }

            //如果是有模板,有设备的时候,在没有发送成功之前

            if (Common.Config.Instance.Home.TemplateMode == 2

               && Common.Config.Instance.Home.SendTemplateSuccess == false)

            {

                rowAddTarget.CanClick = false;

            }



            HdlThreadLogic.Current.RunThread(() =>

            {

@@ -400,6 +434,11 @@
            //分享的场景不能编辑

            if (this.editorScene == null || this.editorScene.IsSharedScene == false)

            {

                if (Config.Instance.Home.IsShowTemplate == true)

                {

                    //模板场景不允许编辑

                    return;

                }

                //编辑

                var btnEditor = rowDevice.AddEditorControl();

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

@@ -523,6 +562,11 @@
            //分享的场景不能编辑

            if (this.editorScene == null || this.editorScene.IsSharedScene == false)

            {

                if (Config.Instance.Home.IsShowTemplate == true)

                {

                    //模板场景不允许编辑

                    return;

                }

                //删除

                var btnDelete = rowScene.AddDeleteControl();

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

@@ -589,6 +633,11 @@
            //分享的场景不能编辑

            if (this.editorScene == null || this.editorScene.IsSharedScene == false)

            {

                if (Common.Config.Instance.Home.IsShowTemplate == true)

                {

                    //模板场景不允许编辑

                    return;

                }

                //编辑

                var btnEditor = rowDelay.AddEditorControl();

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