From 3291885285dfd5d4f665c20676307878dc3163bc Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 20 十二月 2019 16:28:53 +0800
Subject: [PATCH] 请合并最新代码（优化设备不支持的功能）
---
ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
index 2d8c58c..3ad9a3d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
@@ -22,14 +22,15 @@
var titleName = new Button
{
- TextSize = 16,
+ TextSize = 17,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
X = Application.GetRealWidth(176),
- Width = Application.GetRealWidth(400),
+ Width = Application.GetRealWidth(600),
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.custompush,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -70,20 +71,22 @@
};
this.AddChidren(middle);
- var textBox = new EditText
+ var textBox = new EditTextView//EditText
{
Width = Application.GetRealWidth(1080),
Height = Application.GetRealHeight(600),
- TextAlignment = TextAlignment.CenterLeft,
+ TextAlignment = TextAlignment.TopLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
Text = Common.Logic.CurrentLogic.LogicCustomPushText,
+ TextSize = 14,
};
middle.AddChidren(textBox);
+ textBox.HideSoftInput();
- var btnsave = new Button
+ var btnsave = new Button
{
- Y= middle.Height-Application.GetRealHeight(260),
+ Y = middle.Height - Application.GetRealHeight(260),
X = Application.GetRealWidth(85),
Height = Application.GetRealHeight(130),
Width = Application.GetRealWidth(910),
@@ -91,19 +94,19 @@
BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
TextID = MyInternationalizationString.confrim,
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextSize = 16,
};
middle.AddChidren(btnsave);
-
+
middle.AddChidren(btnsave);
btnsave.MouseUpEventHandler += (sender, e) =>
{
+ Common.Logic.CurrentLogic.LogicCustomPushText = textBox.Text.Trim();
if (Common.Logic.CurrentLogic.LogicId != 0)
{
+ ///鍙敼鎺ㄩ�佸唴瀹癸紱
Send.LogicControlSwitch(Common.Logic.CurrentLogic);
- }
- else {
- Send.AddModifyLogic(Common.Logic.CurrentLogic);
}
RemoveFromParent();
--
Gitblit v1.8.0