新版本

黄学彪

2020-09-18 c7df85937f73fb347ee0b19e9c052d2d00a6df6c

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

@@ -178,6 +178,10 @@
                    //将网关的数据设置到本地缓存中

                    this.SetGatewayDataToLocalMemmory(gateway, result);

                }

                if (gateway.HomeId == string.Empty)

                {

                    gateway.HomeId = Config.Instance.Home.Id;

                }

                return gateway;

            }

            catch (Exception ex)

@@ -196,7 +200,7 @@
        /// </summary>
        /// <param name="zbGateway">网关</param>
        /// <param name="mode">是否显示错误</param>
        public async Task<bool> AddNewGateway(ZbGateway zbGateway, ShowErrorMode mode)
        public bool AddNewGateway(ZbGateway zbGateway, ShowErrorMode mode)
        {

            //设置网关的经纬度

            bool falge = this.SetGatewaySite(zbGateway, Common.Config.Instance.Home.Longitude, Common.Config.Instance.Home.Latitude, ShowErrorMode.NO);
@@ -205,7 +209,7 @@
                return falge;

            }
            //执行添加网关到内存
            var result = await this.DoAddGatewayToMemory(zbGateway, mode);
            var result = this.DoAddGatewayToMemory(zbGateway, mode);
            //前的网关绑定在了当前账号下的不同住宅里面

            if (result == 0)

            {

@@ -250,7 +254,7 @@
        /// <param name="zbGateway">网关对象</param>

        /// <param name="mode">是否显示错误</param>

        /// <returns></returns>

        private async Task<int> DoAddGatewayToMemory(ZbGateway zbGateway, ShowErrorMode mode)

        private int DoAddGatewayToMemory(ZbGateway zbGateway, ShowErrorMode mode)

        {

            if (zbGateway == null)

            {

@@ -263,18 +267,7 @@
                return -1;

            }

            //获取网关的信息

            var result = await zbGateway.GetZbGwInfoAsync();

            //检测网关返回的共通错误状态码

            string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);

            if (error != null)

            {

                if (mode == ShowErrorMode.YES)

                {

                    this.ShowTipMsg(error);

                }

                return -1;

            }



            var result = this.GetGatewayInfo(zbGateway, true, mode);

            if (result == null)

            {

                if (mode == ShowErrorMode.YES)

@@ -286,28 +279,20 @@
                return -1;

            }



            if (result.getGwData == null)

            {

                if (mode == ShowErrorMode.YES)

                {

                    //获取网关信息失败

                    string msg = Language.StringByID(R.MyInternationalizationString.uGetGatewayInfoFail);

                    this.ShowTipMsg(msg);

                }

                return -1;

            }



            //设置住宅ID到网关

            bool flage2 = await this.SetHomeIdToGateway(zbGateway, Common.Config.Instance.HomeId, mode);

            if (flage2 == false)

            if (result.HomeId != Common.Config.Instance.HomeId)

            {

                if (mode == ShowErrorMode.YES)

                bool flage2 = this.SetHomeIdToGateway(zbGateway, Common.Config.Instance.HomeId, mode);

                if (flage2 == false)

                {

                    //向网关设置住宅ID失败

                    string msg = Language.StringByID(R.MyInternationalizationString.uSetHomeIdToGatewayFail);

                    this.ShowTipMsg(msg);

                    if (mode == ShowErrorMode.YES)

                    {

                        //向网关设置住宅ID失败

                        string msg = Language.StringByID(R.MyInternationalizationString.uSetHomeIdToGatewayFail);

                        this.ShowTipMsg(msg);

                    }

                    return -1;

                }

                return -1;

            }



            //更新云端数据库

@@ -337,9 +322,9 @@
            //刷新的是缓存,不刷新真实物理网关

            this.dicGateway[gwID].GatewayOnlineFlage = zbGateway.GatewayOnlineFlage;

            //将网关的数据设置到本地缓存中

            this.SetGatewayDataToLocalMemmory(this.dicGateway[gwID], result.getGwData);

            this.SetGatewayDataToLocalMemmory(this.dicGateway[gwID], result);

            //顺便这个变量也设置一下

            this.SetGatewayDataToLocalMemmory(zbGateway, result.getGwData, false);

            this.SetGatewayDataToLocalMemmory(zbGateway, result, false);



            if (isEsist == false)

            {

@@ -356,10 +341,28 @@
        /// <param name="zbGateway"></param>

        /// <param name="HomeId"></param>

        /// <returns></returns>
        public async Task<bool> SetHomeIdToGateway(ZbGateway zbGateway, string HomeId, ShowErrorMode mode)

        public bool SetHomeIdToGateway(ZbGateway zbGateway, string HomeId, ShowErrorMode mode)

        {

            ZbGateway realWay = null;

            if (this.GetRealGateway(ref realWay, zbGateway) == false)

            //账号ID

            string accountId = string.Empty;

            if (HomeId != string.Empty)

            {

                if (UserCenterResourse.UserInfo.AuthorityNo == 1)

                {

                    //主账号

                    accountId = Config.Instance.Guid;

                }

                else

                {

                    accountId = Config.Instance.Home.MainUserDistributedMark;

                }

            }

            var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 82 } };

            var data = new Newtonsoft.Json.Linq.JObject { { "HomeId", HomeId }, { "AccountId", accountId } };

            jObject.Add("Data", data);

            //住宅ID的设置,固定使用局域网,不存在远程的说法

            var result = this.SendJobjectDataToGateway(zbGateway, "GwSetHomeId", jObject.ToString(), "GwSetHomeId_Respon", 5, true);

            if (result.ErrorMsgDiv == -1)

            {

                if (mode == ShowErrorMode.YES)

                {

@@ -369,13 +372,11 @@
                }

                return false;

            }



            var info = await realWay.GwSetHomeIdAsync(HomeId);

            if (info != null && info.gwSetHomeIdData != null)

            if (result.ErrorMsgDiv == 0)

            {

                return true;

                return false;

            }

            return false;

            return true;

        }



        /// <summary>

