From 6031a2d7faaa4f0271b0e9cecaa228e411ceca11 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 24 二月 2021 17:52:33 +0800
Subject: [PATCH] 2021-2-24-1

---
 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs |  134 ++++++++++++++++++++++++--------------------
 1 files changed, 74 insertions(+), 60 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
index 957a50b..f6e3b65 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddButton.cs
@@ -14,13 +14,13 @@
             #region 鐣岄潰甯冨眬
             this.BackgroundColor = CSS.CSS_Color.viewMiddle;
             PirDevice.View.TopView topView = new View.TopView();
-            topView.topNameBtn.TextID = StringId.shebeigaunli;
+            topView.topNameBtn.TextID = StringId.tianjiayaokongqi;
             this.AddChidren(topView.FLayoutView());
             topView.clickBackBtn.MouseUpEventHandler += (sender, e) => { this.RemoveFromParent(); };
 
             FrameLayout editfLayout = new FrameLayout
             {
-                Y= topView.frameLayout.Bottom,
+                Y = topView.frameLayout.Bottom,
                 BackgroundColor = CSS.CSS_Color.textWhiteColor,
                 Height = Application.GetRealHeight(152),
                 Width = Application.GetRealWidth(375),
@@ -40,9 +40,9 @@
             EditText editText = new EditText()
             {
                 X = Application.GetRealWidth(16),
-                Width = Application.GetRealWidth(375-16*2),
+                Width = Application.GetRealWidth(375 - 16 * 2),
                 Height = Application.GetRealHeight(44),
-                PlaceholderText=Language.StringByID(StringId.anjianmingcheng),
+                PlaceholderText = Language.StringByID(StringId.anjianmingcheng),
                 PlaceholderTextColor = CSS.CSS_Color.textCancelColor,
                 TextColor = CSS.CSS_Color.textColor,
                 TextSize = TextSize.text14,
@@ -56,21 +56,21 @@
                 Height = Application.GetRealHeight(44),
                 Y = Application.GetRealHeight(92),
                 X = Application.GetRealWidth(78),
-                TextID = StringId.save,
+                TextID = StringId.xiayibu,
                 TextSize = TextSize.text16,
                 TextColor = CSS.CSS_Color.textWhiteColor,
                 TextAlignment = TextAlignment.Center,
                 BackgroundColor = CSS.CSS_Color.btnSaveBackgroundColor,
                 Radius = (uint)Application.GetRealHeight(22),
             };
-            editfLayout.AddChidren(saveBtn); 
+            editfLayout.AddChidren(saveBtn);
 
             FrameLayout fLayout = new FrameLayout
             {
-                Y = editfLayout.Bottom+Application.GetRealHeight(8),
-                BackgroundColor = CSS.CSS_Color.textWhiteColor,
-                Height = Application.GetRealHeight(667-64-152-8),
+                Y = editfLayout.Bottom + Application.GetRealHeight(8),
+                Height = Application.GetRealHeight(667 - 64 - 152 - 8),
                 Width = Application.GetRealWidth(375),
+                BackgroundColor = CSS.CSS_Color.textWhiteColor,
             };
             this.AddChidren(fLayout);
             //鎺ㄨ崘鎸夐敭
@@ -86,67 +86,81 @@
                 TextAlignment = TextAlignment.CenterLeft,
             };
             fLayout.AddChidren(titleBtn);
-           
+            //鍔ㄦ�佸姞杞紹utton鎸夐挳鐖舵帶浠�
             FrameLayout buttonFLayout = new FrameLayout
             {
-                Y = titleBtn.Bottom,
-                Height = Application.GetRealHeight(667 - 64 - 152 - 8-12-20),
+                Y = Application.GetRealHeight(32),
+                Height = Application.GetRealHeight(667 - 64 - 152 - 8 - 12 - 20),
                 Width = Application.GetRealWidth(375),
             };
             fLayout.AddChidren(buttonFLayout);
