From 334fa3f807b208335305889f0d5112fcd1f77bfb Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 24 三月 2021 16:19:00 +0800
Subject: [PATCH] 2021-3-24-2

---
 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs |  266 ++++++++++-------------------------------------------
 1 files changed, 50 insertions(+), 216 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index c1169c5..1ee2bb0 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -16,7 +16,7 @@
         /// </summary>
         public static Action BackAction;
         /// <summary>
-        /// 
+        /// 娣诲姞鍥炬爣Btn
         /// </summary>
         Button addDevice;
         /// <summary>
@@ -25,6 +25,7 @@
         List<DeviceType> DeviceTypeList = new List<DeviceType>();
         public void Show()
         {
+            #region 鐣岄潰甯冨眬
             this.BackgroundColor = CSS.CSS_Color.viewMiddle;
             PirDevice.View.TopView topView = new View.TopView();
             topView.topNameBtn.TextID = StringId.hongwaiyaokong;
@@ -61,7 +62,10 @@
                 // middFLayout.AddChidren(addDevice);
                 addDevice.Visible = true;
             }
+            #endregion
 
+            #region 鐣岄潰鐐瑰嚮浜嬩欢
+            ///涓嬫媺鍒锋柊鐣岄潰浜嬩欢
             vv.BeginHeaderRefreshingAction += () =>
                 {
                     ////鍏抽棴鍒锋柊View锛�
@@ -77,8 +81,7 @@
                     }, Pir.currPir);
 
                 };
-            UIView(vv);
-
+            ///璁剧疆鍥炬爣鐐瑰嚮浜嬩欢
             topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
             {
 
@@ -92,119 +95,59 @@
                 });
                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
             };
