From c8c33200e43f05136eca9fc8ff4942f8def31cc6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 18 八月 2021 10:45:40 +0800
Subject: [PATCH] 2021-08-18 1.完善Android对接LinphoneSDK 2.完善SIP相关接口对接
---
HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs | 123 +++++++++++++++++++++++++++-------------
1 files changed, 83 insertions(+), 40 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
index 19b6a60..7bbf196 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/WeatherCondition.cs
@@ -9,36 +9,14 @@
{
Tag = "Logic";
}
- public void Show(bool edit = false, int index=-1)
+ public void Show()
{
#region 鐣岄潰甯冨眬
LogicView.TopView topView = new LogicView.TopView();
topView.frameLayout.Height = Application.GetRealHeight(64 + 20);
this.AddChidren(topView.FLayoutView());
topView.topNameBtn.TextID = StringId.selectionCondition;
- //鑾峰彇瀹藉害
- int widthValue= topView.topNameBtn.GetTextWidth();
- int textWidth =(Application.GetRealWidth(255)- widthValue) / 2;
- Button locationBtn = new Button
- {
- Width = Application.GetRealWidth(18),
- Height = Application.GetRealWidth(18),
- X = Application.GetRealWidth(60+4)+ textWidth + widthValue,
- Y = Application.GetRealHeight(34+1),
- UnSelectedImagePath = "LogicIcon/location.png",
-
- };
- topView.frameLayout.AddChidren(locationBtn);
-
- Button textBtn = new Button
- {
- Height = Application.GetRealHeight(14),
- Y = Application.GetRealHeight(57),
- TextSize = LogicView.TextSize.text10,
- TextColor = CSS.CSS_Color.textCancelColor,
- Text = "骞夸笢骞垮窞甯傜暘绂哄尯鐭虫ゼ闀�",
- };
- topView.frameLayout.AddChidren(textBtn);
+ topView.Location();
topView.clickBackBtn.MouseUpEventHandler += (e, sen) =>
{
RemoveFromParent();
@@ -46,9 +24,9 @@
FrameLayout viewLayout = new FrameLayout
{
- Y = Application.GetRealHeight(64+20),
+ Y = Application.GetRealHeight(64 + 20),
Width = Application.GetRealWidth(LogicView.TextSize.view375),
- Height = Application.GetRealHeight(LogicView.TextSize.view667 - 64-20),
+ Height = Application.GetRealHeight(LogicView.TextSize.view667 - 64 - 20),
BackgroundColor = CSS.CSS_Color.viewMiddle,
};
this.AddChidren(viewLayout);
@@ -61,26 +39,91 @@
};
for (int i = 0; i < list.Count; i++)
{
- LogicView.SelectTypeView timeView = new LogicView.SelectTypeView();
- timeView.frameLayout.Y = Application.GetRealHeight(i * 50);
- timeView.btnIcon.Visible = false;
- timeView.btnText.X = Application.GetRealWidth(16);
- timeView.btnLine.X = Application.GetRealWidth(16);
- timeView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
- timeView.btnText.Text = list[i];
- timeView.btnClick.Tag = list[i];
- viewLayout.AddChidren(timeView.FLayoutView());
+ LogicView.SelectTypeView view = new LogicView.SelectTypeView();
+ view.frameLayout.Y = Application.GetRealHeight(i * 50);
+ view.btnIcon.Visible = false;
+ view.btnNextIcon.Visible = false;
+ view.btnText.X = Application.GetRealWidth(16);
+ view.btnLine.X = Application.GetRealWidth(16);
+ view.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
+ view.btnText.Text = list[i];
+ view.btnClick.Tag = list[i];
+ viewLayout.AddChidren(view.FLayoutView());
- timeView.btnClick.MouseUpEventHandler += (sen, e) =>
+ view.btnClick.MouseUpEventHandler += (sen, e) =>
{
- //string
- //if () { }
- //else if () { }
- //else if () { }
+ string value = "";
+ string text = view.btnClick.Tag.ToString();
+ if (text == Language.StringByID(StringId.clearday))
+ {
+ value = "sunny";
+ }
+ else if (text == Language.StringByID(StringId.cloudy))
+ {
+ value = "cloudy";
+ }
+ else if (text == Language.StringByID(StringId.rain))
+ {
+ value = "rainy";
+ }
+ AddDic(value);
};
}
}
+ /// <summary>
+ /// 灏佽鏁版嵁
+ /// </summary>
+ /// <param name="value"></param>
+ private void AddDic(string value)
+ {
+ Input input = new Input();
+ input.sid = LogicMethod.CurrLogicMethod.NewSid();
+ input.condition_type = "6";
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ LogicMethod.CurrLogicMethod.dictionary(dic, "key", "weather");
+ LogicMethod.CurrLogicMethod.dictionary(dic, "comparator", "=");
+ LogicMethod.CurrLogicMethod.dictionary(dic, "data_type", "string");
+ LogicMethod.CurrLogicMethod.dictionary(dic, "value", value);
+ input.condition.Add(dic);
+ AddCondition(input);
+ }
+ /// <summary>
+ /// 娣诲姞鏉′欢
+ /// </summary>
+ /// <param name="input"></param>
+ private void AddCondition(Input input)
+ {
+ ///璁板綍绱㈠紩鍊�
+ int index = -1;
+ for (var i = 0; i < Logic.currlogic.input.Count; i++)
+ {
+ var condition_type = Logic.currlogic.input[i].condition_type;
+ if (condition_type == "6")
+ {
+ ///鎵惧埌鏍囪绱㈠紩锛岄��鍑哄惊鐜綋
+ index = i;
+ break;
+ }
+ }
+ if (index != -1)
+ {
+ //绉婚櫎鏃ф暟鎹�
+ Logic.currlogic.input.RemoveAt(index);
+ //鏂版暟鎹彃鍏ユ棫鏁版嵁鐨勪綅缃�
+ Logic.currlogic.input.Insert(index, input);
+ }
+ else
+ {
+ Logic.currlogic.input.Add(input);
+ }
+ LogicMethod.CurrLogicMethod.RemoveAllView();
+ AddLogic addLogic = new AddLogic();
+ MainPage.BasePageView.AddChidren(addLogic);
+ addLogic.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
+ }
}
}
--
Gitblit v1.8.0