合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

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

@@ -92,6 +92,31 @@


        #endregion



        #region ■ 获取配置信息_______________________



        /// <summary>

        /// 获取PIR传感器的【lux值】，错误时返回-1

        /// </summary>

        /// <param name="iASZone"></param>

        /// <returns></returns>

        public async Task<int> GetPirSensorLux(IASZone iASZone)

        {

            var data = await iASZone.GetPirLuxAbilitySizeAsync();

            if (data == null || data.pirLux == -1)

            {

                //获取传感器亮度值失败

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

                //拼接上【网关回复超时】的Msg

                msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, data);



                this.ShowErrorMsg(msg);

                return -1;

            }

            return data.pirLux;

        }



        #endregion



        #region ■ 设置配置信息_______________________



        /// <summary>