Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 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();

                    }

                });

            }

        }