From 34e965100d635346e2d4cd6e6013bdaed66b3004 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:52:13 +0800
Subject: [PATCH] 2019.1.2-3
---
ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
index 2d8c58c..cdaedb0 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,28 @@
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 (string.IsNullOrEmpty(Common.Logic.CurrentLogic.LogicCustomPushText))
+ {
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.tiptextnull),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
+ return;
+ }
if (Common.Logic.CurrentLogic.LogicId != 0)
{
+ ///鍙敼鎺ㄩ�佸唴瀹癸紱
Send.LogicControlSwitch(Common.Logic.CurrentLogic);
- }
- else {
- Send.AddModifyLogic(Common.Logic.CurrentLogic);
+ Send.Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST");
}
RemoveFromParent();
--
Gitblit v1.8.0