From 737c036a39176fd2085ce82b7c60391da8cb508c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 31 十二月 2019 19:17:47 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs | 138 +++++-----------------------------------------
1 files changed, 15 insertions(+), 123 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
index 38ceff3..fc8cfbd 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 = 14,
+ TextSize = 12,
};
rowLayout.AddChidren(btnDateTime);
@@ -210,7 +210,7 @@
{
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
TextAlignment = TextAlignment.CenterRight,
- TextSize = 14,
+ TextSize = 12,
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 = 14,
+ TextSize = 12,
Text = "00:00",
};
textDisplayDateFrameLayout.AddChidren(textDisplayTime);
@@ -290,65 +290,6 @@
};
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)
{
//鏃ユ湡
@@ -376,57 +317,30 @@
}
for (int m = 1; m < 13; m++)
{
- mList2.Add(m.ToString());
- if (Language.CurrentLanguage == "Chinese")
+ if(Language .CurrentLanguage == "Chinese")
{
- btnTextM.Width = Application.GetRealWidth(100);
- if (setTimeType != "DoorLockTime")
- {
- btnTextM.X = Application.GetRealWidth(418);
- }
- else
- {
- btnTextM.X = Application.GetRealWidth(566);
- }
-
+ mList2.Add(m.ToString()+"鏈�");
}
else
{
- btnTextM.Width = Application.GetRealWidth(0);
- }
-
+ mList2.Add(m.ToString());
+ }
}
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);
- }
+ {
+ mList3.Add(d.ToString() + "鏃�");
}
else
{
- btnTextD.Width = Application.GetRealWidth(0);
- }
+ mList3.Add(d.ToString());
+ }
}
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;
@@ -473,16 +387,12 @@
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;
@@ -498,7 +408,7 @@
curHour = dtNow.Hour;
curMin = dtNow.Minute;
curSec = dtNow.Second;
- }
+ }
}
Action dAction = () =>
@@ -511,38 +421,24 @@
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);
- }
+ mList3.Add(d.ToString() + "鏃�");
}
else
{
- btnTextD.Width = Application.GetRealWidth(0);
+ mList3.Add(d.ToString());
}
}
+
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);
}
}
@@ -602,9 +498,6 @@
}
}
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)
{
@@ -673,7 +566,6 @@
timeSetAction();
}
this.shadowRadiusFrameLayout.RemoveFromParent();
- this.bottomRadiusFrameLayout.RemoveFromParent();
MidFrameLayoutContent();
};
}
--
Gitblit v1.8.0