From 132ef8524e38d06da8cf74292a3ac1eff065bb1b Mon Sep 17 00:00:00 2001
From: tzy <274116637@qq.com>
Date: 星期二, 23 三月 2021 16:38:01 +0800
Subject: [PATCH] 整好新风的UI，待真实设备测试
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 611 ++++++++++++++++++++++++++-----------------------------
1 files changed, 288 insertions(+), 323 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..8f38cfb 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,333 +9,315 @@
{
public PirMain()
{
- Tag = "PirView";
+ Tag = "PirMain";
}
+ /// <summary>
+ /// 鍥炶皟
+ /// </summary>
+ public Action BackAction;
/// <summary>
/// 涓存椂鍌ㄥ瓨璁惧绫诲瀷鍒楄〃
/// </summary>
List<DeviceType> DeviceTypeList = new List<DeviceType>();
public void Show()
{
- #region 鐣岄潰甯冨眬
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
PirDevice.View.TopView topView = new View.TopView();
topView.topNameBtn.TextID = StringId.hongwaiyaokong;
+ topView.topIconBtn.Visible = true;
this.AddChidren(topView.FLayoutView());
- topView.clickBackBtn.MouseUpEventHandler += (sender, e) => { this.RemoveFromParent(); };
+ topView.clickBackBtn.MouseUpEventHandler += (sender, e) => {
+ BackAction();
+ this.RemoveFromParent(); };
+
FrameLayout middFLayout = new FrameLayout();
middFLayout.Y = Application.GetRealHeight(64);
middFLayout.Height = Application.GetRealHeight(667 - 64);
this.AddChidren(middFLayout);
- FrameLayout pirDeviceFLayout = new FrameLayout();
- pirDeviceFLayout.Y = Application.GetRealHeight(12);
- pirDeviceFLayout.X = Application.GetRealWidth(16);
- pirDeviceFLayout.Width = Application.GetRealWidth(343);
- pirDeviceFLayout.Height = Application.GetRealHeight(187);
- pirDeviceFLayout.BackgroundColor = CSS.CSS_Color.view;
- pirDeviceFLayout.Radius = (uint)Application.GetRealHeight(12);
- middFLayout.AddChidren(pirDeviceFLayout);
+ VerticalRefreshLayout vv = new VerticalRefreshLayout();
+ middFLayout.AddChidren(vv);
+ //鍔犲彿鍥炬爣
+ Button addDevice = new Button
+ {
+ Y = Application.GetRealHeight(480),
+ X = Application.GetRealWidth(293),
+ Width = Application.GetRealWidth(82),
+ Height = Application.GetRealWidth(84),
+ UnSelectedImagePath = "PirIcon/add.png",
+ };
- //璁惧绠＄悊
- Button text1Btn = new Button
+ if (Pir.currPir.FunctioList.Count < 10)
{
- Y = Application.GetRealHeight(11),
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(120),
- Height = Application.GetRealHeight(20),
- TextSize = TextSize.text14,
- TextColor = CSS.CSS_Color.textConfirmColor,
- TextAlignment = TextAlignment.CenterLeft,
- TextID = StringId.shebeigaunli,
- IsBold = true,
- };
- pirDeviceFLayout.AddChidren(text1Btn);
+ //10涓仴鎺у櫒灏变細闅愯棌娣诲姞鍥炬爣
+ middFLayout.AddChidren(addDevice);
+ }
+ vv.BeginHeaderRefreshingAction += () =>
+ {
+ ////鍏抽棴鍒锋柊View锛�
+ vv.EndHeaderRefreshing();
- Button pirIcon = new Button
- {
- Y = Application.GetRealHeight(47),
- X = Application.GetRealWidth(28),
- Width = Application.GetRealWidth(66),
- Height = Application.GetRealWidth(66),
- UnSelectedImagePath = "PirIcon/Infraredtreasure.png",
- };
- pirDeviceFLayout.AddChidren(pirIcon);
+ Method.GetControlList(this, () =>
+ {
+ Application.RunOnMainThread(() =>
+ {
+ //鍒锋柊鐣岄潰
+ UIView(vv);
+ });
+ }, Pir.currPir);
- //mini鏅鸿兘閬ユ帶鍣�
- Button text2Btn = new Button
- {
- Y = Application.GetRealHeight(70),
- X = Application.GetRealWidth(112),
- Width = Application.GetRealWidth(120),
- Height = Application.GetRealHeight(20),
- TextSize = TextSize.text14,
- TextColor = CSS.CSS_Color.textTipColor,
- TextAlignment = TextAlignment.CenterLeft,
- Text = "mini鏅鸿兘閬ユ帶鍣�",
- };
- pirDeviceFLayout.AddChidren(text2Btn);
+ };
+ UIView(vv);
- //
- Button numberDeviceBtn = new Button
- {
- Y = Application.GetRealHeight(137),
- X = Application.GetRealWidth(32),
- Width = Application.GetRealWidth(100),
- Height = Application.GetRealHeight(20),
- TextSize = TextSize.text14,
- TextColor = CSS.CSS_Color.textColor,
- TextAlignment = TextAlignment.CenterLeft,
- Text = "1" + Language.StringByID(StringId.ge),
- IsBold = true,
- };
- pirDeviceFLayout.AddChidren(numberDeviceBtn);
- //褰撳墠绾㈠閬ユ帶璁惧
- Button numberDeviceTextBtn = new Button
- {
- Y = numberDeviceBtn.Bottom + Application.GetRealHeight(4),
- X = Application.GetRealWidth(32),
- Width = Application.GetRealWidth(100),
- Height = Application.GetRealHeight(14),
- TextSize = TextSize.text10,
- TextColor = CSS.CSS_Color.textCancelColor,
- TextAlignment = TextAlignment.CenterLeft,
- TextID = StringId.dangqianhongwaishebei,
- };
- pirDeviceFLayout.AddChidren(numberDeviceTextBtn);
- //
- Button currDeviceNumberControlBtn = new Button
- {
- Y = Application.GetRealHeight(137),
- X = Application.GetRealWidth(198),
- Width = Application.GetRealWidth(80),
- Height = Application.GetRealHeight(20),
- TextSize = TextSize.text14,
- TextColor = CSS.CSS_Color.textColor,
- TextAlignment = TextAlignment.CenterLeft,
- Text = "1" + Language.StringByID(StringId.ge),
- IsBold = true,
- };
- pirDeviceFLayout.AddChidren(currDeviceNumberControlBtn);
- //宸叉坊鍔犻仴鎺у櫒
- Button currDeviceNumberControlTextBtn = new Button
- {
- Y = currDeviceNumberControlBtn.Bottom + Application.GetRealHeight(4),
- X = Application.GetRealWidth(198),
- Width = Application.GetRealWidth(80),
- Height = Application.GetRealHeight(14),
- TextSize = TextSize.text10,
- TextColor = CSS.CSS_Color.textCancelColor,
- TextAlignment = TextAlignment.CenterLeft,
- TextID = StringId.yitianjiayaokongqi,
- };
- pirDeviceFLayout.AddChidren(currDeviceNumberControlTextBtn);
- ///绾㈠瀹濈偣鍑讳簨浠�
- FrameLayout clickFLayout = new FrameLayout();
- pirDeviceFLayout.AddChidren(clickFLayout);
- clickFLayout.MouseUpEventHandler += (sender, e) =>
+ topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
{
- DeviceSet deviceSet = new DeviceSet();
- MainPage.BasePageView.AddChidren(deviceSet);
- deviceSet.Show();
+ SetPir setPir = new SetPir();
+ MainPage.BasePageView.AddChidren(setPir);
+ setPir.Show(() =>
+ {
+ BackAction();
+ ////鍒锋柊鐣岄潰
+ UIView(vv);
+ });
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
-
- FrameLayout deviceListFLayout = new FrameLayout();
- deviceListFLayout.Y = pirDeviceFLayout.Bottom + Application.GetRealHeight(12);
- deviceListFLayout.X = Application.GetRealWidth(16);
- deviceListFLayout.Width = Application.GetRealWidth(343);
- deviceListFLayout.Height = Application.GetRealHeight(328);
- deviceListFLayout.BackgroundColor = CSS.CSS_Color.view;
- deviceListFLayout.Radius = (uint)Application.GetRealHeight(12);
- middFLayout.AddChidren(deviceListFLayout);
- ///娣诲姞閬ユ帶鍣�
- Button text3Btn = new Button
+ addDevice.MouseUpEventHandler += (sender, e) =>
{
- Y = Application.GetRealHeight(11),
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(100),
- Height = Application.GetRealHeight(20),
- TextSize = TextSize.text14,
- TextColor = CSS.CSS_Color.textConfirmColor,
- TextAlignment = TextAlignment.CenterLeft,
- TextID = StringId.tianjiayaokongqi,
- IsBold = true,
- };
- deviceListFLayout.AddChidren(text3Btn);
- ///绾㈠瀹濆悕绉�
- Button deviceNameBtn = new Button
- {
- Y = Application.GetRealHeight(13),
- X = Application.GetRealWidth(161),
- Width = Application.GetRealWidth(150),
- Height = Application.GetRealHeight(17),
- TextSize = TextSize.text12,
- TextColor = CSS.CSS_Color.textColor,
- TextAlignment = TextAlignment.CenterRight,
- Text = "mini鏅鸿兘閬ユ帶鍣�",
- };
- deviceListFLayout.AddChidren(deviceNameBtn);
-
- //涓嬫媺鍥炬爣
- var dropdownIconBtn = new Button
- {
- Y = Application.GetRealHeight(13),
- 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) =>
- {
-
-
- };
-
- #endregion
- int line = 0;
- for (int i = 1, j = 0; i <= 7; i++, j++)
- {
- var currpirdeviceFLayout = new FrameLayout
+ FrameLayout frame = new FrameLayout
{
- Width = Application.GetRealWidth(80),
- Height = Application.GetRealWidth(80),
- X = Application.GetRealWidth(26 + (80 + 25) * j),
- Y = Application.GetRealHeight(52 + (80 + 12) * line),
-
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
};
- deviceListFLayout.AddChidren(currpirdeviceFLayout);
- var deviceIconBtn = new Button
+ this.AddChidren(frame);
+ FrameLayout controlFl = new FrameLayout();
+ controlFl.Y = Application.GetRealHeight(319);
+ controlFl.X = Application.GetRealWidth(16);
+ controlFl.Width = Application.GetRealWidth(343);
+ controlFl.Height = Application.GetRealHeight(328);
+ controlFl.BackgroundColor = CSS.CSS_Color.view;
+ controlFl.Radius = (uint)Application.GetRealHeight(12);
+ frame.AddChidren(controlFl);
+ ///娣诲姞閬ユ帶鍣�
+ Button text3Btn = new Button
{
- Y = Application.GetRealHeight(8),
- X = Application.GetRealWidth(20),
- Width = Application.GetRealWidth(40),
- Height = Application.GetRealWidth(40),
- UnSelectedImagePath = "PirIcon/Infraredtreasure.png",
- };
- currpirdeviceFLayout.AddChidren(deviceIconBtn);
- var iconNameBtn = new Button
- {
- Y = deviceIconBtn.Bottom + Application.GetRealHeight(8),
- Width = Application.GetRealWidth(80),
- Height = Application.GetRealHeight(17),
- TextSize = TextSize.text12,
- TextColor = CSS.CSS_Color.TextualColor,
+ Y = Application.GetRealHeight(12),
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(343 - 16 * 2),
+ Height = Application.GetRealHeight(20),
+ TextSize = TextSize.text14,
+ TextColor = CSS.CSS_Color.textConfirmColor,
TextAlignment = TextAlignment.Center,
+ TextID = StringId.tianjiayaokongqi,
+ IsBold = true,
};
- currpirdeviceFLayout.AddChidren(iconNameBtn);
- var clickBtn = new Button { Tag = i };
- currpirdeviceFLayout.AddChidren(clickBtn);
- if (i % 3 == 0)
+ controlFl.AddChidren(text3Btn);
+ frame.MouseUpEventHandler += (sender1, e1) =>
{
- //婊′竴琛岄噸缃甹=0鍊�;
- j = -1;
- line += 1;
- }
- 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();
- }
- else
- {
- 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, null);
+ frame.RemoveFromParent();
+ };
+ int line = 0;
+ for (int i = 1, j = 0; i <= 7; i++, j++)
+ {
+ var currpirdeviceFLayout = new FrameLayout
+ {
+ Width = Application.GetRealWidth(80),
+ Height = Application.GetRealWidth(80),
+ X = Application.GetRealWidth(26 + (80 + 25) * j),
+ Y = Application.GetRealHeight(52 + (80 + 12) * line),
+
+ };
+ controlFl.AddChidren(currpirdeviceFLayout);
+ var deviceIconBtn = new Button
+ {
+ Y = Application.GetRealHeight(8),
+ X = Application.GetRealWidth(20),
+ Width = Application.GetRealWidth(40),
+ Height = Application.GetRealWidth(40),
+ UnSelectedImagePath = "PirIcon/Infraredtreasure.png",
+ };
+ currpirdeviceFLayout.AddChidren(deviceIconBtn);
+ var iconNameBtn = new Button
+ {
+ Y = deviceIconBtn.Bottom + Application.GetRealHeight(8),
+ Width = Application.GetRealWidth(80),
+ Height = Application.GetRealHeight(17),
+ TextSize = TextSize.text12,
+ TextColor = CSS.CSS_Color.TextualColor,
+ TextAlignment = TextAlignment.Center,
+ };
+ currpirdeviceFLayout.AddChidren(iconNameBtn);
+ var clickBtn = new Button { Tag = i };
+ currpirdeviceFLayout.AddChidren(clickBtn);
+ if (i % 3 == 0)
+ {
+ //婊′竴琛岄噸缃甹=0鍊�;
+ j = -1;
+ line += 1;
+ }
+ GetIconAndText(i, deviceIconBtn, iconNameBtn);
+ clickBtn.MouseUpEventHandler += (sender2, e2) =>
+ {
+
+ //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) =>
+ {
+ //鎴愬姛鍚庣Щ闄�;
+ frame.RemoveFromParent();
+ AddButton addButton = new AddButton();
+ MainPage.BasePageView.AddChidren(addButton);
+ addButton.Show(control);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
});
-
- });
-
- }
+ }
+ else
+ {
+ //杩涙潵閮借绉婚櫎;
+ frame.RemoveFromParent();
+ if (DeviceTypeList.Count == 0)
+ {
+ GetDeviceTypeList(true, () =>
+ {
+ DeviceTypeViewClick(if_value);
-
- };
+ });
+ }
+ else
+ {
+ DeviceTypeViewClick(if_value);
+ }
+ }
+ };
+ }
- }
- GetDeviceTypeList();
+ };
+
}
/// <summary>
- /// 鑾峰彇鍝佺墝鏀寔
+ /// 鍔犺浇UI鐣岄潰
/// </summary>
- /// <param name="index">绱㈠紩鍊�</param>
- private List<string> GetBrandSupport(int index)
+ /// <param name="vv">涓婁笅婊戞帶浠�</param>
+ private void UIView(VerticalRefreshLayout vv)
{
- List<string> strList = new List<string>();
- switch (index)
+ vv.RemoveAll();
+ #region 绾㈠瀹濆浘鏍� 鐗堟湰鍙� 鍚嶇О 鐘舵��
+ FrameLayout fLayout = new FrameLayout
{
- case 1:
+ Width = Application.GetRealWidth(375),
+ Height = Application.GetRealHeight(12 + 92 + (50 * Pir.currPir.FunctioList.Count)),
+ };
+ vv.AddChidren(fLayout);
+ View.PirView pirView = new View.PirView();
+ //绾㈠瀹濆悕绉�
+ pirView.deviceNameBtn.Text = Pir.currPir.name;
+ //绾㈠瀹濆綋鍓嶆湁澶氬皯涓仴鎺у櫒
+ pirView.geBtn.Text = Pir.currPir.FunctioList.Count.ToString();
+ //绾㈠瀹濇槸鍚﹀湪绾�-绂荤嚎
+ if (Pir.currPir.online)
+ {
+ pirView.stateIconBtn.IsSelected = true;
+ pirView.stateTextBtn.IsSelected = true;
+ pirView.stateTextBtn.TextID = StringId.zaixian;
+ }
+ else
+ {
+ pirView.stateIconBtn.IsSelected = false;
+ pirView.stateTextBtn.IsSelected = false;
+ pirView.stateTextBtn.TextID = StringId.lixian;
+ }
+ //鏍囪绾㈠瀹�
+ pirView.clickBtn.Tag = Pir.currPir;
+ //鍔犺浇鐣岄潰
+ pirView.Show(Pir.currPir.FunctioList.Count, fLayout);
+ //鏈�鍚庝竴涓悗闈㈠鍔犻棿闅旇儗鏅�
+ vv.AddChidren(new FrameLayout { Height = Application.GetRealHeight(20) });
+ #endregion
+
+ for (int j = 0; j < Pir.currPir.FunctioList.Count; j++)
+ {
+ var control = Pir.currPir.FunctioList[j];
+
+ View.ControlView controlView = new View.ControlView();
+ controlView.Show(pirView.devfLayout, j);
+ //閬ユ帶鍣ㄥ悕绉�
+ controlView.nameBtn.Text = control.name;
+ //閬ユ帶鍣ㄥ瓨鏀惧尯鍩�
+ controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(control);
+ //鏍囪閬ユ帶鍣�
+ controlView.delBtn.Tag = control;
+ //鍒犻櫎鐐瑰嚮浜嬩欢
+ controlView.delBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ var Function = controlView.delBtn.Tag as Entity.Function;
+ string text = Language.StringByID(StringId.shanchushebei) + Function.name + "?";
+ TipPopView tipPopView = new TipPopView();
+ tipPopView.TipBox(StringId.tip, text, (dialog) =>
{
- strList.Add("鏍煎姏");
- strList.Add("缇庣殑");
- strList.Add("娴峰皵");
- strList.Add("鏉句笅");
- strList.Add("娴蜂俊");
- strList.Add("闀胯櫣");
- }
- break;
- case 2:
+ Method.ThreadSend(new Control { deviceId=control.deviceId}, (responsePackNew) =>
+ {
+ dialog.Close();
+ var function = Pir.currPir.FunctioList.Find((c) => c.sid == Function.sid);
+ if (function != null)
+ {
+ Pir.currPir.FunctioList.Remove(Function);
+ }
+ UIView(vv);
+
+ }, "鍒犻櫎", "dialog", null, dialog);
+
+ }, () => { }, false);
+ };
+ //view鐐瑰嚮浜嬩欢
+ controlView.clickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ EditControl editControl = new EditControl();
+ MainPage.BasePageView.AddChidren(editControl);
+ editControl.Show(control,(device) =>
{
- 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;
-
+ //鍥炶皟鏇存柊鍚嶅瓧/鍖哄煙
+ controlView.nameBtn.Text = device.name;
+ controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(device);
+
+ });
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ if (j == Pir.currPir.FunctioList.Count - 1)
+ {
+ //鏈�鍚庢敼鍙樹竴涓嚎鐨勯鑹�
+ controlView.line1Btn.BackgroundColor = CSS.CSS_Color.viewTranslucence;
+ controlView.funControlRow.LineColor = CSS.CSS_Color.viewTranslucence;
+ }
+
}
- return strList;
+ }
+ /// <summary>
+ /// 璁惧杩涘叆涓嬩竴绾ф柟娉�
+ /// </summary>
+ /// <param name="if_value"></param>
+ private 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) =>
+ {
+ Application.RunOnMainThread(() =>
+ {
+ BrandList brandObj = new BrandList();
+ brandObj.Show(brandList, strings[1]);
+ });
+
+ });
+
}
/// <summary>
/// 鑾峰彇璁惧绫诲瀷str
@@ -347,39 +330,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;
@@ -446,7 +431,9 @@
/// <summary>
/// 璇诲彇绾㈠璁惧绫诲瀷鍒楄〃
/// </summary>
- private void GetDeviceTypeList()
+ /// <param name="tag">鏍囪瘑瑕佷笉瑕佹彁绀猴紙true=鎻愮ず锛�</param>
+ /// <param name="action">鍥炶皟鍑芥暟</param>
+ public void GetDeviceTypeList(bool tag, Action action)
{
PirSend.GetDeviceTypesList(this, (responsePackNew) =>
{
@@ -469,19 +456,22 @@
}
}
}
+ 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)
+ public void GetBrandList(string id, Action<List<Brand>> actionBrand)
{
List<Brand> brandList = new List<Brand>();
PirSend.GetDeviceTypesList(this, (responsePackNew) =>
@@ -510,37 +500,12 @@
else
{
Method method = new Method();
- method.ErrorShow(responsePackNew);
+ method.ErrorShow(responsePackNew, "");
}
}, 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