From 7e863a33397f317ffc3ffd9288496d0e4f16aa66 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 12 十二月 2019 14:58:20 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
index 9fd6a4f..f7bffe6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
@@ -48,6 +48,7 @@
/// <param name="i_iasZone">浼犳劅鍣ㄨ澶�</param>
public void ShowForm(IASZone i_iasZone)
{
+ UserView.HomePage.Instance.ScrollEnabled = false;
deviceIASZone = i_iasZone;
//璁剧疆澶撮儴淇℃伅
@@ -70,8 +71,6 @@
var result = await this.GetDeviceAllDefultData();
if (result == false)
{
- //鏄剧ず閲嶆柊鍔犺浇鐨勭晫闈�
- this.ShowReLoadView();
return;
}
@@ -130,22 +129,19 @@
btnLight.Y = Application.GetRealHeight(58);
frameLight.AddChidren(btnLight);
//杩涘害鏉�
- var seekBar = new HorizontalSeekBar();
- seekBar.X = Application.GetRealWidth(138);
- seekBar.Y = Application.GetRealHeight(152);
- seekBar.Width = Application.GetRealWidth(884);
- seekBar.Height = Application.GetRealHeight(84);
- seekBar.Max = lightLevelCount - 1;
- seekBar.BackgroundColor = 0xfff5f5f5;
- seekBar.ThumbColor = Common.ZigbeeColor.Current.GXCButtonBlueColor;
- seekBar.ProgressColor = 0xfffdb500;
- seekBar.Progress = lightLevelCount - Lightconfigure.levelSize;
+ var seekBar = new SeekBarControl(900);
+ seekBar.Gravity = Gravity.Frame;
+ seekBar.X = Application.GetRealWidth(125);
+ seekBar.Y = Application.GetRealHeight(142);
+ seekBar.MaxValue = lightLevelCount - 1;
+ seekBar.ProgressBarColor = 0xfffdb500;
frameLight.AddChidren(seekBar);
- seekBar.ProgressChanged += (sender, value) =>
+ seekBar.ProgressChangedEvent += (div, value) =>
{
//鍥犱负瀹冪殑绛夌骇鍒诲害浠庡乏寰�鍙虫槸浠庡ぇ鍒板皬鐨�
this.Lightconfigure.levelSize = lightLevelCount - value;
};
+ seekBar.Progress = lightLevelCount - Lightconfigure.levelSize;
//浣�
var btnDown = new NormalViewControl(300, 50, true);
@@ -463,5 +459,18 @@
}
#endregion
+
+ #region 鈻� 涓�鑸柟娉昣__________________________
+
+ /// <summary>
+ /// 鐣岄潰鍏抽棴
+ /// </summary>
+ public override void CloseFormBefore()
+ {
+ UserView.HomePage.Instance.ScrollEnabled = true;
+ base.CloseFormBefore();
+ }
+
+ #endregion
}
}
--
Gitblit v1.8.0