合并代码

黄学彪

2020-01-06 72be4f06a683de33ddd563c8447c39f7f17e5b7d

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

@@ -90,16 +90,13 @@
            return data.configureParamates;

        }



        #endregion



        #region ■ 获取配置信息_______________________



        /// <summary>

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

        /// </summary>

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

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

        /// <returns></returns>

        public async Task<int> GetPirSensorLux(IASZone iASZone)

        public async Task<int> GetPirSensorLux(IASZone iASZone, ShowErrorMode mode = ShowErrorMode.YES)

        {

            var data = await iASZone.GetPirLuxAbilitySizeAsync();

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

@@ -108,8 +105,10 @@
                string msg = Language.StringByID(R.MyInternationalizationString.uGetPirSensorLuxFail);

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

                msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, data);



                this.ShowErrorMsg(msg);

                if (mode == ShowErrorMode.YES)

                {

                    this.ShowErrorMsg(msg);

                }

                return -1;

            }

            return data.pirLux;