2019.1.10

gxc

2020-01-10 b8cbf4a8b6910eefcb83b6d3a39e9b5b5a9cd79e

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

@@ -101,7 +101,7 @@
            }
        }

        #region variable 
        #region variable
        /// <summary>
        /// 远程连接成功时的时间
        /// </summary>
@@ -224,6 +224,7 @@
        /// <para>第一个参数：如果为 DDevice/IsGetEpointInfo:有新设备加入zigbee网络反馈</para>设备请求APP获取升级数据
        /// <para>第一个参数：如果为 Device/DeviceJoinZbNet:获取新设备所有端点信息是否成功反馈</para>
        /// <para>第一个参数：如果为 DeviceRequestAcUpdateData: 设备请求空调发升级数据</para>
        /// "已经通知");//已经通知");
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public Action<string, object> ReportAction;
@@ -3324,7 +3325,7 @@
        /// 远程MqttClient
        /// </summary>
        public static IMqttClient RemoteMqttClient= new MqttFactory().CreateMqttClient();
        static bool remoteIsConnected; 
        static bool remoteIsConnected;
        private int IsLogin = 0;
        [Newtonsoft.Json.JsonIgnore]
        static Action actionTemp;
@@ -3382,6 +3383,16 @@
                            RemoteMqttClient.UseConnectedHandler(async (e) =>

                            {

                                DebugPrintLog($"远程连接成功");



                                if (Config.Instance.Home.IsOthreShare == true)

                                {

                                    //订阅一个成员被删除的主题

                                    string myGuid = Config.Instance.Guid;

                                    await RemoteMqttClient.SubscribeAsync("/ZigbeeGateWayToClient/" + myGuid + "/Push/Deleted");

                                    //订阅一个分享数据已经变更的主题

                                    await RemoteMqttClient.SubscribeAsync("/ZigbeeGateWayToClient/" + myGuid + "/Push/DeletedShareData");

                                }



                                await initGateWayBaseInfomation();
                                Shared.Phone.UserCenter.HdlGatewayLogic.Current.CheckGatewayByConnectChanged(Shared.Phone.UserCenter.GatewayConnectMode.Remote);

                                //没有主网关时主动读取，获取主网关信息

@@ -3517,7 +3528,8 @@
                {

                    localIsConnected = false;

                    DebugPrintLog($"Local主动断开_{s}");

                    await localMqttClient.DisconnectAsync(new MQTTnet.Client.Disconnecting.MqttClientDisconnectOptions {  }, CancellationToken.None);

                    //await localMqttClient.DisconnectAsync(new MQTTnet.Client.Disconnecting.MqttClientDisconnectOptions {  }, CancellationToken.None);

                    await localMqttClient.DisconnectAsync(); 
                }

            }
            catch (Exception ex)
@@ -3537,10 +3549,11 @@
                {

                    remoteIsConnected = false;

                    DebugPrintLog($"Remote主动断开_{s}");

                    await RemoteMqttClient.DisconnectAsync(new MQTTnet.Client.Disconnecting.MqttClientDisconnectOptions { }, CancellationToken.None);

                    //await RemoteMqttClient.DisconnectAsync(new MQTTnet.Client.Disconnecting.MqttClientDisconnectOptions { }, CancellationToken.None);

                    await RemoteMqttClient.DisconnectAsync();

                }

            }

            catch(Exception e) { 
            catch(Exception e) {

                DebugPrintLog($"Remote断开通讯连接出异常:{e.Message}");

            }

        }
@@ -4350,22 +4363,18 @@
                #region 设备请求APP获取升级数据
                else if (topic == gatewayID + "/" + "ZbDataPassthrough")
                {
                    var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
                    gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
                    if (gatewayTemp.clientDataPassthroughResponseData == null)
                    {
                        return;
                    }

                    //上报类型通知
                    if (gwa.ReportAction != null)
                    {
                        DebugPrintLog("DeviceRequestAcUpdateData");
                        gwa.ReportAction("DeviceRequestAcUpdateData", gatewayTemp.clientDataPassthroughResponseData);
                    {

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

                        if (clientDataPassthrough != null)

                        {

                            DebugPrintLog("DeviceRequestAcUpdateData");

                            gwa.ReportAction("DeviceRequestAcUpdateData", clientDataPassthrough);

                        }
                    }
                }
                #endregion
                DebugPrintLog("网关返回数据通知");
            }
            catch (Exception ex)
            {