From f3e65daca7978b21b5888f49b1bf35e1a6e5d4fd Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 13 七月 2020 12:33:31 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs
index a48780e..70d9c84 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs
@@ -41,10 +41,10 @@
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uWorkMode));
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鑾峰彇鍒濆鏁版嵁
- var result = await this.GetDeviceAllDefultData();
+ var result = this.GetDeviceAllDefultData();
if (result == false)
{
return;
@@ -132,7 +132,7 @@
row1.ButtonClickEvent += (sender, e) =>
{
var form = new BottomItemSelectForm();
- form.AddForm(btnCaption1.Text, listSelect, this.pirConfigure.mode == 0 ? 1 : 0);
+ form.AddForm(btnCaption1.Text, listSelect, null, this.pirConfigure.mode == 0 ? 1 : 0);
form.FinishSelectEvent += (value) =>
{
this.isDataChanged = true;
@@ -170,7 +170,7 @@
row2.ButtonClickEvent += (sender, e) =>
{
var form = new BottomItemSelectForm();
- form.AddForm(btnCaption2.Text, listSelect, this.pirConfigure.type);
+ form.AddForm(btnCaption2.Text, listSelect, null, this.pirConfigure.type);
form.FinishSelectEvent += (value) =>
{
this.isDataChanged = true;
@@ -237,13 +237,13 @@
/// 鑾峰彇鍒濆鏁版嵁
/// </summary>
/// <returns></returns>
- private async Task<bool> GetDeviceAllDefultData()
+ private bool GetDeviceAllDefultData()
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
-
- //鑾峰彇鐏厜鐨勯厤缃俊鎭�
- this.pirConfigure = await HdlDevicePirSensorLogic.Current.GetPirSensorLightSettion(this.iASZone);
+
+ //鑾峰彇PIR浼犳劅鍣ㄧ殑銆愰厤缃俊鎭��
+ this.pirConfigure = HdlDevicePirSensorLogic.Current.GetPirSensorLightSettion(this.iASZone);
if (pirConfigure == null)
{
//鍏抽棴杩涘害鏉�
@@ -263,12 +263,12 @@
/// <summary>
/// 淇濆瓨Pir浼犳劅鍣ㄦ暟鎹�
/// </summary>
- private async void SavePirSensorData()
+ private void SavePirSensorData()
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
//淇濆瓨閰嶇疆淇℃伅
- var result = await HdlDevicePirSensorLogic.Current.SetPirSensorSettion(this.iASZone, this.pirConfigure);
+ var result = HdlDevicePirSensorLogic.Current.SetPirSensorSettion(this.iASZone, this.pirConfigure);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
--
Gitblit v1.8.0