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

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

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

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

    public class GatewaySearchListForm : EditorCommonForm

    {

        #region ■ 变量声明___________________________



@@ -142,7 +142,7 @@
                    string msg = Language.StringByID(R.MyInternationalizationString.uRebindGatewayMsg);

                    this.ShowMassage(ShowMsgType.Confirm, msg, () =>

                    {

                        var form = new WiredGatewayRebindForm();

                        var form = new GatewayRebindForm();

                        form.AddForm(gateway, dicZbGatewayDiv);

                    });

                };