From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs | 296 +++++++++++-----------------------------------------------
1 files changed, 59 insertions(+), 237 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs
index 06e00f9..01056e8 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs
@@ -6,263 +6,90 @@
namespace HDL_ON.UI.UI2.PersonalCenter.PirDevice
{
- public class BrandList : FrameLayout
+ public class BrandList:FrameLayout
{
- public BrandList()
+
+ public void Show(List<Brand> brandList, string spk)
{
- Tag = "PirView";
- }
- /// <summary>
- ///
- /// </summary>
- /// <param name="list">琛ㄧず璇ュ垪琛ㄥ厓绱燗-Z瀛楁瘝绛涢�夋樉绀哄嚭鏉�</param>
- /// <param name="list6">琛ㄧず璇ュ垪琛ㄥ厓绱犳樉绀哄湪list鍓嶉潰(璇ュ垪琛ㄥ厓绱犱笉鍋欰-Z瀛楁瘝绛涢��),娌℃湁鍙互涓簂ist6=null</param>
- public void Show(List<string> list, List<string> list6)
- {
- //string text = "30";
- //byte[] bytes = new byte[text.Length / 2];
- //for (int i = 0, j = 0; i < bytes.Length; j += 2, i++)
- //{
- // //鎶�16杩涘害杞崲鎴恇yte
- // bytes[i] = Convert.ToByte(text.Substring(j, 2), 16);
- //}
- ////鎶奲yte鏁扮粍杞崲鎴愭枃瀛�
- //string str = System.Text.Encoding.UTF8.GetString(bytes);
- var frameLayout = new FrameLayout
+ var strList = new List<string>();
+ for (int str = 0; str < brandList.Count; str++)
{
- BackgroundColor = CSS.CSS_Color.viewTop,
- Height = Application.GetRealHeight(112),
- Width = Application.GetRealWidth(375),
- };
- this.AddChidren(frameLayout);
-
- var topNameBtn = new Button
- {
- TextSize = TextSize.text18,
- TextColor = CSS.CSS_Color.textColor,
- Width = Application.GetRealWidth(TextSize.view375 - 60 - 60),
- Height = Application.GetRealHeight(25),
- Y = Application.GetRealHeight(30),
- X = Application.GetRealWidth(60),
- Text = "璇烽�夋嫨鍝佺墝",
-
- };
- frameLayout.AddChidren(topNameBtn);
-
- var backBtn = new Button
- {
- Width = Application.GetRealWidth(12),
- Height = Application.GetRealWidth(20),
- X = Application.GetRealWidth(TextSize.left16),
- Y = Application.GetRealHeight(32),
- UnSelectedImagePath = "LogicIcon/back.png",
- };
- frameLayout.AddChidren(backBtn);
- var clickBackBtn = new Button
- {
- Width = Application.GetRealWidth(12+16+20),
- Height = Application.GetRealWidth(20+20),
- Y = Application.GetRealHeight(32),
- };
- frameLayout.AddChidren(clickBackBtn);
- clickBackBtn.MouseUpEventHandler += (sen, e) =>
- {
- this.RemoveFromParent();
- };
-
- var editText = new EditText
- {
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealWidth(28),
- X = Application.GetRealWidth(TextSize.left16),
- Y = Application.GetRealHeight(76),
- BackgroundColor = CSS.CSS_Color.view,
- TextColor = CSS.CSS_Color.textColor,
- TextAlignment = TextAlignment.Center,
-
- };
- frameLayout.AddChidren(editText);
-
- var fram = new FrameLayout
- {
- Y = Application.GetRealHeight(112),
- Height = Application.GetRealHeight(667 - 112),
- Width = Application.GetRealWidth(375),
- BackgroundColor = CSS.CSS_Color.view,
- };
- this.AddChidren(fram);
-
-
- if (list == null)
- {
- list = new List<string>();
+ //鎻愬彇瀛楃涓插垪琛�
+ string s = brandList[str].brandName;
+ strList.Add(s);
}
- if (list6 == null)
+ var dicList = GetDateList(strList);
+ JLCountrycode.CountryCodeView.Current.ShowSortSelection(Language.StringByID(StringId.xuanzehongwaipinpai), dicList, (countryName) =>
{
- list6 = new List<string>();
- }
- var list1 = GetDateList(list);
- list1.InsertRange(0, list6);
- var vv = new VerticalScrolViewLayout();
- fram.AddChidren(vv);
- var listStr = new List<string>();
- listStr.AddRange(list1);
- editText.TextChangeEventHandler += (view, strView) =>
- {
- listStr.Clear();
- for (int i = 0; i < list1.Count; i++)
+ var brandObj = brandList.Find((c) => c.brandName == countryName);
+ if (brandObj == null)
{
- var s = list1[i];
- if (s.Contains(strView))
- {
- listStr.Add(s);
- }
+ return;
}
- RefreshLayout(vv, listStr);
+ GetLibraryList(brandObj.id, (libraryList) =>
+ {
+ Matching matching = new Matching();
+ MainPage.BasePageView.AddChidren(matching);
+ matching.Show(brandList, libraryList, spk);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ });
- };
- #region A-Z
+ });
+ }
-
- var a_zFra = new FrameLayout
- {
- Y = Application.GetRealHeight(46),
- X = Application.GetRealWidth(362 - 6),
- Height = Application.GetRealHeight(351),
- Width = Application.GetRealWidth(10 + 6),
- };
- fram.AddChidren(a_zFra);
- var list2 = GetList();
- for (int i = 0; i < list2.Count; i++)
+ /// <summary>
+ /// 璇诲彇鍝佺墝绾㈠鐮佸簱鍒楄〃
+ /// </summary>
+ private void GetLibraryList(string id, Action<List<Library>> actionBrand)
+ {
+ List<Library> libraryList = new List<Library>();
+ PirSend.GetDeviceTypesList(this, (responsePackNew) =>
{
- var a_zBtn = new Button
+ if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
{
- Padding = new Padding(0, 6, 0, 0),
- Y = Application.GetRealHeight(i * 13),
- Width = Application.GetRealWidth(16),
- Height = Application.GetRealHeight(10),
- Text = list2[i],
- TextSize = TextSize.text10,
- TextColor = CSS.CSS_Color.textConfirmColor,
- Tag = list2[i],
- };
- a_zFra.AddChidren(a_zBtn);
-
-
- a_zBtn.MouseUpEventHandler += (sender, e) =>
- {
-
- try
+ //娓呯┖涔嬪墠鏁版嵁
+ libraryList.Clear();
+ var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString());
+ for (int a = 0; a < jArray.Count; a++)
{
- //鎵惧埌绱㈠紩鍊�
- var index = listStr.IndexOf(a_zBtn.Tag.ToString());
- if (index != -1)
+ var jay = jArray[a];
+ var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
+ var library = Newtonsoft.Json.JsonConvert.DeserializeObject<Library>(str);
+ if (library != null)
{
- vv.ScrollToViewIndex(index);
- }
- else
- {
- if (a_zBtn.Tag.ToString() == "#")
+ if (libraryList.Count < 60)
{
- vv.ScrollToViewIndex(0);
+ //闄愬埗60涓簱锛�
+ libraryList.Add(library);
}
}
}
- catch { }
- };
-
- }
- #endregion
-
- RefreshLayout(vv, list1);
-
- }
- /// <summary>
- /// 鏇存柊鍒楄〃Viev
- /// </summary>
- /// <param name="vv">鐖舵帶浠�</param>
- /// <param name="list">鏄剧ず鍒楄〃</param>
- private void RefreshLayout(VerticalScrolViewLayout vv, List<string> list)
- {
- vv.RemoveAll();
- foreach (var str in list)
- {
- var rowLayout = new RowLayout { LineColor = CSS.CSS_Color.view };
- var textName = new Button
- {
- TextSize = TextSize.text16,
- TextColor = CSS.CSS_Color.textColor,
- Width = Application.GetRealWidth(300),
- Height = Application.GetRealHeight(22),
- X = Application.GetRealWidth(16),
- Gravity = Gravity.CenterVertical,
- TextAlignment = TextAlignment.CenterLeft,
- Text = str,
- };
- var clickBtn = new Button
- {
- Tag = str,
- Width = Application.GetRealWidth(350),
- };
-
- if (Exist(str))
- {
- //鍥犱负瀛楁瘝娌℃湁鐐瑰嚮浜嬩欢
- rowLayout.Height = Application.GetRealHeight(24);
- rowLayout.BackgroundColor = CSS.CSS_Color.viewTop;
- textName.TextSize = TextSize.text12;
- rowLayout.AddChidren(textName);
+ actionBrand(libraryList);
}
else
{
- rowLayout.Height = Application.GetRealHeight(44);
- rowLayout.AddChidren(textName);
- rowLayout.AddChidren(clickBtn);
+ PirMethod method = new PirMethod();
+ method.ErrorShow(responsePackNew, "");
}
- vv.AddChidren(rowLayout);
- clickBtn.MouseUpEventHandler += (sen, e) =>
- {
- ////鎵惧埌绱㈠紩鍊�
- //var index = list.IndexOf(clickBtn.Tag.ToString());
-
- //this.RemoveFromParent();
- };
-
- }
-
- }
- /// <summary>
- /// 鍒楄〃鏄惁鍖呭惈璇ュ��(true=鍖呭惈锛宖alse=涓嶅寘鍚�)
- /// </summary>
- /// <param name="str"></param>
- /// <returns></returns>
- private bool Exist(string str)
- {
-
- if (GetList().Contains(str) || "涓绘祦鍝佺墝" == str)
- {
- return true;
- }
- else
- {
- return false;
- }
+ }, id, "鍝佺墝绾㈠鐮佸簱鍒楄〃");
}
/// <summary>
/// 鑾峰彇鏄剧ず鍒楄〃
/// </summary>
/// <returns></returns>
- private List<string> GetDateList(List<string> mList)
+ private Dictionary<string, List<string>> GetDateList(List<string> mList)
{
- var list = new List<string>();
+ Dictionary<string, List<string>> dict = new Dictionary<string, List<string>>();
//鑾峰彇A-Z瀛楁瘝鍒楄〃
- var a_zList = GetList(false);
+ var a_zList = GetList();
//閬嶅巻A-Z瀛楁瘝鍒楄〃
for (int i = 0; i < a_zList.Count; i++)
{
var zimu = a_zList[i];
+
+ var list = new List<string>();
//閬嶅巻瀛楃涓插垪琛�
for (int a = 0; a < mList.Count; a++)
{
@@ -274,31 +101,22 @@
//鍒ゆ柇鏄惁鍚屽瓧姣�
if (zimu == a_z)
{
- //鍒ゆ柇鍒楄〃鏄惁瀛樺湪瀛楁瘝
- if (!list.Contains(zimu))
- {
- //娣诲姞瀛楁瘝
- list.Add(zimu);
- }
- //娣诲姞棣栧瓧鍚屼竴涓瓧姣嶇殑鏁版嵁
+ //娣诲姞鏁版嵁
list.Add(str);
}
}
+ dict.Add(zimu, list);
}
- return list;
+ return dict;
}
/// <summary>
/// 鑾峰彇A-Z瀛楁瘝鍒楄〃
/// </summary>
/// <returns></returns>
- private List<string> GetList(bool value = true)
+ private List<string> GetList()
{
var list = new List<string>();
- if (value)
- {
- list.Add("#");
- }
for (int j = 65; j <= 90; j++)
{
char c = (char)j;
@@ -332,7 +150,7 @@
iCnChar = i1 * 256 + i2;
}
-
+
// iCnChar match the constant
if ((iCnChar >= 45217) && (iCnChar <= 45252))
@@ -430,6 +248,10 @@
}
else return ("ZZ");
}
+
+
}
+
+
}
--
Gitblit v1.8.0