+            ///娣诲姞閬ユ帶鍣ㄥ浘鏍囩偣鍑讳簨浠�
             addDevice.MouseUpEventHandler += (sender, e) =>
             {
-                FrameLayout frame = new FrameLayout
+                //杩涙潵涓嶅厑璁稿乏婊�
+                MainPage.BasePageView.ScrollEnabled = false;
+                View.Buttons buttons = new View.Buttons();
+                buttons.AddFrameLayout(this, (if_value, view) => 
                 {
-                    BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
-                };
-                this.AddChidren(frame);
-                FrameLayout controlFl = new FrameLayout();
-                controlFl.Y = Application.GetRealHeight(319);
-                controlFl.X = Application.GetRealWidth(16);
-                controlFl.Width = Application.GetRealWidth(343);
-                controlFl.Height = Application.GetRealHeight(328);
-                controlFl.BackgroundColor = CSS.CSS_Color.view;
-                controlFl.Radius = (uint)Application.GetRealHeight(12);
-                frame.AddChidren(controlFl);
-                ///娣诲姞閬ユ帶鍣�
-                Button text3Btn = new Button
-                {
-                    Y = Application.GetRealHeight(12),
-                    X = Application.GetRealWidth(16),
-                    Width = Application.GetRealWidth(343 - 16 * 2),
-                    Height = Application.GetRealHeight(20),
-                    TextSize = TextSize.text14,
-                    TextColor = CSS.CSS_Color.textConfirmColor,
-                    TextAlignment = TextAlignment.Center,
-                    TextID = StringId.tianjiayaokongqi,
-                    IsBold = true,
-                };
-                controlFl.AddChidren(text3Btn);
-                frame.MouseUpEventHandler += (sender1, e1) =>
-                {
-
-                    frame.RemoveFromParent();
-                };
-                int line = 0;
-                for (int i = 1, j = 0; i <= 7; i++, j++)
-                {
-                    var currpirdeviceFLayout = new FrameLayout
+                    //鍏抽棴鍏佽宸︽粦
+                    MainPage.BasePageView.ScrollEnabled = true;
+                    //1=绌鸿皟;2=鐢佃;3=椋庢墖;4=鏈洪《鐩�;5=DVD/EVD/VCD;6=鎶曞奖浠�;7=鑷畾涔�;
+                    if (if_value == 7)
                     {
-                        Width = Application.GetRealWidth(80),
-                        Height = Application.GetRealWidth(80),
-                        X = Application.GetRealWidth(26 + (80 + 25) * j),
-                        Y = Application.GetRealHeight(52 + (80 + 12) * line),
-
-                    };
-                    controlFl.AddChidren(currpirdeviceFLayout);
-                    var deviceIconBtn = new Button
-                    {
-                        Y = Application.GetRealHeight(8),
-                        X = Application.GetRealWidth(20),
-                        Width = Application.GetRealWidth(40),
-                        Height = Application.GetRealWidth(40),
-                        UnSelectedImagePath = "PirIcon/Infraredtreasure.png",
-                    };
-                    currpirdeviceFLayout.AddChidren(deviceIconBtn);
-                    var iconNameBtn = new Button
-                    {
-                        Y = deviceIconBtn.Bottom + Application.GetRealHeight(8),
-                        Width = Application.GetRealWidth(80),
-                        Height = Application.GetRealHeight(17),
-                        TextSize = TextSize.text12,
-                        TextColor = CSS.CSS_Color.TextualColor,
-                        TextAlignment = TextAlignment.Center,
-                    };
-                    currpirdeviceFLayout.AddChidren(iconNameBtn);
-                    var clickBtn = new Button { Tag = i };
-                    currpirdeviceFLayout.AddChidren(clickBtn);
-                    if (i % 3 == 0)
-                    {
-                        //婊′竴琛岄噸缃甹=0鍊�;
-                        j = -1;
-                        line += 1;
-                    }
-                    GetIconAndText(i, deviceIconBtn, iconNameBtn);
-                    clickBtn.MouseUpEventHandler += (sender2, e2) =>
-                    {
-                       
-                        //1=绌鸿皟;2=鐢佃;3=椋庢墖;4=鏈洪《鐩�;5=DVD/EVD/VCD;6=鎶曞奖浠�;7=鑷畾涔�;
-                        int if_value = int.Parse(clickBtn.Tag.ToString());
-                        if (if_value == 7)
+                        Method method = new Method();
+                        method.AddControl(this, (control) =>
                         {
-                            Method method = new Method();
-                            method.AddControl(this, (control) =>
+                           //鎴愬姛鍚庣Щ闄�;
+                           view.RemoveFromParent();
+                            AddButton addButton = new AddButton();
+                            MainPage.BasePageView.AddChidren(addButton);
+                            addButton.Show(control);
+                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                        });
+                    }
+                    else
+                    {
+                        if (if_value == 3 || if_value == 4 || if_value == 5 || if_value == 6)
+                        {
+                            new TipPopView().FlashingBox("鏆傛椂涓嶆敮鎸佽鍔熻兘.");
+                            return;
+                        }
+                        if (DeviceTypeList.Count == 0)
+                        {
+                            GetDeviceTypeList(true, () =>
                             {
-                                //鎴愬姛鍚庣Щ闄�;
-                                frame.RemoveFromParent();
-                                AddButton addButton = new AddButton();
-                                MainPage.BasePageView.AddChidren(addButton);
-                                addButton.Show(control);
-                                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                                DeviceTypeViewClick(if_value);
+                               //鑾峰彇鎴愬姛涔嬪悗绉婚櫎
+                               view.RemoveFromParent();
+
                             });
                         }
                         else
                         {
-                            //杩涙潵閮借绉婚櫎;
-                            frame.RemoveFromParent();
-                            if (DeviceTypeList.Count == 0)
-                            {
-                                GetDeviceTypeList(true, () =>
-                                 {
-                                     DeviceTypeViewClick(if_value);
-
-                                 });
-                            }
-                            else
-                            {
-                                DeviceTypeViewClick(if_value);
-                            }
+                            DeviceTypeViewClick(if_value);
+                            view.RemoveFromParent();
                         }
-                    };
-                }
 
+                    }
+                }, 7);
             };
+            #endregion
+            ///鍒濆鍖栫晫闈�
+            UIView(vv);
 
         }
         /// <summary>
