From b5f348ec1381a8b05d00e585a3e156381f751d72 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 十二月 2020 15:40:11 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs | 1 -
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 4 ++--
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeHorizonView.cs | 1 +
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 18 +++++++-----------
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs | 2 --
.vs/HDL_APP_Project/xs/sqlite3/storage.ide | 0
HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs | 2 +-
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs | 18 +++++++++++-------
8 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
index b86f705..9498c02 100644
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
Binary files differ
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
index 353be15..eedaf35 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
@@ -57,7 +57,6 @@
MainPage.BasePageView.AddChidren(funTpye);
funTpye.Show(LogicMethod.condition_if);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-
};
#endregion
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index 2e1e555..d9ebfb3 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -124,7 +124,7 @@
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) =>
{
@@ -232,7 +232,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();
@@ -320,35 +320,31 @@
{
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)) {
+ if (selecetdBtn.Text == Language.StringByID(StringId.monthly)|| selecetdBtn.Text == 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";
}
//閫変腑淇濆瓨涔嬪悗鏄剧ず鏂囨湰
- button.Text = weekName;
+ button.Text = selecetdBtn.Text;
//绉婚櫎fLayout鐣岄潰
fLayout.RemoveFromParent();
};
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 33fc008..86ebc92 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -196,7 +196,7 @@
/// <returns></returns>
public static HDL_ON.Entity.Function GetDevice(string sid)
{
- HDL_ON.Entity.Function device = new Entity.Function() { name= "Unknown",sid="璁惧涓嶅瓨鍦�"};
+ HDL_ON.Entity.Function device = new Entity.Function() { name= "Unknown"};
List<HDL_ON.Entity.Function> deviceLists = GetGatewayDeviceList();
foreach (var dev in deviceLists)
{
@@ -216,7 +216,7 @@
/// <returns></returns>
public static HDL_ON.Entity.Scene GetSecne(string sid)
{
- HDL_ON.Entity.Scene scene = new Entity.Scene() { name = "Unknown", sid = "鍦烘櫙涓嶅瓨鍦�" };
+ HDL_ON.Entity.Scene scene = new Entity.Scene() { name = "Unknown"};
List<HDL_ON.Entity.Scene> sceneLists = GetSceneList();
foreach (var sce in sceneLists)
{
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs
index 96ba3a1..13afea6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs
@@ -94,8 +94,6 @@
TextID = StringId.Del,
TextSize = LogicView.TextSize.text16,
TextColor = CSS.CSS_Color.view,
- Gravity = Gravity.Center,
- TextAlignment = TextAlignment.Center,
};
public Button btnClick = new Button
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeHorizonView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeHorizonView.cs
index 2d1aa45..14ca130 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeHorizonView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeHorizonView.cs
@@ -68,6 +68,7 @@
Height = Application.GetRealHeight(17),
X = Application.GetRealWidth(20),
Y = Application.GetRealHeight(58),
+ TextAlignment=TextAlignment.CenterLeft,
};
/// <summary>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs
index 0fd5f05..28ddfa1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TimeView.cs
@@ -15,17 +15,18 @@
Width = Application.GetRealWidth(343),
X = Application.GetRealWidth(16),
BackgroundColor = CSS.CSS_Color.view,
- Radius=(uint)Application.GetRealHeight(12),
+ Radius =(uint)Application.GetRealHeight(12),
};
/// <summary>
/// 鏃堕棿鎺т欢UIPickerView
/// </summary>
public UIPickerView mUIPickerView = new UIPickerView
{
- //Y = Application.GetRealHeight(44),
+ X= Application.GetRealWidth(12),
Height = Application.GetRealHeight(297),
- Width = Application.GetRealWidth(343),
- BackgroundColor = CSS.CSS_Color.viewTranslucence,
+ Width = Application.GetRealWidth(343-12*2),
+ BackgroundColor =CSS.CSS_Color.viewTranslucence,
+ Radius = (uint)Application.GetRealHeight(12),
};
/// <summary>
@@ -39,7 +40,8 @@
Width = Application.GetRealWidth(52),
Height = Application.GetRealHeight(32),
Y = Application.GetRealHeight(6),
- X = Application.GetRealWidth(8)
+ X = Application.GetRealWidth(8),
+
};
/// <summary>
/// 纭畾Btn
@@ -62,7 +64,8 @@
BackgroundColor = CSS.CSS_Color.viewLine,
Width = Application.GetRealWidth(343),
Height = 1,
- Y = Application.GetRealWidth(44)
+ Y = Application.GetRealWidth(44),
+
};
/// <summary>
/// 鏃堕棿View鐨勬柟娉�
@@ -70,11 +73,12 @@
/// <returns></returns>
public void FLayoutView(FrameLayout fLayout)
{
+
+ fLayout.AddChidren(frameLayout);
frameLayout.AddChidren(mUIPickerView);
frameLayout.AddChidren(btnCancel);
frameLayout.AddChidren(btnConfirm);
frameLayout.AddChidren(btnLine);
- fLayout.AddChidren(frameLayout);
}
/// <summary>
/// 鑾峰彇1-24灏忔椂鍒楄〃
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
index f8a497a..14a41da 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
@@ -96,7 +96,7 @@
fLayout.RemoveFromParent();
};
//鍙栨秷鐐瑰嚮浜嬩欢
- timePointView.btnCancel.MouseUpEventHandler += removefLayout;
+ timePointView.btnCancel.MouseUpEventHandler += removefLayout;
//鍔犺浇鏁版嵁鐣岄潰鐨勮缃柟娉�(鍒楄〃浜掍笉鑱斿姩)
timePointView.mUIPickerView.setNPicker(timePointView.GethStringList(), timePointView.GetmStringList(), null);
--
Gitblit v1.8.0