Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -85,6 +85,14 @@
        private void AddGatewayRow(VerticalListControl listView, ZbGateway gateway, bool addLine)

        {

            string gwid = HdlGatewayLogic.Current.GetGatewayId(gateway);

            if (this.dicZbGatewayDiv[gwid] != 2)

            {

                //如果本地没有,那么应该是在之后的编辑界面删除了

                if (HdlGatewayLogic.Current.IsGatewayExist(gwid) == false)

                {

                    return;

                }

            }



            var frameRow = new RowLayoutControl(listView.rowSpace / 2);

            listView.AddChidren(frameRow);

@@ -112,6 +120,11 @@
                //底线

                frameRow.frameTable.AddBottomLine();

            }

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

            {

                var form = new GatewayProductInfoForm();

                form.AddForm(gateway);

            };



            if (dicZbGatewayDiv[gwid] == 2)

            {