From 7a11998bb4d64d8fce3aef1ed7918553832baf02 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 三月 2021 13:25:35 +0800
Subject: [PATCH] 2021-3-16-2
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 243 ++++++++++++++++++++++--------------------------
1 files changed, 111 insertions(+), 132 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index 1aebd1f..cfa6492 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -10,7 +10,7 @@
public PirMain()
{
Tag = "PirMain";
- GetPirDeviceList();
+
}
/// <summary>
/// 涓存椂鍌ㄥ瓨璁惧绫诲瀷鍒楄〃
@@ -78,7 +78,7 @@
};
pirDeviceFLayout.AddChidren(text2Btn);
- //
+ //绾㈠瀹濇暟閲�
Button numberDeviceBtn = new Button
{
Y = Application.GetRealHeight(137),
@@ -105,7 +105,7 @@
TextID = StringId.dangqianhongwaishebei,
};
pirDeviceFLayout.AddChidren(numberDeviceTextBtn);
- //
+ //鎵�鏈夌孩澶栧疂鐨勯仴鎺у櫒鏁伴噺
Button currDeviceNumberControlBtn = new Button
{
Y = Application.GetRealHeight(137),
@@ -135,14 +135,7 @@
///绾㈠瀹濈偣鍑讳簨浠�
FrameLayout clickFLayout = new FrameLayout();
pirDeviceFLayout.AddChidren(clickFLayout);
- clickFLayout.MouseUpEventHandler += (sender, e) =>
- {
- DeviceSet deviceSet = new DeviceSet();
- MainPage.BasePageView.AddChidren(deviceSet);
- deviceSet.Show();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
FrameLayout deviceListFLayout = new FrameLayout();
deviceListFLayout.Y = pirDeviceFLayout.Bottom + Application.GetRealHeight(12);
@@ -179,9 +172,17 @@
Text = "mini鏅鸿兘閬ユ帶鍣�",
};
deviceListFLayout.AddChidren(deviceNameBtn);
- if (Pir.pirDeviceList.Count!=0) {
- deviceNameBtn.Text = Pir.pirDeviceList[0].name;
+ if (Pir.pirDeviceList.Count != 0)
+ {
Pir.currPir = Pir.pirDeviceList[0];
+ int sum = 0;
+ for (int i = 0; i < Pir.pirDeviceList.Count; i++)
+ {
+ sum += Pir.pirDeviceList[i].FunctioList.Count;
+ }
+ deviceNameBtn.Text = Pir.pirDeviceList[0].name;
+ numberDeviceBtn.Text = Pir.pirDeviceList.Count.ToString() + Language.StringByID(StringId.ge);
+ currDeviceNumberControlBtn.Text = sum.ToString() + Language.StringByID(StringId.ge);
}
//涓嬫媺鍥炬爣
@@ -209,7 +210,7 @@
fLayout.RemoveFromParent();
};
- FrameLayout iconFLyout = new FrameLayout
+ FrameLayout iconFLyout = new FrameLayout
{
X = Application.GetRealWidth(205),
Y = Application.GetRealHeight(314),
@@ -219,14 +220,14 @@
};
fLayout.AddChidren(iconFLyout);
- FrameLayout textFLyout = new FrameLayout
+ FrameLayout textFLyout = new FrameLayout
{
X = Application.GetRealWidth(8),
Y = Application.GetRealHeight(14),
Width = Application.GetRealWidth(144),
Height = Application.GetRealHeight(44),
};
- VerticalScrolViewLayout vv = new VerticalScrolViewLayout
+ VerticalScrolViewLayout vv = new VerticalScrolViewLayout
{
X = Application.GetRealWidth(8),
Y = Application.GetRealHeight(14),
@@ -234,7 +235,7 @@
Height = Application.GetRealHeight(44 * 4),
};
- if (Pir.pirDeviceList.Count >4)
+ if (Pir.pirDeviceList.Count > 4)
{
iconFLyout.Height = Application.GetRealHeight(21 + 44 * 4);
iconFLyout.AddChidren(vv);
@@ -252,8 +253,8 @@
for (int i = 0; i < Pir.pirDeviceList.Count; i++)
{
- var pirJson = Pir.pirDeviceList[i];
- View.PirNameView pirNameView = new View.PirNameView();
+ var pirJson = Pir.pirDeviceList[i];
+ View.PirNameView pirNameView = new View.PirNameView();
if (Pir.pirDeviceList.Count > 4)
{
vv.AddChidren(pirNameView.FLayoutView());
@@ -280,7 +281,31 @@
}
};
+ ///
+ clickFLayout.MouseUpEventHandler += (sender, e) =>
+ {
+ DeviceSet deviceSet = new DeviceSet();
+ MainPage.BasePageView.AddChidren(deviceSet);
+ deviceSet.Show(() =>
+ {
+ if (Pir.currPir != null)
+ {
+ deviceNameBtn.Text = Pir.currPir.name;
+ deviceNameBtn.Text = Pir.pirDeviceList[0].name;
+ numberDeviceBtn.Text = Pir.pirDeviceList.Count.ToString() + Language.StringByID(StringId.ge);
+ }
+ int sum = 0;
+ for (int i = 0; i < Pir.pirDeviceList.Count; i++)
+ {
+ sum += Pir.pirDeviceList[i].FunctioList.Count;
+ }
+ currDeviceNumberControlBtn.Text = sum.ToString() + Language.StringByID(StringId.ge);
+
+
+ });
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
#endregion
int line = 0;
for (int i = 1, j = 0; i <= 7; i++, j++)
@@ -330,7 +355,8 @@
if (if_value == 7)
{
Method method = new Method();
- method.AddControl(this,(control) => {
+ method.AddControl(this, (control) =>
+ {
AddButton addButton = new AddButton();
MainPage.BasePageView.AddChidren(addButton);
addButton.Show(control);
@@ -339,44 +365,61 @@
}
else
{
- var strings = GetTypeString(if_value).Split('-');
- var jobDeviceType = DeviceTypeList.Find((c) => c.deviceType == strings[0]);
- if (jobDeviceType == null)
+ if (DeviceTypeList.Count == 0)
{
- return;
- }
- GetBrandList(jobDeviceType.id, (brandList) =>
- {
- var brandSupportStrList= GetBrandSupport(if_value);
- var strList = new List<string>();
- for (int str = 0; str < brandList.Count; str++)
+ GetDeviceTypeList(true,() =>
{
- string s = brandList[str].brandName;
- var bool_if = brandSupportStrList.Find((c)=>s.Contains(c));
- if (bool_if!=null)
- {
- strList.Add(s);
- }
+ DeviceTypeViewClick(if_value);
- }
- Application.RunOnMainThread(()=> {
- BrandList brandObj = new BrandList();
- MainPage.BasePageView.AddChidren(brandObj);
- brandObj.Show(brandList, strList, strings[1]);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
});
-
- });
-
+ }
+ else
+ {
+ DeviceTypeViewClick(if_value);
+ }
+ }
+ };
+ }
+ GetDeviceTypeList(false,() => { });
+
+ }
+ /// <summary>
+ /// 璁惧杩涘叆涓嬩竴绾ф柟娉�
+ /// </summary>
+ /// <param name="if_value"></param>
+ void DeviceTypeViewClick(int if_value) {
+ var strings = GetTypeString(if_value).Split('-');
+ var jobDeviceType = DeviceTypeList.Find((c) => c.deviceType == strings[0]);
+ if (jobDeviceType == null)
+ {
+ return;
+ }
+ 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;
+ });
- }
- GetDeviceTypeList();
-
+ });
+
}
+
/// <summary>
/// 鑾峰彇鍝佺墝鏀寔
/// </summary>
@@ -425,7 +468,7 @@
{
}
break;
-
+
}
return strList;
@@ -442,13 +485,13 @@
case 1:
{
//绌鸿皟
- type = "ac-"+SPK.AcIr;
+ type = "ac-" + SPK.AcIr;
}
break;
case 2:
{
//鐢佃
- type = "tv-"+SPK.ElectricTV;
+ type = "tv-" + SPK.TvIr;
}
break;
case 3:
@@ -460,22 +503,22 @@
case 4:
{
//鏈洪《鐩�
- // type = "set_top_box-" + SPK.ElectricTV;
+ // type = "set_top_box-" + SPK.ElectricTV;
}
break;
case 5:
{
- //褰辩鏈�
- // type = "dvd-" + SPK.ElectricTV;
+ //褰辩鏈�
+ // type = "dvd-" + SPK.ElectricTV;
}
break;
case 6:
{
//鎶曞奖浠�
- // type = "projector-" + SPK.ElectricTV;
+ // type = "projector-" + SPK.ElectricTV;
}
break;
-
+
}
return type;
@@ -542,7 +585,9 @@
/// <summary>
/// 璇诲彇绾㈠璁惧绫诲瀷鍒楄〃
/// </summary>
- private void GetDeviceTypeList()
+ /// <param name="tag">鏍囪瘑瑕佷笉瑕佹彁绀猴紙true=鎻愮ず锛�</param>
+ /// <param name="action">鍥炶皟鍑芥暟</param>
+ private void GetDeviceTypeList(bool tag,Action action)
{
PirSend.GetDeviceTypesList(this, (responsePackNew) =>
{
@@ -565,19 +610,21 @@
}
}
}
+ action();
}
else
{
- Method method = new Method();
- method.ErrorShow(responsePackNew);
+ if (tag) {
+ Method method = new Method();
+ method.ErrorShow(responsePackNew,"");
+ }
}
}, "", "璁惧绫诲瀷鍒楄〃");
}
-
/// <summary>
/// 璇诲彇绾㈠璁惧绫诲瀷鐨勫搧鐗屽垪琛�
/// </summary>
- private void GetBrandList(string id,Action<List<Brand>> actionBrand)
+ private void GetBrandList(string id, Action<List<Brand>> actionBrand)
{
List<Brand> brandList = new List<Brand>();
PirSend.GetDeviceTypesList(this, (responsePackNew) =>
@@ -606,78 +653,10 @@
else
{
Method method = new Method();
- method.ErrorShow(responsePackNew);
+ method.ErrorShow(responsePackNew,"");
}
}, id, "鍝佺墝鍒楄〃");
}
-
-
- /// <summary>
- /// 鑾峰彇绾㈠璁惧鍒楄〃
- /// </summary>
- private void GetPirDeviceList( )
- {
-
- //鍔犺浇log
- Loading loading = new Loading();
- this.AddChidren(loading);
- HDL_ON.DAL.Server.ResponsePackNew responsePackNew = null;
- loading.Start();
- new System.Threading.Thread(() =>
- {
- try
- {
- responsePackNew = PirSend.GetDeviceList("ir.module");
- }
- catch { }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- loading.Hide();
- try {
- if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
- {
- var jobject = Newtonsoft.Json.Linq.JObject.Parse(responsePackNew.Data.ToString());
- string list = jobject["list"].ToString();
-
- var jArray = Newtonsoft.Json.Linq.JArray.Parse(list);
- for (int a = 0; a < jArray.Count; a++)
- {
- var jay = jArray[a];
- string spk = jay["spk"].ToString();
- if (spk == "ir.module")
- {
- //鏁版嵁杩斿簭鍒楀寲涓篖ogic瀵硅薄
- var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
- var pirJosn = Newtonsoft.Json.JsonConvert.DeserializeObject<Pir>(str);
- if (pirJosn != null)
- {
- if (null == Pir.pirDeviceList.Find((c) => c.deviceId == pirJosn.deviceId))
- {
-
- Pir.pirDeviceList.Add(pirJosn);
- }
- }
- }
-
- }
- }
- else
- {
- Method method = new Method();
- method.ErrorShow(responsePackNew);
- }
- }
- catch { }
-
- });
- }
-
- })
- { IsBackground = true }.Start();
- }
-
}
-
+
}
--
Gitblit v1.8.0