Merge branch 'feature/邀请有奖' of http://git.yabolive.net:88/pidan/FuSiLive into feature/邀请有奖

DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/FUSGiftCenter/NormalGift/View/FUSLiveWholeDewAwardView.m

@@ -144,9 +144,10 @@
     CompatibleAnimationKeypath *path = [[CompatibleAnimationKeypath alloc] initWithKeys:@[@"获取图片.png"]];
     [self.LargeWholeScreenAnimView addSubview:self.largeAwardLabel forLayerAt:path];
     [self.LargeWholeScreenAnimView addSubview:self.largeAwardDetailLabel forLayerAt:path];
+    MJWeakSelf
     [self.LargeWholeScreenAnimView playWithCompletion:^(BOOL animationFinished) {
         if (animationFinished) {
-            [self fus_stopWholeScreenAnimationView];
+            [weakSelf fus_stopWholeScreenAnimationView];
         }
     }];
 
@@ -189,8 +190,7 @@
         
         FUSLogDebug(@"=====00 大奖创建");
         CompatibleAnimation *lotAnim = [[CompatibleAnimation alloc] initWithName:@"dew_sky_award" bundle:[FUSCommonBundle bundle]];
-        _LargeWholeScreenAnimView = [[CompatibleAnimationView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH)];
-        _LargeWholeScreenAnimView.compatibleAnimation = lotAnim;
+        _LargeWholeScreenAnimView = [[CompatibleAnimationView alloc] initWithCompatibleAnimation:lotAnim];
         _LargeWholeScreenAnimView.frame = CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH);
         _LargeWholeScreenAnimView.centerX = UIView.fus_screenW/2.0;
         _LargeWholeScreenAnimView.contentMode = UIViewContentModeScaleAspectFill;

Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
 		<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>81</integer>
+			<integer>79</integer>
 		</dict>
 	</dict>
 </dict>

Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>84</integer>
+			<integer>81</integer>
 		</dict>
 		<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
 		<dict>

Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>80</integer>
+			<integer>84</integer>
 		</dict>
 		<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>79</integer>
+			<integer>80</integer>
 		</dict>
 	</dict>
 </dict>