合并一个版本

黄学彪

2019-12-17 5986f63b75bd81c6cef262c670e9251c038cbf5d

 ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs

@@ -16,7 +16,7 @@
        /// <summary>
        /// 按键模式（私有功能）
        /// </summary>
        public int panelMode = -1;
        public int panelMode = 65535;
        /// <summary>
        ///按键开状态（指示）亮度
        /// </summary>
@@ -63,6 +63,47 @@
        /// 当前房间ID
        /// </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>
        /// 按键中被绑定的目标列表
@@ -2486,7 +2527,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)
            {
@@ -2535,7 +2576,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());