From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
index 9fd6a4f..97d0d56 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;
}
@@ -108,7 +107,7 @@
var btnIfRinght = frameIfRow.AddMostRightEmptyIcon(58, 58);
frameIfRow.ChangedChidrenBindMode(btnIfRinght, ChidrenBindMode.NotBind);
btnIfRinght.UseClickStatu = false;
- btnIfRinght.UnSelectedImagePath = "Item/Next.png";
+ btnIfRinght.UnSelectedImagePath = "Item/RightNext.png";
btnIfRinght.SelectedImagePath = "Item/Down.png";
btnIfRinght.IsSelected = true;
btnIfRinght.ButtonClickEvent += (sender, e) =>
@@ -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);
@@ -184,7 +180,7 @@
var btnResultRight = frameDo.AddMostRightEmptyIcon(58, 58);
frameDo.ChangedChidrenBindMode(btnResultRight, ChidrenBindMode.NotBind);
btnResultRight.UseClickStatu = false;
- btnResultRight.UnSelectedImagePath = "Item/Next.png";
+ btnResultRight.UnSelectedImagePath = "Item/RightNext.png";
btnResultRight.SelectedImagePath = "Item/Down.png";
btnResultRight.IsSelected = true;
btnResultRight.ButtonClickEvent += (sender, e) =>
@@ -444,7 +440,7 @@
if (listOldData[0] != Lightconfigure.levelSize || listOldData[1] != Lightconfigure.transitionTime)
{
//淇濆瓨鐏厜閰嶇疆
- var result = await HdlDevicePirSensorLogic.Current.SetPirSensorLightSettion(this.deviceIASZone, this.Lightconfigure);
+ var result = await HdlDevicePirSensorLogic.Current.SetPirSensorSettion(this.deviceIASZone, this.Lightconfigure);
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -463,5 +459,18 @@
}
#endregion
+
+ #region 鈻� 涓�鑸柟娉昣__________________________
+
+ /// <summary>
+ /// 鐣岄潰鍏抽棴
+ /// </summary>
+ public override void CloseFormBefore()
+ {
+ UserView.HomePage.Instance.ScrollEnabled = true;
+ base.CloseFormBefore();
+ }
+
+ #endregion
}
}
--
Gitblit v1.8.0