From 9508510f0b27da3278fa1161eb2ba3dd1e3e2030 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 26 七月 2023 13:14:00 +0800
Subject: [PATCH] 2023年07月26日13:12:21
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index 0196aa6..74a8d34 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -433,14 +433,17 @@
var pack = pm.GetSceneInfo(scene.userSceneId);
if (pack.Code == StateCode.SUCCESS)
{
- var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
- var tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);
- if (tempScene != null)
+ if (pack.Data != null)
{
- scene.name = tempScene.name;
- scene.delay = tempScene.delay;
- scene.roomIds = tempScene.roomIds;
- scene.functions = tempScene.functions;
+ var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
+ 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(() =>
{
@@ -482,11 +485,18 @@
scene.functions.Remove(scenefunction);
continue;
}
- //灏唖pk瀹炰綋閲岄潰鐨刴in 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;
+ try
+ {
+ //灏唖pk瀹炰綋閲岄潰鐨刴in 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;
+ }
+ }catch(Exception ex)
+ {
+ MainPage.Log($"鍦烘櫙鍔犺浇鍔熻兘鍒楄〃寮傚父:{ex.Message}");
}
i++;
@@ -578,7 +588,10 @@
};
btnFunctionName.MouseUpEventHandler = skipEvent;
btnFunctionFloorAndRoom.MouseUpEventHandler = skipEvent;
-
+ btnFunctionDelayInfo.MouseUpEventHandler = skipEvent;
+ btnFunctionInfo.MouseUpEventHandler = skipEvent;
+ btnRight.MouseUpEventHandler = skipEvent;
+ row.MouseUpEventHandler = skipEvent;
Button btnDelSceneFunction = new Button() {
BackgroundColor = CSS_Color.WarningColor,
--
Gitblit v1.8.0