-
-            VerticalScrolViewLayout vv = new VerticalScrolViewLayout();
-            buttonFLayout.AddChidren(vv);
-
-            List<string> buttonNameList = new List<string> {
-                "鐢垫簮", "闊抽噺+", "闊抽噺-", "棰戦亾+", "棰戦亾-", "涓�", "涓�", "宸�",
-                 "鍙�", "闈欓煶", "纭", "鎾斁", "閫�鍑�", "鑿滃崟", "鏆傚仠", "杩斿洖",
-                  "鍋滄", "涓婚〉", "蹇繘", "蹇��","瀹氭椂",
-            };
-
-            for (int i = 0; i <7; i++)
-            {
-                //vv.AddChidren(new FrameLayout { Height = Application.GetRealWidth(16) });
-                var currFLayout = new FrameLayout { Height = Application.GetRealWidth(16+ 44+2)};
-                vv.AddChidren(currFLayout);
-                for (int a =i*3+1,b=0; a<= buttonNameList.Count; a++,b++)
-                {
-                    var name = buttonNameList[a-1];
-                    var nameBtn = new Button
-                    {
-                        Y = Application.GetRealHeight(16),
-                        X = Application.GetRealWidth(24 + (98 + 16) * b),
-                        Gravity=Gravity.CenterVertical,
-                        Width = Application.GetRealWidth(98),
-                        Height = Application.GetRealHeight(44),
-                        Text = name,
-                        TextSize = TextSize.text16,
-                        TextColor = CSS.CSS_Color.textColor,
-                        TextAlignment = TextAlignment.Center,
-                        Radius = (uint)Application.GetRealHeight(8),
-                        BorderWidth = 1,
-                        BorderColor = CSS.CSS_Color.textCancelColor,
-
-
-                    };
-                    currFLayout.AddChidren(nameBtn);
-                    if (a % 3 == 0)
-                    {
-                        break;
-                    }
-                    nameBtn.MouseUpEventHandler += (sender, e) =>
-                    {
-                        editText.Text = nameBtn.Text;
-                    };
-                }
-
-            }
-        
             #endregion
+            View.Buttons buttons = new View.Buttons();
+            var buttonNameList = buttons.GetList("榛樿鎸夐挳");
+            buttons.AddButton(buttonFLayout, buttonNameList, (s) => {
+                editText.Text = s;
+               #if __Android__
+                editText.SetSelectionEnd();
+               #endif
+            });
+            ///涓嬩竴姝ョ殑鐐瑰嚮浜嬩欢
+            saveBtn.MouseUpEventHandler += (sender, e) =>
+            {
+                View.ReplicationView replication = new View.ReplicationView();
+                //new寮曞鐣岄潰
+                replication.GuideShow();
 
+                var texts = editText.Text.Trim();
+                if (string.IsNullOrEmpty( editText.Text)) {
+                    //鍚嶇О涓嶈兘涓虹┖
+                    return;
+                }
+                var butName = Pir.BuottonList.Find((c) => c.value == texts);
+                if (butName!=null) {
+                    //鍚嶇О宸茬粡瀛樺湪
+                    return;
+                }
+              
+                //娣诲姞鏁版嵁瀵硅薄
+                ButtonObj buttonObj = new ButtonObj();
+                buttonObj.Key = "key" + Pir.BuottonList.Count.ToString();
+                buttonObj.value = texts;
+              
+                HDL_ON.DAL.Server.ResponsePackNew responsePackNew = null;
+                new System.Threading.Thread(() =>
+                {
 
+                    try
+                    {
+                        //鍙戦�佺孩澶栫爜瀛︿範鍛戒护
+                        responsePackNew = PirSend.CodeStudy(buttonObj);
+                    }
+                    catch { }
+                    finally
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            if (PirSend.Error(responsePackNew))
+                            {
+                                //娣诲姞鏁版嵁
+                                Pir.BuottonList.Add(buttonObj);
+                                //绉婚櫎娣诲姞鎸夐挳鐣岄潰
+                                this.RemoveFromParent();
+                                //鍔犺浇鏁版嵁鐣岄潰
+                                AddControl addControl = new AddControl();
+                                addControl.Show();
+                                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                            }
+                            //绉婚櫎娣诲姞鎸夐挳寮曞鐣岄潰
+                         //  replication.dialog.Close();
 
+                        });
+                    }
 
+                })
+                { IsBackground = true }.Start();
+               
+            };
 
         }
     }

--
Gitblit v1.8.0