From af9c3e0b3b1eb370e966b3ca9db3f62848d4189b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 21 八月 2021 13:03:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index 13d98be..1b9285f 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -238,6 +238,10 @@
new LogicView.TipPopView().TipBox(StringId.tip, StringId.targetNull);
return;
}
+
+
+
+
Loading loading = new Loading();
this.AddChidren(loading);
HDL_ON.DAL.Server.ResponsePackNew responsePackNew = null;
@@ -256,11 +260,13 @@
loading.Start();
new System.Threading.Thread(() =>
{
-
try
{
- //鍙戦�佹柊鍔犻�昏緫鍛戒护锛�
- responsePackNew = Send.AddLogic(Logic.currlogic);
+ if (!MainPage.NoLoginMode)
+ {
+ //鍙戦�佹柊鍔犻�昏緫鍛戒护锛�
+ responsePackNew = Send.AddLogic(Logic.currlogic);
+ }
}
catch { }
@@ -269,10 +275,16 @@
Application.RunOnMainThread(() =>
{
loading.Hide();
+ if(MainPage.NoLoginMode)
+ {
+ Logic.LogicList.Add(Logic.currlogic);
+ LogicMethod.CurrLogicMethod.RemoveAllView();
+ MainView.MainShow();
+ return;
+ }
+
if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
{
-
-
//鑾峰彇閫昏緫璇︾粏杩斿洖鏄竴涓暟缁�(object绫诲瀷杞崲涓烘暟缁�);
var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString());
for (int a = 0; a < jArray.Count; a++)
--
Gitblit v1.8.0