From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC"
---
ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs | 102 ++++++++++++++++++--------------------------------
1 files changed, 37 insertions(+), 65 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
index 2d8c58c..a3530a9 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
@@ -10,103 +10,75 @@
public void Show()
{
+ this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
- #region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
- var topRowLayout = new RowLayout
+ var topFrameLayout = new FrameLayout
{
- BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
- Height = Application.GetRealHeight(184),
- LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
+ Height = Application.GetRealHeight(140),
+ Y = Application.GetRealHeight(80),
};
- this.AddChidren(topRowLayout);
+ AddChidren(topFrameLayout);
var titleName = new Button
{
- TextSize = 16,
+ //TextID = MyInternationalizationString.selection,
+ Text = "鑷畾涔夋帹閫�",
+ TextSize = 17,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- TextAlignment = TextAlignment.CenterLeft,
- X = Application.GetRealWidth(176),
- Width = Application.GetRealWidth(400),
- Height = Application.GetRealHeight(69),
- Y = Application.GetRealHeight(92),
- TextID = MyInternationalizationString.custompush,
};
- topRowLayout.AddChidren(titleName);
-
- var clickBtn = new Button
- {
- Width = Application.GetRealWidth(81 + 51),
- Height = Application.GetRealHeight(58 + 40),
- Y = Application.GetRealHeight(98 - 40),
- };
- topRowLayout.AddChidren(clickBtn);
- clickBtn.MouseDownEventHandler += (sender, e) =>
- {
- RemoveFromParent();
- };
+ topFrameLayout.AddChidren(titleName);
var back = new Button
{
- Width = Application.GetRealWidth(30),
- Height = Application.GetRealHeight(51),
- X = Application.GetRealWidth(81),
- Y = Application.GetRealHeight(98),
- //Gravity = Gravity.CenterVertical;
- UnSelectedImagePath = "ZigeeLogic/back.png",
+ Width = Application.GetRealWidth(110),
+ Height = Application.GetRealHeight(110),
+ X = Application.GetRealWidth(20),
+ Gravity = Gravity.CenterVertical,
+ UnSelectedImagePath = "ZigeeLogic/Back.png",
};
- topRowLayout.AddChidren(back);
- back.MouseDownEventHandler += (sender, e) =>
- {
+ topFrameLayout.AddChidren(back);
+ back.MouseDownEventHandler += (sender, e) => {
RemoveFromParent();
};
- #endregion
- var middle = new FrameLayout
- {
- Y = topRowLayout.Bottom,
- Height = Application.GetRealHeight(1920 - 184),
- BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
- };
+ var middle = new FrameLayout();
+ middle.Y = topFrameLayout.Bottom;
+ middle.Height = Application.GetRealHeight(1920 - 220);
+ middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
this.AddChidren(middle);
var textBox = new EditText
{
- Width = Application.GetRealWidth(1080),
+ Width = Application.GetRealWidth(900),
Height = Application.GetRealHeight(600),
+ X = Application.GetRealWidth(90),
+ Y = Application.GetRealHeight(90),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- Text = Common.Logic.CurrentLogic.LogicCustomPushText,
+ Radius = (uint)Application.GetRealHeight(40),
+ BorderColor = ZigbeeColor.Current.LogicLineColor,
+ BorderWidth = 2,
+ //Text = Common.Logic.CurrentLogic.LogicName,
+ //TextID=MyInternationalizationString.automation1,
};
middle.AddChidren(textBox);
- var btnsave = new Button
+ var btnsave = new Button
{
- Y= middle.Height-Application.GetRealHeight(260),
- X = Application.GetRealWidth(85),
- Height = Application.GetRealHeight(130),
- Width = Application.GetRealWidth(910),
- Radius = (uint)Application.GetRealHeight(60),
- BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
- TextID = MyInternationalizationString.confrim,
- TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ Height = Application.GetRealHeight(150),
+ Y = textBox.Bottom + Application.GetRealHeight(300),
+ //Text = "淇濆瓨",
+ Width = Application.GetRealWidth(500),
+ Radius = (uint)Application.GetRealHeight(50),
+ BackgroundColor = ZigbeeColor.Current.LogicButtonBlueColor,
+ X = Application.GetRealWidth(290),
+ TextID = MyInternationalizationString.Save,
};
- middle.AddChidren(btnsave);
-
-
middle.AddChidren(btnsave);
btnsave.MouseUpEventHandler += (sender, e) =>
{
- if (Common.Logic.CurrentLogic.LogicId != 0)
- {
- Send.LogicControlSwitch(Common.Logic.CurrentLogic);
- }
- else {
- Send.AddModifyLogic(Common.Logic.CurrentLogic);
- }
RemoveFromParent();
-
};
}
}
--
Gitblit v1.8.0