From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs | 143 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 136 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
index bd30cea..38ceff3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
@@ -163,7 +163,7 @@
X = Application.GetRealWidth(58),
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
TextAlignment = TextAlignment.CenterLeft,
- TextSize = 12,
+ TextSize = 14,
};
rowLayout.AddChidren(btnDateTime);
@@ -187,7 +187,7 @@
{
Width = Application.GetRealWidth(58),
Height = Application.GetRealHeight(58),
- UnSelectedImagePath = "Item/Next.png",
+ UnSelectedImagePath = "Item/RightNext.png",
SelectedImagePath = "Item/Down.png",
};
btnNextFrameLayout.AddChidren(btnNext);
@@ -210,7 +210,7 @@
{
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
TextAlignment = TextAlignment.CenterRight,
- TextSize = 12,
+ TextSize = 14,
Text = "_" + Language.StringByID(R.MyInternationalizationString.Year) + "_" + Language.StringByID(R.MyInternationalizationString.Month) + "_" + Language.StringByID(R.MyInternationalizationString.Day),
};
textDisplayDateFrameLayout.AddChidren(textDisplayDate);
@@ -241,7 +241,7 @@
{
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
TextAlignment = TextAlignment.CenterRight,
- TextSize = 12,
+ TextSize = 14,
Text = "00:00",
};
textDisplayDateFrameLayout.AddChidren(textDisplayTime);
@@ -282,13 +282,72 @@
EventHandler<MouseEventArgs> hander = (sender, e) =>
{
this.midFrameLayout.AddChidren(this.shadowRadiusFrameLayout);
+ this.bottomRadiusFrameLayout.RemoveAll();
this.BottomRadiusFrameLayout(this);
-
var mUIPickerView = new UIPickerView()
{
X = Application.GetRealWidth(0),
};
this.bottomRadiusFrameLayout.AddChidren(mUIPickerView);
+
+ var btnTextM = new Button()
+ {
+ Width = Application.GetRealWidth(0),
+ Height = Application.GetRealHeight(58),
+ Y = Application.GetRealHeight(372),
+ Text= "鏈�",
+ TextSize=14,
+ TextColor=ZigbeeColor.Current.XMBlack,
+ };
+ this.bottomRadiusFrameLayout.AddChidren(btnTextM);
+ var btnTextD = new Button()
+ {
+ Width = Application.GetRealWidth(0),
+ Height = Application.GetRealHeight(58),
+ Y = Application.GetRealHeight(372),
+ Text = "鏃�",
+ TextColor = ZigbeeColor.Current.XMBlack,
+ TextSize = 14,
+ };
+ this.bottomRadiusFrameLayout.AddChidren(btnTextD);
+
+ var btnLine1 = new FrameLayout()
+ {
+ Width = Application.GetRealWidth(0),
+ Height = 2,
+ Y = Application.GetRealHeight(161 + 177),
+ BackgroundColor =Shared.Common.ZigbeeColor.Current.XMRowLine,
+ };
+ this.bottomRadiusFrameLayout.AddChidren(btnLine1);
+
+ var btnLine2 = new FrameLayout()
+ {
+ Width = Application.GetRealWidth(0),
+ Height = btnLine1.Height,
+ X = Application.GetRealWidth(246+588),
+ Y = btnLine1.Y,
+ BackgroundColor =Shared.Common.ZigbeeColor.Current.XMRowLine,
+ };
+ this.bottomRadiusFrameLayout.AddChidren(btnLine2);
+
+ var btnLine3 = new FrameLayout()
+ {
+ Width = Application.GetRealWidth(0),
+ Height = 2,
+ Y = Application.GetRealHeight(161 + 269),
+ BackgroundColor =Shared.Common.ZigbeeColor.Current.XMRowLine,
+ };
+ this.bottomRadiusFrameLayout.AddChidren(btnLine3);
+
+ var btnLine4 = new FrameLayout()
+ {
+ Width = Application.GetRealWidth(0),
+ Height = btnLine3.Height,
+ X = btnLine2.X,
+ Y = btnLine3.Y,
+ BackgroundColor =Shared.Common.ZigbeeColor.Current.XMRowLine,
+ };
+ this.bottomRadiusFrameLayout.AddChidren(btnLine4);
if (curIndex == 0)
{
@@ -318,15 +377,56 @@
for (int m = 1; m < 13; m++)
{
mList2.Add(m.ToString());
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ btnTextM.Width = Application.GetRealWidth(100);
+ if (setTimeType != "DoorLockTime")
+ {
+ btnTextM.X = Application.GetRealWidth(418);
+ }
+ else
+ {
+ btnTextM.X = Application.GetRealWidth(566);
+ }
+
+ }
+ else
+ {
+ btnTextM.Width = Application.GetRealWidth(0);
+ }
+
}
for (int d = 1; d < days + 1; d++)
{
mList3.Add(d.ToString());
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ btnTextD.Width = Application.GetRealWidth(100);
+ if (setTimeType != "DoorLockTime")
+ {
+ btnTextD.X = Application.GetRealWidth(710);
+ }
+ else
+ {
+ btnTextD.X = Application.GetRealWidth(922);
+ }
+ }
+ else
+ {
+ btnTextD.Width = Application.GetRealWidth(0);
+ }
}
if (setTimeType != "DoorLockTime")
{
mUIPickerView.setNPicker(mList2, mList3, null);
+ mUIPickerView.Width = Application.GetRealWidth(588);
+ mUIPickerView.X = Application.GetRealWidth(246);
+ btnLine1.Width=btnLine2.Width= btnLine3.Width = btnLine4.Width = Application.GetRealWidth(250);
+ btnLine1.Y = Application.GetRealHeight(161 + 177+15);
+ btnLine2.Y = Application.GetRealHeight(161 + 177 + 15);
+ btnLine3.Y = Application.GetRealHeight(161 + 269+15);
+ btnLine4.Y = Application.GetRealHeight(161 + 269 + 15);
mUIPickerView.setCurrentItems(dtNow.Month - 1, dtNow.Day - 1, 0);
curMonth = dtNow.Month;
curDay = dtNow.Day;
@@ -373,12 +473,16 @@
timeSetAction();
}
this.shadowRadiusFrameLayout.RemoveFromParent();
+ this.bottomRadiusFrameLayout.RemoveFromParent();
MidFrameLayoutContent();
};
}
else
{
mUIPickerView.setNPicker(mList1, mList2, mList3);
+ mUIPickerView.Width = Application.GetRealWidth(1080);
+ mUIPickerView.X = Application.GetRealWidth(0);
+ btnLine1.Width = btnLine2.Width = btnLine3.Width = btnLine4.Width = Application.GetRealWidth(0);
mUIPickerView.setCurrentItems(dtNow.Year, dtNow.Month - 1, dtNow.Day - 1);
curYear = dtNow.Year;
curMonth = dtNow.Month;
@@ -394,7 +498,7 @@
curHour = dtNow.Hour;
curMin = dtNow.Minute;
curSec = dtNow.Second;
- }
+ }
}
Action dAction = () =>
@@ -408,16 +512,37 @@
for (int d = 1; d < days + 1; d++)
{
mList3.Add(d.ToString());
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ btnTextD.Width = Application.GetRealWidth(100);
+ if (setTimeType != "DoorLockTime")
+ {
+ btnTextD.X = Application.GetRealWidth(710);
+ }
+ else
+ {
+ btnTextD.X = Application.GetRealWidth(922);
+ }
+ }
+ else
+ {
+ btnTextD.Width = Application.GetRealWidth(0);
+ }
}
-
if (setTimeType != "DoorLockTime")
{
mUIPickerView.setNPicker(mList2, mList3, null);
+ mUIPickerView.Width = Application.GetRealWidth(588);
+ mUIPickerView.X = Application.GetRealWidth(246);
+ btnLine1.Width = btnLine2.Width = btnLine3.Width = btnLine4.Width = Application.GetRealWidth(250);
mUIPickerView.setCurrentItems(curMonth - 1, curDay - 1, 0);
}
else
{
mUIPickerView.setNPicker(mList1, mList2, mList3);
+ mUIPickerView.Width = Application.GetRealWidth(1080);
+ mUIPickerView.X = Application.GetRealWidth(0);
+ btnLine1.Width = btnLine2.Width = btnLine3.Width = btnLine4.Width = Application.GetRealWidth(0);
mUIPickerView.setCurrentItems(curYear, curMonth - 1, curDay - 1);
}
}
@@ -477,6 +602,9 @@
}
}
mUIPickerView.setNPicker(mList1, mList2, null);
+ mUIPickerView.Width = Application.GetRealWidth(588);
+ mUIPickerView.X = Application.GetRealWidth(246);
+ btnLine1.Width = btnLine2.Width = btnLine3.Width = btnLine4.Width = Application.GetRealWidth(250);
mUIPickerView.setCurrentItems(dtNow.Hour, dtNow.Minute, 0);
if (CurentDoorLockTime != null)
{
@@ -545,6 +673,7 @@
timeSetAction();
}
this.shadowRadiusFrameLayout.RemoveFromParent();
+ this.bottomRadiusFrameLayout.RemoveFromParent();
MidFrameLayoutContent();
};
}
--
Gitblit v1.8.0