Parcourir la source

首页直播中动效

Steven il y a 2 ans
Parent
commit
4fea9dda5e

+ 35 - 18
KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -433,6 +433,8 @@
 		BC2DFF4E28BE068D0056105A /* TeacherStyleFlowLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = BC2DFF4D28BE068D0056105A /* TeacherStyleFlowLayout.m */; };
 		BC2DFF5728BE143A0056105A /* HomeTempLiveCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BC2DFF5528BE143A0056105A /* HomeTempLiveCell.m */; };
 		BC2DFF5828BE143A0056105A /* HomeTempLiveCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC2DFF5628BE143A0056105A /* HomeTempLiveCell.xib */; };
+		BC2DFF5B28C097D60056105A /* talentAnimation.json in Resources */ = {isa = PBXBuildFile; fileRef = BC2DFF5A28C097D60056105A /* talentAnimation.json */; };
+		BC2DFF5D28C097DC0056105A /* styleAnimation.json in Resources */ = {isa = PBXBuildFile; fileRef = BC2DFF5C28C097DC0056105A /* styleAnimation.json */; };
 		BC40B9F82811767A00DEC0D1 /* HotInformationHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC40B9F72811767A00DEC0D1 /* HotInformationHeadView.m */; };
 		BC40B9FA2811768400DEC0D1 /* HotInformationHeadView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC40B9F92811768400DEC0D1 /* HotInformationHeadView.xib */; };
 		BC40B9FE281177BD00DEC0D1 /* HomeInformationCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BC40B9FC281177BD00DEC0D1 /* HomeInformationCell.m */; };
@@ -568,6 +570,13 @@
 		BC7663162827E49900C91A1D /* NotiferHeadView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC7663102827E49800C91A1D /* NotiferHeadView.xib */; };
 		BC7663172827E49900C91A1D /* NotiferMessageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BC7663122827E49800C91A1D /* NotiferMessageCell.m */; };
 		BC7663182827E49900C91A1D /* NotiferMessageCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC7663132827E49900C91A1D /* NotiferMessageCell.xib */; };
+		BC802D8528B872AB0079E350 /* KSLiveAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC802D8428B872AB0079E350 /* KSLiveAlertView.m */; };
+		BC802D8728B872B40079E350 /* KSLiveAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC802D8628B872B40079E350 /* KSLiveAlertView.xib */; };
+		BC802D8A28B876720079E350 /* LiveRoomAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC802D8928B876720079E350 /* LiveRoomAlertView.m */; };
+		BC802D8D28B896460079E350 /* LiveApplyView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC802D8C28B896460079E350 /* LiveApplyView.m */; };
+		BC802D8F28B8964C0079E350 /* LiveApplyView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC802D8E28B8964C0079E350 /* LiveApplyView.xib */; };
+		BC802D9228B897610079E350 /* LiveApplyingView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC802D9128B897610079E350 /* LiveApplyingView.m */; };
+		BC802D9428B897670079E350 /* LiveApplyingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC802D9328B897670079E350 /* LiveApplyingView.xib */; };
 		BC802D9728BC4FC40079E350 /* HomeHotMusicView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC802D9628BC4FC40079E350 /* HomeHotMusicView.m */; };
 		BC802D9928BC4FE90079E350 /* HomeHotMusicView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC802D9828BC4FE90079E350 /* HomeHotMusicView.xib */; };
 		BC802D9D28BC546B0079E350 /* HomeHotMusicCollectionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BC802D9B28BC546B0079E350 /* HomeHotMusicCollectionCell.m */; };
@@ -583,13 +592,6 @@
 		BC802DBA28BC8C810079E350 /* HomeHotVideoCourseView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC802DB928BC8C810079E350 /* HomeHotVideoCourseView.xib */; };
 		BC802DBD28BC8E2C0079E350 /* HomeHotLiveCourseView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC802DBC28BC8E2C0079E350 /* HomeHotLiveCourseView.m */; };
 		BC802DBF28BC8E350079E350 /* HomeHotLiveCourseView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC802DBE28BC8E350079E350 /* HomeHotLiveCourseView.xib */; };
