Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs

@@ -248,18 +248,17 @@


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

                    {

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

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

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



                        if (gatewayTemp.clientDataPassthroughResponseData == null)

                        if (clientDataPassthroughResponseData == null)

                        {

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

                        }

                        else

                        {

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

                            if (clientDataPassthroughResponseData?.PassData != null)

                            {

                                var data = gatewayTemp.clientDataPassthroughResponseData.PassData;

                                var data = clientDataPassthroughResponseData.PassData;

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

                                if (command == "0259")

                                {

@@ -412,18 +411,17 @@


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

                    {

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

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

                        var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.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;

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

                                if (command == "025b")

                                {