2020-07-10-01

陈嘉乐

2020-07-10 48ba446936b51fffafa7c3600c0dadc6ac0e8c20

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

@@ -82,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";

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

@@ -144,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;

@@ -160,7 +160,7 @@
            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);



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