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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/UserView/UserHomeView.cs

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

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

                   

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