From 737c036a39176fd2085ce82b7c60391da8cb508c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 31 十二月 2019 19:17:47 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/Device/CommonForm/RowLayoutEditButton.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RowLayoutEditButton.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RowLayoutEditButton.cs
old mode 100644
new mode 100755
index 33be5f0..109c961
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/RowLayoutEditButton.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RowLayoutEditButton.cs
@@ -14,8 +14,8 @@
/// </summary>
public RowLayoutEditButton()
{
- BackgroundColor = ZigbeeColor.Current.GXCEditorBGColor;
- TextID = R.MyInternationalizationString.Delay;
+ BackgroundColor = ZigbeeColor.Current.GXCEditBackGroundColor;
+ TextID = R.MyInternationalizationString.Edit;
TextColor = ZigbeeColor.Current.GXCTextWhiteColor;
TextAlignment = TextAlignment.Center;
Radius = CommonPage.BigFormRadius;
--
Gitblit v1.8.0