From e747e6d8524e3146bb48dc304a713f309966b1c6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 19 五月 2020 13:10:03 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 491 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 280 insertions(+), 211 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index bf61365..7de8403 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -41,13 +41,19 @@
/// <summary>
/// 閫昏緫涓槸鍚︽湁甯稿紑妯″紡
/// </summary>
- private bool HaveLogicNormallyOpenMode = false;
+ private bool haveLogicNormallyOpenMode = false;
+
+ /// <summary>
+ /// 闂ㄩ攣娣卞害鎺у埗涓婃姤绐楀彛鏄惁寮瑰嚭
+ /// </summary>
+ public static bool canShowDialog = true;
+
/// <summary>
/// 褰撳墠鐢甸噺
/// </summary>
bool canVolume = false;
/// <summary>
- /// 淇濈暀涓婁竴娆￠煶閲�
+ /// 鏄惁鏀寔甯稿紑
/// </summary>
bool canOpenNormallyMode = false;
/// <summary>
@@ -77,7 +83,7 @@
/// <summary>
/// 涓儴甯冨眬涓棬閿佸悕绉版樉绀�
/// </summary>
- Button btnDoorLockTitle;
+ NormalViewControl btnDoorLockTitle;
/// <summary>
/// 鍒嗕韩
/// </summary>
@@ -90,6 +96,7 @@
/// 璁剧疆FrameLayout
/// </summary>
FrameLayout btnFuncSetFrameLayout;
+ FrameLayout progressFrameLayoutMatch;
/// <summary>
/// 鐐瑰嚮寮�甯冨眬
/// </summary>
@@ -217,7 +224,7 @@
ClickHandle();
- if (doorLock.IsOnline == 1)
+ if (Common.LocalDevice.Current.CheckDeviceIsOnline(doorLock) == true)
{
ReadDoorLockUserInfo();
}
@@ -245,18 +252,15 @@
};
this.midFrameLayout.AddChidren(midTopFrameLayout);
- //闂ㄩ攣鏍囬
- btnDoorLockTitle = new Button()
- {
- Width = Application.GetRealWidth(250),
- Height = Application.GetRealHeight(60),
- X = Application.GetRealWidth(372),
- Y = Application.GetRealHeight(46),
- TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
- TextSize = 15,
- TextAlignment = TextAlignment.Center,
- IsBold = true,
- };
+ //璁惧鍚嶇О
+ btnDoorLockTitle = new NormalViewControl(100, 60, true);
+ btnDoorLockTitle.Y = Application.GetRealHeight(46);
+ btnDoorLockTitle.TextSize = 15;
+ btnDoorLockTitle.IsBold = true;
+ btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
+ btnDoorLockTitle.Width = btnDoorLockTitle.GetRealWidthByText();
+ btnDoorLockTitle.TextAlignment = TextAlignment.Center;
+ btnDoorLockTitle.Gravity = Gravity.CenterHorizontal;
midTopFrameLayout.AddChidren(btnDoorLockTitle);
//璁板綍
@@ -366,25 +370,32 @@
};
btnFrameLayout.AddChidren(closeFrameLayout);
+ progressFrameLayoutMatch = new FrameLayout()
+ {
+ Width = Application.GetRealHeight(84),//639-35
+ Height = Application.GetRealHeight(446),
+ X = Application.GetMinReal(51),
+ BackgroundColor = ZigbeeColor.Current.XMWhite,
+ };
+ btnFrameLayout.AddChidren(progressFrameLayoutMatch);
+
var progressFrameLayout = new FrameLayout()
{
- Width = Application.GetRealWidth(9),//639-35
- Height = Application.GetRealHeight(446),
- X = Application.GetRealWidth(95),
- Y = Application.GetRealHeight(0),
+ Width = Application.GetRealHeight(17),//639-35
+ Gravity = Gravity.CenterHorizontal,
BackgroundColor = ZigbeeColor.Current.XMVerticalSeekBar,
};
- btnFrameLayout.AddChidren(progressFrameLayout);
+ progressFrameLayoutMatch.AddChidren(progressFrameLayout);
progressButton = new Button()
{
Width = Application.GetMinReal(84),//639-35
Height = Application.GetMinReal(93),
- X = Application.GetRealWidth(58),
+ Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(347),
UnSelectedImagePath = "DoorLock/UnLockButton.png",
};
- btnFrameLayout.AddChidren(progressButton);
+ progressFrameLayoutMatch.AddChidren(progressButton);
btnDoorOpenPic = new Button()
{
@@ -536,14 +547,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 +570,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() + "%";
};
@@ -610,15 +608,18 @@
{
return;
}
- string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
+ if (doorLock.IsDoorLockNormallyMode)
{
- if (doorLock.IsDoorLockNormallyMode[key] == true)
- {
- if (canOpenNormallyMode)
+ if (canOpenNormallyMode)
+ {
+ Application.RunOnMainThread(() =>
{
- Application.RunOnMainThread(() => { NomallyOpenModeInvalidDialog(true); });
- }
+ Action<bool> action = (obj) =>
+ {
+ UpdateNomallyOpenStatus();
+ };
+ DoorLockCommonInfo.NomallyOpenModeInvalidDialog(doorLock, DoorLockCommonInfo.DoorLockMessType.ServicePush, haveLogicNormallyOpenMode, action);
+ });
}
}
}
@@ -690,12 +691,18 @@
{
tempRes = false;
}
-
- NormallyOpenModeValue(tempRes);
- HaveLogicNormallyOpenMode = await Shared.Phone.Device.Logic.SkipView.Exist();
- Application.RunOnMainThread(() =>
+ DoorLockCommonInfo.NormallyOpenModeValue(doorLock, tempRes);
+ Application.RunOnMainThread(async () =>
{
- UpdateNomallyOpenStatus();
+ var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
+ if (resTemp == 1)
+ {
+ haveLogicNormallyOpenMode = true;
+ }
+ else if (resTemp == 0)
+ {
+ haveLogicNormallyOpenMode = false;
+ }
});
}
}
@@ -758,6 +765,7 @@
{
Application.RunOnMainThread(() =>
{
+ UpdateNomallyOpenStatus();
CommonPage.Loading.Hide();
});
}
@@ -786,13 +794,11 @@
//璁剧疆
EventHandler<MouseEventArgs> btnFuncSetHander = (sender, e) =>
{
- //鎵撳紑鍏朵粬鐣岄潰鏃跺墠绉婚櫎
- RemoveFromParent();
var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(currentRoom, doorLock);
Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
functionSetting.Show();
-
+ canShowDialog = false;
functionSetting.devicNameAction += (deviceRename) =>
{
if (!string.IsNullOrEmpty(deviceRename))
@@ -823,6 +829,7 @@
//鍘嗗彶璁板綍 ---- stan
var form = new DeviceDoorLock.DoorLockHistoryLogForm();
form.AddForm(this.doorLock.DeviceAddr);
+ canShowDialog = false;
};
btnRecordFrameLayout.MouseDownEventHandler += handerRecord;
btnRecord.MouseDownEventHandler += handerRecord;
@@ -846,20 +853,19 @@
//寮�閿佷簨浠�
EventHandler<MouseEventArgs> hander1 = async (sender, e) =>
{
-
- string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
+ canShowDialog = true;
+ if (doorLock.IsDoorLockNormallyMode)
{
- if (doorLock.IsDoorLockNormallyMode[key] == true)
- {
- if (canOpenNormallyMode)
- {
- NomallyOpenModeInvalidDialog(false);
- }
- else
+ if (canOpenNormallyMode)
+ {
+ Application.RunOnMainThread(() =>
{
- OpenDoorLockHandle(progressButton, btnDoorLockPic, btnStatus);
- }
+ Action<bool> action = (obj) =>
+ {
+ UpdateNomallyOpenStatus();
+ };
+ DoorLockCommonInfo.NomallyOpenModeInvalidDialog(doorLock, DoorLockCommonInfo.DoorLockMessType.AppOperate, haveLogicNormallyOpenMode, action);
+ });
}
else
{
@@ -873,19 +879,27 @@
};
openFrameLayout.MouseUpEventHandler += hander1;
btnDoorOpenPic.MouseUpEventHandler += hander1;
+ if (progressButton.Y == Application.GetRealHeight(10))
+ {
+ progressFrameLayoutMatch.MouseUpEventHandler += hander1;
+ }
//鍏抽攣浜嬩欢
EventHandler<MouseEventArgs> hander2 = (sender, e) =>
{
+ canShowDialog = true;
if (canOpenNormallyMode)
{
- var key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
+ if (doorLock.IsDoorLockNormallyMode)
{
- if (doorLock.IsDoorLockNormallyMode[key] == true)
+ Application.RunOnMainThread(() =>
{
- NomallyOpenModeInvalidDialog();
- }
+ Action<bool> action = (obj) =>
+ {
+ UpdateNomallyOpenStatus();
+ };
+ DoorLockCommonInfo.NomallyOpenModeInvalidDialog(doorLock, DoorLockCommonInfo.DoorLockMessType.AppOperate, haveLogicNormallyOpenMode, action);
+ });
}
}
else
@@ -1028,109 +1042,66 @@
}
#endregion
- #region 甯稿紑妯″紡
- /// <summary>
- /// 闂ㄩ攣甯稿紑妯″紡鍊�
- /// </summary>
- public void NormallyOpenModeValue(bool value)
- {
- string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
- {
- doorLock.IsDoorLockNormallyMode[key] = value;
- }
- else
- {
- doorLock.IsDoorLockNormallyMode.Add(key, value);
- }
- }
-
+ #region 甯稿紑妯″紡
/// <summary>
/// 甯稿紑妯″紡澶勭悊
/// </summary>
private async void NomallyOpenDialog()
{
- if (!btnNormallyOpen.IsSelected)
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- {
- this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
- return;
- }
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
+ return;
+ }
- if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
- {
- SystemSecondAuthentication();
- return;
- }
+ if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
+ {
+ SystemSecondAuthentication();
+ return;
+ }
- action = () =>
- {
- string msg = Language.StringByID(R.MyInternationalizationString.SetDoorLockNomallyOpen).Replace("{0}", "\r\n");
- var confirm = Language.StringByID(R.MyInternationalizationString.Confrim);
- var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msg, confirm);
- alert.Show();
-
- alert.ConfirmClickEvent += async () =>
- {
- Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
- var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
- if (result == null || result.defaultControlResponseData == null)
- {
- string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
- this.ShowTipMsg(msg0);
- return;
- }
- if (result.defaultControlResponseData.status != 0)
- {
- string msg1 = Language.StringByID(R.MyInternationalizationString.OpenNormallyOpenModeFailed);
- this.ShowTipMsg(msg1);
- return;
- }
- else
- {
- //娣诲姞App寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
- HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(this.doorLock, 9001, string.Empty);
-
- //姣忔閲嶆柊璁剧疆甯稿紑锛岄粯璁ゆ椂闂撮兘鏄�12灏忔椂
- DoorLockCommonInfo.NormallyOpenModeInvalidTime = 12;
- NormallyOpenModeValue(true);
- UpdateNomallyOpenStatus();
- CommonPage.Loading.Hide();
-
- //甯稿紑妯″紡寮�鍚彁绀�
- string msgNomallyModeIsTurnOn = Language.StringByID(R.MyInternationalizationString.NomallyModeIsTurnOn);
- var doorLockInValidSetting = Language.StringByID(R.MyInternationalizationString.DoorLockInValidSetting);
- var alertNomallyModeIsTurnOn = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.DoorLockLogic, msgNomallyModeIsTurnOn, doorLockInValidSetting);
- alertNomallyModeIsTurnOn.Show();
-
- //鐐瑰嚮鑷姩鍖�
- alertNomallyModeIsTurnOn.LogicClickEvent += () =>
- {
- //閫昏緫璋冪敤鍓嶈寰楃Щ闄�
- ZbGateway.StatusList.Remove(this);
- Shared.Phone.Device.Logic.SkipView.SkipAddLogic(2, doorLock);
- };
- alertNomallyModeIsTurnOn.InvalidClickEvent += async () =>
- {
- NomallyOpenModeInvalidTimeDialog();
- };
- }
- };
+ action = () =>
+ {
+ //绯荤粺瀵嗙爜鏀寔鎿嶄綔闂ㄩ攣鍚庯紝璋冪敤娓╁眳鍩庣殑鐣岄潰銆愬父寮�鑷姩鍖栥��
+ if (doorLock == null)
+ {
+ ///闃叉鎶涘紓甯�
+ return;
+ }
+ ///澶囨敞锛歐JC鐨�
+ Shared.Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
+ ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
+ Common.Logic.LogicDviceList.Clear();
+ if (Common.Logic.LogicDviceList.Count == 0)
+ {
+ Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+ }
+ var addLogicPage = new Shared.Phone.Device.Logic.SoneLogicList();
+ UserView.HomePage.Instance.AddChidren(addLogicPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ addLogicPage.Show();
+ addLogicPage.action += (w) =>
+ {
+ doorLock.IsDoorLockNormallyMode = w;
+ UpdateNomallyOpenStatus();
+ //杩斿洖鎸夐敭娓呯┖褰撳墠閫昏緫瀹氫箟鐨凩ogicAction
+ UserCenter.DoorLock.DoorLockCommonInfo.LogicAction = null;
};
- HdlCheckLogic.Current.CheckSecondarySecurity(action);
- }
- else
- {
- NomallyOpenModeInvalidDialog();
- }
- }
+ };
+ HdlCheckLogic.Current.CheckSecondarySecurity(action);
- /// <summary>
- /// 甯稿紑妯″紡澶辨晥澶勭悊
- /// </summary>
- public void NomallyOpenModeInvalidDialog(bool IsFromReport = false)
+ }
+
+ /// <summary>
+ /// 甯稿紑妯″紡澶辨晥澶勭悊
+ /// </summary>
+ private void NomallyOpenModeInvalidDialog(bool IsFromReport = false)
{
+ if (!canShowDialog)
+ {
+ return;
+ }
+
if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.OnlyMasterOperate));
@@ -1139,73 +1110,128 @@
string msg = Language.StringByID(R.MyInternationalizationString.NomallyModeIsCanceled).Replace("{0}", "\r\n");
var confirm = Language.StringByID(R.MyInternationalizationString.SureCancel);
var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.NomallyOpenMode, msg, confirm);
- if (HaveLogicNormallyOpenMode)
+ if (haveLogicNormallyOpenMode)
{
//鏈夐�昏緫璁剧疆鐨勫脊绐�
alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.CancelNomallyOpenModeWithLogic, msg, confirm);
}
alert.Show();
+
alert.MsgControlClickEvent += async () =>
{
if (IsFromReport)
{
- //鍙栨秷甯稿紑
- NormallyOpenModeValue(false);
- UpdateNomallyOpenStatus();
+ //涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑堬紝app榛樿浜嗏�滃父寮�妯″紡鈥濊鍙栨秷
+ DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
+ Application.RunOnMainThread(() =>
+ {
+ UpdateNomallyOpenStatus();
+ });
+
+ if (haveLogicNormallyOpenMode)
+ {
+ //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
+ }
}
else
{
- //淇濇寔甯稿紑
- NormallyOpenModeValue(true);
- UpdateNomallyOpenStatus();
+ //app榛樿鈥滃父寮�妯″紡鈥濊繕鏄紑鍚�
+ DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
+ Application.RunOnMainThread(() =>
+ {
+ UpdateNomallyOpenStatus();
+ });
}
};
+
alert.CancelClickEvent += async () =>
{
- //淇濇寔甯稿紑
if (IsFromReport)
{
+ //涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑�
Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
+
+ if (haveLogicNormallyOpenMode)
+ {
+ //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
+ }
+ //app閲嶆柊寮�鍚�滃父寮�妯″紡鈥�
var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
if (result == null || result.defaultControlResponseData == null)
{
- string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
- this.ShowTipMsg(msg0);
- NormallyOpenModeValue(false);
- UpdateNomallyOpenStatus();
+ Application.RunOnMainThread(() =>
+ {
+ string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
+ this.ShowTipMsg(msg0);
+ DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
+ UpdateNomallyOpenStatus();
+ });
return;
}
if (result.defaultControlResponseData.status != 0)
{
string msg1 = Language.StringByID(R.MyInternationalizationString.OpenNormallyOpenModeFailed);
this.ShowTipMsg(msg1);
- NormallyOpenModeValue(false);
- UpdateNomallyOpenStatus();
+ DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
+ Application.RunOnMainThread(() =>
+ {
+ UpdateNomallyOpenStatus();
+ });
return;
}
else
{
- NormallyOpenModeValue(true);
- UpdateNomallyOpenStatus();
+ //淇濇寔鈥滃父寮�鎴愬姛鈥�
+ DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
+ Application.RunOnMainThread(() =>
+ {
+ UpdateNomallyOpenStatus();
+ });
+
+ //鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
+ var resu = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
+ //if (!resu)
+ //{
+ // string msg0 = Language.StringByID(R.MyInternationalizationString.AddLogicNormallyModeFailed);
+ // this.ShowTipMsg(msg0);
+ //}
+
CommonPage.Loading.Hide();
}
}
else
{
- NormallyOpenModeValue(true);
- UpdateNomallyOpenStatus();
+ //app鎿嶄綔涓嶅彇娑堚�滃父寮�妯″紡鈥�
+ DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
+ Application.RunOnMainThread(() =>
+ {
+ UpdateNomallyOpenStatus();
+ });
}
};
+
alert.ConfirmClickEvent += async () =>
{
- //纭鍙栨秷甯稿紑
if (IsFromReport)
{
- NormallyOpenModeValue(false);
- UpdateNomallyOpenStatus();
+ //涓婃姤闂ㄩ攣鈥滃父寮�妯″紡鈥濆凡缁忓彇娑堬紝鐜板湪app纭鈥滃父寮�妯″紡鈥濆彇娑�
+ DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
+ Application.RunOnMainThread(() =>
+ {
+ UpdateNomallyOpenStatus();
+ });
+
+ if (haveLogicNormallyOpenMode)
+ {
+ //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
+ }
}
else
{
+ //app鎿嶄綔鍙栨秷鈥滃父寮�妯″紡鈥�
Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
var result = await doorLock.SetNormallyOpenModeFuncAsync(false);
if (result == null || result.defaultControlResponseData == null)
@@ -1225,17 +1251,61 @@
//娣诲姞App寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(this.doorLock, 9002, string.Empty);
- NormallyOpenModeValue(false);
- UpdateNomallyOpenStatus();
+ //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔�
+ DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
+ Application.RunOnMainThread(() =>
+ {
+ UpdateNomallyOpenStatus();
+ });
+
+ if (haveLogicNormallyOpenMode)
+ {
+ //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
+ }
string msg2 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeSuccess);
this.ShowTipMsg(msg2);
- Shared.Phone.Device.Logic.SkipView.LockCloseLogic(doorLock);
}
}
};
}
- ///// <summary>
+ /// <summary>
+ /// 宸茬粡寮�鍚父寮�妯″紡鎻愮ず
+ /// </summary>
+ public void AlreadyOpenNormallyMode()
+ {
+ //甯稿紑妯″紡寮�鍚彁绀�
+ string msgNomallyModeIsTurnOn = Language.StringByID(R.MyInternationalizationString.NomallyModeIsTurnOn);
+ var doorLockInValidSetting = Language.StringByID(R.MyInternationalizationString.DoorLockInValidSetting);
+ var alertNomallyModeIsTurnOn = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.DoorLockLogic, msgNomallyModeIsTurnOn, doorLockInValidSetting);
+ alertNomallyModeIsTurnOn.Show();
+ alertNomallyModeIsTurnOn.MsgControlClickEvent += async () =>
+ {
+ //榛樿鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
+ var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
+ //if (!res)
+ //{
+ //string msg0 = Language.StringByID(R.MyInternationalizationString.AddLogicNormallyModeFailed);
+ // this.ShowTipMsg(msg0);
+ //return;
+ //}
+ };
+ //鐐瑰嚮鑷姩鍖�
+ alertNomallyModeIsTurnOn.LogicClickEvent += () =>
+ {
+ //閫昏緫璋冪敤鍓嶈寰楃Щ闄�
+ ZbGateway.StatusList.Remove(this);
+ //璋冪敤閫昏緫鐣岄潰
+ Shared.Phone.Device.Logic.SkipView.SkipAddLogic(2, doorLock);
+ };
+ alertNomallyModeIsTurnOn.InvalidClickEvent += async () =>
+ {
+ NomallyOpenModeInvalidTimeDialog();
+ };
+ }
+
+ /// <summary>
/// 甯稿紑妯″紡澶辨晥鏃堕棿澶勭悊
/// </summary>
private void NomallyOpenModeInvalidTimeDialog()
@@ -1246,26 +1316,25 @@
var alertTimeInValidSetting = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.InValid, msgTimeInValidSetting, timeConfrim);
alertTimeInValidSetting.Show();
- alertTimeInValidSetting.InvalidTimeAction += (obj) =>
- {
- Regex rg = new Regex("^[0-9]+$");
- if (!rg.IsMatch(obj))
- {
- //蹇呴』鏄暟瀛�
- string msg0 = Language.StringByID(R.MyInternationalizationString.NormallyOpenModeInvalidTimeTip);
- this.ShowTipMsg(msg0);
-
- string msgTimeInValidSetting2 = Language.StringByID(R.MyInternationalizationString.DoorLockOpenAllTheTime);
- var timeConfrim2 = Language.StringByID(R.MyInternationalizationString.Confrim);
- var alertTimeInValidSetting2 = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.InValid, msgTimeInValidSetting2, timeConfrim2);
- alertTimeInValidSetting2.Show();
- return;
- }
- var temp = int.Parse(obj);
- DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
- Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
- };
+ alertTimeInValidSetting.InvalidTimeAction += async (obj) =>
+ {
+ //甯稿紑妯″紡澶辨晥鏃堕棿璁剧疆鎴愬姛
+ var temp = int.Parse(obj);
+ DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
+ //榛樿鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
+ var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
+ if (res == 0)
+ {
+ //榛樿鍒涘缓甯稿紑妯″紡澶辫触
+ string msg0 = Language.StringByID(R.MyInternationalizationString.AddLogicNormallyModeFailed);
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal, msg0, Language.StringByID(R.MyInternationalizationString.confrim));
+ alert.Show();
+ //浜屾鍔犺浇寮圭獥 甯稿紑妯″紡寮�鍚彁绀�
+ NomallyOpenModeInvalidTimeDialog();
+ }
+ };
}
+
/// <summary>
/// 甯稿紑妯″紡鐘舵�佹洿鏂�
/// </summary>
@@ -1276,8 +1345,7 @@
btnNormallyOpenFrameLayout.Width = Application.GetRealWidth(0);
return;
}
- string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- if (doorLock.IsDoorLockNormallyMode[key] == true)
+ if (doorLock.IsDoorLockNormallyMode)
{
btnNormallyOpen.IsSelected = true;
btnDoorLockPic.IsSelected = true;
@@ -1285,7 +1353,7 @@
btnStatus.Text = Language.StringByID(R.MyInternationalizationString.Current) + Language.StringByID(R.MyInternationalizationString.DoorLockOpen);
}
- else if (doorLock.IsDoorLockNormallyMode[key] == false)
+ else if (!doorLock.IsDoorLockNormallyMode)
{
btnStatus.Text = Language.StringByID(R.MyInternationalizationString.Current) + Language.StringByID(R.MyInternationalizationString.CLose);
btnDoorLockPic.IsSelected = false;
@@ -1374,6 +1442,7 @@
CommonPage.Instance.IsDrawerLockMode = false;
}
ZbGateway.StatusList.Remove(this);
+ DoorLockCommonInfo.LogicAction = null;
base.RemoveFromParent();
}
#endregion
--
Gitblit v1.8.0