Merge branch 'Dev-Branch' into dev--wxr

wxr

2022-09-27 0ee75b88cfe03e46289de0de96e8ed4580c797d3

 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs

@@ -98,6 +98,7 @@

        public void LoadPage(Action backRefresh)
        {
             //DB_ResidenceData.Instance.sceneChooseRoomId
            new TopViewDiv(bodyView, Language.StringByID(StringId.EditScene)).LoadTopView(backRefresh);
            initPage();
        }
@@ -436,7 +437,10 @@
                        var tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);
                        if (tempScene != null)
                        {
                            scene = tempScene;
                            scene.name = tempScene.name;
                            scene.delay = tempScene.delay;
                            scene.roomIds = tempScene.roomIds;
                            scene.functions = tempScene.functions;
                        }
                        Application.RunOnMainThread(() =>
                        {
@@ -478,6 +482,13 @@
                    scene.functions.Remove(scenefunction);
                    continue;
                }
                //将spk实体里面的min max值放入场景功能实体里，要不然数据会丢失 2022-06-21 16:06:45
                foreach (var tt in scenefunction.status) {
                    tt.min = scenefunction.localFunction.GetAttribute(tt.key).min;
                    tt.max = scenefunction.localFunction.GetAttribute(tt.key).max;
                    tt.valueList = scenefunction.localFunction.GetAttribute(tt.key).value;
                }

                i++;
                var row = new RowLayout()
                {
@@ -839,6 +850,12 @@
            UploadImage(selectImagePath, addSceneImageView, scene, uploadSuccessAction);
        }

        public override void RemoveFromParent()
        {
            backAction();
            base.RemoveFromParent();
        }

        /// <summary>
        /// 完成按钮点击事件
        /// </summary>
@@ -868,7 +885,7 @@
                    }
                    scene.EditScene();
                    FunctionList.List.scenes.Add(scene);
                    backAction();
                    //backAction();
                    this.RemoveFromParent();
                }
                if (btnComplete.TextID == StringId.Del)
@@ -876,7 +893,7 @@
                    Action action = () =>
                    {
                        FunctionList.List.DeleteScene(scene,true);
                        backAction();
                        //backAction();
                        this.RemoveFromParent();
                    };
                    new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.DeleteSceneTip, action);