From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs
index b097cc1..c4fca7a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs
@@ -205,6 +205,7 @@
}
//璁╁畠澶勪簬5鐨勬暣鍊嶆暟
this.pirConfigure.iasReportPeriod = (this.pirConfigure.iasReportPeriod / 5) * 5;
+ int index = listTime.IndexOf(this.pirConfigure.iasReportPeriod + miao);
//涓婃姤闂撮殧
var row3 = new FrameRowControl(listView.rowSpace / 2);
@@ -222,7 +223,7 @@
btnStatu3.Text = listTime[value];
this.pirConfigure.iasReportPeriod = Convert.ToInt32(listTime[value].Replace(miao, string.Empty));
- }, 0, btnCaption3.Text,
+ }, index == -1 ? 0 : index, btnCaption3.Text,
Language.StringByID(R.MyInternationalizationString.uFinish),
Language.StringByID(R.MyInternationalizationString.uCancel));
};
@@ -240,8 +241,8 @@
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
-
- //鑾峰彇鐏厜鐨勯厤缃俊鎭�
+
+ //鑾峰彇PIR浼犳劅鍣ㄧ殑銆愰厤缃俊鎭��
this.pirConfigure = await HdlDevicePirSensorLogic.Current.GetPirSensorLightSettion(this.iASZone);
if (pirConfigure == null)
{
--
Gitblit v1.8.0