From 8b9ce384b26c414db32f98e94e088f5334869c2d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 15:36:28 +0800
Subject: [PATCH] 全部合并了代码，安卓和 IOS 都测试通过了
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayRebindForm.cs | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayRebindForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayRebindForm.cs
similarity index 83%
rename from ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayRebindForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayRebindForm.cs
index 3b5f660..262558f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayRebindForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayRebindForm.cs
@@ -3,12 +3,12 @@
using System.Text;
using ZigBee.Device;
-namespace Shared.Phone.UserCenter.GatewayAdd
+namespace Shared.Phone.UserCenter.GatewayManage
{
/// <summary>
/// 閲嶆柊缁戝畾缃戝叧鐨勭晫闈�
/// </summary>
- public class WiredGatewayRebindForm : EditorCommonForm
+ public class GatewayRebindForm : EditorCommonForm
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -26,11 +26,18 @@
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddGateway));
+ var btnLoading = new LoadingControl();
+ btnLoading.Y = Application.GetRealHeight(656);
+ btnLoading.Gravity = Gravity.CenterHorizontal;
+ bodyFrameLayout.AddChidren(btnLoading);
+ btnLoading.StartAction();
+
//姝ｅ湪鎹㈢粦缃戝叧锛岃绋嶅�欌��
var btnMsg = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
btnMsg.Y = Application.GetRealHeight(979);
btnMsg.TextAlignment = TextAlignment.Center;
btnMsg.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnMsg.TextID = R.MyInternationalizationString.uIsReBindingPleaseWaiting;
bodyFrameLayout.AddChidren(btnMsg);
HdlThreadLogic.Current.RunThread(async () =>
@@ -58,7 +65,7 @@
//鎴愬姛鎴栬�呭け璐ラ兘鍏抽棴鐣岄潰
this.CloseForm();
});
- });
+ });
}
#endregion
--
Gitblit v1.8.0