From 34b65350abbb8b740b9c3bc0b43254cbbe23fcb5 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 19 五月 2020 09:31:44 +0800
Subject: [PATCH] 合并代码，更改面板目标信息
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
index de24e88..2364376 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
@@ -73,11 +73,12 @@
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
{
RemoveFromParent();
-
- var userDoorLockPage = new UserDoorLockPage(currentRoom, deviceUI);
- HomePage.Instance.AddChidren(userDoorLockPage);
- HomePage.Instance.PageIndex += 1;
- userDoorLockPage.Show();
+ UserDoorLockPage.canShowDialog = true;
+ //鏆傛椂涓嶈�冭檻涓嬬骇鐣岄潰绛夋帹閫佸鑷村父寮�妯″紡澶辨晥鐨勯棶棰�
+ //var userDoorLockPage = new UserDoorLockPage(currentRoom, deviceUI);
+ //HomePage.Instance.AddChidren(userDoorLockPage);
+ //HomePage.Instance.PageIndex += 1;
+ //userDoorLockPage.Show();
};
this.btnBack.MouseUpEventHandler += eHandlerBack;
this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
@@ -215,7 +216,7 @@
};
//璁惧妯″潡
- caption = Language.StringByID(R.MyInternationalizationString.BelongModel);
+ caption = Language.StringByID(R.MyInternationalizationString.BelongDevice);
deviceName = Common.LocalDevice.Current.GetDeviceObjectText(listNewDevice);
var btnType = new FrameCaptionViewControl(caption, deviceName, listview.rowSpace / 2);
btnType.UseClickStatu = false;
--
Gitblit v1.8.0