Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

old mode 100755
new mode 100644
@@ -2485,7 +2485,7 @@
                    MainAccountId = Config.Instance.Home.MainUserDistributedMark,

                    SharedHid = Config.Instance.Home.Id

                };

                var resultData = Shared.Phone.UserCenter.UserCenterLogic.GetByteResponseDataByRequestHttps("App/GetSharedHomeApiControl", false, pra);

                var resultData = Shared.Phone.UserCenter.UserCenterLogic.GetByteResponseDataByRequestHttps("App/GetSharedHomeApiControl", false, pra, new List<string> { "NotCheck" });

                if (resultData == null)

                {

                    return;

@@ -2620,8 +2620,8 @@
                        {
                            RemoteMqttClient.UseConnectedHandler(async (e) =>

                            {

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



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

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

                                {

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

@@ -2746,8 +2746,8 @@
           .WithTcpServer(domain, int.Parse(port))

           .WithCredentials(connEmqUserName, connEmqPwd)

           .WithKeepAlivePeriod(TimeSpan.FromSeconds(20))

           .WithCleanSession()

           //.WithCommunicationTimeout(TimeSpan.FromSeconds(10))

           .WithCleanSession()
           //.WithCommunicationTimeout(TimeSpan.FromSeconds(10))
           .Build();

                                await DisConnectRemoteMqttClient("StartRemoteMqtt");

                                await RemoteMqttClient.ConnectAsync(options, CancellationToken.None);