Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc

mac

2023-08-29 2d5cd35af7437ad4015d38594d8c721dc6166b11

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

@@ -436,13 +436,16 @@
                        if (pack.Data != null)
                        {
                            var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
                            var tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);
                            if (tempScene != null)
                            if (sceneList != null)
                            {
                                scene.name = tempScene.name;
                                scene.delay = tempScene.delay;
                                scene.roomIds = tempScene.roomIds;
                                scene.functions = tempScene.functions;
                                var tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);
                                if (tempScene != null)
                                {
                                    scene.name = tempScene.name;
                                    scene.delay = tempScene.delay;
                                    scene.roomIds = tempScene.roomIds;
                                    scene.functions = tempScene.functions;
                                }
                            }
                        }
                        Application.RunOnMainThread(() =>
@@ -490,9 +493,22 @@
                    //将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;
                        var attr = scenefunction.localFunction.GetAttribute(tt.key);
                        if(attr == null)
                        {
                            continue;
                        }
                        tt.min = attr.min;
                        tt.max = attr.max;
                        tt.valueList = attr.value;
                        if(tt.key == FunctionAttributeKey.SetTemp)
                        {
                            var tempType = scenefunction.localFunction.GetAttribute(FunctionAttributeKey.TempType);
                            if(tempType != null)
                            {
                                tt.UintString = tempType.unit;
                            }
                        }
                    }
                }catch(Exception ex)
                {