-		BC802D8528B872AB0079E350 /* KSLiveAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC802D8428B872AB0079E350 /* KSLiveAlertView.m */; };
-		BC802D8728B872B40079E350 /* KSLiveAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC802D8628B872B40079E350 /* KSLiveAlertView.xib */; };
-		BC802D8A28B876720079E350 /* LiveRoomAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC802D8928B876720079E350 /* LiveRoomAlertView.m */; };
-		BC802D8D28B896460079E350 /* LiveApplyView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC802D8C28B896460079E350 /* LiveApplyView.m */; };
-		BC802D8F28B8964C0079E350 /* LiveApplyView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC802D8E28B8964C0079E350 /* LiveApplyView.xib */; };
-		BC802D9228B897610079E350 /* LiveApplyingView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC802D9128B897610079E350 /* LiveApplyingView.m */; };
-		BC802D9428B897670079E350 /* LiveApplyingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC802D9328B897670079E350 /* LiveApplyingView.xib */; };
 		BC8A4593283DC33400094BBB /* KSCloudViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC8A4548283DC33400094BBB /* KSCloudViewController.m */; };
 		BC8A4594283DC33400094BBB /* MidiPlayerEngine.m in Sources */ = {isa = PBXBuildFile; fileRef = BC8A454A283DC33400094BBB /* MidiPlayerEngine.m */; };
 		BC8A4595283DC33400094BBB /* GCDTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = BC8A454B283DC33400094BBB /* GCDTimer.m */; };
