From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs | 128 ++++++++++++++++++++++++------------------
1 files changed, 73 insertions(+), 55 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
index 6c565cfc..64287ce 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
@@ -11,62 +11,18 @@
public void Show()
{
- #region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
- var topRowLayout = new RowLayout
- {
- BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
- Height = Application.GetRealHeight(184),
- LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
- };
- this.AddChidren(topRowLayout);
-
- var titleName = new Button
- {
- TextSize = 17,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- TextAlignment = TextAlignment.CenterLeft,
- X = Application.GetRealWidth(176),
- Width = Application.GetRealWidth(600),
- Height = Application.GetRealHeight(69),
- Y = Application.GetRealHeight(92),
- TextID = MyInternationalizationString.custompush,
- IsBold = true,
- };
- topRowLayout.AddChidren(titleName);
-
- var clickBtn = new Button
- {
- Width = Application.GetRealWidth(81 + 51),
- Height = Application.GetRealHeight(58 + 40),
- Y = Application.GetRealHeight(98 - 40),
- };
- topRowLayout.AddChidren(clickBtn);
- clickBtn.MouseDownEventHandler += (sender, e) =>
- {
- RemoveFromParent();
- };
-
- var back = new Button
- {
- Width = Application.GetRealWidth(30),
- Height = Application.GetRealHeight(51),
- X = Application.GetRealWidth(81),
- Y = Application.GetRealHeight(98),
- //Gravity = Gravity.CenterVertical;
- UnSelectedImagePath = "ZigeeLogic/back.png",
- };
- topRowLayout.AddChidren(back);
- back.MouseDownEventHandler += (sender, e) =>
- {
- RemoveFromParent();
- };
+ #region 涓婇潰鐨勫竷灞�浠ｇ爜
+ TopView view = new TopView();
+ this.AddChidren(view.TopRowView());
+ view.toptitleNameBtn.TextID = MyInternationalizationString.custompush;
+ view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
#endregion
var middle = new FrameLayout
{
- Y = topRowLayout.Bottom,
- Height = Application.GetRealHeight(1920 - 184),
+ Y = view.topRowLayout.Bottom,
+ Height = Application.GetRealHeight(Method.H - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
@@ -83,6 +39,61 @@
};
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 = "";
+ if (!string.IsNullOrEmpty(Common.Logic.CurrentLogic.LogicCustomPushText))
+ {
+ textBtn.Text = (50 - Common.Logic.CurrentLogic.LogicCustomPushText.Length).ToString();
+ }
+ 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
{
@@ -103,15 +114,22 @@
btnsave.MouseUpEventHandler += (sender, e) =>
{
Common.Logic.CurrentLogic.LogicCustomPushText = textBox.Text.Trim();
- if (Common.Logic.CurrentLogic.LogicId != 0)
+ if (string.IsNullOrEmpty(Common.Logic.CurrentLogic.LogicCustomPushText))
{
- ///鍙敼鎺ㄩ�佸唴瀹癸紱
- Send.LogicControlSwitch(Common.Logic.CurrentLogic);
- Send.Data("娣诲姞/鏇存柊", "/App/HomeLogicConfig", "POST");
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.tiptextnull),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
+ return;
}
+ Send.Zj(true, Common.Logic.CurrentLogic);
RemoveFromParent();
};
+
+
+
+
}
}
}
--
Gitblit v1.8.0