From 652243206427f35a256400a149a1734085824cb9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:35:03 +0800
Subject: [PATCH] 2020-09-02-4

---
 ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs |  126 +++++++++++++----------------------------
 1 files changed, 40 insertions(+), 86 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
old mode 100644
new mode 100755
index 0f27e05..39bcd16
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
@@ -11,62 +11,18 @@
         public void Show()
         {
 
-            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
-            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  涓婇潰鐨勫竷灞�浠g爜
+            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);
@@ -94,16 +50,47 @@
                 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);
-                    textBox.Text = substring;
+                    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();
                 }
             };
@@ -141,40 +128,7 @@
              };
 
 
-            //var txtInput = new EditTextView();
-            //txtInput.Width = bodyFrameLayout.Width - ControlCommonResourse.XXLeft * 2;
-            //txtInput.Height = Application.GetRealHeight(470);
-            //txtInput.Y = Application.GetRealHeight(32);
-            //txtInput.TextAlignment = TextAlignment.TopLeft;
-            //txtInput.Gravity = Gravity.CenterHorizontal;
-            //txtInput.TextColor = UserCenterColor.Current.TextColor1;
-            //txtInput.PlaceholderTextColor = UserCenterColor.Current.TextGrayColor1;
-            //txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uYouSuggestionMsg);
-            //frameInput.AddChidren(txtInput);
-            //txtInput.TextChangeEventHandler += (sender, txtvalue) =>
-            //{
-            //    if (this.suggestionCount <= 0)
-            //    {
-            //        return;
-            //    }
-
-            //    int length = txtvalue.Length;
-            //    if (length > 500)
-            //    {
-            //        if (btnSubmit.CanClick == true) { btnSubmit.CanClick = false; }
-            //        btnFild.Text = "0";
-            //        return;
-            //    }
-            //    if (length == 0)
-            //    {
-            //        if (btnSubmit.CanClick == true) { btnSubmit.CanClick = false; }
-            //    }
-            //    else
-            //    {
-            //        if (btnSubmit.CanClick == false) { btnSubmit.CanClick = true; }
-            //    }
-            //    btnFild.Text = (500 - length).ToString();
-            //};
+        
 
         }
     }

--
Gitblit v1.8.0