合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -67,10 +67,10 @@


        #endregion



        #region ■ 获取灯光配置_______________________

        #region ■ 获取配置信息_______________________



        /// <summary>

        /// 获取PIR传感器的【灯光配置】，错误时返回null

        /// 获取PIR传感器的【配置信息】，错误时返回null

        /// </summary>

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

        /// <returns></returns>

@@ -79,8 +79,8 @@
            var data = await iASZone.GetPIRSensorParamateAsync();

            if (data == null || data.configureParamates == null)

            {

                //获取传感器灯光设置信息失败

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

                //获取传感器设置信息失败

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

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

                msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, data);



@@ -92,21 +92,21 @@


        #endregion



        #region ■ 设置灯光配置_______________________

        #region ■ 设置配置信息_______________________



        /// <summary>

        /// 设置PIR传感器的【灯光配置】

        /// 设置PIR传感器的【配置信息】

        /// </summary>

        /// <param name="iASZone">传感器对象</param>

        /// <param name="configure">灯光配置</param>

        /// <returns></returns>

        public async Task<bool> SetPirSensorLightSettion(IASZone iASZone, IASZone.ConfigureParamates configure)

        public async Task<bool> SetPirSensorSettion(IASZone iASZone, IASZone.ConfigureParamates configure)

        {

            var result = await iASZone.SetPIRSensorParamateAsync(configure);

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

            {

                //设置传感器灯光配置失败

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

                //设置传感器配置信息失败

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

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

                msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);



@@ -115,8 +115,8 @@
            }

            if (result.responseData.status != 0)

            {

                //设置传感器灯光配置失败

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

                //设置传感器配置信息失败

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

                this.ShowErrorMsg(msg);

                return false;

            }