From 47b841ed6c4d7dc03ff25bf74454fa41cd4e02a5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 17 三月 2021 11:08:49 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr

---
 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs |   37 ++++++++-----------------------------
 1 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs
index d2c643c..3634608 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs
@@ -16,8 +16,7 @@
         /// 
         /// </summary>
         /// <param name="list">琛ㄧず璇ュ垪琛ㄥ厓绱燗-Z瀛楁瘝绛涢�夋樉绀哄嚭鏉�</param>
-        /// <param name="list6">琛ㄧず璇ュ垪琛ㄥ厓绱犳樉绀哄湪list鍓嶉潰(璇ュ垪琛ㄥ厓绱犱笉鍋欰-Z瀛楁瘝绛涢��),娌℃湁鍙互涓簂ist6=null</param>
-        public void Show(List<Brand>brandList,List<string> list, List<string> list6)
+        public void Show(List<Brand>brandList,List<string> list,string spk)
         {
 
             var frameLayout = new FrameLayout
@@ -89,12 +88,7 @@
             {
                 list = new List<string>();
             }
-            if (list6 == null)
-            {
-                list6 = new List<string>();
-            }
             var list1 = GetDateList(list);
-            list1.InsertRange(0, list6);
 
             var vv = new VerticalScrolViewLayout();
             fram.AddChidren(vv);
@@ -111,7 +105,7 @@
                         listStr.Add(s);
                     }
                 }
-                RefreshLayout(vv, brandList, listStr);
+                RefreshLayout(vv, brandList, listStr,spk);
 
             };
             #region A-Z
@@ -168,7 +162,7 @@
             }
             #endregion
 
-            RefreshLayout(vv, brandList, list1);
+            RefreshLayout(vv, brandList, list1,spk);
 
         }
         /// <summary>
@@ -176,7 +170,7 @@
         /// </summary>
         /// <param name="vv">鐖舵帶浠�</param>
         /// <param name="list">鏄剧ず鍒楄〃</param>
-        private void RefreshLayout(VerticalScrolViewLayout vv, List<Brand> brandList, List<string> list)
+        private void RefreshLayout(VerticalScrolViewLayout vv, List<Brand> brandList, List<string> list,string spk)
         {
             vv.RemoveAll();
             foreach (var str in list)
@@ -225,7 +219,7 @@
                      {
                          Matching matching = new Matching();
                          MainPage.BasePageView.AddChidren(matching);
-                         matching.Show();
+                         matching.Show(libraryList, spk);
                          MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                      });
                  
@@ -256,7 +250,7 @@
                         var library = Newtonsoft.Json.JsonConvert.DeserializeObject<Library>(str); 
                         if (library != null)
                         {
-                            if (null == libraryList.Find((c) => c.brandId == library.brandId))
+                            if (libraryList.Count<20)
                             {
                                 libraryList.Add(library);
                             }
@@ -267,7 +261,7 @@
                 else
                 {
                     Method method = new Method();
-                    method.ErrorShow(responsePackNew);
+                    method.ErrorShow(responsePackNew,"");
                 }
             }, id, "鍝佺墝绾㈠鐮佸簱鍒楄〃");
         }
@@ -470,21 +464,6 @@
         }
     }
 
-    public class Library
-    {
-        /// <summary>
-        /// 绾㈠鐮�
-        /// </summary>
-        public string irCode = string.Empty;
-        /// <summary>
-        /// 鍝佺墝涓婚敭Id
-        /// </summary>
-        public string brandId = string.Empty;
-        /// <summary>
-        /// 绾㈠鐮佺储寮曞簭鍙�
-        /// </summary>
-        public string irIndex = string.Empty;
-
-    }
+   
 }
 

--
Gitblit v1.8.0