From 39cf2411b59772d56ee731f229f09ff472889bad Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 22 九月 2022 15:12:04 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into hxb
---
HDL_ON/UI/UI2/3-Intelligence/Automation/OnePortAutomation.cs | 66 +++++++++-----------------------
1 files changed, 19 insertions(+), 47 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/OnePortAutomation.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/OnePortAutomation.cs
index 6da7fb2..e548adf 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/OnePortAutomation.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/OnePortAutomation.cs
@@ -67,7 +67,7 @@
}
// 鏉′欢澶勭悊鏂规硶
- InpOrOutLogicMethod.InputCondition(this, viewLayout);
+ InpOrOutLogicMethod.Current.InputCondition(this, viewLayout);
///娣诲姞鍥炬爣鐨刅iew
LogicView.LogicAddView addInputIcon = new LogicView.LogicAddView();
addInputIcon.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
@@ -79,7 +79,7 @@
LogicView.AddOutputInputTextView addOutpuTextView = new LogicView.AddOutputInputTextView();
addOutpuTextView.btnIf.TextID = StringId.isExecuted;
viewLayout.AddChidren(addOutpuTextView.FLayoutView(54, 20));
-
+
#region 鎵ц鎺ㄩ�� 鍙戦�侀�氱煡
///涓婁笅闂撮殧12鍍忕礌
@@ -187,7 +187,7 @@
}
Loading loading = new Loading();
this.AddChidren(loading);
- HDL_ON.DAL.Server.ResponsePackNew responsePackNew = null;
+ HDL_ON.DAL.Server.ResponsePackNew r = null;
if (string.IsNullOrEmpty(Logic.currlogic.userLogicId))
{
List<string> list = new List<string>();
@@ -195,15 +195,15 @@
{
list.Add(logic.name);
}
- new LogicView.TipPopView().InputBox(StringId.editName, InpOrOutLogicMethod.GetLogicName(Logic.currlogic), StringId.nameNull, StringId.NameAlreadyExists, list, (logicName, view) =>
+ new LogicView.TipPopView().InputBox(StringId.editName, InpOrOutLogicMethod.Current.GetLogicName(Logic.currlogic), StringId.nameNull, StringId.NameAlreadyExists, list, (logicName, view) =>
{
Logic.currlogic.name = logicName;
- Logic.currlogic.sid = LogicMethod.CurrLogicMethod.NewSid();
+ Logic.currlogic.sid = LogicMethod.Current.NewSid();
if (MainPage.NoLoginMode)
{
Logic.currlogic.userLogicId = Guid.NewGuid().ToString();
Logic.LogicList.Add(Logic.currlogic);
- LogicMethod.CurrLogicMethod.RemoveAllView();
+ LogicMethod.Current.RemoveAllView();
MainView.MainShow();
return;
}
@@ -213,8 +213,7 @@
try
{
//鍙戦�佹柊鍔犻�昏緫鍛戒护锛�
- responsePackNew = Send.AddLogic(Logic.currlogic);
-
+ r = Send.Current.AddLogic(Logic.currlogic, true);
}
catch { }
finally
@@ -222,42 +221,24 @@
Application.RunOnMainThread(() =>
{
loading.Hide();
- if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
+ if (r != null)
{
-
-
- //鑾峰彇閫昏緫璇︾粏杩斿洖鏄竴涓暟缁�(object绫诲瀷杞崲涓烘暟缁�);
- var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString());
- for (int a = 0; a < jArray.Count; a++)
+ var userLogicIdList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Logic>>(r.Data.ToString());
+ for (int i = 0; i < userLogicIdList.Count; i++)
{
- var jay = jArray[a];
- //鏁版嵁杩斿簭鍒楀寲涓篖ogic瀵硅薄
- var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
- var logic = Newtonsoft.Json.JsonConvert.DeserializeObject<Logic>(str);
- if (logic.userLogicId != "")
- {
- //鏇存柊浜戠鍞竴鑷姩鍖杋d;
- Logic.currlogic.userLogicId = logic.userLogicId;
- }
- else
+ var logic = userLogicIdList[i];
+ if (string.IsNullOrEmpty(logic.userLogicId))
{
//鑷繁鐪嬬殑鎵�浠ヤ笉闇�瑕佹敮鎸佷腑鑻辨枃
new LogicView.TipPopView().FlashingBox("娌℃湁杩斿洖浜戠鍞竴鑷姩鍖杋d");
}
-
+ //鏇存柊浜戠鍞竴鑷姩鍖杋d;
+ Logic.currlogic.userLogicId = logic.userLogicId;
}
Logic.LogicList.Add(Logic.currlogic);
- LogicMethod.CurrLogicMethod.RemoveAllView();
+ LogicMethod.Current.RemoveAllView();
MainView.MainShow();
- }
- else if (responsePackNew != null && responsePackNew.Code == "14005")
- {
- new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.gatewayNotOnline));
- }
- else
- {
- new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.saveFail));
}
});
}
@@ -277,7 +258,7 @@
try
{
//鍙戦�佷慨鏀归�昏緫鍛戒护锛�
- responsePackNew = Send.UpdateLogic(Logic.currlogic);
+ r = Send.Current.UpdateLogic(Logic.currlogic, true);
}
catch { }
@@ -286,23 +267,14 @@
Application.RunOnMainThread(() =>
{
loading.Hide();
- if (responsePackNew != null && responsePackNew.Code == "0")
+ if (r != null)
{
- LogicMethod.CurrLogicMethod.RemoveAllView();
+ LogicMethod.Current.RemoveAllView();
MainView.MainShow();
}
- else if (responsePackNew != null && responsePackNew.Code == "14005")
- {
- new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.gatewayNotOnline));
- }
- else
- {
- new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.saveFail));
- }
+
});
}
-
-
})
{ IsBackground = true }.Start();
--
Gitblit v1.8.0