@@ -391,7 +392,7 @@
            //获取控制主人账号的Token

            bindGateway.LoginAccessToken = UserCenterLogic.GetConnectMainToken();

            var result = UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, new List<string> { "NotCheck" });
            var result = UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, new List<string> { "NotCheck" }, false);
            if (result == "Error")

            {

                return -1;

@@ -437,7 +438,7 @@
        /// </summary>
        /// <param name="zbGateway">网关</param>
        /// <param name="btnMsg">消息控件</param>
        public async Task<int> ReBindNewGateway(ZbGateway zbGateway, NormalViewControl btnMsg = null)
        public int ReBindNewGateway(ZbGateway zbGateway, NormalViewControl btnMsg = null)
        {

            if (zbGateway == null)

            {

@@ -454,7 +455,7 @@
            }



            //设置住宅ID到网关

            bool flage2 = await this.SetHomeIdToGateway(zbGateway, Common.Config.Instance.HomeId, ShowErrorMode.YES);

            bool flage2 = this.SetHomeIdToGateway(zbGateway, Common.Config.Instance.HomeId, ShowErrorMode.YES);

            if (flage2 == false)

            {

                //向网关设置住宅ID失败

@@ -489,31 +490,23 @@
                    btnMsg.TextID = R.MyInternationalizationString.uGatewayDataIsChangingPleaseWhait;

                });

            }

            await Task.Delay(8000);

            System.Threading.Thread.Sleep(8000);



            //获取网关的信息

            ZbGatewayData.GetGwAllData result = null;

            ZbGatewayData.GetGwData result = null;

            int count = 5;

            while (count >= 0)

            {

                result = await zbGateway.GetZbGwInfoAsync();

                if (result != null && result.getGwData != null)

                result = this.GetGatewayInfo(zbGateway, true, ShowErrorMode.NO);

                if (result != null)

                {

                    break;

                }

                count--;

                //最多再等20秒

                await Task.Delay(4000);

                System.Threading.Thread.Sleep(4000);

            }

            //检测网关返回的共通错误状态码

            string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);

            if (error != null)

            {

                this.ShowTipMsg(error);

                return -1;

            }



            if (result == null || result.getGwData == null)

            if (result == null)

            {

                //获取网关信息失败

                string msg = Language.StringByID(R.MyInternationalizationString.uGetGatewayInfoFail);

@@ -535,9 +528,9 @@
            //刷新的是缓存,不刷新真实物理网关

            this.dicGateway[gwID].GatewayOnlineFlage = zbGateway.GatewayOnlineFlage;

            //将网关的数据设置到本地缓存中

            this.SetGatewayDataToLocalMemmory(this.dicGateway[gwID], result.getGwData);

            this.SetGatewayDataToLocalMemmory(this.dicGateway[gwID], result);

            //顺便这个变量也设置一下

            this.SetGatewayDataToLocalMemmory(zbGateway, result.getGwData, false);

            this.SetGatewayDataToLocalMemmory(zbGateway, result, false);



            if (isEsist == false)

            {

@@ -606,18 +599,15 @@
        /// 执行切换网关操作

        /// </summary>

        /// <param name="gatewayId"></param>

        public async Task<bool> DoSwitchGateway(string gatewayId)

        public bool DoSwitchGateway(string gatewayId)

        {

            var zbGateway = this.GetLocalGateway(gatewayId);

            if (this.CheckGatewayOnlineByFlag(zbGateway) == true)

            //重新获取在线网关的信息

            var result = this.GetOnlineGatewayInfo(gatewayId);

            if (result == false)

            {

                //重新获取在线网关的信息

                var result = await this.GetOnlineGatewayInfo(gatewayId);

                if (result == false)

                {

                    return false;

                }

                return false;

            }



            //切换网关,保存缓存

            this.SaveGatewayIdToLocation(gatewayId);

            //切换网关的话,主页需要重新刷新

@@ -631,7 +621,7 @@
        /// </summary>

        /// <param name="gatewayId"></param>

        /// <returns></returns>

        private async Task<bool> GetOnlineGatewayInfo(string gatewayId)

        private bool GetOnlineGatewayInfo(string gatewayId)

        {

            //显示进度条

            ProgressBar.Show();

@@ -644,7 +634,7 @@
                //重新设置住宅ID(这个应该是不经过APP,直接把网关恢复了出厂设置)

                if (this.HomeIdIsEmpty(realWay.HomeId) == true)

                {

                    int result2 = await this.ReBindNewGateway(realWay);

                    int result2 = this.ReBindNewGateway(realWay);

                    if (result2 == 0)

                    {

                        //出现未知错误,请稍后再试

@@ -666,7 +656,7 @@
            if (getGatewayInfo == true)

            {

                //获取网关信息

                var info = this.GetGatewayInfo(realWay);

                var info = this.GetGatewayInfo(realWay, false);

                if (info == null)

                {

                    //关闭进度条

@@ -674,9 +664,14 @@
                    return false;

                }

            }

            //刷新全部场景

            if (this.IsMainGateway(realWay) == 1)

            {

                HdlSceneLogic.Current.RefreshSceneUIList(false);

            }



            //获取全部设备

            int result = LocalDevice.Current.SetDeviceToMemmoryByGateway(realWay);

            int result = LocalDevice.Current.SetDeviceToMemmoryByGateway(realWay, false);

            //关闭进度条

            ProgressBar.Close();

            if (result == -1)

@@ -703,34 +698,15 @@
        /// <summary>
        /// 删除网关，包括云端和本地(失败时不会显示信息，并且会返回true)
        /// </summary>
        /// <param name="zbGateway"></param>
        public async Task<bool> DeleteGateway(ZbGateway zbGateway)
        {
            //移除本地网关信息
            return await this.DeleteGateway(zbGateway.GwId);
        }

        /// <summary>
        /// 删除网关，包括云端和本地(失败时不会显示信息，并且会返回true)
        /// </summary>
        /// <param name="zbGatewayID"></param>
        public async Task<bool> DeleteGateway(string zbGatewayID)
        public bool DeleteGateway(string zbGatewayID)
        {

            ZbGateway realWay = null;

            bool hadReal = this.GetRealGateway(ref realWay, zbGatewayID);



            //暂不支持分享

            if (hadReal == true && realWay.GatewayOnlineFlage == true)

            this.GetRealGateway(ref realWay, zbGatewayID);

            //清空网关的住宅ID 网关解绑失败  不理它,因为网关可以按按键强制搜索得到

            if (realWay != null)

            {

                //清空网关的住宅ID

                bool result = await this.SetHomeIdToGateway(realWay, string.Empty, ShowErrorMode.YES);

                if (result == false)

                {

                    //网关解绑失败  不理它,因为网关可以按按键强制搜索得到

                    string msg = Language.StringByID(R.MyInternationalizationString.uGatewayUnBindFail);

                    //this.ShowErrorMsg(msg);

                    //return false;

                }

                this.SetHomeIdToGateway(realWay, string.Empty, ShowErrorMode.NO);

            }



            //删除云端的网关

@@ -742,7 +718,10 @@
            //移除
            ZbGateway.GateWayList.RemoveAll((obj) => obj.GwId == zbGatewayID);
            //断开mqtt连接
            realWay.DisConnectLocalMqttClient("GD");
            if (realWay != null)

            {

                realWay.DisConnectLocalMqttClient("GD");

            }

            return true;
        }

@@ -1308,6 +1287,8 @@
        /// <returns></returns>

        public string GetGatewayName(ZbGateway zbGateway)

        {

            if (zbGateway == null) { return string.Empty; }



            string gwId = zbGateway.GwId;

            if (this.dicGateway.ContainsKey(gwId) == false)

            {

@@ -1321,11 +1302,10 @@
                return name;

            }



            string keyName = Common.LocalDevice.deviceModelIdName + localWay.LinuxImageType;

            if (LocalDevice.Current.dicDeviceAllNameID.ContainsKey(keyName) == true)

            var nameContent = LocalDevice.Current.GetDeviceModelIdNameInfo(localWay.LinuxImageType.ToString());

            if (nameContent != null)

            {

                //没有名称时，则使用R文件里面设置的默认设备名称

                return Language.StringByID(LocalDevice.Current.dicDeviceAllNameID[keyName] + 20000);

                return nameContent.A备注名字;

            }



            return string.Empty;

@@ -1362,11 +1342,10 @@
                //如果这个网关没有信息，则从新获取

                if (zbGateway.LinuxImageType != -1)

                {

                    string keyName = Common.LocalDevice.deviceModelIdName + zbGateway.LinuxImageType;

                    if (Common.LocalDevice.Current.dicDeviceAllNameID.ContainsKey(keyName) == true)

                    var nameContent = LocalDevice.Current.GetDeviceModelIdNameInfo(zbGateway.LinuxImageType.ToString());

                    if (nameContent != null)

                    {

                        //使用R文件里面设置的东西

                        button.TextID = LocalDevice.Current.dicDeviceAllNameID[keyName];

                        button.Text = nameContent.A官方名字;

                    }

                }

                else

@@ -1374,7 +1353,7 @@
                    //给一个线程去获取它的镜像类型

                    HdlThreadLogic.Current.RunThread(() =>

                    {

                        var result = this.GetGatewayInfo(zbGateway, ShowErrorMode.NO);

                        var result = this.GetGatewayInfo(zbGateway, false, ShowErrorMode.NO);

                        if (result != null)

                        {

                            //将网关的数据设置到本地缓存中

@@ -1382,11 +1361,10 @@


                            HdlThreadLogic.Current.RunMain(() =>

                            {

                                string keyName = Common.LocalDevice.deviceModelIdName + zbGateway.LinuxImageType;

                                if (Common.LocalDevice.Current.dicDeviceAllNameID.ContainsKey(keyName) == true)

                                var nameContent = LocalDevice.Current.GetDeviceModelIdNameInfo(zbGateway.LinuxImageType.ToString());

                                if (nameContent != null)

                                {

                                    //使用R文件里面设置的东西

                                    button.TextID = LocalDevice.Current.dicDeviceAllNameID[keyName];

                                    button.Text = nameContent.A官方名字;

                                }

                            });

                        }

@@ -1395,11 +1373,10 @@
            }

            else

            {

                string keyName = Common.LocalDevice.deviceModelIdName + this.dicGateway[gwId].LinuxImageType;

                if (Common.LocalDevice.Current.dicDeviceAllNameID.ContainsKey(keyName) == true)

                var nameContent = LocalDevice.Current.GetDeviceModelIdNameInfo(zbGateway.LinuxImageType.ToString());

                if (nameContent != null)

                {

                    //使用R文件里面设置的东西

                    button.TextID = Common.LocalDevice.Current.dicDeviceAllNameID[keyName];

                    button.Text = nameContent.A官方名字;

                }

            }

        }

@@ -1412,13 +1389,14 @@
        /// 获取网关信息(版本信息,镜像类型,基本信息等。只刷新本地网关的缓存)

        /// </summary>

        /// <param name="zbGateway"></param>

        /// <param name="useLocalConnect">是否强制使用本地连接发送</param>

        /// <param name="mode"></param>

        /// <returns></returns>

        public ZbGatewayData.GetGwData GetGatewayInfo(ZbGateway zbGateway, ShowErrorMode mode = ShowErrorMode.YES)

        public ZbGatewayData.GetGwData GetGatewayInfo(ZbGateway zbGateway, bool useLocalConnect, ShowErrorMode mode = ShowErrorMode.YES)

        {

            //获取网关版本信息

            var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 95 } };

            var result = this.SendJobjectDataToGateway(zbGateway, "GetZbGwInfo", jObject.ToString(), "GetZbGwInfo_Respon");

            var result = this.SendJobjectDataToGateway(zbGateway, "GetZbGwInfo", jObject.ToString(), "GetZbGwInfo_Respon", 5, useLocalConnect);



            if (result.ErrorMsgDiv != 1)

            {

@@ -1467,6 +1445,7 @@
            localWay.CoordinatorFirmwareVersion = data.ZbFWVersion;

            localWay.CoordinatorImageId = data.ZbImageType;

            localWay.DriveCodeList = data.DriveCodeList;

            localWay.GwVersionDate = data.AppVersion;

            if (saveFile == true)

            {

                localWay.ReSave();

@@ -1521,24 +1500,39 @@


        #endregion



        #region ■ 清空真实网关列表___________________

        #region ■ 清空真实网关链接___________________



        /// <summary>

        /// 清空全部的真实物理网关对象

        /// 清空全部的真实物理网关的链接

        /// </summary>

        public void ClearAllRealGateway()

        /// <param name="roadGateway">是否加载本地的网关对象到真实列表中</param>

        public void ClearAllRealGatewayConection(bool roadGateway)

        {

            //因为那一瞬间，有可能mqtt会加回来,所以先加缓存

            var list = new List<ZbGateway>();

            list.AddRange(ZbGateway.GateWayList);

            //然后清空掉

            ZbGateway.GateWayList.Clear();

            //最后再断开mqtt连接

            for (int i = 0; i < list.Count; i++)

            //断开mqtt连接(即使保存在内存当中也没问题,因为如果广播不到,则它不会建立链接)

            for (int i = 0; i < ZbGateway.GateWayList.Count; i++)

            {

                list[i].DisConnectLocalMqttClient("G");

                ZbGateway.GateWayList[i].DisConnectLocalMqttClient("G");

            }

            list.Clear();

            //加载本地网关对象

            if (roadGateway == true)

            {

                List<string> listFile = this.GetAllGatewayFile();

                //反序列化添加到缓存

                foreach (string file in listFile)

                {

                    //从文件中反序列化出网关对象

                    var gateway = this.GetGatewayFromFile(file);

                    if (gateway == null)

                    {

                        continue;

                    }

                    var tempWay = ZbGateway.GateWayList.Find(obj => (obj != null) && (obj.GwId == gateway.GwId));
                    if (tempWay == null)
                    {
                        ZbGateway.GateWayList.Add(gateway);
                    }

                }

            }

        }



        #endregion

@@ -1553,8 +1547,13 @@
        /// <returns></returns>

        public List<FirmwareVersionInfo> GetGatewayAllNewVersion(ZbGateway zbGateway, ShowErrorMode mode = ShowErrorMode.YES)

        {

            //如果是展示模板,或者是虚拟住宅的话,没有什么新版本的说法

            if (Common.Config.Instance.Home.IsVirtually == true || Common.Config.Instance.Home.IsShowTemplate == true)

            {

                return new List<FirmwareVersionInfo> { null, null, null };

            }

            //获取网关版本信息

            var result = this.GetGatewayInfo(zbGateway, mode);

            var result = this.GetGatewayInfo(zbGateway, false, mode);

            if (result == null)

            {

                return null;

@@ -1575,7 +1574,7 @@
            if (flage == 1)

            {

                //没网的时候不再处理

                HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.Coordinator,

                HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.A协调器,

                    localWay.CoordinatorHardVersion.ToString(),

                    localWay.CoordinatorImageId.ToString());

            }

@@ -1587,7 +1586,7 @@
                localWay.LinuxFirmwareVersion);



            //协调器版本

            var coordinatorFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.Coordinator,

            var coordinatorFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A协调器,

                localWay.CoordinatorHardVersion.ToString(),

                localWay.CoordinatorImageId.ToString(),

                localWay.CoordinatorFirmwareVersion);

@@ -1605,13 +1604,13 @@
                    //添加虚拟驱动的升级固件(成不成功都无所谓) 必须能够联网才行

                    if (flage == 1)

                    {

                        HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.VirtualDevice,

                        HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.A虚拟驱动,

                           data.DriveHwVersion.ToString(),

                           data.DriveImageType.ToString());

                    }



                    //虚拟驱动

                    var virtualFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.VirtualDevice,

                    var virtualFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A虚拟驱动,

                        data.DriveHwVersion.ToString(),

                        data.DriveImageType.ToString(),

                        data.DriveFwVersion);

@@ -1638,6 +1637,13 @@
        /// <returns></returns>

        public List<ZbGatewayData.DriveCodeObj> GetListVDDriveCode(ZbGateway zbGateway)

        {

            //如果是展示模板,或者是虚拟住宅的话,直接取缓存

            if (Common.Config.Instance.Home.IsVirtually == true || Common.Config.Instance.Home.IsShowTemplate == true)

            {

                //取本地对象

                var localgw = this.GetLocalGateway(zbGateway.GwId);

                return localgw != null ? zbGateway.DriveCodeList : zbGateway.DriveCodeList;

            }

            var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 505 } };

            var result = this.SendJobjectDataToGateway(zbGateway, "VirtualDrive/CatDriveCode", jObject.ToString(), "VirtualDrive/CatDriveCode_Respon");

            if (result.ErrorMsg != null)

@@ -1673,12 +1679,16 @@
        /// <returns></returns>

        public int IsMainGateway(string waiID)

        {

            ZbGateway zbGateway = null;

            if (this.GetRealGateway(ref zbGateway, waiID) == false)

            var realWay = ZbGateway.GateWayList.Find((obj) =>

            {

                return obj.GwId == waiID;

            });

            //虚拟网关也返回 0

            if (realWay == null || realWay.IsVirtual == true)

            {

                return 0;

            }

            return zbGateway.IsMainGateWay == true ? 1 : 2;

            return realWay.IsMainGateWay == true ? 1 : 2;

        }



        #endregion

@@ -1704,7 +1714,7 @@
                    //给一个线程去获取它的镜像类型

                    HdlThreadLogic.Current.RunThread(() =>

                    {

                        var result = this.GetGatewayInfo(zbGateway, ShowErrorMode.NO);

                        var result = this.GetGatewayInfo(zbGateway, true, ShowErrorMode.NO);

                        if (result != null)

                        {

                            //将网关的数据设置到本地缓存中

@@ -1742,7 +1752,7 @@
                    //给一个线程去获取它的镜像类型

                    HdlThreadLogic.Current.RunThread(() =>

                    {

                        var result = this.GetGatewayInfo(zbGateway, ShowErrorMode.NO);

                        var result = this.GetGatewayInfo(zbGateway, true, ShowErrorMode.NO);

                        if (result != null)

                        {

                            //将网关的数据设置到本地缓存中

@@ -1845,7 +1855,7 @@
                //获取控制主人账号的Token

                pra.ReqDto.LoginAccessToken = UserCenterLogic.GetConnectMainToken();



                var result = UserCenterLogic.GetResponseDataByRequestHttps("App/GetSingleHomeGatewayPagger", true, pra, list);

                var result = UserCenterLogic.GetResponseDataByRequestHttps("App/GetSingleHomeGatewayPagger", true, pra, list, false);

                if (string.IsNullOrEmpty(result) == true)

                {

                    canBreak = true;

@@ -1901,6 +1911,11 @@
                    this.ShowTipMsg(msg);

                }

                return false;

            }

            if (((decimal)Longitude) == 0 && ((decimal)Latitude) == 0)

            {

                //没有配置过经纬度

                return true;

            }



            int result = -1;

@@ -1977,7 +1992,7 @@


            List<string> listNotShowError = new List<string>() { "NoExist", "NoBind", "NoRecord", "NotCheck" };



            bool result = UserCenterLogic.GetResultStatuByRequestHttps("App/ReleaseGatewayToHome", true, Pra, listNotShowError);

            bool result = UserCenterLogic.GetResultStatuByRequestHttps("App/ReleaseGatewayToHome", true, Pra, listNotShowError, false);

            if (result == false)

            {

                return false;

@@ -2030,7 +2045,7 @@
                {

                    bindGateway.BindGateways.Clear();

                    bindGateway.BindGateways.Add(gwId);

                    var result = UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, new List<string> { "NotCheck" });

                    var result = UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, new List<string> { "NotCheck" }, false);

                    if (result == "Success")

                    {

                        this.listBackupGwId.Remove(gwId);

@@ -2070,8 +2085,9 @@
        /// <param name="sendData">需要发送的数据  JObject.ToString()的东西</param>

        /// <param name="receiptTopic">指定接收哪个主题</param>

        /// <param name="waitTime">超时时间(秒)</param>

        /// <param name="useLocalConnect">是否强制使用本地连接发送</param>

        /// <returns>网关返回的数据</returns>

        public ReceiptGatewayResult SendJobjectDataToGateway(ZbGateway gateway, string sendTopic, string sendData, string receiptTopic, int waitTime = 5)

        public ReceiptGatewayResult SendJobjectDataToGateway(ZbGateway gateway, string sendTopic, string sendData, string receiptTopic, int waitTime = 5, bool useLocalConnect = false)

        {

            var reResult = new ReceiptGatewayResult();



@@ -2108,7 +2124,14 @@
            };

            myGateway.Actions += receiptAction;

            //发送数据

            myGateway.Send(sendTopic, sendData);

            if (useLocalConnect == false)

            {

                myGateway.Send(sendTopic, sendData);

            }

            else

            {

                myGateway.SendLocation(sendTopic, System.Text.Encoding.UTF8.GetBytes(sendData));

            }



            //超时时间

            int TimeOut = 0;