From 05adbc074259c66c7dd62bc9d9d60aadbb86df2d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 02 四月 2021 14:02:28 +0800
Subject: [PATCH] 2021-04-02 1.获取功能介绍增加英文适配
---
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index 2fee51d..7cdf979 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(427),//667
+ Height = Application.GetRealHeight(240),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
div.AddChidren(bodyView);
@@ -495,24 +495,25 @@
{
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 +533,8 @@
row = new FrameLayout()
{
Height = Application.GetRealHeight(56),
+ Width = Application.GetRealWidth(296),
+ Gravity = Gravity.CenterHorizontal,
};
contentView.AddChidren(row);
}
@@ -570,7 +573,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;
@@ -611,8 +617,8 @@
btn.MouseUpEventHandler = (sender, e) =>
{
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add(FunctionAttributeKey.Key, attr.key);
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(attr.key, "");
Control.Ins.SendWriteCommand(device, d);
new System.Threading.Thread(() =>
@@ -630,11 +636,6 @@
index++;
}
-
-
-
-
-
dialog.Show();
}
--
Gitblit v1.8.0