加上各种地方的直播记录入口

DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/LiveRouter/FUSPublicModels/Live/FUSRoomUserInfoModel.h

@@ -56,5 +56,7 @@
 @property (nonatomic, strong) FUSHomeVideoChatModel *chatWith;  // 视讯对象
 
 @property (nonatomic, assign)BOOL cannotBeAt;  // 是否不能被 At
+/// 是否显示直播记录入口（0：否、1：是）
+@property (nonatomic, assign) NSInteger showLiveRecords;
 
 @end

DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/UserRouter/FUSUserRouterProtocol.h

@@ -84,6 +84,9 @@ NS_ASSUME_NONNULL_BEGIN
 /// 进入完成用户资料页面
 -(void)fus_pushToCompleteUserInfoWithController:(UIViewController *)vc type:(NSInteger)type;
 
+/// 进入版本检测页面
+-(void)fus_pushToVerifyVersionController;
+
 #pragma mark - Public Http
 
 /**

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

@@ -7,12 +7,12 @@
 		<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>74</integer>
+			<integer>75</integer>
 		</dict>
 		<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>77</integer>
+			<integer>72</integer>
 		</dict>
 	</dict>
 </dict>

Modules/FUSChatCenterModule/FUSChatCenterModule/Features/ZhaiXin/Official/Controller/FUSOfficialViewController.m

@@ -591,6 +591,21 @@
                         [FUSRouter.userRouter fus_enterTaskVC];
                     }
                         break;
+                    case 19:{
+                        //跳轉到设置->检测版本
+                        [[FUSRouter userRouter] fus_pushToVerifyVersionController];
+                    }
+                        break;
+                    case 20:{
+                        //跳转我是主播
+                        if ([NSString isNull:msgModel.clickdata]) {
+                            [[FUSRouter liveRouter] fus_showLiveRecordsControllerWithTurnToTimeInterval:-1];
+                        }else {
+                            double turnToTimeMill = [msgModel.clickdata doubleValue];
+                            [[FUSRouter liveRouter] fus_showLiveRecordsControllerWithTurnToTimeInterval:turnToTimeMill/1000];
+                        }
+                    }
+                        break;
                     default:
                         break;
                 }

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

@@ -7,12 +7,12 @@
 		<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>75</integer>
+			<integer>74</integer>
 		</dict>
 		<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>72</integer>
+			<integer>73</integer>
 		</dict>
 	</dict>
 </dict>

Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/zone_my_liveRecord_icon.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "zone_my_liveRecord_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "zone_my_liveRecord_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/LiveRecords/ViewModel/FUSLiveRecordsViewModel.swift

@@ -184,7 +184,7 @@ extension FUSLiveRecordsViewModel {
             // 补全前面
             if let model = dateList.first,
                model.weekday > 1 {
-                for i in 0..<(model.weekday - 1) {
+                for _ in 0..<(model.weekday - 1) {
                     let model = FFImAnchorAssessHistoryCalendarModel()
                     model.fus_isShowingMonth = false
                     dateList.insert(model, at: 0)

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/UserInfoCard/FUSVideoChatUserInfoView.m

@@ -36,6 +36,8 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
 @property (nonatomic, strong) UIButton *vipBtn;
 // 举报按钮
 @property (nonatomic, strong) UIButton *reportBtn;
+/// 直播记录按钮
+@property (nonatomic, strong) UIButton *liveRecordBtn;
 // 昵称
 @property (nonatomic, strong) UILabel *nickNameLabel;
 // 在线等级
@@ -390,6 +392,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
     _faceImageView.y = 0;
     _secrectBgImgView.y = _faceImageView.centerY;
 //    _richWearImageView.center = _faceImageView.center;
+    _liveRecordBtn.right = _bgView.width;
     
     [_bgView addRoundedCorners:UIRectCornerTopLeft|UIRectCornerTopRight withRadii:CGSizeMake(16, 16)];
 }
@@ -410,6 +413,13 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
     [bgView addRoundedCorners:UIRectCornerTopLeft|UIRectCornerTopRight withRadii:CGSizeMake(16, 16)];
     self.bgView = bgView;
     [clearBgView addSubview:self.bgView];
+    
+    self.liveRecordBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    self.liveRecordBtn.hidden = YES;
+    self.liveRecordBtn.frame = CGRectMake(0, 0, 40, 40);
+    [self.liveRecordBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"zone_my_liveRecord_icon"] forState:UIControlStateNormal];
+    [self.bgView addSubview:self.liveRecordBtn];
+    [self.liveRecordBtn addTarget:self action:@selector(liveRecordBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
 }
 
 - (void)fus_initFaceImageView {
@@ -999,8 +1009,15 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
             [_zoneBtn setImage:nil forState:UIControlStateNormal];
             [_zoneBtn setImage:nil forState:UIControlStateHighlighted];
         }
+        
+        if (model.showLiveRecords == 1) {
+            _liveRecordBtn.hidden = NO;
+        }else {
+            _liveRecordBtn.hidden = YES;
+        }
     } else {
         
+        _liveRecordBtn.hidden = YES;
         _zoneBtn.y = 0;
         _zoneBtn.height = _buttomBtnBgView.height;
         _zoneBtn.layer.cornerRadius = 0;
@@ -1336,6 +1353,9 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
 }
 
 #pragma mark - Action
+-(void)liveRecordBtnDidClicked:(UIButton *)btn{
+    [[FUSRouter liveRouter] fus_showLiveRecordsControllerWithTurnToTimeInterval:-1];
+}
 - (void)fus_onClickReportBtnAction:(UIButton *)reportBtn {
     [self fus_dismissUserInfoViewWithAnimate:YES];
     _currentModel.uid = _currentModel.realUid;

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

@@ -7,12 +7,12 @@
 		<key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>73</integer>
+			<integer>76</integer>
 		</dict>
 		<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>76</integer>
+			<integer>77</integer>
 		</dict>
 	</dict>
 </dict>

Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/MyUserZone/zone_my_liveRecord_icon.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "zone_my_liveRecord_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "zone_my_liveRecord_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/Controller/FUSSettingViewController.m

@@ -238,7 +238,7 @@
     self.versionItem.redCircleColor = [UIColor redColor];
     self.versionItem.isShowRedCirclePoint = [FUSSwiftCacheDataShare share].oc_localUserHadVerifyUpdateVersion == NO;
     self.versionItem.itemClick = ^(FUSCustomSettingItem *item) {
-        //TODO:版本检测: added By Pidan
+        // 版本检测
         [FUSSwiftCacheDataShare share].oc_localUserHadVerifyUpdateVersion = YES;
         weakSelf.versionItem.isShowRedCirclePoint = NO;
         [weakSelf.tableView reloadData];

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneInfoCell.m

@@ -10,6 +10,7 @@
 
 #import "FUSVideoPlayer.h"
 #import "FUSVoiceSignRecordViewController.h"
+#import <Masonry/Masonry.h>
 @interface FUSMyZoneInfoCell ()<FUSVideoPlayerDelegate>
 
 @property (strong, nonatomic) IBOutlet UILabel *nickNameLabel;
@@ -28,6 +29,12 @@
 
 @property (weak, nonatomic) IBOutlet UIButton *recordOrPlayBtn;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *recordOrPlayBtnWidthConstraint;
+/// 录音按钮右边距离，原始15
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *recordOrPlayBtnRightConstraint;
+
+/// 直播记录按钮
+@property (nonatomic, strong) UIButton *liveRecordBtn;
+
 // 播放器
 @property (nonatomic, strong) FUSVideoPlayer *audioPlayer;
 
@@ -76,6 +83,17 @@
     self.levelLabel.textColor = [UIColor whiteColor];
     self.fansNumLabel.textColor = [UIColor fus_textColorRich];
     self.focusNumLabel.textColor = [UIColor fus_textColorRich];
+    
+    self.liveRecordBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    self.liveRecordBtn.hidden = YES;
+    [self.liveRecordBtn setImage:[FUSUserCenterBunble imageNamed:@"zone_my_liveRecord_icon"] forState:UIControlStateNormal];
+    [self.contentView addSubview:self.liveRecordBtn];
+    [self.liveRecordBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.offset(0);
+        make.size.mas_equalTo(CGSizeMake(40, 40));
+        make.centerY.equalTo(self.recordOrPlayBtn.mas_centerY);
+    }];
+    [self.liveRecordBtn addTarget:self action:@selector(liveRecordBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
 }
 
 - (void)fus_setupCellWithModel:(FUSZoneInfosModel *)zoneModel isMyZone:(BOOL)isMyZone {
@@ -94,6 +112,14 @@
         _levelLabel.text = [NSString stringWithFormat:@"%@",zoneModel.lev];
     }
     
+    if (zoneModel.showLiveRecords == 1 && isMyZone) {
+        self.liveRecordBtn.hidden = NO;
+        self.recordOrPlayBtnRightConstraint.constant = 40;
+    }else {
+        self.liveRecordBtn.hidden = YES;
+        self.recordOrPlayBtnRightConstraint.constant = 15;
+    }
+    
     // w:32
     if (zoneModel.sex.integerValue == 0) {//女
         [_sexAndAgeButton setBackgroundImage:UIImage.fus_girlBgImg forState:UIControlStateNormal];
@@ -191,6 +217,10 @@
     [_sexAndAgeButton setBackgroundImage:nil forState:UIControlStateNormal];
 }
 
+-(void)liveRecordBtnDidClicked:(UIButton *)btn{
+    [[FUSRouter liveRouter] fus_showLiveRecordsControllerWithTurnToTimeInterval:-1];
+}
+
 - (IBAction)onClickBtnAction:(UIButton *)sender {
     if (_didClickFocusAndFansBtnBlock) _didClickFocusAndFansBtnBlock(sender.tag);
 }

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneInfoCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -202,6 +202,7 @@
                 <outlet property="levelLabel" destination="W2o-3M-oQx" id="Vcd-hM-bqD"/>
                 <outlet property="nickNameLabel" destination="zR6-f6-N6I" id="CsQ-Il-Gks"/>
                 <outlet property="recordOrPlayBtn" destination="HN9-sq-vX5" id="9rc-A4-Ati"/>
+                <outlet property="recordOrPlayBtnRightConstraint" destination="oM9-dJ-WSc" id="3KB-m7-VTQ"/>
                 <outlet property="recordOrPlayBtnWidthConstraint" destination="C5h-0S-Dgv" id="mbD-wP-rg8"/>
                 <outlet property="richBtn" destination="f9D-yI-ehB" id="bjD-M5-icF"/>
                 <outlet property="richImageView" destination="taI-i1-CE8" id="pBZ-yJ-Bf8"/>

Modules/FUSUserCenterModule/FUSUserCenterModule/Router/FUSUserCenterRouter.m

@@ -879,4 +879,10 @@
     }];
 }
 
+- (void)fus_pushToVerifyVersionController{
+    FUSVerifyVersionController *vc = [[FUSVerifyVersionController alloc] init];
+    vc.hidesBottomBarWhenPushed = YES;
+    [[UIViewController fus_topViewController].navigationController pushViewController:vc animated:YES];
+}
+
 @end