From a4d525d08da7b6fb985b0069c539c11b06306a9b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 16:28:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs b/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs
old mode 100644
new mode 100755
index 4df2296..39cc2e4
--- a/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs
@@ -9,6 +9,10 @@
{
BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
}
+ public override void RemoveFromParent()
+ {
+ base.RemoveFromParent();
+ }
public void Show()
{
ShowPic();
@@ -21,7 +25,7 @@
var title = new Button()
{
TextAlignment = TextAlignment.Center,
- TextID = R.MyInternationalizationString.SelectPic,
+ //TextID = R.MyInternationalizationString.SelectPic,
TextSize = 20,
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
Width = Application.GetRealWidth(500),
--
Gitblit v1.8.0