Merge branch 'houchaoxin/dev' into 'master'

Houchaoxin/dev

See merge request !29

GMBase/Classes/AddClass/GMFloatWindow.m

@@ -38,9 +38,13 @@
 }
 
 - (void)showController:(UIViewController *)controller {
+    //如果之前已有controller
+    if (_controller) {
+        [(id<GMFloatWindowProtocol>)_controller destroyOtherController];
+        _controller = nil;
+    }
     if (self.superview == nil) {
         [[UIApplication sharedApplication].keyWindow addSubview:self];
-//        [[AppDelegate shareInstance].window addSubview:self];
     }
     _controller = controller;
     [self addSubview:controller.view];

GMBase/Classes/AddClass/GMFloatWindowProtocol.h

@@ -20,4 +20,8 @@
  GMFloatWindow 由小窗口模式到全屏模式，会调用此方法
  */
 - (void)showOtherViews;
+
+/// 销毁当前的VC(解决关闭直播间依旧有声音的bug)
+- (void)destroyOtherController;
+
 @end