Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

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