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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs

@@ -199,7 +199,7 @@
                    frameTemp.Height = bodyFrameLayout.Height - btnShard.Y;

                    listView.AddChidren(frameTemp);

                }

                if (listView.ChildrenCount == 0)

                if (listDataRoom.Count == 0)

                {

                    //如果没有能够共享的房间

                    bodyFrameLayout.RemoveAll();