2020-07-10-01

陈嘉乐

2020-07-10 48ba446936b51fffafa7c3600c0dadc6ac0e8c20

 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)

@@ -83,8 +82,8 @@


            //图标

            var picGwImage = new FrameLayout();

            picGwImage.Width = Application.GetMinRealAverage(861);

            picGwImage.Height = Application.GetMinRealAverage(245);

            picGwImage.Width = this.GetPictrueRealSize(861);

            picGwImage.Height = this.GetPictrueRealSize(245);

            picGwImage.Y = Application.GetRealWidth(223);

            picGwImage.Gravity = Gravity.CenterHorizontal;

            picGwImage.BackgroundImagePath = "Gateway/WirelessApGatewaySearching.png";

@@ -92,7 +91,7 @@
            var btnFailIcon = new PicViewControl(66, 66);

            btnFailIcon.UnSelectedImagePath = "Item/FailIcon.png";

            btnFailIcon.Gravity = Gravity.CenterHorizontal;

            btnFailIcon.Y = Application.GetMinRealAverage(110);

            btnFailIcon.Y = this.GetPictrueRealSize(110);

            picGwImage.AddChidren(btnFailIcon);

            //搜索失败

            var btnFailView = new NormalViewControl(300, 60, true);

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

@@ -145,7 +144,7 @@
            bodyFrameLayout.AddChidren(btnMsg5);



            //重试

            var frameback = new FrameLayoutControl();

            var frameback = new FrameLayoutStatuControl();

            frameback.UseClickStatu = false;

            frameback.Y = Application.GetRealHeight(1259);

            frameback.Gravity = Gravity.CenterHorizontal;

@@ -154,13 +153,14 @@
            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);

            btnReDo.Gravity = Gravity.CenterHorizontal;

            btnReDo.TextAlignment = TextAlignment.Center;

            btnReDo.TextID = R.MyInternationalizationString.uReDoAgain;

            frameback.AddChidren(btnReDo, ChidrenBindMode.BindEventOnly);

            frameback.AddChidren(btnReDo, ChidrenBindMode.BindEvent);

            frameback.ButtonClickEvent += (sender, e) =>

            {

                //初始化初始中部控件

@@ -196,8 +196,8 @@
        {

            //图标

            var btnGwImage = new FrameLayout();

            btnGwImage.Width = Application.GetMinRealAverage(861);

            btnGwImage.Height = Application.GetMinRealAverage(245);

            btnGwImage.Width = this.GetPictrueRealSize(861);

            btnGwImage.Height = this.GetPictrueRealSize(245);

            btnGwImage.Y = Application.GetRealHeight(360);

            btnGwImage.Gravity = Gravity.CenterHorizontal;

            btnGwImage.BackgroundImagePath = "Gateway/WirelessApGatewaySearching.png";

@@ -212,11 +212,11 @@
            bodyFrameLayout.AddChidren(btnMsg);



            //首格的X轴

            int firstPoint = Application.GetMinRealAverage(275);

            int firstPoint = this.GetPictrueRealSize(275);

            //一格的宽度

            int width = Application.GetMinRealAverage(22);

            int width = this.GetPictrueRealSize(22);

            //间距大小

            int space = Application.GetMinRealAverage(12);

            int space = this.GetPictrueRealSize(12);



            //生成格子坐标

            var listPoint = new List<int>();

@@ -229,7 +229,7 @@
            var btnRound = new PicViewControl(width, width, false);

            btnRound.Radius = (uint)width / 2;

            btnRound.BackgroundColor = UserCenterColor.Current.ConcetionRoundColor;

            btnRound.Y = Application.GetMinRealAverage(135);

            btnRound.Y = this.GetPictrueRealSize(135);

            btnRound.X = listPoint[0];

            btnGwImage.AddChidren(btnRound);



@@ -244,7 +244,7 @@
                //计时时间

                int timeCount = 0;

                //超时时间

                int timeOut = 120;

                int timeOut = 240;

                while (btnGwImage.Parent != null)

                {

                    timeCount++;

@@ -332,7 +332,7 @@
            for (int i = 0; i < ZbGateway.GateWayList.Count; i++)

            {

                var way = ZbGateway.GateWayList[i];

                var wayId = HdlGatewayLogic.Current.GetGatewayId(way);

                var wayId = way.GwId;

                if (dicZbGatewayDiv.ContainsKey(wayId) == true)

                {

                    //已经处理了

@@ -343,9 +343,9 @@
                GatewayBindMode mode = GatewayBindMode.BindAgain;

                //如果是第一次绑定,或者是以前已经绑定过了的

                if (HdlGatewayLogic.Current.HomeIdIsEmpty(way) == true

                    || way.getGatewayBaseInfo.HomeId == Common.Config.Instance.HomeId)

                    || way.HomeId == Common.Config.Instance.HomeId)

                {

                    if (way.getGatewayBaseInfo.HomeId != Common.Config.Instance.HomeId)

                    if (way.HomeId != Common.Config.Instance.HomeId)

                    {

                        //第一次绑定,也就是网关住宅ID为空

                        mode = GatewayBindMode.First;

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

        }