新版本

黄学彪

2020-09-18 c7df85937f73fb347ee0b19e9c052d2d00a6df6c

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

@@ -133,7 +133,7 @@
            //如果当前住宅是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return ModelData.DeviceModelDataLogic.Current.GetPirSensorLightSettion(device);

                return TemplateData.TemplateDeviceDataLogic.Current.GetPirSensorLightSettion(device.DeviceAddr, 200);

            }

            var sendData = this.GetPirSensorParamateCommadText(device.DeviceAddr);

            var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway2(device, sendData, "0302", 34, 9);

@@ -225,7 +225,7 @@
            //如果是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return ModelData.DeviceModelDataLogic.Current.SetPirSensorLightSettion(device, configureParamates, "ClientDataPassthrough");

                return TemplateData.TemplateDeviceDataLogic.Current.SetPirSensorLightSettion(device.DeviceAddr, 200, configureParamates, null);

            }

            //发送数据

            var sendData = this.GetPirSensorSettionCommandText(device.DeviceAddr, configureParamates);

@@ -238,6 +238,9 @@
            var tempD = new IASZone.ResponseData();

            tempD.command = data[12].ToString() + data[13].ToString() + data[10].ToString() + data[11].ToString();

            tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);



            //添加缓存

            TemplateData.TemplateDeviceDataLogic.Current.SetPirSensorLightSettion(device.DeviceAddr, 200, configureParamates, result.JsonData[0]);



            return new CommonDevice.ResponseAllData { responseData = tempD };

        }

@@ -258,10 +261,10 @@
            return jObject.ToString();

        }



    /// <summary>

    /// 获取修改PIR传感器配置的命令字符

    /// </summary>

    private string GetPIRSensorSettionPassData(IASZone.ConfigureParamates configureParamates)

        /// <summary>

        /// 获取修改PIR传感器配置的命令字符

        /// </summary>

        private string GetPIRSensorSettionPassData(IASZone.ConfigureParamates configureParamates)

        {

            string data = "";

            string dataLength = "10";