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

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

 ZigbeeApp/Shared/Phone/UserView/UserPage.cs

@@ -67,6 +67,7 @@
        /// <param name="typeTag">Type tag.</param>
        public void DeviceInfoChange(CommonDevice common, string typeTag)
        {
            ///
            //设备上报状态中 当CluterID=3,就证明该设备在线，直接标记
            if (typeTag == "DeviceStatusReport")
            {
@@ -523,8 +524,6 @@

        EventHandler<MouseEventArgs> BottomEventHandler = (sender, e) =>
        {
            Room.GetAllRoomDeviceUIList();

            Instance.homePageName.IsSelected = false;
            Instance.homePageIMG.IsSelected = false;