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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/Device/Room/RoomCommon.cs

@@ -14,5 +14,18 @@
                alert.Show();
            });
        }

        /// <summary>
        /// 提示用户还没选择房间
        /// </summary>
        public static void ShowTipNoRoom()
        {
            Application.RunOnMainThread(() =>
            {
                var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.NotSelectZone), Language.StringByID(R.MyInternationalizationString.Close));
                alert.Show();
            });
        }

    }
}