From a45fe56aeeac8f28a9891b83362954067c8166dc Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 14 八月 2020 09:07:05 +0800
Subject: [PATCH] 请合并新代码，更改多功能面板绑定表重复问题
---
ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
index 867e73b..232bbd8 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DelayTime.cs
@@ -31,12 +31,12 @@
var middle = new FrameLayout
{
Y = view.topRowLayout.Bottom,
- Height = Application.GetRealHeight(1920 - 184),
+ Height = Application.GetRealHeight(Method.H - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
- var blancolor = new FrameLayout
+ var blancolorFl = new FrameLayout
{
Width = Application.GetMinRealAverage(200),
Height = Application.GetMinRealAverage(200),
@@ -45,32 +45,32 @@
Radius = (uint)Application.GetMinRealAverage(100),
X = Application.GetRealWidth(440),
};
- middle.AddChidren(blancolor);
- var color = new FrameLayout
+ middle.AddChidren(blancolorFl);
+ var colorBtn = new Button
{
- Width = blancolor.Width - Application.GetMinRealAverage(24),
- Height = blancolor.Height - Application.GetMinRealAverage(24),
- Y = Application.GetRealHeight(12),
+ Width = Application.GetMinRealAverage(200-24),
+ Height =Application.GetMinRealAverage(200-24),
+ X = Application.GetMinRealAverage(12),
+ Y = Application.GetMinRealAverage(12),
BackgroundColor = 0xFFFEF1ED,
- Radius = (uint)Application.GetMinRealAverage(86),
- X = Application.GetRealWidth(12),
+ Radius = (uint)Application.GetMinRealAverage(88),
};
- blancolor.AddChidren(color);
+ blancolorFl.AddChidren(colorBtn);
var btnicon = new Button
{
- X = Application.GetRealWidth(48),
- Width = Application.GetRealWidth(80),
- Height = Application.GetRealHeight(80),
- Y = Application.GetRealHeight(48),
+ X = Application.GetMinRealAverage(58),
+ Y = Application.GetMinRealAverage(58),
+ Width = Application.GetMinRealAverage(84),
+ Height = Application.GetMinRealAverage(84),
UnSelectedImagePath = "ZigeeLogic/delay.png",
};
- color.AddChidren(btnicon);
+ blancolorFl.AddChidren(btnicon);
var titleText = new Button
{
- Width = Application.GetMinRealAverage(580),
- Height = Application.GetMinRealAverage(60),
+ Width = Application.GetRealWidth(580),
+ Height = Application.GetRealHeight(60),
X = Application.GetRealWidth(250),
- Y = blancolor.Bottom + Application.GetRealHeight(50),
+ Y = blancolorFl.Bottom + Application.GetRealHeight(50),
TextID = MyInternationalizationString.createtimetext,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextSize = 15,
@@ -91,12 +91,14 @@
{
Y = Application.GetRealHeight(50),
Height = Application.GetRealHeight(600),
+ //Width=Application.GetRealWidth(1080-400),
+ //X=Application.GetRealWidth(200),
};
PickerViewfra.AddChidren(mUIPickerView);
var mList1 = new List<string>();
var mList2 = new List<string>();
- for (int i = 0; i < 61; i++)
+ for (int i = 0; i < 60; i++)
{
if (i < 10)
{
@@ -111,7 +113,8 @@
}
}
- mUIPickerView.setNPicker(mList1, mList2, new List<string>());
+
+ mUIPickerView.setNPicker(mList1, mList2,null);
///榛樿鐘舵��
mUIPickerView.setCurrentItems(0, 5, 0);
int timevalue = 5;
@@ -146,6 +149,9 @@
};
+
+
+
var btnsave = new Button
{
Y = PickerViewfra.Height - Application.GetRealHeight(260),
--
Gitblit v1.8.0