From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
index cdaedb0..64b11b8 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
@@ -84,6 +84,57 @@
middle.AddChidren(textBox);
textBox.HideSoftInput();
+ var textBtn = new Button
+ {
+ 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),
@@ -111,15 +162,14 @@
alert.Show();
return;
}
- if (Common.Logic.CurrentLogic.LogicId != 0)
- {
- ///鍙敼鎺ㄩ�佸唴瀹癸紱
- Send.LogicControlSwitch(Common.Logic.CurrentLogic);
- Send.Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST");
- }
+ Send.Zj(true, Common.Logic.CurrentLogic);
RemoveFromParent();
};
+
+
+
+
}
}
}
--
Gitblit v1.8.0