???????

黄学彪

2020-05-11 2e7e5f9af5b32cfe1fc3c6ba40bf7eb984bbd0a4

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

@@ -11,16 +11,6 @@
        {
            this.Type = DeviceType.IASZone;
        }

        /// <summary>

        /// 光感等级个数（Lux能力）

        /// <para>有几个等级就显示几个刻度</para>

        /// </summary>

        public int LightLevelCount = -1;

        /// <summary>

        /// 当前Lux值 
        /// </summary>

        public int PirLux = -1;



        #region IAS安防信息上报.
        /// <summary>
@@ -130,8 +120,7 @@


                    if (topic == gatewayID + "/" + "Error_Respon")

                    {

                        var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };

                        var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());

                        var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());



                        if (temp == null)

                        {

@@ -146,18 +135,17 @@


                    if (topic == gatewayID + "/" + "ZbDataPassthrough")

                    {

                        var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };

                        gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());

                        var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());



                        if (gatewayTemp.clientDataPassthroughResponseData == null)

                        if (clientDataPassthroughResponseData == null)

                        {

                            result = new PirLightAbilitySizeInfo { errorMessageBase = "网关返回的数据为空" };

                        }

                        else

                        {

                            if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)

                            if (clientDataPassthroughResponseData?.PassData != null)

                            {

                                var data = gatewayTemp.clientDataPassthroughResponseData.PassData;

                                var data = clientDataPassthroughResponseData.PassData;

                                if (data.Length == 12)

                                {
                                    var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();

@@ -165,7 +153,6 @@
                                    {

                                        var cou = data[10].ToString() + data[11].ToString();

                                        int countTemp = Convert.ToInt32(cou, 16);

                                        LightLevelCount = countTemp;

                                        result = new PirLightAbilitySizeInfo { LightLevelCount = countTemp };
                                        System.Console.WriteLine($"UI收到通知后的主题_command:0303_{ topic}");

                                    }
@@ -235,19 +222,9 @@
        /// <summary>

        /// PIR配置参数回复

        /// </summary>

        public PirLightAbilitySizeInfo lightLevelSizeInfo;

        [System.Serializable]

        public class PirLightAbilitySizeInfo

        public class PirLightAbilitySizeInfo : ErrorResponCommon

        {

            /// <summary>

            /// 错误信息

            /// </summary>

            public string errorMessageBase;

            /// <summary>

            /// 网关信息错误反馈

            /// <para>当网关接收到客户端信息后，出现以下异常情况将反馈错误。</para>

            /// </summary>

            public ErrorResponData errorResponData;

            /// <summary>

            /// 光感等级个数（Lux能力）

            /// <para>有几个等级就显示几个刻度</para>

@@ -278,8 +255,7 @@

                    if (topic == gatewayID + "/" + "Error_Respon")
                    {
                        var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
                        var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
                        var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

                        if (temp == null)
                        {
@@ -294,18 +270,17 @@

                    if (topic == gatewayID + "/" + "ZbDataPassthrough")
                    {
                        var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
                        gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
                        var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());

                        if (gatewayTemp.clientDataPassthroughResponseData == null)
                        if (clientDataPassthroughResponseData == null)
                        {
                            result = new ResponseAllData { errorMessageBase = "网关返回的数据为空" };
                        }
                        else
                        {
                            if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)

                            if (clientDataPassthroughResponseData?.PassData != null)

                            {

                                var data = gatewayTemp.clientDataPassthroughResponseData.PassData;

                                var data = clientDataPassthroughResponseData.PassData;

                                if (data.Length == 16)

                                {

                                    var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();

@@ -362,29 +337,15 @@
        /// <summary>
        /// PIR配置参数回复
        /// </summary>
        public ParamatesInfo paramatesInfo;
        [System.Serializable]
        public class ParamatesInfo
        public class ParamatesInfo : ErrorResponCommon
        {
            /// <summary>
            /// 错误信息
            /// </summary>
            public string errorMessageBase;
            /// <summary>
            /// 网关信息错误反馈
            /// <para>当网关接收到客户端信息后，出现以下异常情况将反馈错误。</para>
            /// </summary>
            public ErrorResponData errorResponData;
            /// <summary>
            /// PIR配置参数
            /// </summary>
            public ConfigureParamates configureParamates;
        }



        /// <summary>

        /// PIR配置参数

        /// </summary>

        public ConfigureParamates configureParamates;

        /// <summary>

        /// PIR配置参数
        /// </summary>
@@ -626,8 +587,7 @@

                    if (topic == gatewayID + "/" + "Error_Respon")
                    {
                        var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
                        var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
                        var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());

                        if (temp == null)
                        {
@@ -642,18 +602,17 @@

                    if (topic == gatewayID + "/" + "ZbDataPassthrough")
                    {
                        var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
                        gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
                        var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());

                        if (gatewayTemp.clientDataPassthroughResponseData == null)
                        if (clientDataPassthroughResponseData == null)
                        {
                            result = new ParamatesInfo { errorMessageBase = "网关返回的数据为空" };
                        }
                        else
                        {
                            if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
                            if (clientDataPassthroughResponseData?.PassData != null)
                            {
                                var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
                                var data = clientDataPassthroughResponseData.PassData;
                                if (data.Length == 34)
                                {

                                    var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();

@@ -691,7 +650,6 @@
                                        tempD.dimmerOffTime = Convert.ToInt32(data[30].ToString() + data[31].ToString(), 16);

                                        tempD.dimmerLevel = Convert.ToInt32(data[32].ToString() + data[33].ToString(), 16);



                                        configureParamates = tempD;

                                        result = new ParamatesInfo { configureParamates = tempD };
                                        System.Console.WriteLine($"UI收到通知后的主题_command:0301_{ topic}");



@@ -782,8 +740,7 @@

                    if (topic == gatewayID + "/" + "Error_Respon")

                    {

                        var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };

                        var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());

                        var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());



                        if (temp == null)

                        {

@@ -798,18 +755,17 @@


                    if (topic == gatewayID + "/" + "ZbDataPassthrough")

                    {

                        var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };

                        gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());

                        var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());



                        if (gatewayTemp.clientDataPassthroughResponseData == null)

                        if (clientDataPassthroughResponseData == null)

                        {

                            result = new PirLuxAbilitySizeInfo { errorMessageBase = "网关返回的数据为空" };

                        }

                        else

                        {

                            if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)

                            if (clientDataPassthroughResponseData?.PassData != null)

                            {

                                var data = gatewayTemp.clientDataPassthroughResponseData.PassData;

                                var data = clientDataPassthroughResponseData.PassData;

                                if (data.Length == 12)

                                {

                                    var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();

@@ -817,7 +773,6 @@
                                    {

                                        var cou = data[10].ToString() + data[11].ToString();

                                        int countTemp = Convert.ToInt32(cou, 16);

                                        PirLux = countTemp;

                                        result = new PirLuxAbilitySizeInfo { pirLux = countTemp };

                                        System.Console.WriteLine($"UI收到通知后的主题_command:0303_{ topic}");

                                    }

@@ -886,7 +841,6 @@
        /// <summary>

        /// PIR配置参数回复

        /// </summary>

        public PirLuxAbilitySizeInfo pirLuxAbilitySizeInfo;

        [System.Serializable]

        public class PirLuxAbilitySizeInfo

        {