请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs

@@ -54,8 +54,7 @@
            //清空bodyFrame

            this.ClearBodyFrame();



            //系统灯每秒闪烁一次

            //则连接成功

            //网关如果正常连接路由器{0}系统指示灯会1秒闪烁

            string[] ArryMsg = Language.StringByID(R.MyInternationalizationString.uAddApWirelessGatewayMsg4).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);

            int yy = Application.GetRealHeight(1066);

            foreach (var msg in ArryMsg)

@@ -109,7 +108,7 @@
            btnMsg1.Y = picGwImage.Bottom + Application.GetRealHeight(112);

            btnMsg1.TextID = R.MyInternationalizationString.uSearchGatewayFailMsg1;

            bodyFrameLayout.AddChidren(btnMsg1);

            //1.长按ZB/RST键20秒，网关恢复出厂设置，指示灯全部熄灭后，重新入网。

            //1.短按HID/WCFG按键，系统指示灯快闪3秒，网关进入换绑模式，强制网关绑定到当前APP

            var btnMsg2 = new NormalViewControl(930, 100, true);

            btnMsg2.X = Application.GetRealWidth(75);

            btnMsg2.Y = btnMsg1.Bottom + Application.GetRealHeight(35);

@@ -118,7 +117,7 @@
            btnMsg2.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnMsg2.IsMoreLines = true;

            bodyFrameLayout.AddChidren(btnMsg2);

            //2.点按HID/WCFG键，进入网关换绑模式，系统指示灯快闪5秒。

            //2.长按网关ZB/RST按键20秒以上，直到所有指示灯同时灭，即恢复出厂设置并重启

            var btnMsg3 = new NormalViewControl(930, 100, true);

            btnMsg3.X = Application.GetRealWidth(75);

            btnMsg3.Y = btnMsg2.Bottom + Application.GetRealHeight(12);

@@ -154,6 +153,7 @@
            frameback.BackgroundImagePath = "Item/BottomButtonGround.png";

            bodyFrameLayout.AddChidren(frameback);

            var btnReDo = new NormalViewControl(300, 65, true);

            btnReDo.IsBold = true;

            btnReDo.TextColor = UserCenterColor.Current.White;

            btnReDo.TextSize = 16;

            btnReDo.Y = Application.GetRealHeight(49);

@@ -382,6 +382,8 @@
                {

                    //需要重新绑定

                    this.dicZbGatewayDiv[wayId] = 2;

                    //获取到了新网关

                    this.newGatewayGetting = true;

                }



                if (mode == GatewayBindMode.First)

@@ -403,14 +405,7 @@
        public override void CloseFormBefore()

        {

            ZigBee.Common.Application.IsSearchingGateway = false;

            //停止Wi-Fi配网

            HdlWifiLogic.Current.StopSmartConnection();



            if (UserCenterResourse.listActionFormId.Contains("UserMainForm") == false)

            {

                //刷新主页

                UserView.UserPage.Instance.Fresh();

            }

            base.CloseFormBefore();

        }