2020-07-10-01

陈嘉乐

2020-07-10 48ba446936b51fffafa7c3600c0dadc6ac0e8c20

 ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs

@@ -369,23 +369,26 @@
                }

            }



            //延时

            string strMinute = string.Empty;

            if (pirConfigure.transitionTime / 60 > 0)

            //延时(半自动没有延时的概念)

            if (this.pirConfigure.mode == 1)

            {

                strMinute = pirConfigure.transitionTime / 60 + Language.StringByID(R.MyInternationalizationString.uMinute);

                string strMinute = string.Empty;

                if (pirConfigure.transitionTime / 60 > 0)

                {

                    strMinute = pirConfigure.transitionTime / 60 + Language.StringByID(R.MyInternationalizationString.uMinute);

                }

                string strSecond = pirConfigure.transitionTime % 60 + Language.StringByID(R.MyInternationalizationString.uSecond);

                var rowDelay = new FrameRowControl(listView.rowSpace / 2);

                rowDelay.LeftOffset = Application.GetRealWidth(138) - ControlCommonResourse.XXLeft;

                frameResult.AddChidren(rowDelay);

                rowDelay.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uDelayed), 300);

                rowDelay.AddRightArrow();

                var btnDelayView = rowDelay.AddMostRightView(strMinute + strSecond, 700);

                rowDelay.ButtonClickEvent += (sender, e) =>

                {

                    this.ShowDelayListTime(btnDelayView);

                };

            }

            string strSecond = pirConfigure.transitionTime % 60 + Language.StringByID(R.MyInternationalizationString.uSecond);

            var rowDelay = new FrameRowControl(listView.rowSpace / 2);

            rowDelay.LeftOffset = Application.GetRealWidth(138) - ControlCommonResourse.XXLeft;

            frameResult.AddChidren(rowDelay);

            rowDelay.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uDelayed), 300);

            rowDelay.AddRightArrow();

            var btnDelayView = rowDelay.AddMostRightView(strMinute + strSecond, 700);

            rowDelay.ButtonClickEvent += (sender, e) =>

            {

                this.ShowDelayListTime(btnDelayView);

            };



            //保存

            var btnSave = new BottomClickButton();

@@ -415,7 +418,7 @@
            this.ShowProgressBar();



            //获取绑定目标设备

            List<CommonDevice> listDevice = await HdlDeviceBindLogic.Current.GetBindTargetDevice(this.deviceIASZone);

            List<CommonDevice> listDevice = HdlDeviceBindLogic.Current.GetBindTargetDevice(this.deviceIASZone);

            if (listDevice == null)

            {

                //关闭进度条

@@ -445,7 +448,7 @@
            }



            //获取pir的配置信息

            this.pirConfigure = await HdlDevicePirSensorLogic.Current.GetPirSensorLightSettion(deviceIASZone);

            this.pirConfigure = HdlDevicePirSensorLogic.Current.GetPirSensorLightSettion(deviceIASZone);

            if (pirConfigure == null)

            {

                //关闭进度条

@@ -517,7 +520,7 @@


            PickerView.ShowSecondary(listfirst, listSecond, (value1, value2) =>

             {

                 btnTime.Text = listfirst[value1] + listSecond[value1][value2];

                 btnTime.Text = listfirst[value1].TrimStart('0') + listSecond[value1][value2];

                 int minute = Convert.ToInt32(listfirst[value1].Substring(0, 2));

                 int second = Convert.ToInt32(listSecond[value1][value2].Substring(0, 2));

                 int delaySecond = minute * 60 + second;

@@ -538,7 +541,7 @@
        /// <summary>

        /// 保存Pir传感器数据

        /// </summary>

        private async void SavePirSensorData()

        private void SavePirSensorData()

        {

            if (this.isDataChanged == false)

            {

@@ -574,7 +577,7 @@
                if (listDelDevice.Count > 0)

                {

                    //删除目标

                    var listSucess = await HdlDeviceBindLogic.Current.DeleteDeviceTarget(deviceIASZone, listDelDevice);

                    var listSucess = HdlDeviceBindLogic.Current.DeleteDeviceTarget(deviceIASZone, listDelDevice);

                    if (listSucess == null || listSucess.Count == 0)

                    {

                        //关闭进度条

@@ -584,7 +587,7 @@
                    if (listLightDevice.Count > 0)

                    {

                        //删除调光器镞

                        listSucess = await HdlDeviceBindLogic.Current.DeleteDeviceTarget(deviceIASZone, listLightDevice, 8);

                        listSucess = HdlDeviceBindLogic.Current.DeleteDeviceTarget(deviceIASZone, listLightDevice, 8);

                        if (listSucess == null || listSucess.Count == 0)

                        {

                            //关闭进度条

@@ -609,7 +612,7 @@
                if (listSaveDevice.Count > 0)

                {

                    //绑定目标

                    var listSucess = await HdlDeviceBindLogic.Current.BindDeviceTarget(deviceIASZone, listBind);

                    var listSucess = HdlDeviceBindLogic.Current.BindDeviceTarget(deviceIASZone, listBind);

                    if (listSucess == null || listSucess.Count == 0)

                    {

                        //关闭进度条

@@ -619,7 +622,7 @@
                    if (listLightDevice.Count > 0)

                    {

                        //绑定调光镞

                        listSucess = await HdlDeviceBindLogic.Current.BindDeviceTarget(deviceIASZone, listLightDevice, 8);

                        listSucess = HdlDeviceBindLogic.Current.BindDeviceTarget(deviceIASZone, listLightDevice, 8);

                        if (listSucess == null || listSucess.Count == 0)

                        {

                            //关闭进度条

@@ -630,7 +633,7 @@
                }

            }

            //保存pir配置信息

            var result = await HdlDevicePirSensorLogic.Current.SetPirSensorSettion(this.deviceIASZone, this.pirConfigure);

            var result = HdlDevicePirSensorLogic.Current.SetPirSensorSettion(this.deviceIASZone, this.pirConfigure);

            if (result == false)

            {

                //关闭进度条