From edf7c324bea0556a3df9096dd41d668a9d41bf51 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 15:58:29 +0800
Subject: [PATCH] 改版是门锁新功能需要给测试部的版本
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 64 +++++++++----------------------
1 files changed, 19 insertions(+), 45 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
old mode 100755
new mode 100644
index e1c744d..17af4c2
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -615,6 +615,10 @@
{
if (canOpenNormallyMode)
{
+ //Application.RunOnMainThread(() =>
+ //{
+ // NomallyOpenModeInvalidDialog(true);
+ //});
Application.RunOnMainThread(() =>
{
Action<bool> action = (obj) =>
@@ -856,17 +860,14 @@
//寮�閿佷簨浠�
EventHandler<MouseEventArgs> hander1 = async (sender, e) =>
{
+ canShowDialog = true;
if (doorLock.IsDoorLockNormallyMode)
{
if (canOpenNormallyMode)
{
Application.RunOnMainThread(() =>
{
- Action<bool> action = (obj) =>
- {
- UpdateNomallyOpenStatus();
- };
- DoorLockCommonInfo.NomallyOpenModeInvalidDialog(doorLock, DoorLockCommonInfo.DoorLockMessType.AppOperate, haveLogicNormallyOpenMode, action);
+ NomallyOpenModeInvalidDialog();
});
}
else
@@ -889,17 +890,14 @@
//鍏抽攣浜嬩欢
EventHandler<MouseEventArgs> hander2 = (sender, e) =>
{
+ canShowDialog = true;
if (canOpenNormallyMode)
{
if (doorLock.IsDoorLockNormallyMode)
{
Application.RunOnMainThread(() =>
{
- Action<bool> action = (obj) =>
- {
- UpdateNomallyOpenStatus();
- };
- DoorLockCommonInfo.NomallyOpenModeInvalidDialog(doorLock, DoorLockCommonInfo.DoorLockMessType.AppOperate, haveLogicNormallyOpenMode, action);
+ NomallyOpenModeInvalidDialog();
});
}
}
@@ -1128,15 +1126,11 @@
{
UpdateNomallyOpenStatus();
});
- //鍒犻櫎宸茬粡澶辨晥鐨勨�滃父寮�妯″紡鈥濈殑閫昏緫
+
if (haveLogicNormallyOpenMode)
{
- var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
- //if (resTemp == 3)
- //{
- // string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
- // this.ShowTipMsg(msg0);
- //}
+ //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
}
}
else
@@ -1156,16 +1150,11 @@
{
//涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑�
Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
- //鍏堝垹闄ゅ凡澶辨晥鐨勨�滃父寮�妯″紡鈥濈殑閫昏緫
+
if (haveLogicNormallyOpenMode)
{
- var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
- //if (resTemp == 3)
- //{
- // string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed2);
- // this.ShowTipMsg(msg0);
- // return;
- //}
+ //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
}
//app閲嶆柊寮�鍚�滃父寮�妯″紡鈥�
var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
@@ -1233,15 +1222,10 @@
UpdateNomallyOpenStatus();
});
- //鍒犻櫎宸茬粡澶辨晥鐨勨�滃父寮�妯″紡鈥濈殑閫昏緫
if (haveLogicNormallyOpenMode)
{
- var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
- //if (resTemp == 3)
- //{
- // string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
- // this.ShowTipMsg(msg0);
- //}
+ //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
}
}
else
@@ -1272,21 +1256,11 @@
{
UpdateNomallyOpenStatus();
});
- //鍒犻櫎璁剧疆甯稿紑妯″紡鍒涘缓鐨勯�昏緫
+
if (haveLogicNormallyOpenMode)
{
- var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3);
- //鍥犱负鐩墠鏈哄埗闂锛岄�昏緫缁忓父澶辫触锛屾墍浠ヤ笉鎻愮ず锛屽悗鏈熸満鍒惰鏀癸紝閲嶆柊鍋氫竴涓繖涓晫闈�
- //if (resTemp == 3)
- //{
- // string msg0 = Language.StringByID(R.MyInternationalizationString.CancelLogicNormallyModeFailed);
- // this.ShowTipMsg(msg0);
- //}
- //else if (resTemp == 2)
- //{
- // string msg2 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeSuccess);
- // this.ShowTipMsg(msg2);
- //}
+ //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
}
string msg2 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeSuccess);
this.ShowTipMsg(msg2);
--
Gitblit v1.8.0