From 97e259d966cb5cb5d73c105d5dbaadcc1f920614 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 十月 2019 13:48:43 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGatewaySearchForm.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGatewaySearchForm.cs
index 18a1bbc..ed9d6cd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGatewaySearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGatewaySearchForm.cs
@@ -59,7 +59,7 @@
//鏅鸿兘缃戝叧姝ｅ湪閰嶇疆缃戠粶涓�
var btnMsg1 = new NormalViewControl(bodyFrameLayout.Width, false);
- btnMsg1.TextID = R.MyInternationalizationString.uGatewaySetting;
+ btnMsg1.TextID = R.MyInternationalizationString.uGatewaySearching;
btnMsg1.Y = Application.GetRealHeight(1036);
btnMsg1.TextAlignment = TextAlignment.Center;
bodyFrameLayout.AddChidren(btnMsg1);
@@ -259,8 +259,8 @@
//鎼滅储寰楀埌鏃犵嚎缃戝叧
if (mode != GatewayBindMode.Binded)
{
- var form = new GatewayInfoAddForm();
- this.AddFromAndRemoveNowForm(form, realWay);
+ //var form = new GatewayInfoAddForm();
+ //this.AddFromAndRemoveNowForm(form, realWay);
}
}
});
--
Gitblit v1.8.0