fixed bugs

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/BaseModel/FUSBaseModel.m

@@ -20,7 +20,7 @@
  *
  *
  *  @return 返回对象
  *  @return 返回对象
  */
  */
-+ (instancetype)fus_modelWithDict:(NSDictionary *)jsonDict{
++ (instancetype)fus_modelWithDict:(NSDictionary *)jsonDict {
     
     
     return [self modelWithDictionary:jsonDict];
     return [self modelWithDictionary:jsonDict];
 }
 }

FuSiLive/Classes/BaoFang/Broadcast/Model/FUSBroadcastModel.m

@@ -96,7 +96,7 @@
         }
         }
     }
     }
     
     
-    _languageContent = [FUSFormatContentHelper fus_replaceFusiLevelImg:_languageContent whiteBg:YES];
+    _languageContent = [FUSFormatContentHelper fus_replaceFusiLevelImg:_languageContent];
     return _languageContent;
     return _languageContent;
 }
 }
 
 

FuSiLive/Classes/BaoFang/Broadcast/View/FUSAnimationLabel.m

@@ -178,7 +178,7 @@
 
 
         FUSFormatContentModel *contentModel = [[FUSFormatContentModel alloc] init];
         FUSFormatContentModel *contentModel = [[FUSFormatContentModel alloc] init];
         contentModel.languageContent = string;
         contentModel.languageContent = string;
-        NSMutableAttributedString *attributedString = [FUSFormatContentHelper fus_createContentAttributedStringWithModel:contentModel font:self.animationLabel.font levelImageSize:CGSizeMake(45, 27)];
+        NSMutableAttributedString *attributedString = [FUSFormatContentHelper fus_createContentAttributedStringWithModel:contentModel font:self.animationLabel.font levelImageSize:CGSizeMake(0, 14)];
         dispatch_async(dispatch_get_main_queue(), ^{
         dispatch_async(dispatch_get_main_queue(), ^{
             complete(attributedString);
             complete(attributedString);
         });
         });

FuSiLive/Classes/InstantMessaging/Controller/FUSChatDetailViewController.m

@@ -1475,6 +1475,7 @@
     for (FUSChatDetailFrameModel *frameModel in self.chatDetailArr) {
     for (FUSChatDetailFrameModel *frameModel in self.chatDetailArr) {
         if ([model.msgModel.messageID isEqualToString:frameModel.msgModel.messageID]) {
         if ([model.msgModel.messageID isEqualToString:frameModel.msgModel.messageID]) {
             [frameModel fus_setValueWithModel:model];
             [frameModel fus_setValueWithModel:model];
+            frameModel.msgModel = model.msgModel;
             [self fus_judgeMessageTimeIsNeedShowWithIsNewMessage:YES];
             [self fus_judgeMessageTimeIsNeedShowWithIsNewMessage:YES];
             FUSIMChatDetailCell *cell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:[self.chatDetailArr indexOfObject:frameModel] inSection:0]];
             FUSIMChatDetailCell *cell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:[self.chatDetailArr indexOfObject:frameModel] inSection:0]];
             [cell fus_setCellDetailContentWithModel:frameModel];
             [cell fus_setCellDetailContentWithModel:frameModel];

FuSiLive/Classes/NewLive/Main/View/FunctionView/GiftView/FUSLiveGiftView.m

@@ -1232,12 +1232,13 @@ static FUSLiveGiftView *giftView = nil;
         _broadcastNewsHaveData = YES;
         _broadcastNewsHaveData = YES;
         __block int newsIndex = 0;
         __block int newsIndex = 0;
         FUSBroadcastModel *model = broadcastNewsDic[@"newsModel"][newsIndex];
         FUSBroadcastModel *model = broadcastNewsDic[@"newsModel"][newsIndex];
+        __weak typeof(self) weakSelf = self;
         [_jackpotScrollInfoView.animationLabel changeTextColorWithString:model.languageContent complete:^(NSMutableAttributedString *attributedString) {
         [_jackpotScrollInfoView.animationLabel changeTextColorWithString:model.languageContent complete:^(NSMutableAttributedString *attributedString) {
             
             
-            [_jackpotScrollInfoView.animationLabel fus_setAnimationattrContent:attributedString];
-            [_jackpotScrollInfoView.animationLabel fus_startAnimation];
+            [weakSelf.jackpotScrollInfoView.animationLabel fus_setAnimationattrContent:attributedString];
+            [weakSelf.jackpotScrollInfoView.animationLabel fus_startAnimation];
         }];
         }];
-        __weak typeof(self) weakSelf = self;
+        
         _jackpotScrollInfoView.animationLabel.endBlock = ^{
         _jackpotScrollInfoView.animationLabel.endBlock = ^{
             
             
             if (weakSelf.giftPanelIsShow == YES && newsArr.count > 0) {
             if (weakSelf.giftPanelIsShow == YES && newsArr.count > 0) {

FuSiLive/Classes/NewLive/Main/View/FunctionView/PK/View/PKPrepareView/FUSPKRecordHeaderView.m

@@ -35,15 +35,16 @@
     self.sessionLocalLabel.text = [NSString fus_localString:@"场次"];
     self.sessionLocalLabel.text = [NSString fus_localString:@"场次"];
     self.winRateLocalLabel.text = [NSString fus_localString:@"胜率"];
     self.winRateLocalLabel.text = [NSString fus_localString:@"胜率"];
     
     
-    _circleView = [[FUSCircleProgressView alloc] initWithFrame:CGRectMake(8, 5.5, 75, 75)];
+    _circleView = [[FUSCircleProgressView alloc] initWithFrame:CGRectMake(-2, -2, 94, 94)];
     //    _circleView.textfont = [UIFont systemFontOfSize:11];
     //    _circleView.textfont = [UIFont systemFontOfSize:11];
     //    _circleView.textColor = [UIColor clearColor];
     //    _circleView.textColor = [UIColor clearColor];
     //    _circleView.processStr = nil;
     //    _circleView.processStr = nil;
     _circleView.proessBgColor = [UIColor colorWithHex:@"#EEEEEE"];
     _circleView.proessBgColor = [UIColor colorWithHex:@"#EEEEEE"];
-//    _circleView.processColor = [UIColor colorWithHex:@"#FFC231"];
+    _circleView.processColor = [UIColor colorWithHex:@"#FFC231"];
         _circleView.processGradientColor = @[(id)[UIColor colorWithHex:@"#FFC231"].CGColor,(id)[UIColor colorWithHex:@"#FADA8D"].CGColor];
         _circleView.processGradientColor = @[(id)[UIColor colorWithHex:@"#FFC231"].CGColor,(id)[UIColor colorWithHex:@"#FADA8D"].CGColor];
     _circleView.processWidth = 4;
     _circleView.processWidth = 4;
     _circleView.isAnimate = YES;
     _circleView.isAnimate = YES;
+    _circleView.clockwise = YES;
     [self.winRateBgView addSubview:_circleView];
     [self.winRateBgView addSubview:_circleView];
     [_circleView startDrawCircleProcessView];
     [_circleView startDrawCircleProcessView];
     [_circleView animateToProgress:0.0];
     [_circleView animateToProgress:0.0];