From 9c8baf7e7e1169ebdf7d5f7ed33ab29dd5fcbf18 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 14 十二月 2020 17:45:17 +0800
Subject: [PATCH] 2020-12-14 1.解锁设置问题修复，增加面容ID验证。2.错误码对接增加。
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 409 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 205 insertions(+), 204 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index c877f26..4f2c328 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -23,7 +23,7 @@
{
RemoveFromParent();
};
- if (string.IsNullOrEmpty(Logic.currlogic.sid))
+ if (string.IsNullOrEmpty(Logic.currlogic.userLogicId))
{
topView.topNameBtn.TextID = StringId.newAutomation;
topView.setBtn.Visible = false;
@@ -35,7 +35,8 @@
topView.setBtn.Visible = true;
topView.clickSetBtn.Visible = true;
}
- topView.clickSetBtn.MouseUpEventHandler += (sender,e) => {
+ topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
+ {
Set set = new Set();
MainPage.BasePageView.AddChidren(set);
set.Show();
@@ -43,7 +44,7 @@
};
- VerticalScrolViewLayout viewLayout = new VerticalScrolViewLayout
+ VerticalScrolViewLayout viewLayout = new VerticalScrolViewLayout
{
Y = Application.GetRealHeight(64),
Width = Application.GetRealWidth(LogicView.TextSize.view375),
@@ -97,6 +98,7 @@
LogicView.LogicTypeTitleView titleOutpu = new LogicView.LogicTypeTitleView();
titleOutpu.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
titleOutpu.btnText.TextID = StringId.theFollowingActions;
+ titleOutpu.btnNextIcon.Visible = false;
viewLayout.AddChidren(titleOutpu.FLayoutView());
//鐩爣澶勭悊鏂规硶
InpOrOutLogicMethod.OutputTarget(this, viewLayout);
@@ -122,16 +124,12 @@
LogicView.LogicTypeTitleView cyclicTitle = new LogicView.LogicTypeTitleView();
cyclicTitle.frameLayout.Height = Application.GetRealHeight(50);
cyclicTitle.frameLayout.Radius = (uint)Application.GetRealHeight(12);
- cyclicTitle.btnText.TextID = StringId.days;
+ cyclicTitle.btnText.Text = MainView.GetWeekText(Logic.currlogic);
viewLayout.AddChidren(cyclicTitle.FLayoutView());
cyclicTitle.btnClick.MouseUpEventHandler += (sender, e) =>
{
- FrameLayout fLayout = new FrameLayout
- {
- BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
- };
- this.AddChidren(fLayout);
- DateMethod(fLayout, cyclicTitle.btnText);
+
+ DateMethod(cyclicTitle.btnText);
};
@@ -140,19 +138,24 @@
#region 鎵ц鎺ㄩ�� 鍙戦�侀�氱煡
///涓婁笅闂撮殧12鍍忕礌
viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(12) });
- ///鎵ц鎺ㄩ�乮ew
- LogicView.LogicTypeTitleView push = new LogicView.LogicTypeTitleView();
- push.frameLayout.Height = Application.GetRealHeight(50);
- push.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
- push.btnText.TextID = StringId.push;
- viewLayout.AddChidren(push.FLayoutView());
- ///鍙戦�侀�氱煡View
- LogicView.LogicTypeTitleView notification = new LogicView.LogicTypeTitleView();
- notification.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
- notification.btnText.TextID = StringId.notification;
- viewLayout.AddChidren(notification.FLayoutView());
- ///涓婁笅闂撮殧62鍍忕礌
- viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(62) });
+ /////鎵ц鎺ㄩ�乮ew
+ //LogicView.LogicTypeTitleView push = new LogicView.LogicTypeTitleView();
+ //push.frameLayout.Height = Application.GetRealHeight(50);
+ //push.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ //push.btnText.TextID = StringId.push;
+ //push.btnNextIcon.Width = Application.GetMinRealAverage(36);
+ //push.btnNextIcon.Height = Application.GetMinRealAverage(36);
+ //push.btnNextIcon.X = Application.GetRealWidth(305);
+ //push.btnNextIcon.UnSelectedImagePath = "LogicIcon/off.png";
+ //push.btnNextIcon.SelectedImagePath = "LogicIcon/on.png";
+ //viewLayout.AddChidren(push.FLayoutView());
+ /////鍙戦�侀�氱煡View
+ //LogicView.LogicTypeTitleView notification = new LogicView.LogicTypeTitleView();
+ //notification.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
+ //notification.btnText.TextID = StringId.notification;
+ //viewLayout.AddChidren(notification.FLayoutView());
+ /////涓婁笅闂撮殧62鍍忕礌
+ //viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(62) });
#endregion
#region 淇濆瓨
@@ -162,50 +165,47 @@
this.AddChidren(saveView.FLayoutView());
saveView.btnClick.MouseUpEventHandler += (sender, e) =>
{
+ if (string.IsNullOrEmpty(Logic.currlogic.userLogicId))
+ {
+ List<string> list = new List<string>();
+ foreach (var logic in Logic.LogicList)
+ {
+ list.Add(logic.name);
+ }
+ new LogicView.TipPopView().InputBox(StringId.editName, Logic.currlogic.name, StringId.nameNull, StringId.NameAlreadyExists, list, (logicName) =>
+ {
+ Logic.currlogic.name = logicName;
+ Logic.currlogic.sid = LogicMethod.NewSid();
+ //鍙戦�佹柊鍔犱慨鏀归�昏緫鍛戒护锛�
+ var responsePackNew = Send.AddLogic(Logic.currlogic);
+ if (responsePackNew.Code == "0")
+ {
+ Logic.LogicList.Add(Logic.currlogic);
+ LogicMethod.RemoveAllView();
+ MainView.MainShow();
+ }
+ else
+ {
+ new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.saveFail));
+ }
- Logic.currlogic.sid = "000101000000000A0A0100CC1100";
- //Logic.currlogic.sid = LogicMethod.NewSid();
- //var f = Send.AddLogic(Logic.currlogic);
+ });
- //var a = Send.getLogicIdList();
-
- //var d = Send.getLogic(Logic.currlogic);
-
- // var c = Send.delLogic(Logic.currlogic);
-
- var e1= Send.switchLogic(Logic.currlogic);
-
-
-
- //if (string.IsNullOrEmpty(Logic.currlogic.sid))
- //{
- // List<string> list = new List<string>();
- // foreach (var logic in Logic.LogicList)
- // {
- // list.Add(logic.name);
- // }
- // new LogicView.TipPopView().InputBox(StringId.editName, Logic.currlogic.name, StringId.nameNull, StringId.NameAlreadyExists, list, (logicName) =>
- // {
- // Logic.currlogic.name = logicName;
- // Logic.currlogic.sid = LogicMethod.NewSid();
- // var responsePackNew = Send.AddLogic(Logic.currlogic);
- // if (responsePackNew.Code == "0")
- // {
- // Logic.LogicList.Add(Logic.currlogic);
- // LogicMethod.RemoveAllView();
- // MainView.MainShow();
- // }
- // //鍙戦�佹柊鍔犱慨鏀归�昏緫鍛戒护锛�
-
- // });
-
- //}
- //else
- //{
- // LogicMethod.RemoveAllView();
- // MainView.MainShow();
- // //鍙戦�佹柊鍔犱慨鏀归�昏緫鍛戒护锛�
- //}
+ }
+ else
+ {
+ //鍙戦�佹柊鍔犱慨鏀归�昏緫鍛戒护锛�
+ var responsePackNew = Send.updateLogic(Logic.currlogic);
+ if (responsePackNew.Code == "0")
+ {
+ LogicMethod.RemoveAllView();
+ MainView.MainShow();
+ }
+ else
+ {
+ new LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.saveFail));
+ }
+ }
};
#endregion
@@ -214,11 +214,14 @@
/// <summary>
/// 寰幆鏂瑰紡(姣忓ぉ锛屾瘡鏈堛�傘��)
/// </summary>
- /// <param name="fLayout">寮规涓绘帶浠�</param>
/// <param name="button">鏄剧ず鏂囨湰</param>
- public void DateMethod(FrameLayout fLayout, Button button)
+ public void DateMethod(Button button)
{
-
+ FrameLayout fLayout = new FrameLayout
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+ };
+ this.AddChidren(fLayout);
LogicView.DateView dateView = new LogicView.DateView();
dateView.btnTitle.TextID = StringId.cyclic;
dateView.FLayoutView(fLayout, 4);
@@ -230,7 +233,7 @@
//瀹氫箟涓�涓眬閮ㄥ彉閲忚褰曢�変腑鏂囨湰鐘舵��
string weekName = "";
//瀹氫箟涓�涓眬閮˙tn鐢ㄦ潵璁板綍閫変腑Btn;
- var selecetdBtn = new Button();
+ var selecetdBtn = new Button() { Text = "" };
for (int i = 0; i < 4; i++)
{
LogicView.SelectTypeView dateTypeView = new LogicView.SelectTypeView();
@@ -243,6 +246,7 @@
dateTypeView.btnLine.Width = Application.GetRealWidth(303);
dateView.frameLayout.AddChidren(dateTypeView.FLayoutView());
dateTypeView.btnClick.Tag = i;//鏍囪绫诲瀷
+
switch (i)
{
case 0:
@@ -317,35 +321,30 @@
{
dateTypeView.btnText.TextColor = CSS.CSS_Color.textConfirmColor;
selecetdBtn = dateTypeView.btnText;
- }
- else if (button.Text == weekName)
- {
- dateTypeView.btnText.TextColor = CSS.CSS_Color.textConfirmColor;
- selecetdBtn = dateTypeView.btnText;
+
}
}
//纭畾淇濆瓨
dateView.btnConfirm.MouseUpEventHandler += (sender3, e3) =>
{
- if (weekName == Language.StringByID(StringId.monthly)|| weekName== Language.StringByID(StringId.weekly)) {
- //鎻愮ず锛氳繕鏈��
- return;
-
- }
-
- if (weekName == Language.StringByID(StringId.performA))
+ if (selecetdBtn.Text == Language.StringByID(StringId.performA))
{
//鎵ц涓�娆�
Logic.currlogic.cycle.type = "once";
}
- else if (weekName == Language.StringByID(StringId.days))
+ else if (selecetdBtn.Text == Language.StringByID(StringId.days))
{
//姣忓ぉ
Logic.currlogic.cycle.type = "day";
}
+ else
+ {
+ //鎻愮ず锛氳繕鏈��
+ return;
+ }
//閫変腑淇濆瓨涔嬪悗鏄剧ず鏂囨湰
- button.Text = weekName;
+ button.Text = selecetdBtn.Text;
//绉婚櫎fLayout鐣岄潰
fLayout.RemoveFromParent();
};
@@ -357,125 +356,35 @@
/// <param name="button">鏄剧ず鏂囨湰</param>
public void WeekMethod(FrameLayout fLayout, Button button)
{
-
- LogicView.DateView weekView = new LogicView.DateView();
- weekView.btnTitle.TextID = StringId.cyclic;
- weekView.FLayoutView(fLayout, 7);
- weekView.btnCancel.MouseUpEventHandler += (sender2, e2) =>
- {
- weekView.frameLayout.RemoveFromParent();
+ List<string> weekStr = new List<string> {
+ Language.StringByID(StringId.monday),
+ Language.StringByID(StringId.tuesday),
+ Language.StringByID(StringId.wednesday),
+ Language.StringByID(StringId.thursday),
+ Language.StringByID(StringId.friday),
+ Language.StringByID(StringId.saturday),
+ Language.StringByID(StringId.sunday),
};
+
//瀹氫箟涓�涓眬閮╳eekList鍒楄〃鐢ㄦ潵璁板綍閫変腑鏁版嵁;
- List<string> weekList = new List<string>();
+ List<string> weekStateList = new List<string>();
+ weekStateList.Clear();
if (Logic.currlogic.cycle.type == "week")
{
+ var list = GetWeekString(Logic.currlogic.cycle.value, "int");
//鍔犺浇涔嬪墠淇濆瓨鐨勬暟鎹�
- weekList.AddRange(Logic.currlogic.cycle.value);
+ weekStateList.AddRange(list);
}
- //瀹氫箟涓�涓眬閮ㄥ彉閲忚褰曢�変腑鏂囨湰鐘舵��
- string weekName = "";
- for (int i = 0; i < 7; i++)
- {
- LogicView.SelectTypeView weekTypeView = new LogicView.SelectTypeView();
- weekTypeView.frameLayout.BackgroundColor = CSS.CSS_Color.viewTranslucence;
- weekTypeView.frameLayout.Y = Application.GetRealHeight(56 + 50 * i);
- weekTypeView.btnIcon.Visible = false;
- weekTypeView.btnText.X = Application.GetRealWidth(20);
- weekTypeView.btnLine.X = Application.GetRealWidth(20);
- weekTypeView.btnLine.Width = Application.GetRealWidth(303);
- weekTypeView.btnNextIcon.X = Application.GetRealWidth(303);
- weekTypeView.btnNextIcon.Width = Application.GetMinRealAverage(28);
- weekTypeView.btnNextIcon.Height = Application.GetMinRealAverage(28);
- weekTypeView.btnNextIcon.UnSelectedImagePath = "LogicIcon/weekoff.png";
- weekTypeView.btnNextIcon.SelectedImagePath = "LogicIcon/weekon.png";
- weekView.frameLayout.AddChidren(weekTypeView.FLayoutView());
- weekTypeView.btnClick.Tag = i;//鏍囪绱㈠紩
- switch (i)
- {
- case 0:
- {
- weekName = Language.StringByID(StringId.monday);
- }
- break;
- case 1:
- {
- weekName = Language.StringByID(StringId.tuesday);
- }
- break;
- case 2:
- {
- weekName = Language.StringByID(StringId.wednesday);
- }
- break;
- case 3:
- {
- weekName = Language.StringByID(StringId.thursday);
- }
- break;
- case 4:
- {
- weekName = Language.StringByID(StringId.friday);
- }
- break;
- case 5:
- {
- weekName = Language.StringByID(StringId.saturday);
- }
- break;
- case 6:
- {
- weekName = Language.StringByID(StringId.sunday);
- }
- break;
+ PublicInterface weekView = new PublicInterface();
+ weekView.MultiSelectShow(fLayout, weekStr, Language.StringByID(StringId.cyclic), weekStateList
+ , (list) =>
+ {
+ var statelist = GetWeekString(list, "str");
+ Logic.currlogic.cycle.type = "week";
+ Logic.currlogic.cycle.value = statelist;
+ button.Text = MainView.GetWeekString(statelist);
- }
- weekTypeView.btnText.Text = weekName;
- if (weekList.Contains(i.ToString()))
- {
- //鏄剧ず涔嬪墠鐨勯�変腑鐘舵��
- weekTypeView.btnNextIcon.IsSelected = true;
- }
- //鏄熸湡鐨勭偣鍑讳簨浠�
- weekTypeView.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- string clickIndex = weekTypeView.btnClick.Tag.ToString();
- weekTypeView.btnClick.IsSelected = !weekTypeView.btnClick.IsSelected;
- if (weekTypeView.btnClick.IsSelected)
- {
- weekTypeView.btnNextIcon.IsSelected = true;
- if (!weekList.Contains(clickIndex))
- {
- //娣诲姞閫変腑鏁版嵁
- weekList.Add(clickIndex);
- }
- }
- else
- {
- weekTypeView.btnNextIcon.IsSelected = false;
- if (weekList.Contains(clickIndex))
- {
- //绉婚櫎閫変腑鏁版嵁
- weekList.Remove(clickIndex);
- }
- }
-
- };
-
- }
- //纭畾鐐瑰嚮浜嬩欢
- weekView.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
- {
- if (weekList.Count == 0)
- {
- //鎻愮ず锛氳繕娌￠�変腑鎵ц鍛ㄦ湡
- return;
- }
- Logic.currlogic.cycle.type = "week";
- Logic.currlogic.cycle.value = weekList;
- button.Text = MainView.GetWeekString(weekList);
- fLayout.RemoveFromParent();
- };
-
+ });
}
/// <summary>
/// 姣忔湀
@@ -504,9 +413,9 @@
{
Button monTextBtn = new Button
{
- Width = Application.GetMinRealAverage(30),
- Height = Application.GetMinRealAverage(30),
- Radius = (uint)Application.GetRealHeight(15),
+ Width = Application.GetRealWidth(30),
+ Height = Application.GetRealWidth(30),
+ Radius = (uint)Application.GetRealWidth(15),
Text = i.ToString(),
TextSize = LogicView.TextSize.text14,
TextColor = CSS.CSS_Color.textColor,
@@ -557,7 +466,8 @@
}
};
- if (monList.Contains(i.ToString())) {
+ if (monList.Contains(i.ToString()))
+ {
monTextBtn.IsSelected = true;
}
}
@@ -575,7 +485,6 @@
fLayout.RemoveFromParent();
};
}
-
/// <summary>
/// 婊¤冻鏉′欢
/// </summary>
@@ -583,6 +492,8 @@
/// <param name="button">鏄剧ず鏂囨湰</param>
public void AndOrMethod(FrameLayout fLayout, Button button)
{
+
+
LogicView.DateView meetTheConditionView = new LogicView.DateView();
meetTheConditionView.btnTitle.TextID = StringId.meetTheCondition;
meetTheConditionView.FLayoutView(fLayout, 2);
@@ -602,8 +513,8 @@
andConditionViews.btnLine.X = Application.GetRealWidth(20);
andConditionViews.btnLine.Width = Application.GetRealWidth(303);
andConditionViews.btnNextIcon.X = Application.GetRealWidth(303);
- andConditionViews.btnNextIcon.Width = Application.GetMinRealAverage(28);
- andConditionViews.btnNextIcon.Height = Application.GetMinRealAverage(28);
+ andConditionViews.btnNextIcon.Width = Application.GetRealWidth(28);
+ andConditionViews.btnNextIcon.Height = Application.GetRealWidth(28);
andConditionViews.btnNextIcon.UnSelectedImagePath = "LogicIcon/weekoff.png";
andConditionViews.btnNextIcon.SelectedImagePath = "LogicIcon/weekon.png";
meetTheConditionView.frameLayout.AddChidren(andConditionViews.FLayoutView());
@@ -618,8 +529,8 @@
orConditionView.btnLine.X = Application.GetRealWidth(20);
orConditionView.btnLine.Width = Application.GetRealWidth(303);
orConditionView.btnNextIcon.X = Application.GetRealWidth(303);
- orConditionView.btnNextIcon.Width = Application.GetMinRealAverage(28);
- orConditionView.btnNextIcon.Height = Application.GetMinRealAverage(28);
+ orConditionView.btnNextIcon.Width = Application.GetRealWidth(28);
+ orConditionView.btnNextIcon.Height = Application.GetRealWidth(28);
orConditionView.btnNextIcon.UnSelectedImagePath = "LogicIcon/weekoff.png";
orConditionView.btnNextIcon.SelectedImagePath = "LogicIcon/weekon.png";
meetTheConditionView.frameLayout.AddChidren(orConditionView.FLayoutView());
@@ -668,7 +579,97 @@
};
}
+ /// <summary>
+ /// 鏄熸湡鍛ㄦ湡杞崲鍊肩殑鏂规硶
+ /// </summary>
+ /// <param name="list"></param>
+ /// <param name="str_or_int"></param>
+ /// <returns></returns>
+ public List<string> GetWeekString(List<string> list, string str_or_int)
+ {
+ string weekTextName = "";
+ List<string> stateList = new List<string>();
+ for (int i = 0; i < list.Count; i++)
+ {
+ var s = list[i];
+ if (str_or_int == "int")
+ {
+ switch (s)
+ {
+ case "1":
+ {
+ weekTextName = Language.StringByID(StringId.monday);
+ }
+ break;
+ case "2":
+ {
+ weekTextName = Language.StringByID(StringId.tuesday);
+ }
+ break;
+ case "3":
+ {
+ weekTextName = Language.StringByID(StringId.wednesday);
+ }
+ break;
+ case "4":
+ {
+ weekTextName = Language.StringByID(StringId.thursday);
+ }
+ break;
+ case "5":
+ {
+ weekTextName = Language.StringByID(StringId.friday);
+ }
+ break;
+ case "6":
+ {
+ weekTextName = Language.StringByID(StringId.saturday);
+ }
+ break;
+ case "0":
+ {
+ weekTextName = Language.StringByID(StringId.sunday);
+ }
+ break;
+ }
+ }
+ else
+ {
+ if (Language.StringByID(StringId.monday) == s)
+ {
+ weekTextName = "1";
+ }
+ else if (Language.StringByID(StringId.tuesday) == s)
+ {
+ weekTextName = "2";
+ }
+ else if (Language.StringByID(StringId.wednesday) == s)
+ {
+ weekTextName = "3";
+ }
+ else if (Language.StringByID(StringId.thursday) == s)
+ {
+ weekTextName = "4";
+ }
+ else if (Language.StringByID(StringId.friday) == s)
+ {
+ weekTextName = "5";
+ }
+ else if (Language.StringByID(StringId.saturday) == s)
+ {
+ weekTextName = "6";
+ }
+ else if (Language.StringByID(StringId.sunday) == s)
+ {
+ weekTextName = "0";
+ }
+ }
+ stateList.Add(weekTextName);
+ }
+
+ return stateList;
+ }
}
}
--
Gitblit v1.8.0