From 95d51dfc65299bdb735a855b515af84ca5b58252 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 十二月 2020 17:26:13 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index cbf976b..2116491 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -373,32 +373,40 @@
var waitPage = new Loading();
new Thread(() => {
- Application.RunOnMainThread(() => {
- bodyView.AddChidren(waitPage);
- waitPage.Start(Language.StringByID(StringId.PleaseWait));
- });
- var pm = new HttpServerRequest();
- var pack = pm.GetSceneInfo(scene.userSceneId);
- if (pack.Code == StateCode.SUCCESS)
+ try
{
- var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
- var tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);
- if(tempScene!= null)
- {
- scene.functions = tempScene.functions;
- }
Application.RunOnMainThread(() =>
{
- LoadFunctionRow();
- waitPage.Hide();
+ bodyView.AddChidren(waitPage);
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
});
+ var pm = new HttpServerRequest();
+ 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)
+ {
+ scene.functions = tempScene.functions;
+ }
+ Application.RunOnMainThread(() =>
+ {
+ LoadFunctionRow();
+ waitPage.Hide();
+ });
+ }
+ else
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+ }
}
- else
+ catch { }
+ finally
{
Application.RunOnMainThread(() =>
{
waitPage.Hide();
- IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
});
}
}).Start();
--
Gitblit v1.8.0