@@ -1722,6 +1724,8 @@
 		BC2DFF5428BE143A0056105A /* HomeTempLiveCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeTempLiveCell.h; sourceTree = "<group>"; };
 		BC2DFF5528BE143A0056105A /* HomeTempLiveCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeTempLiveCell.m; sourceTree = "<group>"; };
 		BC2DFF5628BE143A0056105A /* HomeTempLiveCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeTempLiveCell.xib; sourceTree = "<group>"; };
+		BC2DFF5A28C097D60056105A /* talentAnimation.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = talentAnimation.json; sourceTree = "<group>"; };
+		BC2DFF5C28C097DC0056105A /* styleAnimation.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = styleAnimation.json; sourceTree = "<group>"; };
 		BC40B9F62811767A00DEC0D1 /* HotInformationHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HotInformationHeadView.h; sourceTree = "<group>"; };
 		BC40B9F72811767A00DEC0D1 /* HotInformationHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HotInformationHeadView.m; sourceTree = "<group>"; };
 		BC40B9F92811768400DEC0D1 /* HotInformationHeadView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HotInformationHeadView.xib; sourceTree = "<group>"; };
@@ -1899,6 +1903,17 @@
 		BC7663122827E49800C91A1D /* NotiferMessageCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotiferMessageCell.m; sourceTree = "<group>"; };
 		BC7663132827E49900C91A1D /* NotiferMessageCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NotiferMessageCell.xib; sourceTree = "<group>"; };
 		BC7663142827E49900C91A1D /* NotiferHeadView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotiferHeadView.h; sourceTree = "<group>"; };
+		BC802D8328B872AB0079E350 /* KSLiveAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KSLiveAlertView.h; sourceTree = "<group>"; };
+		BC802D8428B872AB0079E350 /* KSLiveAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KSLiveAlertView.m; sourceTree = "<group>"; };
+		BC802D8628B872B40079E350 /* KSLiveAlertView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KSLiveAlertView.xib; sourceTree = "<group>"; };
+		BC802D8828B876720079E350 /* LiveRoomAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveRoomAlertView.h; sourceTree = "<group>"; };
+		BC802D8928B876720079E350 /* LiveRoomAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LiveRoomAlertView.m; sourceTree = "<group>"; };
+		BC802D8B28B896460079E350 /* LiveApplyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LiveApplyView.h; sourceTree = "<group>"; };
+		BC802D8C28B896460079E350 /* LiveApplyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LiveApplyView.m; sourceTree = "<group>"; };
+		BC802D8E28B8964C0079E350 /* LiveApplyView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LiveApplyView.xib; sourceTree = "<group>"; };
+		BC802D9028B897610079E350 /* LiveApplyingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LiveApplyingView.h; sourceTree = "<group>"; };
+		BC802D9128B897610079E350 /* LiveApplyingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LiveApplyingView.m; sourceTree = "<group>"; };
+		BC802D9328B897670079E350 /* LiveApplyingView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LiveApplyingView.xib; sourceTree = "<group>"; };
 		BC802D9528BC4FC40079E350 /* HomeHotMusicView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeHotMusicView.h; sourceTree = "<group>"; };
 		BC802D9628BC4FC40079E350 /* HomeHotMusicView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeHotMusicView.m; sourceTree = "<group>"; };
 		BC802D9828BC4FE90079E350 /* HomeHotMusicView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeHotMusicView.xib; sourceTree = "<group>"; };
@@ -1922,17 +1937,6 @@
 		BC802DBB28BC8E2C0079E350 /* HomeHotLiveCourseView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeHotLiveCourseView.h; sourceTree = "<group>"; };
 		BC802DBC28BC8E2C0079E350 /* HomeHotLiveCourseView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeHotLiveCourseView.m; sourceTree = "<group>"; };
 		BC802DBE28BC8E350079E350 /* HomeHotLiveCourseView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeHotLiveCourseView.xib; sourceTree = "<group>"; };
-		BC802D8328B872AB0079E350 /* KSLiveAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KSLiveAlertView.h; sourceTree = "<group>"; };
-		BC802D8428B872AB0079E350 /* KSLiveAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KSLiveAlertView.m; sourceTree = "<group>"; };
-		BC802D8628B872B40079E350 /* KSLiveAlertView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = KSLiveAlertView.xib; sourceTree = "<group>"; };
-		BC802D8828B876720079E350 /* LiveRoomAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveRoomAlertView.h; sourceTree = "<group>"; };
-		BC802D8928B876720079E350 /* LiveRoomAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LiveRoomAlertView.m; sourceTree = "<group>"; };
-		BC802D8B28B896460079E350 /* LiveApplyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LiveApplyView.h; sourceTree = "<group>"; };
-		BC802D8C28B896460079E350 /* LiveApplyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LiveApplyView.m; sourceTree = "<group>"; };
-		BC802D8E28B8964C0079E350 /* LiveApplyView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LiveApplyView.xib; sourceTree = "<group>"; };
-		BC802D9028B897610079E350 /* LiveApplyingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LiveApplyingView.h; sourceTree = "<group>"; };
-		BC802D9128B897610079E350 /* LiveApplyingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LiveApplyingView.m; sourceTree = "<group>"; };
-		BC802D9328B897670079E350 /* LiveApplyingView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LiveApplyingView.xib; sourceTree = "<group>"; };
 		BC8A4547283DC33400094BBB /* KSCloudViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSCloudViewController.h; sourceTree = "<group>"; };
 		BC8A4548283DC33400094BBB /* KSCloudViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSCloudViewController.m; sourceTree = "<group>"; };
 		BC8A454A283DC33400094BBB /* MidiPlayerEngine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MidiPlayerEngine.m; sourceTree = "<group>"; };
@@ -2805,6 +2809,7 @@
 		275FA1F527E7356A00CFEA2E /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				BC2DFF5928C097D00056105A /* AnimationSource */,
 				BCD457AD28646B580010B493 /* NoticeSourceModel.h */,
 				BCD457AE28646B580010B493 /* NoticeSourceModel.m */,
 				BCA193B6282B6094004A585D /* RecentCourseModel.h */,
@@ -4294,6 +4299,16 @@
 			path = View;
 			sourceTree = "<group>";
 		};
