From 0d1b995a55d2c9a049550b28f72ca0265ca588f0 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 04 三月 2021 19:49:58 +0800
Subject: [PATCH] 2021-3-4-2
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 59 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index 98c3e74..1aebd1f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -10,6 +10,7 @@
public PirMain()
{
Tag = "PirMain";
+ GetPirDeviceList();
}
/// <summary>
/// 涓存椂鍌ㄥ瓨璁惧绫诲瀷鍒楄〃
@@ -178,6 +179,10 @@
Text = "mini鏅鸿兘閬ユ帶鍣�",
};
deviceListFLayout.AddChidren(deviceNameBtn);
+ if (Pir.pirDeviceList.Count!=0) {
+ deviceNameBtn.Text = Pir.pirDeviceList[0].name;
+ Pir.currPir = Pir.pirDeviceList[0];
+ }
//涓嬫媺鍥炬爣
var dropdownIconBtn = new Button
@@ -228,9 +233,8 @@
Width = Application.GetRealWidth(144),
Height = Application.GetRealHeight(44 * 4),
};
- var pirDeviceList = new List<int> { 1, 2, 3,4,5,6, };
- if (pirDeviceList.Count >4)
+ if (Pir.pirDeviceList.Count >4)
{
iconFLyout.Height = Application.GetRealHeight(21 + 44 * 4);
iconFLyout.AddChidren(vv);
@@ -240,17 +244,17 @@
{
iconFLyout.AddChidren(textFLyout);
- iconFLyout.Height = Application.GetRealHeight(21 + 44 * pirDeviceList.Count);
- textFLyout.Height = Application.GetRealHeight(44 * pirDeviceList.Count);
- iconFLyout.BackgroundImagePath = $"PirIcon/{pirDeviceList.Count}.png";
+ iconFLyout.Height = Application.GetRealHeight(21 + 44 * Pir.pirDeviceList.Count);
+ textFLyout.Height = Application.GetRealHeight(44 * Pir.pirDeviceList.Count);
+ iconFLyout.BackgroundImagePath = $"PirIcon/{Pir.pirDeviceList.Count}.png";
}
#endregion
- for (int i = 0; i < pirDeviceList.Count; i++)
+ for (int i = 0; i < Pir.pirDeviceList.Count; i++)
{
- var room = pirDeviceList[i];
+ var pirJson = Pir.pirDeviceList[i];
View.PirNameView pirNameView = new View.PirNameView();
- if (pirDeviceList.Count > 4)
+ if (Pir.pirDeviceList.Count > 4)
{
vv.AddChidren(pirNameView.FLayoutView());
}
@@ -259,14 +263,16 @@
pirNameView.frameLayout.Y = Application.GetRealHeight(i * 44);
textFLyout.AddChidren(pirNameView.FLayoutView());
}
- pirNameView.btnName.Text = room.ToString();
- pirNameView.btnClick.Tag = room;
+ pirNameView.btnName.Text = pirJson.name;
+ pirNameView.btnClick.Tag = pirJson;
pirNameView.btnClick.MouseUpEventHandler += (sender2, e2) =>
{
fLayout.RemoveFromParent();
-
+ deviceNameBtn.Text = pirJson.name;
+ Pir.currPir = pirJson;
+
};
- if (pirDeviceList.Count - 1 == i)
+ if (Pir.pirDeviceList.Count - 1 == i)
{
///鏀瑰彉鏈�鍚庨偅鏉′竴涓嚎鐨勯鑹�,鐣岄潰鏄剧ず鏁堟灉浣滅敤;
pirNameView.btnLine.BackgroundColor = CSS.CSS_Color.view;
@@ -318,6 +324,7 @@
GetIconAndText(i, deviceIconBtn, iconNameBtn);
clickBtn.MouseUpEventHandler += (sender, e) =>
{
+
//1=绌鸿皟;2=鐢佃;3=椋庢墖;4=鏈洪《鐩�;5=DVD/EVD/VCD;6=鎶曞奖浠�;7=鑷畾涔�;
int if_value = int.Parse(clickBtn.Tag.ToString());
if (if_value == 7)
@@ -368,6 +375,7 @@
}
GetDeviceTypeList();
+
}
/// <summary>
/// 鑾峰彇鍝佺墝鏀寔
@@ -619,7 +627,6 @@
{
try
{
- //鍙戦�佹寜閿垹闄わ紱
responsePackNew = PirSend.GetDeviceList("ir.module");
}
catch { }
@@ -628,15 +635,41 @@
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 { }
});
}
--
Gitblit v1.8.0