2020-07-10-01

陈嘉乐

2020-07-10 48ba446936b51fffafa7c3600c0dadc6ac0e8c20

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

@@ -60,9 +60,9 @@


            //图标

            var picGwImage = new FrameLayout();

            picGwImage.Width = Application.GetMinRealAverage(861);

            picGwImage.Height = Application.GetMinRealAverage(478);

            picGwImage.Y = Application.GetRealWidth(251);

            picGwImage.Width = this.GetPictrueRealSize(861);

            picGwImage.Height = this.GetPictrueRealSize(478);

            picGwImage.Y = Application.GetRealHeight(251);

            picGwImage.Gravity = Gravity.CenterHorizontal;

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

            bodyFrameLayout.AddChidren(picGwImage);

@@ -89,8 +89,8 @@


            //图标

            var picGwImage = new FrameLayout();

            picGwImage.Width = Application.GetMinRealAverage(861);

            picGwImage.Height = Application.GetMinRealAverage(478);

            picGwImage.Width = this.GetPictrueRealSize(861);

            picGwImage.Height = this.GetPictrueRealSize(478);

            picGwImage.Y = Application.GetRealWidth(158);

            picGwImage.Gravity = Gravity.CenterHorizontal;

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

@@ -98,12 +98,12 @@
            var btnFailIcon = new PicViewControl(66, 66);

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

            btnFailIcon.Gravity = Gravity.CenterHorizontal;

            btnFailIcon.Y = Application.GetMinRealAverage(181);

            btnFailIcon.Y = this.GetPictrueRealSize(181);

            picGwImage.AddChidren(btnFailIcon);

            //搜索失败

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

            btnFailView.TextAlignment = TextAlignment.Center;

            btnFailView.Y = Application.GetMinRealAverage(305);

            btnFailView.Y = this.GetPictrueRealSize(305);

            btnFailView.Gravity = Gravity.CenterHorizontal;

            btnFailView.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnFailView.TextID = R.MyInternationalizationString.uSearchFail;

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



            //重试

            var frameback = new FrameLayoutControl();

            var frameback = new FrameLayoutStatuControl();

            frameback.UseClickStatu = false;

            frameback.Y = Application.GetRealHeight(1259);

            frameback.Gravity = Gravity.CenterHorizontal;

@@ -167,7 +167,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) =>

            {

                //初始化初始中部控件

@@ -202,11 +202,11 @@
        private void InitConcetionAnimete(FrameLayout picGwImage, NormalViewControl btnMsg)

        {

            //首格的X轴

            int firstPoint = Application.GetMinRealAverage(288);

            int firstPoint = this.GetPictrueRealSize(288);

            //一格的宽度

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

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

            btnRound.Radius = (uint)width / 2;

            btnRound.BackgroundColor = UserCenterColor.Current.ConcetionRoundColor;

            btnRound.Y = Application.GetMinRealAverage(202);

            btnRound.Y = this.GetPictrueRealSize(202);

            btnRound.X = listPoint[0];

            picGwImage.AddChidren(btnRound);



@@ -315,12 +315,12 @@
            List<string> listId = new List<string>();

            for (int i = 0; i < ZbGateway.GateWayList.Count; i++)

            {

                if (ZbGateway.GateWayList[i].getGatewayBaseInfo.IpAddress == string.Empty)

                if (ZbGateway.GateWayList[i].GwIP == string.Empty)

                {

                    //IP没有的网关，我也不知道它是干嘛的

                    continue;

                }

                string gwId = HdlGatewayLogic.Current.GetGatewayId(ZbGateway.GateWayList[i]);

                string gwId = ZbGateway.GateWayList[i].GwId;

                //重复添加检测

                if (this.dicIdCheckCount.ContainsKey(gwId) == false)

                {

@@ -342,7 +342,7 @@
            }

            for (int i = 0; i < listId.Count; i++)

            {

                ZbGateway way = ZbGateway.GateWayList.Find((obj) => HdlGatewayLogic.Current.GetGatewayId(obj) == listId[i]);

                ZbGateway way = ZbGateway.GateWayList.Find((obj) => obj.GwId == listId[i]);

                if (way == null)

                {

                    continue;

@@ -352,9 +352,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;