From 783f19a056f29c892c4f852f1da37233951bdb95 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 18 三月 2021 18:01:49 +0800
Subject: [PATCH] 2021-3-18-2
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 91 +++++++++------------------------------------
1 files changed, 19 insertions(+), 72 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index 8f065de..d2e068c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -15,7 +15,7 @@
/// 涓存椂鍌ㄥ瓨璁惧绫诲瀷鍒楄〃
/// </summary>
List<DeviceType> DeviceTypeList = new List<DeviceType>();
- public void Show()
+ public void Show(Entity.Function function)
{
#region 鐣岄潰甯冨眬
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
@@ -79,6 +79,19 @@
if (Pir.pirDeviceList.Count != 0)
{
+
+ //if (function != null)
+ //{
+ // Pir pir = new Pir();
+ // pir.name = function.name;
+ // pir.deviceId = function.deviceId;
+ // pir.sid = function.sid;
+ // Pir.currPir = pir;
+ //}
+ //else
+ //{
+ // Pir.currPir = Pir.pirDeviceList[0];
+ //}
//榛樿绗竴涓孩澶栧疂
Pir.currPir = Pir.pirDeviceList[0];
int sum = 0;
@@ -91,6 +104,7 @@
mainView.numberDeviceBtn.Text = Pir.pirDeviceList.Count.ToString() + Language.StringByID(StringId.ge);
mainView.currDeviceNumberControlBtn.Text = sum.ToString() + Language.StringByID(StringId.ge);
}
+
///璁惧绠＄悊鐨勭偣鍑讳簨浠�
mainView.clickBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -214,83 +228,16 @@
}
GetBrandList(jobDeviceType.id, (brandList) =>
{
- var brandSupportStrList = GetBrandSupport(if_value);
- var strList = new List<string>();
- for (int str = 0; str < brandList.Count; str++)
- {
- string s = brandList[str].brandName;
- var bool_if = brandSupportStrList.Find((c) => s.Contains(c));
- if (bool_if != null)
- {
- strList.Add(s);
- }
-
- }
Application.RunOnMainThread(() =>
{
BrandList brandObj = new BrandList();
- MainPage.BasePageView.AddChidren(brandObj);
- brandObj.Show(brandList, strList, strings[1]);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ brandObj.Show(brandList, strings[1]);
});
});
}
- /// <summary>
- /// 鑾峰彇鍝佺墝鏀寔
- /// </summary>
- /// <param name="index">绱㈠紩鍊�</param>
- private List<string> GetBrandSupport(int index)
- {
- List<string> strList = new List<string>();
- switch (index)
- {
- case 1:
- {
- strList.Add("鏍煎姏");
- strList.Add("缇庣殑");
- strList.Add("娴峰皵");
- strList.Add("鏉句笅");
- strList.Add("娴蜂俊");
- strList.Add("闀胯櫣");
- }
- break;
- case 2:
- {
- strList.Add("鍒涚淮");
- strList.Add("TCL");
- strList.Add("娴蜂俊");
- strList.Add("闀胯櫣");
- strList.Add("娴峰皵");
- strList.Add("涓夋槦");
- strList.Add("涔愯");
- strList.Add("绱㈠凹");
- strList.Add("LG涔愰噾");
- }
- break;
- case 3:
- {
- }
- break;
- case 4:
- {
- }
- break;
- case 5:
- {
- }
- break;
- case 6:
- {
- }
- break;
-
-
- }
- return strList;
- }
/// <summary>
/// 鑾峰彇璁惧绫诲瀷str
/// </summary>
@@ -315,7 +262,7 @@
case 3:
{
//椋庢墖
- // type = "fan-" + SPK.ElectricFan;
+ // type = "fan-" + SPK.ElectricFan;
}
break;
case 4:
@@ -405,7 +352,7 @@
/// </summary>
/// <param name="tag">鏍囪瘑瑕佷笉瑕佹彁绀猴紙true=鎻愮ず锛�</param>
/// <param name="action">鍥炶皟鍑芥暟</param>
- public void GetDeviceTypeList(bool tag, Action action)
+ public void GetDeviceTypeList(bool tag, Action action)
{
PirSend.GetDeviceTypesList(this, (responsePackNew) =>
{
@@ -443,7 +390,7 @@
/// <summary>
/// 璇诲彇绾㈠璁惧绫诲瀷鐨勫搧鐗屽垪琛�
/// </summary>
- public void GetBrandList(string id, Action<List<Brand>> actionBrand)
+ public void GetBrandList(string id, Action<List<Brand>> actionBrand)
{
List<Brand> brandList = new List<Brand>();
PirSend.GetDeviceTypesList(this, (responsePackNew) =>
--
Gitblit v1.8.0