From 463cf39019aa54e6c1226be4620766a035a0c490 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 14 四月 2020 13:31:07 +0800
Subject: [PATCH] 上传个东西
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index bf61365..f7bd9c0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -536,14 +536,14 @@
};
flMain.AddChidren(progressBackground);
- var progressValue = (currentVolume * (Convert.ToInt32(((float)100 / 15) * 100))) / 100;
+ //var progressValue = (currentVolume * (Convert.ToInt32(((float)100 / 15) * 100))) / 100;
progressText = new Button()
{
Height = Application.GetRealHeight(58),
Y = Application.GetRealHeight(89),
TextColor = ZigbeeColor.Current.XMGray2,
TextAlignment = TextAlignment.Center,
- Text = progressValue.ToString() + "%",
+ Text = currentVolume.ToString() + "%",
};
diyImageVerticalSeekBar = new DiyImageVerticalSeekBar()
@@ -559,27 +559,14 @@
ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
SeekBarViewHeight = Application.GetRealHeight(17),//杩涘害鏉＄殑瀹藉害
- Progress = progressValue,
+ Progress = currentVolume,
};
progressBackground.AddChidren(progressText);
progressBackground.AddChidren(diyImageVerticalSeekBar);
diyImageVerticalSeekBar.OnProgressChangedEvent += (sender, e) =>
{
int curVolume = -1;
- if (e == 0)
- {
- curVolume = 0;
- }
- else if (e == 100)
- {
- curVolume = 14;
- }
- else
- {
- int comandValue = e;
- int comandValueTemp = (comandValue * 100) / (Convert.ToInt32(((float)100 / 15) * 100));
- curVolume = comandValueTemp;
- }
+ curVolume = e;
currentVolume = curVolume;
progressText.Text = e.ToString() + "%";
};
@@ -1103,12 +1090,19 @@
var doorLockInValidSetting = Language.StringByID(R.MyInternationalizationString.DoorLockInValidSetting);
var alertNomallyModeIsTurnOn = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.DoorLockLogic, msgNomallyModeIsTurnOn, doorLockInValidSetting);
alertNomallyModeIsTurnOn.Show();
+ alertNomallyModeIsTurnOn.MsgControlClickEvent += async () =>
+ {
+ //榛樿鍒涘缓鐗规畩閫昏緫
+ DoorLockCommonInfo.NormallyOpenModeInvalidTime = 12;
+ Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
+ };
//鐐瑰嚮鑷姩鍖�
alertNomallyModeIsTurnOn.LogicClickEvent += () =>
{
//閫昏緫璋冪敤鍓嶈寰楃Щ闄�
ZbGateway.StatusList.Remove(this);
+ //璋冪敤閫昏緫鐣岄潰
Shared.Phone.Device.Logic.SkipView.SkipAddLogic(2, doorLock);
};
alertNomallyModeIsTurnOn.InvalidClickEvent += async () =>
@@ -1145,26 +1139,27 @@
alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.CancelNomallyOpenModeWithLogic, msg, confirm);
}
alert.Show();
+
alert.MsgControlClickEvent += async () =>
{
if (IsFromReport)
{
- //鍙栨秷甯稿紑
+ //涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑堬紝app榛樿浜嗏�滃父寮�妯″紡鈥濊鍙栨秷
NormallyOpenModeValue(false);
UpdateNomallyOpenStatus();
}
else
{
- //淇濇寔甯稿紑
+ //app榛樿鈥滃父寮�妯″紡鈥濊繕鏄紑鍚�
NormallyOpenModeValue(true);
UpdateNomallyOpenStatus();
}
};
alert.CancelClickEvent += async () =>
{
- //淇濇寔甯稿紑
if (IsFromReport)
{
+ //涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑堬紝app閲嶆柊寮�鍚�滃父寮�妯″紡鈥�
Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
if (result == null || result.defaultControlResponseData == null)
@@ -1185,6 +1180,7 @@
}
else
{
+ //淇濇寔鈥滃父寮�鎴愬姛鈥�
NormallyOpenModeValue(true);
UpdateNomallyOpenStatus();
CommonPage.Loading.Hide();
@@ -1192,20 +1188,22 @@
}
else
{
+ //app鎿嶄綔涓嶅彇娑堚�滃父寮�妯″紡鈥�
NormallyOpenModeValue(true);
UpdateNomallyOpenStatus();
}
};
alert.ConfirmClickEvent += async () =>
{
- //纭鍙栨秷甯稿紑
if (IsFromReport)
{
+ //涓婃姤闂ㄩ攣鈥滃父寮�妯″紡鈥濆凡缁忓彇娑堬紝鐜板湪app纭鈥滃父寮�妯″紡鈥濆彇娑�
NormallyOpenModeValue(false);
UpdateNomallyOpenStatus();
}
else
{
+ //app鎿嶄綔鍙栨秷鈥滃父寮�妯″紡鈥�
Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
if (result == null || result.defaultControlResponseData == null)
@@ -1224,7 +1222,7 @@
{
//娣诲姞App寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(this.doorLock, 9002, string.Empty);
-
+ //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔�
NormallyOpenModeValue(false);
UpdateNomallyOpenStatus();
string msg2 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeSuccess);
@@ -1235,7 +1233,7 @@
};
}
- ///// <summary>
+ /// <summary>
/// 甯稿紑妯″紡澶辨晥鏃堕棿澶勭悊
/// </summary>
private void NomallyOpenModeInvalidTimeDialog()
@@ -1261,6 +1259,7 @@
alertTimeInValidSetting2.Show();
return;
}
+ //甯稿紑妯″紡澶辨晥鏃堕棿璁剧疆鎴愬姛
var temp = int.Parse(obj);
DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
--
Gitblit v1.8.0