From 47b841ed6c4d7dc03ff25bf74454fa41cd4e02a5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 17 三月 2021 11:08:49 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index 57fa14e..446157c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -15,7 +15,7 @@
/// 涓存椂鍌ㄥ瓨璁惧绫诲瀷鍒楄〃
/// </summary>
List<DeviceType> DeviceTypeList = new List<DeviceType>();
- public void Show()
+ public void Show(Entity.Function function)
{
#region 鐣岄潰甯冨眬
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
@@ -79,8 +79,20 @@
if (Pir.pirDeviceList.Count != 0)
{
+
+ //if (function != null)
+ //{
+ // Pir pir = new Pir();
+ // pir.name = function.name;
+ // pir.deviceId = function.deviceId;
+ // pir.sid = function.sid;
+ // Pir.currPir = pir;
+ //}
+ //else
+ //{
+ // Pir.currPir = Pir.pirDeviceList[0];
+ //}
//榛樿绗竴涓孩澶栧疂
- Pir.currPir = Pir.pirDeviceList[0];
int sum = 0;
for (int i = 0; i < Pir.pirDeviceList.Count; i++)
{
@@ -91,6 +103,7 @@
mainView.numberDeviceBtn.Text = Pir.pirDeviceList.Count.ToString() + Language.StringByID(StringId.ge);
mainView.currDeviceNumberControlBtn.Text = sum.ToString() + Language.StringByID(StringId.ge);
}
+
///璁惧绠＄悊鐨勭偣鍑讳簨浠�
mainView.clickBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -315,7 +328,7 @@
case 3:
{
//椋庢墖
- type = "fan-" + SPK.ElectricFan;
+ // type = "fan-" + SPK.ElectricFan;
}
break;
case 4:
@@ -405,7 +418,7 @@
/// </summary>
/// <param name="tag">鏍囪瘑瑕佷笉瑕佹彁绀猴紙true=鎻愮ず锛�</param>
/// <param name="action">鍥炶皟鍑芥暟</param>
- public void GetDeviceTypeList(bool tag, Action action)
+ public void GetDeviceTypeList(bool tag, Action action)
{
PirSend.GetDeviceTypesList(this, (responsePackNew) =>
{
@@ -443,7 +456,7 @@
/// <summary>
/// 璇诲彇绾㈠璁惧绫诲瀷鐨勫搧鐗屽垪琛�
/// </summary>
- public 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) =>
--
Gitblit v1.8.0