From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
index 9e5e423..ea8b188 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
@@ -109,10 +109,11 @@
/// 鎸夐敭涓缁戝畾鐨勭洰鏍囧垪琛�
/// </summary>
public System.Collections.Generic.List<BindListResponseObj> bindList = new System.Collections.Generic.List<BindListResponseObj> { };
+
/// <summary>
/// 鎸夐敭鏀寔鐨勭鏈夋ā寮忓垪琛�
/// </summary>
- public System.Collections.Generic.List<string> priFunList = new System.Collections.Generic.List<string> { };
+ public System.Collections.Generic.Dictionary<int, string> priDeviceModeFunList = new System.Collections.Generic.Dictionary<int, string> { };
/// <summary>
/// 绉佹湁鍔熻兘绫�
@@ -1240,8 +1241,8 @@
#region 閰嶇疆鎸夐敭鎸囩ず鐏潰鏉夸寒搴﹀睘鎬�.
///<summary >
///閰嶇疆鎸夐敭鎸囩ず鐏潰鏉夸寒搴﹀睘鎬�
- /// <para>directionsLevel:鎸囩ず鐏寒搴� 0-100</para>
- /// <para>backlightLevel:鑳屽厜鐏寒搴� 0-100</para>
+ /// <para>directionsLevel:鎸囩ず鐏寒搴� 0-100(杩欎釜鏄偣鍑诲悗鐨勫��)</para>
+ /// <para>backlightLevel:鑳屽厜鐏寒搴� 0-100(杩欎釜鏄偣鍑诲墠鐨勫��)</para>
/// </summary>
public async System.Threading.Tasks.Task<ResponseAllData> SetKeyLevelAsync(int directionsLevel, int backlightLevel)
{
@@ -1940,12 +1941,12 @@
/// </summary>
public ErrorResponData errorResponData;
/// <summary>
- ///鎸夐敭寮�鐘舵�侊紙鎸囩ず锛変寒搴�
+ ///鎸夐敭寮�鐘舵�侊紙鎸囩ず锛変寒搴�(杩欎釜鏄偣鍑诲悗鐨勫��)
/// </summary>
public int panelDirectionsLevel = -1;
/// <summary>
- /// 鎸夐敭鍏崇姸鎬侊紙鑳屽厜锛変寒搴�
+ /// 鎸夐敭鍏崇姸鎬侊紙鑳屽厜锛変寒搴�(杩欎釜鏄偣鍑诲墠鐨勫��)
/// </summary>
public int panelBacklightLevel = -1;
}
--
Gitblit v1.8.0