新版本

黄学彪

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)

@@ -659,6 +663,11 @@
                    ProgressBar.Close();

                    return false;

                }

            }

            //刷新全部场景

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

            {

                HdlSceneLogic.Current.RefreshSceneUIList(false);

            }



            //获取全部设备

@@ -1520,7 +1529,7 @@
                    var tempWay = ZbGateway.GateWayList.Find(obj => (obj != null) && (obj.GwId == gateway.GwId));
                    if (tempWay == null)
                    {
                        ZbGateway.GateWayList.Add(tempWay);
                        ZbGateway.GateWayList.Add(gateway);
                    }

                }

            }

@@ -1538,6 +1547,11 @@
        /// <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, false, mode);

            if (result == null)

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

            {

                //没网的时候不再处理

                HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.Coordinator,

                HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.A协调器,

                    localWay.CoordinatorHardVersion.ToString(),

                    localWay.CoordinatorImageId.ToString());

            }

@@ -1572,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);

@@ -1590,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);

@@ -1623,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)

@@ -1891,6 +1912,11 @@
                }

                return false;

            }

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

            {

                //没有配置过经纬度

                return true;

            }



            int result = -1;

            Action<string, string> action = (topic, message) =>