From 7e863a33397f317ffc3ffd9288496d0e4f16aa66 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 12 十二月 2019 14:58:20 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
index a8a3b9d..3ad9a3d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
@@ -30,6 +30,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.custompush,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -74,7 +75,7 @@
{
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,
@@ -83,9 +84,9 @@
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),
@@ -93,20 +94,19 @@
BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
TextID = MyInternationalizationString.confrim,
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
- TextSize = 16,
- };
+ 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