From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/GatewayProductInfoForm.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/GatewayProductInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/GatewayProductInfoForm.cs
index ea27de1..1eca0ed 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/GatewayProductInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/GatewayProductInfoForm.cs
@@ -125,6 +125,8 @@
btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uMoreSettion);
btnHelp.ButtonClickEvent += (sender, e) =>
{
+ var form = new GatewayManage.GatewayInfoEditorForm();
+ this.AddFromAndRemoveNowForm(form, zbGateway);
};
bodyFrameLayout.AddChidren(btnHelp);
//搴曠嚎
@@ -169,13 +171,6 @@
this.ShowMassage(ShowMsgType.Error, msg);
return;
}
- string nameValue = HdlGatewayLogic.Current.GetGatewayName(zbGateway);
- if (nameValue == gwName)
- {
- //鍚屽悕涓嶉渶瑕佸鐞�
- this.CloseForm();
- return;
- }
HdlThreadLogic.Current.RunThread(() =>
{
//淇敼鍚嶅瓧
@@ -210,8 +205,14 @@
{
HdlThreadLogic.Current.RunMain(() =>
{
- //鐣岄潰鍏抽棴
+ //鍏抽棴鑷韩
this.CloseForm();
+ //鏄惁鏄富椤垫坊鍔�
+ if (UserCenterResourse.DicActionForm.ContainsKey("GatewayListForm") == false)
+ {
+ var form = new GatewayAddSuccessForm();
+ form.AddForm();
+ }
});
}
}
--
Gitblit v1.8.0