From 9463fa981945f278a639a1303192272732415f22 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 09:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 183 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 175 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index 1ee2bb0..981952e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using System.Text;
using HDL_ON.Entity;
using HDL_ON.UI.UI2.Intelligence.Automation.LogicView;
using Shared;
@@ -7,8 +8,12 @@
{
public class PirMain : FrameLayout
{
+ /// <summary>
+ /// 鏋勯�犲嚱鏁�
+ /// </summary>
public PirMain()
{
+ /// 鏍囪鐣岄潰
Tag = "PirMain";
}
/// <summary>
@@ -87,12 +92,7 @@
SetPir setPir = new SetPir();
MainPage.BasePageView.AddChidren(setPir);
- setPir.Show(() =>
- {
- //BackAction();
- ////鍒锋柊鐣岄潰
- UIView(vv);
- });
+ setPir.Show();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
///娣诲姞閬ユ帶鍣ㄥ浘鏍囩偣鍑讳簨浠�
@@ -123,7 +123,7 @@
{
if (if_value == 3 || if_value == 4 || if_value == 5 || if_value == 6)
{
- new TipPopView().FlashingBox("鏆傛椂涓嶆敮鎸佽鍔熻兘.");
+ new TipPopView().FlashingBox(Language.StringByID(StringId.zanshibuzhichigaigongneng));
return;
}
if (DeviceTypeList.Count == 0)
@@ -150,6 +150,174 @@
UIView(vv);
}
+
+ void GoToShowSortSelection(List<string> dataList)
+ {
+ Dictionary<string, List<string>> dict = new Dictionary<string, List<string>>();
+
+ foreach (var data in dataList)
+ {
+ //鎻愬彇瀛楃涓茬涓�浣�
+ //string s = data.Substring(0, 1);
+ var key = GetCharSpellCode(data);
+
+ if (dict.ContainsKey(key))
+ {
+ var value = dict[key];
+ if (value == null)
+ {
+ value = new List<string>();
+ }
+ value.Add(data);
+
+
+ }
+ else
+ {
+ var value = new List<string>();
+ value.Add(data);
+ dict.Add(key, value);
+ }
+
+
+ }
+
+
+ Application.RunOnMainThread(() =>
+ {
+ JLCountrycode.CountryCodeView.Current.ShowSortSelection("閫夋嫨绾㈠鍝佺墝", dict, (countryName) =>
+ {
+ //Console.WriteLine("countryName: " + countryName);
+ Utlis.ShowTip("閫変腑浜�:" + countryName);
+
+
+ });
+ });
+ }
+
+ /// <summary>
+ /// 鑾峰彇姹夊瓧棣栧瓧姣�
+ /// </summary>
+ /// <param name="textValue"></param>
+ /// <returns></returns>
+ private string GetCharSpellCode(string textValue)
+ {
+ long iCnChar;
+
+ byte[] ZW = Encoding.GetEncoding("gb2312").GetBytes(textValue);
+
+ //濡傛灉鏄瓧姣嶏紝鍒欑洿鎺ヨ繑鍥�
+ if (ZW.Length == 1)
+ {
+ return textValue.ToUpper();
+ }
+ else
+ {
+ // get the array of byte from the single char
+ int i1 = (short)(ZW[0]);
+ int i2 = (short)(ZW[1]);
+ iCnChar = i1 * 256 + i2;
+ }
+
+
+
+ // iCnChar match the constant
+ if ((iCnChar >= 45217) && (iCnChar <= 45252))
+ {
+ return "A";
+ }
+ else if ((iCnChar >= 45253) && (iCnChar <= 45760))
+ {
+ return "B";
+ }
+ else if ((iCnChar >= 45761) && (iCnChar <= 46317))
+ {
+ return "C";
+ }
+ else if ((iCnChar >= 46318) && (iCnChar <= 46825))
+ {
+ return "D";
+ }
+ else if ((iCnChar >= 46826) && (iCnChar <= 47009))
+ {
+ return "E";
+ }
+ else if ((iCnChar >= 47010) && (iCnChar <= 47296))
+ {
+ return "F";
+ }
+ else if ((iCnChar >= 47297) && (iCnChar <= 47613))
+ {
+ return "G";
+ }
+ else if ((iCnChar >= 47614) && (iCnChar <= 48118))
+ {
+ return "H";
+ }
+ else if ((iCnChar >= 48119) && (iCnChar <= 49061))
+ {
+ return "J";
+ }
+ else if ((iCnChar >= 49062) && (iCnChar <= 49323))
+ {
+ return "K";
+ }
+ else if ((iCnChar >= 49324) && (iCnChar <= 49895))
+ {
+ return "L";
+ }
+ else if ((iCnChar >= 49896) && (iCnChar <= 50370))
+ {
+ return "M";
+ }
+
+ else if ((iCnChar >= 50371) && (iCnChar <= 50613))
+ {
+ return "N";
+ }
+ else if ((iCnChar >= 50614) && (iCnChar <= 50621))
+ {
+ return "O";
+ }
+ else if ((iCnChar >= 50622) && (iCnChar <= 50905))
+ {
+ return "P";
+ }
+ else if ((iCnChar >= 50906) && (iCnChar <= 51386))
+ {
+ return "Q";
+ }
+ else if ((iCnChar >= 51387) && (iCnChar <= 51445))
+ {
+ return "R";
+ }
+ else if ((iCnChar >= 51446) && (iCnChar <= 52217))
+ {
+ return "S";
+ }
+ else if ((iCnChar >= 52218) && (iCnChar <= 52697))
+ {
+ return "T";
+ }
+ else if ((iCnChar >= 52698) && (iCnChar <= 52979))
+ {
+ return "W";
+ }
+ else if ((iCnChar >= 52980) && (iCnChar <= 53640))
+ {
+ return "X";
+ }
+ else if ((iCnChar >= 53689) && (iCnChar <= 54480))
+ {
+ return "Y";
+ }
+ else if ((iCnChar >= 54481) && (iCnChar <= 55289))
+ {
+ return "Z";
+ }
+ else return ("");
+ }
+
/// <summary>
/// 鍔犺浇UI鐣岄潰
/// </summary>
@@ -358,7 +526,6 @@
public override void RemoveFromParent()
{
BackAction();
- BackAction = null;
base.RemoveFromParent();
}
--
Gitblit v1.8.0