From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs | 60 ++++++++++++++++++++----------------------------------------
1 files changed, 20 insertions(+), 40 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
index 5ba6f1a..38eaf8a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
@@ -116,8 +116,8 @@
//Log鍑哄姏
string msg = "褰撳墠婵�娲荤殑鐣岄潰[" + UserCenterResourse.NowActionFormID + "]";
HdlLogLogic.Current.WriteLog(ex, msg);
- //鍑虹幇鏈煡閿欒
- this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
+ //鐢垫満鏁版嵁寮傚父,璇烽噸缃數鏈�
+ this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uCurtainDataIsErrorPleaseResetCurtain));
try
{
this.listView.RemoveAll();
@@ -242,7 +242,7 @@
btnProgress1.Text = progressValue + "%";
frameBack.AddChidren(btnProgress1);
//杩涘害鏉�
- this.openSeekBar = new SeekBarControl(965);
+ this.openSeekBar = new SeekBarControl(965);
openSeekBar.Y = btnProgressView.Bottom + Application.GetRealHeight(46);
openSeekBar.ProgressBarColor = 0xff288bfd;
openSeekBar.Progress = progressValue;
@@ -352,17 +352,7 @@
}
oldProValue = nowValue;
checking = true;
- if (curtainData.DeleteOpenLimit == true)
- {
- //閲嶇疆寮�闄愪綅鐐�
- var result = await HdlDeviceCurtainLogic.Current.DeleteCurtainLimitPoint(curtainDevice, Rollershade.LimiType.UpLimit);
- if (result == false)
- {
- checking = false;
- continue;
- }
- curtainData.DeleteOpenLimit = false;
- }
+
//灏嗙獥甯樿皟鏁村埌鎸囧畾鐧惧垎姣�
this.sendDiv = 1;
curtainDevice.WcdGoToTiltValue(nowValue);
@@ -380,12 +370,15 @@
string msg = Language.StringByID(R.MyInternationalizationString.uCommitCurtainOpenLimitMsg);
this.ShowMassage(ShowMsgType.Confirm, msg, async () =>
{
+ decimal openValue = ((decimal)curtainData.OpenLimitPersent / 100) * curtainData.CurtainLength;
+ decimal closeValue = ((decimal)curtainData.CloseLimitPersent / 100) * curtainData.CurtainLength;
+ if (openValue < 0) { openValue = 0; }
+ if (closeValue < 0) { closeValue = curtainData.CurtainLength; }
//鎵ц纭鍙婅鐩栦笂闄愪綅鐐�
var result = await HdlDeviceCurtainLogic.Current.CommitCurtainLimitPoint(curtainDevice, Rollershade.CurtainPrivateInstalledLimi.UpLimit,
- curtainData.OpenLimitPersent, curtainData.CloseLimitPersent);
+ (int)openValue, (int)closeValue);
if (result == true)
{
- curtainData.DeleteOpenLimit = true;
this.receiveOpenlimit = false;
}
});
@@ -419,7 +412,7 @@
btnProgress1.Text = progressValue + "%";
frameBack.AddChidren(btnProgress1);
//杩涘害鏉�
- this.closeSeekBar = new SeekBarControl(965);
+ this.closeSeekBar = new SeekBarControl(965);
closeSeekBar.Y = btnProgressView.Bottom + Application.GetRealHeight(46);
closeSeekBar.ProgressBarColor = 0xff288bfd;
closeSeekBar.Progress = progressValue;
@@ -475,7 +468,7 @@
frameBack.AddChidren(btnPlus);
btnPlus.ButtonClickEvent += (sender, e) =>
{
- if (closeSeekBar.Progress >=100)
+ if (closeSeekBar.Progress >= 100)
{
return;
}
@@ -529,16 +522,7 @@
}
checking = true;
oldProValue = nowValue;
- if (curtainData.DeleteCloseLimit == true)
- {
- //閲嶇疆鍚堥檺浣嶇偣
- var result = await HdlDeviceCurtainLogic.Current.DeleteCurtainLimitPoint(curtainDevice, Rollershade.LimiType.DownLimit);
- if (result == false)
- {
- continue;
- }
- curtainData.DeleteCloseLimit = false;
- }
+
//灏嗙獥甯樿皟鏁村埌鎸囧畾鐧惧垎姣�
this.sendDiv = 2;
curtainDevice.WcdGoToTiltValue(nowValue);
@@ -556,12 +540,16 @@
string msg = Language.StringByID(R.MyInternationalizationString.uCommitCurtainCloseLimitMsg);
this.ShowMassage(ShowMsgType.Confirm, msg, async () =>
{
- //鎵ц纭鍙婅鐩栧悎闄愪綅鐐�
+ decimal openValue = ((decimal)curtainData.OpenLimitPersent / 100) * curtainData.CurtainLength;
+ decimal closeValue = ((decimal)curtainData.CloseLimitPersent / 100) * curtainData.CurtainLength;
+ if (openValue < 0) { openValue = 0; }
+ if (closeValue < 0) { closeValue = curtainData.CurtainLength; }
+ //鎵ц纭鍙婅鐩栦笂闄愪綅鐐�
var result = await HdlDeviceCurtainLogic.Current.CommitCurtainLimitPoint(curtainDevice, Rollershade.CurtainPrivateInstalledLimi.DownLimit,
- curtainData.OpenLimitPersent, curtainData.CloseLimitPersent);
+ (int)openValue, (int)closeValue);
+
if (result == true)
{
- curtainData.DeleteCloseLimit = true;
this.receiveCloseLimit = false;
}
});
@@ -726,7 +714,7 @@
//鏂瑰悜澶囦唤
await HdlDeviceCurtainLogic.Current.BackupCurtainDirection(curtainDevice, curtainData.Direction);
//闄愪綅澶囦唤
- int uplimit= (int)(curtainData.OpenLimitValue / (curtainData.CurtainLength * 1.0) * 100);
+ int uplimit = (int)(curtainData.OpenLimitValue / (curtainData.CurtainLength * 1.0) * 100);
int downlimit = (int)(curtainData.CloseLimitValue / (curtainData.CurtainLength * 1.0) * 100);
await HdlDeviceCurtainLogic.Current.BackupCurtainLimitPoint(curtainDevice, uplimit, downlimit);
});
@@ -806,14 +794,6 @@
/// false:鐢垫満鏂瑰悜姝ｅ悜锛泃rue:鐢垫満鏂瑰悜鍙嶅悜
/// </summary>
public bool Direction = false;
- /// <summary>
- /// 鏄惁閲嶇疆寮�闄愪綅鐐�
- /// </summary>
- public bool DeleteOpenLimit = true;
- /// <summary>
- /// 鏄惁閲嶇疆鍚堥檺浣嶇偣
- /// </summary>
- public bool DeleteCloseLimit = true;
/// <summary>
/// 寮�闄愪綅鐨勫��
/// </summary>
--
Gitblit v1.8.0