From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01
---
HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
index a3b5cbf..5b6d5ca 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
@@ -226,7 +226,7 @@
private void InitUnLockMenuControl()
{
//濡傛灉鏄垚鍛�,鍒欏彧鏈変竴閿紑閿�
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == true)
+ if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == true)
{
//涓�閿紑閿�
var btnOneKey = new NormalViewControl(100, 25, true);
@@ -444,7 +444,7 @@
private void InitBottomMenuIconControl()
{
//濡傛灉鏄垚鍛�,鍒欏彧鏈夊紑閿佹柟寮忕鐞�
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == true)
+ if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == true)
{
//寮�閿佹柟寮忕鐞嗗浘鏍�
var btnManagerIcon = new IconViewControl(40);
@@ -849,7 +849,7 @@
if (this.listMember != null) { return true; }
//涓昏处鍙烽渶瑕佸幓鑾峰彇鎴愬憳鍒楄〃,鑰屽瓙璐﹀彿鍙兘浠栬嚜宸�
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == false)
+ if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false)
{
//鑾峰彇鎴愬憳鍒楄〃
var responePack = new DAL.Server.HttpServerRequest().GetResidenceMemberAccount();
@@ -874,7 +874,7 @@
//鑷韩鍔犺繘鍘�,鑷繁浣嶄簬棣栦綅
var info = new ResidenceMemberInfo();
info.childAccountId = OnAppConfig.Instance.LastLoginUserId;
- info.childAccountType = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare == false ? "ADMIN" : "ORDINARY";
+ info.childAccountType = DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false ? "ADMIN" : "ORDINARY";
info.nickName = UserInfo.Current.userName;
this.listMember.Insert(0, info);
if (string.IsNullOrEmpty(info.nickName))
@@ -924,10 +924,25 @@
if (UserInfo.Current.appUnlockPage.Contains("3") == true)
{
//璋冭捣瀹夊叏璁よ瘉
- HdlCheckLogic.Current.CheckUnlockSecurity(true, () =>
+ HdlCheckLogic.Current.CheckUnlockSecurity(true, (div) =>
{
//閿佸凡鎵撳紑
- HdlMessageLogic.Current.ShowMassage(ShowMsgType.TipSuccess, Language.StringByID(StringId.LockIsOpened), null, null, null, 2);
+ if (div == 1)
+ {
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.TipSuccess, Language.StringByID(StringId.LockIsOpened), null, null, null, 2);
+ }
+ else
+ {
+ //涓轰簡瀹夊叏锛岃璺宠浆鑷充釜浜轰腑蹇儃0}璁剧疆涓汉瀵嗙爜锛屽苟搴旂敤浜庨棬閿佸紑閿�
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Confirm, Language.StringByID(StringId.JumpToPersonalCentetToSetPasswordMsg), () =>
+ {
+ var page = new AppUnlockSettingsPage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
+ }, Language.StringByID(StringId.Jump));
+ }
});
}
else
--
Gitblit v1.8.0