From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 70 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
old mode 100755
new mode 100644
index a8a3b9d..5230ed5
--- 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,60 @@
middle.AddChidren(textBox);
textBox.HideSoftInput();
- var btnsave = new Button
+ var textBtn = new Button
{
- Y= middle.Height-Application.GetRealHeight(260),
+ Width = Application.GetRealWidth(80),
+ Height = Application.GetRealHeight(50),
+ X = Application.GetRealWidth(1080 - 80 - 50),
+ Y = Application.GetRealHeight(550 - 25),
+ TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ Text = "50",
+ };
+ middle.AddChidren(textBtn);
+ string s1 = "";
+ string s2 = "";
+ textBox.TextChangeEventHandler += (sender, e) =>
+ {
+ var leng = e.Length;
+ if (leng > 50)
+ {
+ var substring = e.Substring(0, 50);
+ s1 = substring;
+ if (s1 == s2)
+ {
+ s2 = s1;
+ }
+ else
+ {
+ if (s2 == "")
+ {
+ s2 = s1;
+ }
+ else
+ {
+ s1 = s2;
+ }
+ }
+ textBox.Text = s2;
+ }
+ else
+ {
+ if (leng == 50)
+ {
+ s2 = e.Substring(0, 50);
+ }
+ else
+ {
+ s1 = "";
+ s2 = "";
+ }
+ textBtn.Text = (50 - leng).ToString();
+ }
+ };
+
+ var btnsave = new Button
+ {
+ Y = middle.Height - Application.GetRealHeight(260),
X = Application.GetRealWidth(85),
Height = Application.GetRealHeight(130),
Width = Application.GetRealWidth(910),
@@ -93,24 +145,31 @@
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) =>
{
- if (Common.Logic.CurrentLogic.LogicId != 0)
+ Common.Logic.CurrentLogic.LogicCustomPushText = textBox.Text.Trim();
+ if (string.IsNullOrEmpty(Common.Logic.CurrentLogic.LogicCustomPushText))
{
- Send.LogicControlSwitch(Common.Logic.CurrentLogic);
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.tiptextnull),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
+ return;
}
- else {
- Send.AddModifyLogic(Common.Logic.CurrentLogic);
- }
+ Send.Zj(true, Common.Logic.CurrentLogic);
RemoveFromParent();
};
+
+
+
+
}
}
}
--
Gitblit v1.8.0