From ed2f4a97aa48cdb4a013d2a389877f52eb3eccdf Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:15:59 +0800
Subject: [PATCH] Merge branch 'DEV_GXC' of http://172.16.1.23:6688/r/~xm/HomeApp into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
old mode 100644
new mode 100755
index 467f613..2e14c60
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -98,7 +98,7 @@
///璁惧鐘舵�佹潯浠�
var btndevice = new Button {
//Text = "璁惧鐘舵�佹潯浠�",
- TextID = MyInternationalizationString.devicestate,
+ TextID = MyInternationalizationString.device,
TextAlignment = TextAlignment.CenterLeft,
X = Application.GetRealWidth (60),
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
@@ -145,7 +145,7 @@
//Text = "瀹夐槻鏉′欢",
TextAlignment = TextAlignment.CenterLeft,
X = Application.GetRealWidth(60),
- TextID = MyInternationalizationString.securityconditions,
+ TextID = MyInternationalizationString.security,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
};
securityrowlayout.AddChidren(btnsecurity);
--
Gitblit v1.8.0