@@ -250,7 +193,6 @@
             for (int j = 0; j < Pir.currPir.FunctioList.Count; j++)
             {
                 var control = Pir.currPir.FunctioList[j];
-
                 View.ControlView controlView = new View.ControlView();
                 controlView.Show(pirView.devfLayout, j);
                 //閬ユ帶鍣ㄥ悕绉�
@@ -313,10 +255,11 @@
         /// <summary>
         /// 璁惧杩涘叆涓嬩竴绾ф柟娉�
         /// </summary>
-        /// <param name="if_value"></param>
+        /// <param name="if_value">鎺т欢绱㈠紩鍊�</param>
         private void DeviceTypeViewClick(int if_value)
         {
-            var strings = GetTypeString(if_value).Split('-');
+          
+            var strings = View.Buttons.GetTypeString(if_value).Split('-');
             var jobDeviceType = DeviceTypeList.Find((c) => c.deviceType == strings[0]);
             if (jobDeviceType == null)
             {
@@ -334,118 +277,9 @@
 
         }
         /// <summary>
-        /// 鑾峰彇璁惧绫诲瀷str
-        /// </summary>
-        /// <param name="index">绱㈠紩鍊�</param>
-        private string GetTypeString(int index)
-        {
-            string type = "";
-            switch (index)
-            {
-                case 1:
-                    {
-                        //绌鸿皟
-                        type = "ac-" + SPK.AcIr;
-                    }
-                    break;
-                case 2:
-                    {
-                        //鐢佃
-                        type = "tv-" + SPK.TvIr;
-                    }
-                    break;
-                case 3:
-                    {
-                        //椋庢墖
-                        // type = "fan-" + SPK.ElectricFan;
-                    }
-                    break;
-                case 4:
-                    {
-                        //鏈洪《鐩�
-                        //  type = "set_top_box-" + SPK.ElectricTV;
-                    }
-                    break;
-                case 5:
-                    {
-                        //褰辩鏈�
-                        // type = "dvd-" + SPK.ElectricTV;
-                    }
-                    break;
-                case 6:
-                    {
-                        //鎶曞奖浠�
-                        //  type = "projector-" + SPK.ElectricTV;
-                    }
-                    break;
-
-
-            }
-            return type;
-        }
-        /// <summary>
-        /// 璁剧疆鍥剧墖鍜屽娉�
-        /// </summary>
-        /// <param name="index">绱㈠紩鍊�</param>
-        /// <param name="deviceIconBtn">鍥炬爣Btn</param>
-        /// <param name="deviceNameBtn">璁惧澶囨敞Btn</param>
-        private void GetIconAndText(int index, Button deviceIconBtn, Button deviceNameBtn)
-        {
-            string iconPath = "";
-            int deviceNameIndex = 0;
-            switch (index)
-            {
-                case 1:
-                    {
-                        iconPath = "PirIcon/air.png";
-                        deviceNameIndex = StringId.kongtiao;
-                    }
-                    break;
-                case 2:
-                    {
-                        iconPath = "PirIcon/tv.png";
-                        deviceNameIndex = StringId.dianshi;
-                    }
-                    break;
-                case 3:
-                    {
-                        iconPath = "PirIcon/fan.png";
-                        deviceNameIndex = StringId.fengshan;
-                    }
-                    break;
-                case 4:
-                    {
-                        iconPath = "PirIcon/stb.png";
-                        deviceNameIndex = StringId.jidinghe;
-                    }
-                    break;
-                case 5:
-                    {
-                        iconPath = "PirIcon/dvd.png";
-                        deviceNameIndex = StringId.dvd;
-                    }
-                    break;
-                case 6:
-                    {
-                        iconPath = "PirIcon/projector.png";
-                        deviceNameIndex = StringId.touyingyi;
-                    }
-                    break;
-                case 7:
-                    {
-                        iconPath = "PirIcon/custom.png";
-                        deviceNameIndex = StringId.zidingyi;
-                    }
-                    break;
-
-            }
-            deviceIconBtn.UnSelectedImagePath = iconPath;
-            deviceNameBtn.TextID = deviceNameIndex;
-        }
-        /// <summary>
         /// 璇诲彇绾㈠璁惧绫诲瀷鍒楄〃
         /// </summary>
-        /// <param name="tag">鏍囪瘑瑕佷笉瑕佹彁绀猴紙true=鎻愮ず锛�</param>
+        /// <param name="tag">琛ㄧず瑕佷笉瑕佹彁绀洪敊璇俊鎭紙true=鎻愮ず锛�</param>
         /// <param name="action">鍥炶皟鍑芥暟</param>
         public void GetDeviceTypeList(bool tag, Action action)
         {

--
Gitblit v1.8.0