全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayRebindForm.cs

File was renamed from ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewayRebindForm.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