From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期五, 27 八月 2021 13:21:21 +0800 Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1 --- 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