新版本

黄学彪

2020-07-29 8ce0f9b1e568dd9125e74421cd02fbc29381c1f1

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

@@ -660,6 +660,11 @@
                    return false;

                }

            }

            //刷新全部场景

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

            {

                HdlSceneLogic.Current.RefreshSceneUIList(false);

            }



            //获取全部设备

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

@@ -1538,6 +1543,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)

@@ -1623,6 +1633,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 +1908,11 @@
                }

                return false;

            }

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

            {

                //没有配置过经纬度

                return true;

            }



            int result = -1;

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