From 8e5ba5665861b29a4b8da0335c81d620aa891862 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 08 三月 2021 09:23:54 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 430 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 354 insertions(+), 76 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index 9da222a..902b7ee 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,8 +9,13 @@
{
public PirMain()
{
- Tag = "PirView";
+ Tag = "PirMain";
+
}
+ /// <summary>
+ /// 涓存椂鍌ㄥ瓨璁惧绫诲瀷鍒楄〃
+ /// </summary>
+ List<DeviceType> DeviceTypeList = new List<DeviceType>();
public void Show()
{
#region 鐣岄潰甯冨眬
@@ -43,9 +49,9 @@
TextColor = CSS.CSS_Color.textConfirmColor,
TextAlignment = TextAlignment.CenterLeft,
TextID = StringId.shebeigaunli,
- IsBold=true,
+ IsBold = true,
};
- pirDeviceFLayout.AddChidren(text1Btn);
+ pirDeviceFLayout.AddChidren(text1Btn);
Button pirIcon = new Button
@@ -129,7 +135,8 @@
///绾㈠瀹濈偣鍑讳簨浠�
FrameLayout clickFLayout = new FrameLayout();
pirDeviceFLayout.AddChidren(clickFLayout);
- clickFLayout.MouseUpEventHandler += (sender,e) => {
+ clickFLayout.MouseUpEventHandler += (sender, e) =>
+ {
DeviceSet deviceSet = new DeviceSet();
MainPage.BasePageView.AddChidren(deviceSet);
@@ -160,7 +167,7 @@
};
deviceListFLayout.AddChidren(text3Btn);
///绾㈠瀹濆悕绉�
- Button deviceNameBtn= new Button
+ Button deviceNameBtn = new Button
{
Y = Application.GetRealHeight(13),
X = Application.GetRealWidth(161),
@@ -172,17 +179,108 @@
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
{
Y = Application.GetRealHeight(13),
- X = Application.GetRealWidth(343-8-16),
+ X = Application.GetRealWidth(343 - 8 - 16),
Width = Application.GetRealWidth(16),
Height = Application.GetRealWidth(16),
UnSelectedImagePath = "PirIcon/dropdown.png",
};
deviceListFLayout.AddChidren(dropdownIconBtn);
+
+ 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;
+ }
+ }
+
+ };
#endregion
int line = 0;
@@ -206,9 +304,9 @@
UnSelectedImagePath = "PirIcon/Infraredtreasure.png",
};
currpirdeviceFLayout.AddChidren(deviceIconBtn);
- var iconNameBtn = new Button
+ var iconNameBtn = new Button
{
- Y = deviceIconBtn.Bottom+Application.GetRealHeight(8),
+ Y = deviceIconBtn.Bottom + Application.GetRealHeight(8),
Width = Application.GetRealWidth(80),
Height = Application.GetRealHeight(17),
TextSize = TextSize.text12,
@@ -227,68 +325,163 @@
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 list11 = new List<string> {
- "鐖变綘", "鍝庡懄","鍩冨強","鍝堝紬鎹㈠３鍝堝紬", "鐖卞痉鍗庡v","淇哄嚑涓柉浜�",
- "鎷滀簡", "宸村＋", "鐧惧か", "鐧惧悎鍦扮悊璇句綘鎵撶畻", "涓嶅害鑰侀浼忔灔", "姣斿埌涔濈偣",
- "杞︾珯","娴嬭瘯","姝ゅ湴", "鎵嶇湅瑙佸ソ寰楀揩","鍚冭蒋楗�","浠庣湅瑙佷簩鍗佸",
- "绛夊緟鏈轰細鍚�","鐨勫鎴�", "澶氬枬鐐�", "鐧昏鍝︾劧鍚�", "鎵撶數璇�",
- "鎭╄偆闇滅湅灏辩湅浜�", "楗挎os","鎭堕瓟鍩�","鍎跨鑱斿姩", "鎭╁叚棰楀瓙寮规媺鎷夎￥娲楁尽浜�","鍙戝ぇ瀛︾敓鍙戝彂",
- "鐪熷帀瀹砳鍙戝灏�", "鐭ラ亾浣犱粯娆句簡鍙�", "灏厭鍥炲", "鏀硅繘鐨勮瘽", "澶╁ぉ閫熷害鍥炵瓟", "澶ソ浜嗗紑杞�",
- "鍑忚偉鐨勭湅杩�","妗″嚭鍙ｅ閭�","濡傛灉瑙夊緱", "寰堣垝鏈嶇殑","鍚冭蒋楗�","浠庣湅瑙佷簩鍗佸",
- "榫欏嵎椋庝簭澶у彂","鍘诲ソ鐪�", "澶氬枬鐐�", "濂芥氮璐瑰ソ", "鎵撶數璇�"};
- System.Threading.Tasks.Task.Run(() =>
+ int if_value = int.Parse(clickBtn.Tag.ToString());
+ if (if_value == 7)
{
- Application.RunOnMainThread(() =>
+ Method method = new Method();
+ method.AddControl(this, (control) =>
{
- switch (if_value)
+ 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 strList = new List<string>();
+ for (int str = 0; str < brandList.Count; str++)
{
- case 1:
- {
- }
- break;
- case 2:
- {
- }
- break;
- case 3:
- {
- }
- break;
- case 4:
- {
- }
- break;
- case 5:
- {
- }
- break;
- case 6:
- {
- }
- break;
- case 7:
- {
- Method method = new Method();
- method.AddControl();
-
- }
- break;
+ 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;
+ });
- //BrandList brandList = new BrandList();
- //MainPage.BasePageView.AddChidren(brandList);
- //brandList.Show(list11, null);
- //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
});
- });
+
+ }
+
+
};
}
+ GetDeviceTypeList();
+ }
+ /// <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>
+ /// <param name="index">绱㈠紩鍊�</param>
+ private string GetTypeString(int index)
+ {
+ string type = "";
+ switch (index)
+ {
+ case 1:
+ {
+ //绌鸿皟
+ type = "ac-" + SPK.AcIr;
+ }
+ break;
+ case 2:
+ {
+ //鐢佃
+ type = "tv-" + SPK.ElectricTV;
+ }
+ break;
+ case 3:
+ {
+ //椋庢墖
+ type = "fan-" + SPK.ElectricFan;
+ }
+ break;
+ case 4:
+ {
+ //鏈洪《鐩�
+ // type = "set_top_box-" + SPK.ElectricTV;
+ }
+ break;
+ case 5:
+ {
+ //褰辩鏈�
+ // type = "dvd-" + SPK.ElectricTV;
+ }
+ break;
+ case 6:
+ {
+ //鎶曞奖浠�
+ // type = "projector-" + SPK.ElectricTV;
+ }
+ break;
+
+
+ }
+ return type;
}
/// <summary>
/// 璁剧疆鍥剧墖鍜屽娉�
@@ -296,44 +489,129 @@
/// <param name="index">绱㈠紩鍊�</param>
/// <param name="deviceIconBtn">鍥炬爣Btn</param>
/// <param name="deviceNameBtn">璁惧澶囨敞Btn</param>
- private void GetIconAndText(int index,Button deviceIconBtn, Button deviceNameBtn) {
- string iconPath = "";
- int deviceNameIndex=0;
+ private void GetIconAndText(int index, Button deviceIconBtn, Button deviceNameBtn)
+ {
+ string iconPath = "";
+ int deviceNameIndex = 0;
switch (index)
{
- case 1: {
+ case 1:
+ {
iconPath = "PirIcon/air.png";
deviceNameIndex = StringId.kongtiao;
- } break;
- case 2: {
+ }
+ break;
+ case 2:
+ {
iconPath = "PirIcon/tv.png";
deviceNameIndex = StringId.dianshi;
- } break;
- case 3: {
+ }
+ break;
+ case 3:
+ {
iconPath = "PirIcon/fan.png";
deviceNameIndex = StringId.fengshan;
- } break;
- case 4: {
+ }
+ break;
+ case 4:
+ {
iconPath = "PirIcon/stb.png";
deviceNameIndex = StringId.jidinghe;
- } break;
- case 5: {
+ }
+ break;
+ case 5:
+ {
iconPath = "PirIcon/dvd.png";
deviceNameIndex = StringId.dvd;
- } break;
- case 6: {
+ }
+ break;
+ case 6:
+ {
iconPath = "PirIcon/projector.png";
deviceNameIndex = StringId.touyingyi;
- } break;
- case 7: {
+ }
+ break;
+ case 7:
+ {
iconPath = "PirIcon/custom.png";
deviceNameIndex = StringId.zidingyi;
- } break;
+ }
+ break;
}
deviceIconBtn.UnSelectedImagePath = iconPath;
deviceNameBtn.TextID = deviceNameIndex;
}
-
+ /// <summary>
+ /// 璇诲彇绾㈠璁惧绫诲瀷鍒楄〃
+ /// </summary>
+ private void GetDeviceTypeList()
+ {
+ PirSend.GetDeviceTypesList(this, (responsePackNew) =>
+ {
+
+ if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
+ {
+ //娓呯┖涔嬪墠鏁版嵁
+ DeviceTypeList.Clear();
+ var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString());
+ for (int a = 0; a < jArray.Count; a++)
+ {
+ var jay = jArray[a];
+ var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
+ var objDeviceType = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceType>(str);
+ if (objDeviceType != null)
+ {
+ if (null == DeviceTypeList.Find((c) => c.id == objDeviceType.id))
+ {
+ DeviceTypeList.Add(objDeviceType);
+ }
+ }
+ }
+ }
+ else
+ {
+ Method method = new Method();
+ method.ErrorShow(responsePackNew);
+ }
+ }, "", "璁惧绫诲瀷鍒楄〃");
+ }
+ /// <summary>
+ /// 璇诲彇绾㈠璁惧绫诲瀷鐨勫搧鐗屽垪琛�
+ /// </summary>
+ private void GetBrandList(string id, Action<List<Brand>> actionBrand)
+ {
+ List<Brand> brandList = new List<Brand>();
+ PirSend.GetDeviceTypesList(this, (responsePackNew) =>
+ {
+
+ if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
+ {
+ //娓呯┖涔嬪墠鏁版嵁
+ brandList.Clear();
+ var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString());
+ for (int a = 0; a < jArray.Count; a++)
+ {
+ var jay = jArray[a];
+ var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
+ var brand = Newtonsoft.Json.JsonConvert.DeserializeObject<Brand>(str);
+ if (brand != null)
+ {
+ if (null == brandList.Find((c) => c.id == brand.id))
+ {
+ brandList.Add(brand);
+ }
+ }
+ }
+ actionBrand(brandList);
+ }
+ else
+ {
+ Method method = new Method();
+ method.ErrorShow(responsePackNew);
+ }
+ }, id, "鍝佺墝鍒楄〃");
+ }
}
+
}
--
Gitblit v1.8.0