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 | 63 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
index 005792d..ea8b188 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
@@ -16,7 +16,7 @@
/// <summary>
/// 鎸夐敭妯″紡锛堢鏈夊姛鑳斤級
/// </summary>
- public int panelMode = -1;
+ public int panelMode = 65535;
/// <summary>
///鎸夐敭寮�鐘舵�侊紙鎸囩ず锛変寒搴�
/// </summary>
@@ -31,7 +31,10 @@
/// 褰撳墠閫夋嫨妯″紡
/// </summary>
public string currentKeySelectModeText = "";
-
+ /// <summary>
+ /// 褰撳墠閫夋嫨鐨勬ゼ灞侷D
+ /// </summary>
+ public string currentSelectFloorId = string.Empty;
/// <summary>
/// 褰撳墠寮�鍏虫ā寮�
/// </summary>
@@ -61,14 +64,56 @@
/// </summary>
public string curSelectSceneID = "";
+ /// <summary>
+ /// 鏈湴妤煎眰鎴块棿缁戝畾鍒楄〃
+ /// </summary>
+ public Dictionary<int, FloorRoomBindObj> FloorRoomBindObjList = new Dictionary<int, FloorRoomBindObj> { };
+ /// <summary>
+ /// 缁戝畾鐨勬ゼ灞傛埧闂翠俊鎭�
+ /// </summary>
+ [System.Serializable]
+ public class FloorRoomBindObj
+ {
+ /// <summary>
+ /// 妤煎眰ID
+ /// </summary>
+ public string floodID;
+ /// <summary>
+ /// 妤煎眰鍚嶇О
+ /// </summary>
+ public string floodName;
+ /// <summary>
+ /// 鎴块棿ID
+ /// </summary>
+ public string roomID;
+ /// <summary>
+ /// 鎴块棿鍚嶇О
+ /// </summary>
+ public string roomName;
+ /// <summary>
+ /// 缁戝畾鐩爣ID
+ /// </summary>
+ public string BindID;
+ /// <summary>
+ /// 缁戝畾鐩爣鍚嶇О
+ /// </summary>
+ public string BindName;
+ /// <summary>
+ /// 鍥剧墖璺緞
+ /// </summary>
+ public string IconPath = "";
+
+ }
+
// <summary>
/// 鎸夐敭涓缁戝畾鐨勭洰鏍囧垪琛�
/// </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>
/// 绉佹湁鍔熻兘绫�
@@ -1196,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)
{
@@ -1896,12 +1941,12 @@
/// </summary>
public ErrorResponData errorResponData;
/// <summary>
- ///鎸夐敭寮�鐘舵�侊紙鎸囩ず锛変寒搴�
+ ///鎸夐敭寮�鐘舵�侊紙鎸囩ず锛変寒搴�(杩欎釜鏄偣鍑诲悗鐨勫��)
/// </summary>
public int panelDirectionsLevel = -1;
/// <summary>
- /// 鎸夐敭鍏崇姸鎬侊紙鑳屽厜锛変寒搴�
+ /// 鎸夐敭鍏崇姸鎬侊紙鑳屽厜锛変寒搴�(杩欎釜鏄偣鍑诲墠鐨勫��)
/// </summary>
public int panelBacklightLevel = -1;
}
@@ -2483,7 +2528,7 @@
///閰嶇疆闈㈡澘鍔熻兘
///<para>value:缁欓潰鏉块厤缃殑妯″紡</para>
/// </summary>
- public async System.Threading.Tasks.Task<SetWritableValueResponAllData> ConfigureHdlKeyValueAsync(KeyMode value)
+ public async System.Threading.Tasks.Task<SetWritableValueResponAllData> ConfigureHdlKeyValueAsync(KeyMode value, int clusterID = 6)
{
if (Gateway == null)
{
@@ -2532,7 +2577,7 @@
System.Console.WriteLine("SetWritableValue_Actions 鍚姩" + "_" + System.DateTime.Now.ToString());
try
{
- var jObject = new JObject { { "DeviceAddr", DeviceAddr }, { "Epoint", DeviceEpoint }, { "Cluster_ID", 6 }, { "Command", 120 } };
+ var jObject = new JObject { { "DeviceAddr", DeviceAddr }, { "Epoint", DeviceEpoint }, { "Cluster_ID", clusterID }, { "Command", 120 } };
var data = new JObject { { "Undivided", 0 }, { "AttributeId", 6533 }, { "AttributeDataType", 33 }, { "AttributeData", (int)value } };
jObject.Add("Data", data);
Gateway.Send("SetWritableValue", jObject.ToString());
--
Gitblit v1.8.0