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/PirMain.cs | 265 +++++++++++------------------------------------------
1 files changed, 55 insertions(+), 210 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index 981952e..38b713e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -61,12 +61,7 @@
};
middFLayout.AddChidren(addDevice);
- if (Pir.currPir.FunctioList.Count < 10)
- {
- //10涓仴鎺у櫒灏变細闅愯棌娣诲姞鍥炬爣
- // middFLayout.AddChidren(addDevice);
- addDevice.Visible = true;
- }
+
#endregion
#region 鐣岄潰鐐瑰嚮浜嬩欢
@@ -76,7 +71,7 @@
////鍏抽棴鍒锋柊View锛�
vv.EndHeaderRefreshing();
- Method.GetControlList(this, () =>
+ PirMethod.GetControlList(this, () =>
{
Application.RunOnMainThread(() =>
{
@@ -101,18 +96,18 @@
//杩涙潵涓嶅厑璁稿乏婊�
MainPage.BasePageView.ScrollEnabled = false;
View.Buttons buttons = new View.Buttons();
- buttons.AddFrameLayout(this, (if_value, view) =>
+ buttons.AddFrameLayout(this, (if_value, view) =>
{
//鍏抽棴鍏佽宸︽粦
MainPage.BasePageView.ScrollEnabled = true;
//1=绌鸿皟;2=鐢佃;3=椋庢墖;4=鏈洪《鐩�;5=DVD/EVD/VCD;6=鎶曞奖浠�;7=鑷畾涔�;
if (if_value == 7)
{
- Method method = new Method();
+ PirMethod method = new PirMethod();
method.AddControl(this, (control) =>
{
- //鎴愬姛鍚庣Щ闄�;
- view.RemoveFromParent();
+ //鎴愬姛鍚庣Щ闄�;
+ view.RemoveFromParent();
AddButton addButton = new AddButton();
MainPage.BasePageView.AddChidren(addButton);
addButton.Show(control);
@@ -121,7 +116,7 @@
}
else
{
- if (if_value == 3 || if_value == 4 || if_value == 5 || if_value == 6)
+ if (if_value == 6)
{
new TipPopView().FlashingBox(Language.StringByID(StringId.zanshibuzhichigaigongneng));
return;
@@ -131,8 +126,8 @@
GetDeviceTypeList(true, () =>
{
DeviceTypeViewClick(if_value);
- //鑾峰彇鎴愬姛涔嬪悗绉婚櫎
- view.RemoveFromParent();
+ //鑾峰彇鎴愬姛涔嬪悗绉婚櫎
+ view.RemoveFromParent();
});
}
@@ -141,189 +136,25 @@
DeviceTypeViewClick(if_value);
view.RemoveFromParent();
}
-
}
}, 7);
};
#endregion
///鍒濆鍖栫晫闈�
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>
/// <param name="vv">涓婁笅婊戞帶浠�</param>
private void UIView(VerticalRefreshLayout vv)
{
+ if (Pir.currPir.FunctioList.Count < 10)
+ {
+ //10涓仴鎺у櫒灏变細闅愯棌娣诲姞鍥炬爣
+ // middFLayout.AddChidren(addDevice);
+ addDevice.Visible = true;
+ }
vv.RemoveAll();
#region 绾㈠瀹濆浘鏍� 鐗堟湰鍙� 鍚嶇О 鐘舵��
FrameLayout fLayout = new FrameLayout
@@ -366,7 +197,7 @@
//閬ユ帶鍣ㄥ悕绉�
controlView.nameBtn.Text = control.name;
//閬ユ帶鍣ㄥ瓨鏀惧尯鍩�
- controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(control);
+ controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(control);
//鏍囪閬ユ帶鍣�
controlView.delBtn.Tag = control;
//鍒犻櫎鐐瑰嚮浜嬩欢
@@ -377,7 +208,7 @@
TipPopView tipPopView = new TipPopView();
tipPopView.TipBox(StringId.tip, text, (dialog) =>
{
- Method.ThreadSend(new Control { deviceId=control.deviceId}, (responsePackNew) =>
+ PirMethod.ThreadSend(new Control { deviceId=control.deviceId}, (responsePackNew) =>
{
dialog.Close();
var function = Pir.currPir.FunctioList.Find((c) => c.sid == Function.sid);
@@ -405,7 +236,7 @@
{
//鍥炶皟鏇存柊鍚嶅瓧/鍖哄煙
controlView.nameBtn.Text = device.name;
- controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(device);
+ controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(device);
});
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -426,7 +257,6 @@
/// <param name="if_value">鎺т欢绱㈠紩鍊�</param>
private void DeviceTypeViewClick(int if_value)
{
-
var strings = View.Buttons.GetTypeString(if_value).Split('-');
var jobDeviceType = DeviceTypeList.Find((c) => c.deviceType == strings[0]);
if (jobDeviceType == null)
@@ -442,7 +272,6 @@
});
});
-
}
/// <summary>
/// 璇诲彇绾㈠璁惧绫诲瀷鍒楄〃
@@ -453,32 +282,38 @@
{
PirSend.GetDeviceTypesList(this, (responsePackNew) =>
{
-
if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
{
//娓呯┖涔嬪墠鏁版嵁
DeviceTypeList.Clear();
- var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString());
- for (int a = 0; a < jArray.Count; a++)
+ try
{
- var jay = jArray[a];
- var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
- var objDeviceType = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceType>(str);
- if (objDeviceType != null)
+ var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString());
+ for (int a = 0; a < jArray.Count; a++)
{
- if (null == DeviceTypeList.Find((c) => c.id == objDeviceType.id))
+ var jay = jArray[a];
+ var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
+ var objDeviceType = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceType>(str);
+ if (objDeviceType != null)
{
- DeviceTypeList.Add(objDeviceType);
+ if (null == DeviceTypeList.Find((c) => c.id == objDeviceType.id))
+ {
+ DeviceTypeList.Add(objDeviceType);
+ }
}
}
+ action();
}
- action();
+ catch
+ {
+
+ }
}
else
{
if (tag)
{
- Method method = new Method();
+ PirMethod method = new PirMethod();
method.ErrorShow(responsePackNew, "");
}
}
@@ -497,25 +332,35 @@
{
//娓呯┖涔嬪墠鏁版嵁
brandList.Clear();
- var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString());
- for (int a = 0; a < jArray.Count; a++)
+ try
{
- var jay = jArray[a];
- var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
- var brand = Newtonsoft.Json.JsonConvert.DeserializeObject<Brand>(str);
- if (brand != null)
+ var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString());
+ for (int a = 0; a < jArray.Count; a++)
{
- if (null == brandList.Find((c) => c.id == brand.id))
+ var jay = jArray[a];
+ var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
+ var brand = Newtonsoft.Json.JsonConvert.DeserializeObject<Brand>(str);
+ if (brand != null)
{
- brandList.Add(brand);
+ if (null == brandList.Find((c) => c.id == brand.id))
+ {
+ brandList.Add(brand);
+ }
}
}
}
- actionBrand(brandList);
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ actionBrand(brandList);
+ });
+ }
}
else
{
- Method method = new Method();
+ PirMethod method = new PirMethod();
method.ErrorShow(responsePackNew, "");
}
}, id, "鍝佺墝鍒楄〃");
--
Gitblit v1.8.0