+		BC2DFF5928C097D00056105A /* AnimationSource */ = {
+			isa = PBXGroup;
+			children = (
+				BC2DFF5C28C097DC0056105A /* styleAnimation.json */,
+				BC2DFF5A28C097D60056105A /* talentAnimation.json */,
+			);
+			name = AnimationSource;
+			path = KulexiuForStudent/Module/Home/View/TeacherStyle/AnimationSource;
+			sourceTree = SOURCE_ROOT;
+		};
 		BC40BA0F28124D0C00DEC0D1 /* NoticeCenter */ = {
 			isa = PBXGroup;
 			children = (
@@ -6041,6 +6056,7 @@
 				BC71D254288804CD0010F14B /* img_4.png in Resources */,
 				2723B62127F157D500E0B90B /* NoticeEditBodyView.xib in Resources */,
 				BC802DB328BC70370079E350 /* HomeHotTalentCell.xib in Resources */,
+				BC2DFF5B28C097D60056105A /* talentAnimation.json in Resources */,
 				BC5367C9283F6D72008428E8 /* HomeVideoCourseView.xib in Resources */,
 				BC71D25F288804CD0010F14B /* img_45.png in Resources */,
 				2723B66127F15CFB00E0B90B /* SettingBodyView.xib in Resources */,
@@ -6069,6 +6085,7 @@
 				2723B66227F15CFC00E0B90B /* FeedbackBodyView.xib in Resources */,
 				BC5367C4283F6D58008428E8 /* HomeLiveCourseView.xib in Resources */,
 				BCB908F32850B08D00F5FF69 /* ShareLiveCellContentView.xib in Resources */,
+				BC2DFF5D28C097DC0056105A /* styleAnimation.json in Resources */,
 				BC71D266288804CD0010F14B /* img_43.png in Resources */,
 				BC71D257288804CD0010F14B /* img_28.png in Resources */,
 				BC71D279288804CD0010F14B /* img_34.png in Resources */,

BIN
KulexiuForStudent/KulexiuForStudent.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate


+ 5 - 5
KulexiuForStudent/KulexiuForStudent.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -128,7 +128,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "708"
             endingLineNumber = "708"
-            landmarkName = "-connectHostWithStatus:"
+            landmarkName = "-countMemberCount"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -512,7 +512,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1119"
             endingLineNumber = "1119"
-            landmarkName = "-connectHostWithStatus:"
+            landmarkName = "-displayCloseView"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -544,7 +544,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1352"
             endingLineNumber = "1352"
-            landmarkName = "-connectHostWithStatus:"
+            landmarkName = "-didReceiveMessageNotification:"
             landmarkType = "7">
             <Locations>
                <Location
@@ -592,7 +592,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1342"
             endingLineNumber = "1342"
-            landmarkName = "-connectHostWithStatus:"
+            landmarkName = "-didReceiveMessageNotification:"
             landmarkType = "7">
             <Locations>
                <Location
@@ -640,7 +640,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1269"
             endingLineNumber = "1269"
-            landmarkName = "-connectHostWithStatus:"
+            landmarkName = "-sendLeaveMessageCallback:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Chat/View/ContractListCell.m

@@ -27,7 +27,7 @@
 - (void)configWithSource:(id)sourceModel {
     if ([sourceModel isKindOfClass:[FriendListModel class]]) {
         FriendListModel *model = sourceModel;
-        [self.friendAvatar sd_setImageWithURL:[NSURL URLWithString:model.friendAvatar] placeholderImage:[UIImage imageNamed:CHAT_USER_DEFAULT_LOGO]];
+        [self.friendAvatar sd_setImageWithURL:[NSURL URLWithString:[model.friendAvatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:CHAT_USER_DEFAULT_LOGO]];
         if ([NSString isEmptyString:model.friendNickname]) {
             self.friendName.text = [NSString stringWithFormat:@"游客%@",model.friendId];
         }

+ 29 - 0
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotTalent/HomeHotTalentCell.m

@@ -6,6 +6,7 @@
 //
 
 #import "HomeHotTalentCell.h"
+#import <Lottie/Lottie.h>
 
 @interface HomeHotTalentCell ()
 
@@ -20,6 +21,11 @@
 @property (weak, nonatomic) IBOutlet UIView *liveColorView;
 @property (weak, nonatomic) IBOutlet UILabel *tipsLabel;
 
+@property (weak, nonatomic) IBOutlet UIView *animationBgView;
+
+@property (nonatomic, strong) LOTAnimationView *animationView;
+
+
 @end
 
 @implementation HomeHotTalentCell
@@ -32,6 +38,13 @@
     layer.masksToBounds = YES;
     [self.liveColorView.layer addSublayer:layer];
     [self.liveColorView bringSubviewToFront:self.tipsLabel];
+    
+    if (![self.animationBgView.subviews containsObject:self.animationView]) {
+        [self.animationBgView addSubview:self.animationView];
+        [self.animationView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.right.top.bottom.mas_equalTo(self.animationBgView);
+        }];
+    }
 }
 
 - (CAGradientLayer *)createGradientLayerFromColor:(UIColor *)fromColor startPoint:(CGPoint)startPoint endColor:(UIColor *)endColor endPoint:(CGPoint)endPoint bounds:(CGRect)bounds {
@@ -47,9 +60,17 @@
 - (void)configWithSource:(TalentTeacherModel *)sourceModel {
     if (sourceModel.living) {
         self.liveView.hidden = NO;
+        self.animationBgView.hidden = NO;
+        if ([self.animationView isAnimationPlaying] == NO) {
+            [self.animationView play];
+        }
     }
     else {
         self.liveView.hidden = YES;
+        self.animationBgView.hidden = YES;
+        if ([self.animationView isAnimationPlaying] == YES) {
+            [self.animationView stop];
+        }
     }
     [self.teacherAvatar sd_setImageWithURL:[NSURL URLWithString:[sourceModel.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:USERDEFAULT_LOGO]];
     if ([NSString isEmptyString:sourceModel.username]) {
@@ -66,4 +87,12 @@
     }
 }
 
+
+- (LOTAnimationView *)animationView {
+    if (!_animationView) {
+        _animationView = [LOTAnimationView animationNamed:@"talentAnimation.json"];
+        _animationView.loopAnimation = YES;
+    }
+    return _animationView;
+}
 @end

+ 11 - 4
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotTalent/HomeHotTalentCell.xib

@@ -97,10 +97,14 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="eh3-qI-h6t">
-                                <rect key="frame" x="82" y="8" width="16" height="22"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            </imageView>
+                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dhx-ki-5CL">
+                                <rect key="frame" x="84" y="9" width="14" height="14"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="14" id="5B7-fz-a6F"/>
+                                    <constraint firstAttribute="height" constant="14" id="5K0-04-Rux"/>
+                                </constraints>
+                            </view>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
@@ -110,7 +114,9 @@
                             <constraint firstItem="S4c-t1-3Yg" firstAttribute="top" secondItem="PcD-yn-vxS" secondAttribute="bottom" constant="4" id="F0j-4p-Fhl"/>
                             <constraint firstItem="PcD-yn-vxS" firstAttribute="top" secondItem="0eq-MB-HnX" secondAttribute="bottom" constant="7" id="L3T-P9-iJy"/>
                             <constraint firstAttribute="trailing" secondItem="PcD-yn-vxS" secondAttribute="trailing" constant="12" id="N7b-Za-5rX"/>
+                            <constraint firstAttribute="trailing" secondItem="Dhx-ki-5CL" secondAttribute="trailing" constant="8" id="PxQ-Bl-WvW"/>
                             <constraint firstItem="S4c-t1-3Yg" firstAttribute="leading" secondItem="QRJ-mO-zJO" secondAttribute="leading" constant="12" id="Rii-NH-CrS"/>
+                            <constraint firstItem="Dhx-ki-5CL" firstAttribute="top" secondItem="QRJ-mO-zJO" secondAttribute="top" constant="9" id="S3r-5n-u2l"/>
                             <constraint firstItem="PcD-yn-vxS" firstAttribute="leading" secondItem="QRJ-mO-zJO" secondAttribute="leading" constant="12" id="fs8-JQ-NPs"/>
                             <constraint firstAttribute="trailing" secondItem="S4c-t1-3Yg" secondAttribute="trailing" constant="12" id="fyR-jX-nrb"/>
                             <constraint firstItem="AqF-It-spJ" firstAttribute="centerX" secondItem="QRJ-mO-zJO" secondAttribute="centerX" id="ghn-5q-7fh"/>
@@ -133,6 +139,7 @@
             </constraints>
             <size key="customSize" width="168" height="183"/>
             <connections>
+                <outlet property="animationBgView" destination="Dhx-ki-5CL" id="iPZ-w4-Zrw"/>
                 <outlet property="graduateSchool" destination="S4c-t1-3Yg" id="wYB-Bo-d7v"/>
                 <outlet property="liveColorView" destination="CQV-RL-RU6" id="SUB-wz-3UT"/>
                 <outlet property="liveView" destination="0eq-MB-HnX" id="G0f-AD-yCi"/>

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherStyle/AnimationSource/styleAnimation.json


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherStyle/AnimationSource/talentAnimation.json


+ 23 - 0
KulexiuForStudent/KulexiuForStudent/Module/Home/View/TeacherStyle/HomeTempLiveCell.m

@@ -6,6 +6,7 @@
 //
 
 #import "HomeTempLiveCell.h"
+#import <Lottie/Lottie.h>
 
 @interface HomeTempLiveCell ()
 
@@ -18,6 +19,8 @@
 @property (weak, nonatomic) IBOutlet UILabel *teacherName;
 @property (weak, nonatomic) IBOutlet UIView *liveStatusView;
 
+@property (nonatomic, strong) LOTAnimationView *animationView;
+
 @end
 
 @implementation HomeTempLiveCell
@@ -27,6 +30,15 @@
     // Initialization code
     self.liveStatusView.layer.cornerRadius = 13;
     self.liveStatusView.layer.maskedCorners = kCALayerMinXMinYCorner | kCALayerMinXMaxYCorner; // 左上圆角
+    if (![self.liveStatusView.subviews containsObject:self.animationView]) {
+        [self.liveStatusView addSubview:self.animationView];
+        [self.animationView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.mas_equalTo(self.liveStatusView);
+            make.width.mas_equalTo(24.0f);
+            make.height.mas_equalTo(24.0f);
+            make.centerY.mas_equalTo(self.liveStatusView.mas_centerY);
+        }];
+    }
 }
 
 - (void)configWithSource:(HomeTeacherLiveModel *)source {
@@ -39,6 +51,17 @@
     else {
         self.teacherName.text = [NSString stringWithFormat:@"%@",source.username];
     }
+    if ([self.animationView isAnimationPlaying] == NO) {
+        [self.animationView play];
+    }
+}
+
+- (LOTAnimationView *)animationView {
+    if (!_animationView) {
+        _animationView = [LOTAnimationView animationNamed:@"styleAnimation.json"];
+        _animationView.loopAnimation = YES;
+    }
+    return _animationView;
 }
 
 @end

+ 2 - 2
KulexiuForStudent/KulexiuForStudent/Module/Live/Model/KSEnterLiveroomManager.m

@@ -36,14 +36,14 @@
     NSInteger lookCount = [source integerValueForKey:@"lookNum"] + 1;
     liveVC.blacklistFlag = [source integerValueForKey:@"blacklistFlag"] == 1 ? YES : NO;
     liveVC.totalCount = lookCount; // 观看人数
-    
     BOOL isTemp = [[source stringValueForKey:@"roomType"] isEqualToString:@"TEMP"];
     liveVC.isTempRoom = isTemp;
     if (isTemp == NO) {
         liveVC.liveEndTime = [source stringValueForKey:@"liveEndTime"];
         liveVC.expiredMinute = [source integerValueForKey:@"expiredMinute"];
     }
-    
+    liveVC.enableSeat = ![source boolValueForKey:@"whether_mic"];
+
     CustomNavViewController *liveNav = [[CustomNavViewController alloc] initWithRootViewController:liveVC];
     liveNav.modalPresentationStyle = UIModalPresentationFullScreen;
     

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff