From 981ccd4afab6271422d7f169b30a2efa55eafde1 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 26 二月 2021 16:18:16 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs | 90 ++++++++++++--------------------------------
1 files changed, 25 insertions(+), 65 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/EmptyClass.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs
similarity index 83%
copy from HDL_ON/UI/UI2/3-Intelligence/Automation/EmptyClass.cs
copy to HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs
index 2293a25..06e00f9 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/EmptyClass.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs
@@ -4,20 +4,21 @@
using System.Collections.Generic;
using System.Text;
-namespace HDL_ON.UI.UI2.Intelligence.Automation
+namespace HDL_ON.UI.UI2.PersonalCenter.PirDevice
{
- public class EmptyClass : FrameLayout
+ public class BrandList : FrameLayout
{
+ public BrandList()
+ {
+ Tag = "PirView";
+ }
/// <summary>
///
/// </summary>
/// <param name="list">琛ㄧず璇ュ垪琛ㄥ厓绱燗-Z瀛楁瘝绛涢�夋樉绀哄嚭鏉�</param>
/// <param name="list6">琛ㄧず璇ュ垪琛ㄥ厓绱犳樉绀哄湪list鍓嶉潰(璇ュ垪琛ㄥ厓绱犱笉鍋欰-Z瀛楁瘝绛涢��),娌℃湁鍙互涓簂ist6=null</param>
- /// <param name="action">杩斿洖閫変腑鏂囨湰</param>
- public void Show(List<string> list, List<string> list6, Action<string> action)
+ 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++)
@@ -27,8 +28,6 @@
//}
////鎶奲yte鏁扮粍杞崲鎴愭枃瀛�
//string str = System.Text.Encoding.UTF8.GetString(bytes);
-
-
var frameLayout = new FrameLayout
{
BackgroundColor = CSS.CSS_Color.viewTop,
@@ -59,7 +58,14 @@
UnSelectedImagePath = "LogicIcon/back.png",
};
frameLayout.AddChidren(backBtn);
- backBtn.MouseUpEventHandler += (sen, e) =>
+ 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();
};
@@ -86,16 +92,7 @@
};
this.AddChidren(fram);
-
- //var list11 = new List<string> {
- // "鐖变綘", "鍝庡懄","鍩冨強","鍝堝紬鎹㈠３鍝堝紬", "鐖卞痉鍗庡v","淇哄嚑涓柉浜�",
- // "鎷滀簡", "宸村＋", "鐧惧か", "鐧惧悎鍦扮悊璇句綘鎵撶畻", "涓嶅害鑰侀浼忔灔", "姣斿埌涔濈偣",
- // "杞︾珯","娴嬭瘯","姝ゅ湴", "鎵嶇湅瑙佸ソ寰楀揩","鍚冭蒋楗�","浠庣湅瑙佷簩鍗佸",
- // "绛夊緟鏈轰細鍚�","鐨勫鎴�", "澶氬枬鐐�", "鐧昏鍝︾劧鍚�", "鎵撶數璇�",
- // "鎭╄偆闇滅湅灏辩湅浜�", "楗挎os","鎭堕瓟鍩�","鍎跨鑱斿姩", "鎭╁叚棰楀瓙寮规媺鎷夎￥娲楁尽浜�","鍙戝ぇ瀛︾敓鍙戝彂",
- // "鐪熷帀瀹砳鍙戝灏�", "鐭ラ亾浣犱粯娆句簡鍙�", "灏厭鍥炲", "鏀硅繘鐨勮瘽", "澶╁ぉ閫熷害鍥炵瓟", "澶ソ浜嗗紑杞�",
- // "鍑忚偉鐨勭湅杩�","妗″嚭鍙ｅ閭�","濡傛灉瑙夊緱", "寰堣垝鏈嶇殑","鍚冭蒋楗�","浠庣湅瑙佷簩鍗佸",
- // "榫欏嵎椋庝簭澶у彂","鍘诲ソ鐪�", "澶氬枬鐐�", "濂芥氮璐瑰ソ", "鎵撶數璇�"};
+
if (list == null)
{
list = new List<string>();
@@ -105,10 +102,7 @@
list6 = new List<string>();
}
var list1 = GetDateList(list);
- list1.Add("1");
list1.InsertRange(0, list6);
-
-
var vv = new VerticalScrolViewLayout();
fram.AddChidren(vv);
@@ -125,10 +119,9 @@
listStr.Add(s);
}
}
- RefreshLayout(vv, listStr, action);
+ RefreshLayout(vv, listStr);
};
-
#region A-Z
@@ -140,7 +133,7 @@
Width = Application.GetRealWidth(10 + 6),
};
fram.AddChidren(a_zFra);
- var list2 = GetList();
+ var list2 = GetList();
for (int i = 0; i < list2.Count; i++)
{
@@ -183,11 +176,7 @@
}
#endregion
- RefreshLayout(vv, list1,action);
-
-
-
-
+ RefreshLayout(vv, list1);
}
/// <summary>
@@ -195,7 +184,7 @@
/// </summary>
/// <param name="vv">鐖舵帶浠�</param>
/// <param name="list">鏄剧ず鍒楄〃</param>
- private void RefreshLayout(VerticalScrolViewLayout vv, List<string> list,Action<string> action)
+ private void RefreshLayout(VerticalScrolViewLayout vv, List<string> list)
{
vv.RemoveAll();
foreach (var str in list)
@@ -235,10 +224,10 @@
vv.AddChidren(rowLayout);
clickBtn.MouseUpEventHandler += (sen, e) =>
{
- //鎵惧埌绱㈠紩鍊�
- var index = list.IndexOf(clickBtn.Tag.ToString());
+ ////鎵惧埌绱㈠紩鍊�
+ //var index = list.IndexOf(clickBtn.Tag.ToString());
- this.RemoveFromParent();
+ //this.RemoveFromParent();
};
}
@@ -261,7 +250,6 @@
return false;
}
}
-
/// <summary>
/// 鑾峰彇鏄剧ず鍒楄〃
/// </summary>
@@ -300,7 +288,6 @@
}
return list;
}
-
/// <summary>
/// 鑾峰彇A-Z瀛楁瘝鍒楄〃
/// </summary>
@@ -321,7 +308,6 @@
}
return list;
}
-
/// <summary>
/// 鑾峰彇姹夊瓧棣栧瓧姣�
/// </summary>
@@ -346,34 +332,7 @@
iCnChar = i1 * 256 + i2;
}
- //expresstion
- //table of the constant list
- // 'A'; //45217..45252
- // 'B'; //45253..45760
- // 'C'; //45761..46317
- // 'D'; //46318..46825
- // 'E'; //46826..47009
- // 'F'; //47010..47296
- // 'G'; //47297..47613
-
- // 'H'; //47614..48118
- // 'J'; //48119..49061
- // 'K'; //49062..49323
- // 'L'; //49324..49895
- // 'M'; //49896..50370
- // 'N'; //50371..50613
- // 'O'; //50614..50621
- // 'P'; //50622..50905
- // 'Q'; //50906..51386
-
- // 'R'; //51387..51445
- // 'S'; //51446..52217
- // 'T'; //52218..52697
- //娌℃湁U,V
- // 'W'; //52698..52979
- // 'X'; //52980..53640
- // 'Y'; //53689..54480
- // 'Z'; //54481..55289
+
// iCnChar match the constant
if ((iCnChar >= 45217) && (iCnChar <= 45252))
@@ -473,3 +432,4 @@
}
}
}
+
--
Gitblit v1.8.0