From 08a8afe782cd499550f94f3da0ba5788e1e12971 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 02 三月 2021 17:45:45 +0800
Subject: [PATCH] 2021-3-2-1
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs | 35 +++++++----------------------------
1 files changed, 7 insertions(+), 28 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..0f62f69 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);
}
@@ -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