Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

@@ -311,7 +311,7 @@
                    }

                });

            }

           

        }
        /// <summary>
        /// Changeds the IL ogic status.
@@ -919,7 +919,7 @@
        /// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
        private void GoToAddGateWay(object sender, MouseEventArgs mouseEventArgs)
        {
            var selectNewGateWayForm = new UserCenter.GatewayAdd.NewGateWaySelectForm { };
            var selectNewGateWayForm = new UserCenter.GatewayAdd.NewGateWayMenuSelectForm { };
            selectNewGateWayForm.AddForm(selectNewGateWayForm);
        }

@@ -972,7 +972,7 @@
            else
            {
                deviceVerticalScrolViewLayout = new VerticalScrolViewLayout { };
                

                functionSceneBodyView.AddChidren(deviceVerticalScrolViewLayout);
               for(int i=0;i<deviceList.Count;i++)
                {
@@ -996,7 +996,7 @@
                        deviceVerticalScrolViewLayout.AddChidren(itemView);
                    }

                   

                    //删除设备
                    EventHandler<MouseEventArgs> delEvent = (sender, e) =>
                    {