From 1d1cad99a27c9f644c84eb3d376c70bd30a55879 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 10 三月 2021 18:02:13 +0800
Subject: [PATCH] 2021-3-10-1
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 145 +++++++++++++++++++----------------------------
1 files changed, 59 insertions(+), 86 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..b1e7b74 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";
+
}
/// <summary>
/// 涓存椂鍌ㄥ瓨璁惧绫诲瀷鍒楄〃
@@ -134,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);
@@ -178,6 +172,11 @@
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
@@ -204,7 +203,7 @@
fLayout.RemoveFromParent();
};
- FrameLayout iconFLyout = new FrameLayout
+ FrameLayout iconFLyout = new FrameLayout
{
X = Application.GetRealWidth(205),
Y = Application.GetRealHeight(314),
@@ -214,23 +213,22 @@
};
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),
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 +238,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];
- View.PirNameView pirNameView = new View.PirNameView();
- if (pirDeviceList.Count > 4)
+ var pirJson = Pir.pirDeviceList[i];
+ View.PirNameView pirNameView = new View.PirNameView();
+ if (Pir.pirDeviceList.Count > 4)
{
vv.AddChidren(pirNameView.FLayoutView());
}
@@ -259,14 +257,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;
@@ -275,6 +275,19 @@
};
+ clickFLayout.MouseUpEventHandler += (sender, e) =>
+ {
+
+ DeviceSet deviceSet = new DeviceSet();
+ MainPage.BasePageView.AddChidren(deviceSet);
+ deviceSet.Show(() => {
+ if (Pir.currPir != null)
+ {
+ deviceNameBtn.Text = Pir.currPir.name;
+ }
+ });
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
#endregion
int line = 0;
for (int i = 1, j = 0; i <= 7; i++, j++)
@@ -318,12 +331,14 @@
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)
{
Method method = new Method();
- method.AddControl(this,(control) => {
+ method.AddControl(this, (control) =>
+ {
AddButton addButton = new AddButton();
MainPage.BasePageView.AddChidren(addButton);
addButton.Show(control);
@@ -340,34 +355,36 @@
}
GetBrandList(jobDeviceType.id, (brandList) =>
{
- var brandSupportStrList= GetBrandSupport(if_value);
+ 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)
+ var bool_if = brandSupportStrList.Find((c) => s.Contains(c));
+ if (bool_if != null)
{
strList.Add(s);
}
}
- Application.RunOnMainThread(()=> {
+ 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>
/// 鑾峰彇鍝佺墝鏀寔
@@ -417,7 +434,7 @@
{
}
break;
-
+
}
return strList;
@@ -434,13 +451,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:
@@ -452,22 +469,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;
@@ -565,11 +582,10 @@
}
}, "", "璁惧绫诲瀷鍒楄〃");
}
-
/// <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) =>
@@ -602,49 +618,6 @@
}
}, 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();
- if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
- {
-
- }
- else
- {
- Method method = new Method();
- method.ErrorShow(responsePackNew);
- }
-
- });
- }
-
- })
- { IsBackground = true }.Start();
- }
-
}
-
+
}
--
Gitblit v1.8.0