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 | 105 +++++++++++++++++++++++-----------------------------
1 files changed, 46 insertions(+), 59 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index 757f209..1b9285f 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -52,6 +52,9 @@
viewLayout.AddChidren(addInputTextView.FLayoutView(46, 12));
///婊¤冻浠ヤ笅鏉′欢鐨刅iew
LogicView.LogicTypeTitleView titleCondition = new LogicView.LogicTypeTitleView();
+ titleCondition.btnText.Width = Application.GetRealWidth(300);
+ titleCondition.btnText.Height = Application.GetRealHeight(28);
+ titleCondition.btnText.IsMoreLines = true;
titleCondition.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
titleCondition.btnText.TextID = StringId.andCondition;
viewLayout.AddChidren(titleCondition.FLayoutView());
@@ -129,8 +132,8 @@
notification.btnText.TextID = StringId.notification;
notification.btnLine.BackgroundColor = CSS.CSS_Color.textWhiteColor;
viewLayout.AddChidren(notification.FLayoutView());
-
- if (Logic.currlogic.pushConfigs.Count > 0)
+ //鏄剧ず涔嬪墠鎺ㄩ�佸紑鍏崇姸鎬�
+ if (Logic.currlogic.noticeConfig.enable)
{
push.btnNextIcon.IsSelected = true;
}
@@ -141,7 +144,7 @@
///涓婁笅闂撮殧62鍍忕礌
viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(40) });
#endregion
-
+
#region 淇濆瓨
///淇濆瓨View
LogicView.SaveView saveView = new LogicView.SaveView();
@@ -188,47 +191,25 @@
DateMethod(cyclicTitle.btnText);
};
///鏄惁瑕佹帹閫佺偣鍑讳簨浠�
- //鍒濆鍖栧璞�
- PushConfigs pushConfigs = new PushConfigs();
- if (Logic.currlogic.pushConfigs.Count > 0)
- {
- pushConfigs = Logic.currlogic.pushConfigs[0];
- }
- else
- {
- if (!string.IsNullOrEmpty(UserInfo.Current.userMobileInfo))
- {
- //榛樿鎺ㄩ�佸綋鍓嶈处鍙�
- pushConfigs.pushTarget.Add(UserInfo.Current.userMobileInfo);
- }
- else
- {
- //榛樿鎺ㄩ�佸綋鍓嶈处鍙�
- pushConfigs.pushTarget.Add(UserInfo.Current.userEmailInfo);
- }
- }
push.btnNextIcon.MouseUpEventHandler += (sender, e) =>
{
- push.btnNextIcon.IsSelected = !push.btnNextIcon.IsSelected;
+ //璐﹀彿鍒楄〃涓虹┖榛樿鎺ㄩ�佸綋鍓嶈处鍙�
+ if (Logic.currlogic.pushConfigs.Count == 0)
+ {
+ //鍒濆鍖栧璞�
+ PushConfigs pushConfigs = new PushConfigs();
+ //榛樿娣诲姞鎺ㄩ�佸綋鍓嶈处鍙�
+ pushConfigs.pushTarget.Add(UserInfo.Current.ID);
+ Logic.currlogic.pushConfigs.Add(pushConfigs);
+ }
+ push.btnNextIcon.IsSelected = !push.btnNextIcon.IsSelected;
if (push.btnNextIcon.IsSelected)
{
- if (Logic.currlogic.pushConfigs.Count > 0)
- {
- //娓呯┖涔嬪墠鏃ч厤缃暟鎹�
- Logic.currlogic.pushConfigs.Clear();
- }
- //澧炲姞閰嶇疆鏁版嵁
- Logic.currlogic.pushConfigs.Add(pushConfigs);
+ Logic.currlogic.noticeConfig.enable = true;
}
else
{
- if (Logic.currlogic.pushConfigs.Count > 0)
- {
- //榛樿鍙栫涓�涓祴鍊�
- pushConfigs = Logic.currlogic.pushConfigs[0];
- //娓呯┖閰嶇疆鏁版嵁
- Logic.currlogic.pushConfigs.Clear();
- }
+ Logic.currlogic.noticeConfig.enable = false;
}
};
///杈撳叆鎺ㄩ�佹枃鏈�
@@ -236,18 +217,13 @@
{
InputPushText inputPushText = new InputPushText();
MainPage.BasePageView.AddChidren(inputPushText);
- inputPushText.Show(pushConfigs);
+ inputPushText.Show();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- inputPushText.action += (pushConfigsIfon) =>
- {
- //璧嬪��
- pushConfigs = pushConfigsIfon;
- };
};
///淇濆瓨鐐瑰嚮浜嬩欢
saveView.btnClick.MouseUpEventHandler += (sender, e) =>
{
- if (Logic.currlogic.input.Count == 0&& Logic.currlogic.output.Count == 0)
+ if (Logic.currlogic.input.Count == 0 && Logic.currlogic.output.Count == 0)
{
new LogicView.TipPopView().TipBox(StringId.tip, StringId.conditioncNullOrtargetNull);
return;
@@ -262,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;
@@ -272,19 +252,21 @@
{
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.GetLogicName(Logic.currlogic), StringId.nameNull, StringId.NameAlreadyExists, list, (logicName, view
) =>
{
Logic.currlogic.name = logicName;
- Logic.currlogic.sid = LogicMethod.NewSid();
+ Logic.currlogic.sid = LogicMethod.CurrLogicMethod.NewSid();
loading.Start();
new System.Threading.Thread(() =>
{
-
try
{
- //鍙戦�佹柊鍔犻�昏緫鍛戒护锛�
- responsePackNew = Send.AddLogic(Logic.currlogic);
+ if (!MainPage.NoLoginMode)
+ {
+ //鍙戦�佹柊鍔犻�昏緫鍛戒护锛�
+ responsePackNew = Send.AddLogic(Logic.currlogic);
+ }
}
catch { }
@@ -293,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++)
@@ -319,7 +307,7 @@
}
Logic.LogicList.Add(Logic.currlogic);
- LogicMethod.RemoveAllView();
+ LogicMethod.CurrLogicMethod.RemoveAllView();
MainView.MainShow();
}
else if (responsePackNew != null && responsePackNew.Code == "14005")
@@ -336,7 +324,7 @@
})
{ IsBackground = true }.Start();
- },()=> { });
+ }, () => { });
}
else
@@ -359,14 +347,14 @@
loading.Hide();
if (responsePackNew != null && responsePackNew.Code == "0")
{
- LogicMethod.RemoveAllView();
+ LogicMethod.CurrLogicMethod.RemoveAllView();
MainView.MainShow();
}
else if (responsePackNew != null && responsePackNew.Code == "14005")
{
new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.gatewayNotOnline));
}
- else
+ else
{
new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.saveFail));
}
@@ -536,7 +524,7 @@
//鍔犺浇涔嬪墠淇濆瓨鐨勬暟鎹�
weekStateList.AddRange(list);
}
- var weekListStr= weekView.GetViewList("week");
+ var weekListStr = weekView.GetViewList("week");
weekView.MultiSelectShow(fLayout, weekListStr, Language.StringByID(StringId.cyclic), weekStateList
, (list) =>
{
@@ -564,7 +552,7 @@
weekView.MonSelectShow(fLayout, Logic.currlogic, (monList) =>
{
//閫変腑鏁版嵁澶勭悊
- string textStr= MainView.GetMonString(monList);
+ string textStr = MainView.GetMonString(monList);
//鏄剧ず閫変腑鏁版嵁
button.Text = textStr;
//灏佽鏁版嵁
@@ -603,8 +591,7 @@
}
-
-
+
}
}
--
Gitblit v1.8.0