Merge branch 'houchaoxin/dev' into 'master'

【735直播】直播小框大小的调整

See merge request !30

GMBase/Classes/AddClass/GMFloatWindow.m

@@ -154,8 +154,8 @@
     self.layer.cornerRadius = 18;
     _isExpanded = NO;
     [UIView animateWithDuration:0.25f animations:^{
-        self.transform = CGAffineTransformMakeScale(0.24, (MAINSCREEN_WIDTH * 0.24 * 1.78)/MAINSCREEN_HEIGHT);
-        self.frame = CGRectMake(MAINSCREEN_WIDTH * 0.76, 85, MAINSCREEN_WIDTH * 0.24, MAINSCREEN_WIDTH * 0.24 * 1.78);
+        self.transform = CGAffineTransformMakeScale(0.28, (MAINSCREEN_WIDTH * 0.28 * 1.78)/MAINSCREEN_HEIGHT);
+        self.frame = CGRectMake(MAINSCREEN_WIDTH * 0.72 - 10, 85, MAINSCREEN_WIDTH * 0.28, MAINSCREEN_WIDTH * 0.28 * 1.78);
     } completion:^(BOOL finished) {
         [self addGestureRecognizer:self.tapGesture];
         [self addGestureRecognizer:self.panGesture];