安川

黄学彪

2020-05-09 21736b2944d5e88cd705a39ff87fd73d5a16e609

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

@@ -136,6 +136,13 @@
            //单击事件

            gatewayRow.frameTable.ButtonClickEvent += (sender, e) =>

            {

                if (UserCenterResourse.HideOption.GotoGatewayProductInfoForm == 1)

                {

                    //强制跳转

                    var form2 = new GatewayProductInfoForm();

                    form2.AddForm(gateway);

                    return;

                }

                var form = new GatewayInfoEditorForm();

                form.AddForm(gateway);

            };

@@ -172,13 +179,8 @@
            };



            //定位

            var btnPosition = new NormalViewControl(Application.GetRealWidth(184), gatewayRow.Height, false);

            btnPosition.BackgroundColor = 0xff4a4a4a;

            btnPosition.TextAlignment = TextAlignment.Center;

            btnPosition.TextColor = UserCenterColor.Current.White;

            btnPosition.TextSize = 12;

            var btnPosition = gatewayRow.AddEditorControl(false);

            btnPosition.TextID = R.MyInternationalizationString.uFixedPosition;

            gatewayRow.AddRightView(btnPosition);

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

            {

                //发送定位命令

@@ -218,14 +220,14 @@
            }



            //当前网关的角标

            //if (strWayId == GatewayResourse.AppOldSelectGatewayId)

            //{

            //    var btnNow = new IconViewControl(52);

            //    btnNow.Y = Application.GetMinReal(23) + gatewayRow.frameTable.chidrenYaxis;

            //    btnNow.UnSelectedImagePath = "Item/NowAcctionTip.png";

            //    btnNow.X = gatewayRow.btnName.X + gatewayRow.btnName.GetRealWidthByText(15);

            //    gatewayRow.frameTable.AddChidren(btnNow, ChidrenBindMode.BindEventOnly);

            //}

            if (strWayId == GatewayResourse.AppOldSelectGatewayId)

            {

                var btnNow = new IconViewControl(52);

                btnNow.Y = Application.GetMinReal(23) + gatewayRow.frameTable.chidrenYaxis;

                btnNow.UnSelectedImagePath = "Item/NowAcctionTip.png";

                btnNow.X = gatewayRow.btnName.X + gatewayRow.btnName.GetRealWidthByText();

                gatewayRow.frameTable.AddChidren(btnNow, ChidrenBindMode.BindEventOnly);

            }

        }



        #endregion

@@ -295,7 +297,7 @@
                    //关闭界面

                    this.CloseForm();

                    //刷新主画面(不重新获取设备状态)

                    this.LoadFormMethodByName("DeviceListMainForm", "InitMiddleFrame", false);

                    this.LoadFormMethodByName("DeviceListMainForm", "InitMiddleFrame");

                }

            });

        }

@@ -361,7 +363,7 @@
                string gwid = HdlGatewayLogic.Current.GetGatewayId(gateWay);

                if (this.dicRowContr.ContainsKey(gwid) == true && this.dicRowContr[gwid] != null)

                {

                    this.dicRowContr[gwid].RefreshControl(gateWay);

                    this.dicRowContr[gwid].IsOnline = online;

                }

            });

        }