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 | 207 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 142 insertions(+), 65 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index 501c526..b1e7b74 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using HDL_ON.Entity;
using HDL_ON.UI.UI2.Intelligence.Automation.LogicView;
using Shared;
namespace HDL_ON.UI.UI2.PersonalCenter.PirDevice
@@ -8,7 +9,8 @@
{
public PirMain()
{
- Tag = "PirView";
+ Tag = "PirMain";
+
}
/// <summary>
/// 涓存椂鍌ㄥ瓨璁惧绫诲瀷鍒楄〃
@@ -133,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);
@@ -177,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
@@ -192,9 +192,102 @@
deviceNameBtn.MouseUpEventHandler += (sender, e) =>
{
+ #region 鍖哄煙寮规鐣岄潰
+ FrameLayout fLayout = new FrameLayout
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+ };
+ this.AddChidren(fLayout);
+ fLayout.MouseUpEventHandler += (sender1, e1) =>
+ {
+ fLayout.RemoveFromParent();
+ };
+
+ FrameLayout iconFLyout = new FrameLayout
+ {
+ X = Application.GetRealWidth(205),
+ Y = Application.GetRealHeight(314),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealHeight(21 + 44),
+ //BackgroundImagePath = "LogicIcon/bjicon.png",
+ };
+ fLayout.AddChidren(iconFLyout);
+
+ FrameLayout textFLyout = new FrameLayout
+ {
+ X = Application.GetRealWidth(8),
+ Y = Application.GetRealHeight(14),
+ Width = Application.GetRealWidth(144),
+ Height = Application.GetRealHeight(44),
+ };
+ VerticalScrolViewLayout vv = new VerticalScrolViewLayout
+ {
+ X = Application.GetRealWidth(8),
+ Y = Application.GetRealHeight(14),
+ Width = Application.GetRealWidth(144),
+ Height = Application.GetRealHeight(44 * 4),
+ };
+
+ if (Pir.pirDeviceList.Count > 4)
+ {
+ iconFLyout.Height = Application.GetRealHeight(21 + 44 * 4);
+ iconFLyout.AddChidren(vv);
+ iconFLyout.BackgroundImagePath = "PirIcon/4.png";
+ }
+ else
+ {
+
+ iconFLyout.AddChidren(textFLyout);
+ 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 < Pir.pirDeviceList.Count; i++)
+ {
+ var pirJson = Pir.pirDeviceList[i];
+ View.PirNameView pirNameView = new View.PirNameView();
+ if (Pir.pirDeviceList.Count > 4)
+ {
+ vv.AddChidren(pirNameView.FLayoutView());
+ }
+ else
+ {
+ pirNameView.frameLayout.Y = Application.GetRealHeight(i * 44);
+ textFLyout.AddChidren(pirNameView.FLayoutView());
+ }
+ pirNameView.btnName.Text = pirJson.name;
+ pirNameView.btnClick.Tag = pirJson;
+ pirNameView.btnClick.MouseUpEventHandler += (sender2, e2) =>
+ {
+ fLayout.RemoveFromParent();
+ deviceNameBtn.Text = pirJson.name;
+ Pir.currPir = pirJson;
+
+ };
+ if (Pir.pirDeviceList.Count - 1 == i)
+ {
+ ///鏀瑰彉鏈�鍚庨偅鏉′竴涓嚎鐨勯鑹�,鐣岄潰鏄剧ず鏁堟灉浣滅敤;
+ pirNameView.btnLine.BackgroundColor = CSS.CSS_Color.view;
+ }
+ }
};
+ 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++)
@@ -238,50 +331,60 @@
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());
- var jobDeviceType = DeviceTypeList.Find((c) => c.deviceType == GetTypeString(if_value));
- if (jobDeviceType == null)
- {
- return;
- }
if (if_value == 7)
{
Method method = new Method();
- method.AddControl();
+ method.AddControl(this, (control) =>
+ {
+ AddButton addButton = new AddButton();
+ MainPage.BasePageView.AddChidren(addButton);
+ addButton.Show(control);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ });
}
else
{
+ 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 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, null);
+ brandObj.Show(brandList, strList, strings[1]);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
});
-
+
});
-
+
}
-
+
};
}
GetDeviceTypeList();
+
}
/// <summary>
/// 鑾峰彇鍝佺墝鏀寔
@@ -331,7 +434,7 @@
{
}
break;
-
+
}
return strList;
@@ -347,39 +450,41 @@
{
case 1:
{
- type = "ac";
+ //绌鸿皟
+ type = "ac-" + SPK.AcIr;
}
break;
case 2:
{
- type = "tv";
+ //鐢佃
+ type = "tv-" + SPK.TvIr;
}
break;
case 3:
{
- type = "fan";
+ //椋庢墖
+ type = "fan-" + SPK.ElectricFan;
}
break;
case 4:
{
- type = "set_top_box";
+ //鏈洪《鐩�
+ // type = "set_top_box-" + SPK.ElectricTV;
}
break;
case 5:
{
- type = "dvd";
+ //褰辩鏈�
+ // type = "dvd-" + SPK.ElectricTV;
}
break;
case 6:
{
- type = "projector";
+ //鎶曞奖浠�
+ // type = "projector-" + SPK.ElectricTV;
}
break;
- case 7:
- {
- type = "PirIcon/custom.png";
- }
- break;
+
}
return type;
@@ -477,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) =>
@@ -514,33 +618,6 @@
}
}, id, "鍝佺墝鍒楄〃");
}
+ }
- }
- class DeviceType
- {
- /// <summary>
- /// 璁惧绫诲瀷涓婚敭Id
- /// </summary>
- public string id = string.Empty;
- /// <summary>
- /// 璁惧绫诲瀷(鎶曞奖浠�,椋庢墖,鏈洪《鐩�...)
- /// </summary>
- public string deviceType = string.Empty;
- }
- public class Brand
- {
- /// <summary>
- /// 鍝佺墝涓婚敭Id
- /// </summary>
- public string id = string.Empty;
- /// <summary>
- /// 璁惧绫诲瀷涓婚敭Id
- /// </summary>
- public string deviceTypeId = string.Empty;
- /// <summary>
- /// 鍝佺墝鍚嶇О
- /// </summary>
- public string brandName = string.Empty;
-
- }
}
--
Gitblit v1.8.0