From 9463fa981945f278a639a1303192272732415f22 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 09:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index 61b56a6..8519535 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -485,8 +485,8 @@
var bodyView = new FrameLayout()
{
- Y = Application.GetRealHeight(463),
- Height = Application.GetRealHeight(375),
+ Y = Application.GetRealHeight(423),
+ Height = Application.GetRealHeight(296),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
div.AddChidren(bodyView);
@@ -495,24 +495,26 @@
{
Y = Application.GetRealHeight(16),
Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(296),
+ Width = Application.GetRealWidth(296+200),
+
};
bodyView.AddChidren(contentView);
- var row = new FrameLayout()
- {
- Height = Application.GetRealHeight(60),
- };
- contentView.AddChidren(row);
+ var row = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(60),
+ Width = Application.GetRealWidth(296),
+ Gravity = Gravity.CenterHorizontal,
+ };
+ contentView.AddChidren(row);
- int index = 0;
+ int index = 0;
List<FunctionAttributes> attrList = new List<FunctionAttributes>();
attrList.AddRange(device.attributes);
attrList.Add(new FunctionAttributes() {
key = "+",
});
-
foreach (var attr in attrList)
{
@@ -532,6 +534,8 @@
row = new FrameLayout()
{
Height = Application.GetRealHeight(56),
+ Width = Application.GetRealWidth(296),
+ Gravity = Gravity.CenterHorizontal,
};
contentView.AddChidren(row);
}
@@ -570,7 +574,10 @@
btnAdd.MouseUpEventHandler = (sender, e) =>
{
dialog.Close();
- var addButton = new AcControlPage_AddIrButton();
+ Action action = () => {
+ LoadDialog_IrMoreView();
+ };
+ var addButton = new AcControlPage_AddIrButton(action);
MainPage.BasePageView.AddChidren(addButton);
addButton.Show(device);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -630,11 +637,6 @@
index++;
}
-
-
-
-
-
dialog.Show();
}
--
Gitblit v1.8.0