From 081ea8d273048fd03756718ac6fb48a3c09218e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:10:00 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGatewaySearchForm.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessGatewaySearchForm.cs
index 18a1bbc..943dab1 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);
@@ -250,7 +250,7 @@
//缃戝叧缁戝畾鍦ㄥ綋鍓嶈处鍙蜂笅鐨勫叾浠栦綇瀹呴噷\r\n璇疯В闄ょ粦瀹氬悗鍐嶈瘯(IP鍦板潃)
if (result == 0) { continue; }
//鎴戣寰楄繖閲岄渶瑕佽幏鍙栦竴涓嬫柊缃戝叧鐨勮澶囧垪琛�
- await Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(realWay);
+ Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(realWay);
Application.RunOnMainThread(() =>
{
@@ -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