From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs b/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
index 29fe305..7c3b7e4 100755
--- a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
+++ b/ZigbeeApp20200414/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();
--
Gitblit v1.8.0