Skip to content

pidan / FuSiLive

Go to a project
Commit 30c8b82d by ludi
Options

完成网页打开app跳转的适配，完成加入直播间欢迎语的适配

parent 5b83134d
Inline Side-by-side
Showing with 437 additions and 118 deletions
DevelopmentPods/FUSCommon/FUSCommon.podspec
......@@ -48,6 +48,7 @@ Pod::Spec.new do |s|
s.dependency 'RxCocoa'
s.dependency 'RxSwift'
s.dependency 'RxDataSources'
s.dependency 'SwiftyJSON', '~> 4.0'
s.prefix_header_contents = ['#import <FUSFoundation/FUSFoundation.h>', '#import <Bifrost/BifrostHeader.h>', '#import "FUSCommonBundle.h"', '#import "FUSCommonURLs.h"']
......
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/Models/FUSSettingConfigModel.h
......@@ -64,4 +64,23 @@ NS_ASSUME_NONNULL_BEGIN
@end
/// 获取平台开关限制
@interface FUSSwitchStintConfigModel : FUSBaseModel
/// 动态发送评论回复等级（-1：不限制）
@property (nonatomic, assign) NSInteger dynamicCommentLevelStint;
/// 发布动态按钮显示开关（0：不显示、1：显示）
@property (nonatomic, assign) BOOL dynamicSendShowSwitch;
/// 热门/最新/聊天；动态显示控制开关（0：不显示、1：显示）
@property (nonatomic, assign) BOOL dynamicEntranceShowSwitch;
/// 首页动态+号自动加载控制开关（0：不自动、1：自动）
@property (nonatomic, assign) BOOL dynamicAutoLoadingSwitch;
/// 连麦头像放大动效开关（0：不展示、1：展示）
@property (nonatomic, assign) BOOL micTakeFaceEffectSwitch;
/// 首页私房模块显示开关（0：不展示、1：展示）
@property (nonatomic, assign) BOOL oneToOneHomeShowSwitch;
@end
NS_ASSUME_NONNULL_END
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/Models/FUSSettingConfigModel.m
......@@ -17,3 +17,10 @@
}
@end
@implementation FUSSwitchStintConfigModel
@end
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/Other/FUSHandleEventHelper.swift 0 → 100644
//
// FUSHandleEventHelper.swift
// FUSCommon
//
// Created by aaa on 2025/6/27.
//
import UIKit
import RxSwift
import SwiftyJSON
@objcMembers public class FUSHandleEventHelper: FUSBaseModel {
enum FUSOutsideJumpAPPType: Int {
case PushLive = 0
case EnterRoom = 1
case EnterZone = 2
case Web = 3
case FansClub = 4
case Dynamic = 5
}
@objc static public let shared = FUSHandleEventHelper()
private let disposeBag = DisposeBag()
private var urlScheduleDisposeBag = DisposeBag()
private var calendarOpenReuseDisposeBag = DisposeBag()
@objc public func fus_oc_fus_handlerUrlOpenAppAction(url: NSURL) {
let swiftURL = url as URL
self.fus_handlerUrlOpenAppAction(url: swiftURL)
}
func fus_handlerUrlOpenAppAction(url:URL) {
if url.absoluteString.contains(String.calendar_openSchedule) {
if let components = URLComponents(url: url, resolvingAgainstBaseURL: false){
// 提取查询参数
if let queryItems = components.queryItems {
for queryItem in queryItems {
// 日历返回打开部分
if queryItem.name == String.calendar_openSchedule,
let queryItemValue = queryItem.value,
let jsonData = Data(base64Encoded: queryItemValue){
let dataJson = JSON(jsonData)
let type = dataJson["type"].intValue
// 上报由网页打开
let behaviorLog = dataJson["behaviorLog"]
let reqType = behaviorLog["reqType"].intValue
if reqType != 0 {
FUSDataStatisticsManager.fus_behaviorExternalCallLog(withReqType: reqType, reqEventType: -1, reqJson: behaviorLog.rawString(options: .sortedKeys) ?? "")
}
if type == 0 {
calendarOpenReuseDisposeBag = DisposeBag()
Observable<Int>.just(1).delay(.seconds(2), scheduler: MainScheduler.instance).subscribe(onNext: {_ in
FUSRouter.live().fus_pushLive()
}).disposed(by: calendarOpenReuseDisposeBag)
}else if type == 1 {
Observable.combineLatest(FUSSwiftCacheDataShare.share.isLogin,FUSSwiftCacheDataShare.share.switchStintConfig).delay(.seconds(1), scheduler: MainScheduler.instance).subscribe(onNext: {[weak self] isLogin, switchStintConfig in
if isLogin && switchStintConfig != nil {
let roomId = dataJson["roomId"].stringValue
FUSRouter.live().fus_enterLiveRoom(roomId)
let behaviorLog = dataJson["behaviorLog"]
let liveType = behaviorLog["liveType"].intValue
if liveType != 0 {
FUSDataStatisticsManager.fus_behaviorJoinRoomLog(withReqType: 5, reqEventType: liveType, extraInfo: "", extraJson: behaviorLog.rawString(options: .sortedKeys) ?? "", roomId: roomId)
}
self?.urlScheduleDisposeBag = DisposeBag()
}
}).disposed(by: urlScheduleDisposeBag)
}
}
}
}
}
} else if url.absoluteString.contains(String.openAppEventSchedule) {
if let components = URLComponents(url: url, resolvingAgainstBaseURL: false){
// 提取查询参数
if let queryItems = components.queryItems {
for queryItem in queryItems {
// 日历返回打开部分
if (queryItem.name == String.openAppEventSchedule),
let queryItemValue = queryItem.value,
let jsonData = Data(base64Encoded: queryItemValue) {
let dataJson = JSON(jsonData)
var data = dataJson["openData"]
if data.isEmpty {
data = dataJson
}
// 上报由网页打开
let behaviorLog = dataJson["behaviorLog"]
let reqType = behaviorLog["reqType"].intValue
if reqType != 0 {
FUSDataStatisticsManager.fus_behaviorExternalCallLog(withReqType: reqType, reqEventType: -1, reqJson: behaviorLog.rawString(options: .sortedKeys) ?? "")
}
Observable.combineLatest(FUSSwiftCacheDataShare.share.isLogin,FUSSwiftCacheDataShare.share.switchStintConfig).delay(.seconds(1), scheduler: MainScheduler.instance).subscribe(onNext: {[weak self] isLogin, switchStintConfig in
if isLogin && switchStintConfig != nil {
let type = FUSOutsideJumpAPPType(rawValue: dataJson["type"].intValue)
switch type {
case .PushLive:
FUSRouter.live().fus_pushLive()
case .EnterRoom:
let roomId = data["paramInfo"].stringValue
// Mediator.Live?.enterLiveRoom(roomId: roomId, behaviorSrc: "1")
FUSRouter.live().fus_enterLiveRoom(roomId)
let behaviorLog = dataJson["behaviorLog"]
let liveType = behaviorLog["liveType"].intValue
if liveType != 0 {
FUSDataStatisticsManager.fus_behaviorJoinRoomLog(withReqType: 5, reqEventType: liveType, extraInfo: "", extraJson: behaviorLog.rawString(options: .sortedKeys) ?? "", roomId: roomId)
}
case .EnterZone:
let uid = data["paramInfo"].stringValue
FUSRouter.userRouter().fus_enterUserZone(uid, isFromLiveRoomChat: false)
case .Web:
let webParams = data["paramInfo"].stringValue
// 这里之所以写死地址，是因为做一层防护，以防别人在我们APP内注入别的网页。所以通过写死的地址，由网页传参，网页端通过网页的传参决定要重定向到哪个地方
let url = (FUSConfig.sharedInstanced().devConfigs.devLevel == .release) ? FUSCommonWebURLs.fus_scheduleOpenUrlMiddlewareUrl() : FUSCommonWebURLs.fus_scheduleOpenUrlMiddlewareTestUrl()
let webVc = FUSWKWebViewController()
webVc.webUrlString = url + webParams
UIViewController.fus_top()?.navigationController?.pushViewController(webVc, animated: true)
case .FansClub:
// fusi 没有粉丝团
// let groupId = dataJson["data"].stringValue
// Mediator.PersonalPage?.showFansGroupHomeViewController(groupId: groupId)
break
case .Dynamic:
let topicId = dataJson["topicId"].stringValue
FUSRouter.userRouter().fus_showNewsFeedDetailVC(topicId)
case .none:
break
}
self?.urlScheduleDisposeBag = DisposeBag()
}
}).disposed(by: urlScheduleDisposeBag)
}
}
}
}
}
}
}
extension String {
/// 日历打开app的参数
static var calendar_openSchedule = "calendarSchedule"
/// 外链跳转到APP网页
static var openAppEventSchedule = "openAppEventSchedule"
}
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/View/ImageFallDownFromTopView/FUSImageFallDownFromTopView.m
......@@ -161,7 +161,7 @@
return;
}
[FUSRouter.liveRouter fus_enterLiveRoomWithModel:roomModel];
[FUSRouter.liveRouter fus_enterLiveRoomWithModel:roomModel behaviorSrc:@""];
break;
}
case 2: {
......
DevelopmentPods/FUSCommon/FUSCommon/Classes/FUSAPPConfigs/FUSFuSiWebViewEventHelper.m
......@@ -128,7 +128,17 @@ NSString * const kEVENT_RECHARGE_FIRST_RECHARGE_WINDOW_RECEIVE_OFFICIAL_RECAHARG
NSString *uid = [strArray objectAtIndex:1];
[FUSRouter.userRouter fus_enterUserZone:uid isFromLiveRoomChat:NO];
NSMutableDictionary *complexParams = [[NSMutableDictionary alloc] init];
NSRange range = [urlStr rangeOfString:@"\\$(.*?)\\$" options:NSRegularExpressionSearch];
if (range.location != NSNotFound) {
NSString *matched = [urlStr substringWithRange:range];
NSString *content = [matched stringByReplacingOccurrencesOfString:@"$" withString:@""];
if (content.length > 0) {
complexParams[FUSCommonExtraKeys.fus_KEY_zoneBehaviorSrc] = content;
}
}
[FUSRouter.userRouter fus_enterUserZone:uid isFromLiveRoomChat:NO extraParm:complexParams];
}
decisionHandler(WKNavigationActionPolicyCancel);
return;
......@@ -144,7 +154,7 @@ NSString * const kEVENT_RECHARGE_FIRST_RECHARGE_WINDOW_RECEIVE_OFFICIAL_RECAHARG
[FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_ROOM_ENTER_SOURCE label:@"" parameters:@{@"source":@"h5",
@"room_id":model.roomId
}];
[FUSRouter.liveRouter fus_enterLiveRoom:model.roomId];
[FUSRouter.liveRouter fus_enterLiveRoom:model.roomId behaviorSrc:@""];
}
decisionHandler(WKNavigationActionPolicyCancel);
return;
......
DevelopmentPods/FUSCommon/FUSCommon/Classes/Foundation/DataShare/FUSSwiftCacheDataShare.swift
......@@ -71,6 +71,11 @@ import RxSwift
@objc public var oc_backpackAllUnreadBadgeShow: Bool {
get{ FUSSwiftCacheDataShare.share.backpackAllUnreadBadgeShow.value }
}
/// OC 获取平台开关限制
@objc public var oc_switchStintConfig: FUSSwitchStintConfigModel? {
get { FUSSwiftCacheDataShare.share.switchStintConfig.value }
set { FUSSwiftCacheDataShare.share.switchStintConfig.accept(newValue) }
}
// - swift PART
/// 当前是否登录
......@@ -136,6 +141,8 @@ import RxSwift
public var oc_settingDataTemplateGetList: [String : Any] { FUSSwiftCacheDataShare.share.settingDataTemplateGetList.value }
/// 平台模版基础数据配置
public var settingDataTemplateGetList: BehaviorRelay<[String : Any]> = .init(value: .init())
/// 获取平台开关限制
public var switchStintConfig: BehaviorRelay<FUSSwitchStintConfigModel?> = .init(value: nil)
// - common part
......
DevelopmentPods/FUSCommon/FUSCommon/Classes/Foundation/Http/FUSCommonURLs.h
......@@ -72,6 +72,12 @@ NS_ASSUME_NONNULL_BEGIN
/// 我的族人地址
+(NSString *)fus_inviteMyClansmanUrl;
/// 正式服外链跳转中转页面
+(NSString *)fus_scheduleOpenUrlMiddlewareUrl;
/// 测试服外链跳转中转页面
+(NSString *)fus_scheduleOpenUrlMiddlewareTestUrl;
@end
@interface FUSCommonURLs : NSObject
......@@ -213,4 +219,11 @@ NS_ASSUME_NONNULL_BEGIN
@end
@interface FUSCommonExtraKeys: NSObject
/// 传到空间的BehaviorSrc
+(NSString *)fus_KEY_zoneBehaviorSrc;
@end
NS_ASSUME_NONNULL_END
DevelopmentPods/FUSCommon/FUSCommon/Classes/Foundation/Http/FUSCommonURLs.m
......@@ -104,6 +104,16 @@
return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/vestApp/newShare/inviteNum.html"];
}
/// 正式服外链跳转中转页面
+(NSString *)fus_scheduleOpenUrlMiddlewareUrl{
return @"https://events.yabolive.net/vestApp/middleware/index.html";
}
/// 测试服外链跳转中转页面
+(NSString *)fus_scheduleOpenUrlMiddlewareTestUrl{
return @"https://ceshi.yabolive.tv/vestApp/middleware/index.html";
}
@end
@implementation FUSCommonURLs
......@@ -332,3 +342,12 @@
}
@end
@implementation FUSCommonExtraKeys
/// 传到空间的BehaviorSrc
+ (NSString *)fus_KEY_zoneBehaviorSrc{
return @"fus_common_KEY_zoneBehaviorSrc";
}
@end
DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/LiveRouter/FUSLiveRouterProtocol.h
......@@ -58,7 +58,9 @@ NS_ASSUME_NONNULL_BEGIN
#pragma mark - Public Methods
- (void)fus_enterLiveRoom:(NSString *)roomId;
- (void)fus_enterLiveRoom:(NSString *)roomId behaviorSrc:(NSString *)behaviorSrc;
- (void)fus_enterLiveRoomWithModel:(FUSRoomInfoModel *)model;
- (void)fus_enterLiveRoomWithModel:(FUSRoomInfoModel *)model behaviorSrc:(NSString *)behaviorSrc;
/**
结束观看直播
*/
......
DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/UserRouter/FUSUserRouterProtocol.h
......@@ -39,6 +39,13 @@ NS_ASSUME_NONNULL_BEGIN
- (void)fus_enterUserZone:(NSString *)userId isFromLiveRoomChat:(BOOL)isFromLiveRoomChat;
/// 带有额外传参的进入空间
/// - Parameters:
/// - userId: 用户id
/// - isFromLiveRoomChat: 是否来自直播间
/// - extraParm: 额外参数,key参考FUSCommonExtraKeys类
- (void)fus_enterUserZone:(NSString *)userId isFromLiveRoomChat:(BOOL)isFromLiveRoomChat extraParm:(NSDictionary *)extraParm;
- (void)fus_enterMotorWareVC;
/// 进入任务中心
......
FuSiLive.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -12,7 +12,7 @@
<key>NotificationService.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>82</integer>
<integer>86</integer>
</dict>
</dict>
</dict>
......
FuSiLive/AppDelegate.m
......@@ -14,6 +14,7 @@
#import <FirebaseAnalytics/FirebaseAnalytics.h>
#import <FUSCommon/FUSCommonURLs.h>
#import <FUSFoundation/FUSFoundation.h>
#import <FUSCommon/FUSCommon-Swift.h>
static NSString *const kGtAppId = @"2ecfODySFs8GlqYu7H2hW9";
static NSString *const kGtAppKey = @"tjOur8OKTU7srFHoA0lB91";
......@@ -127,6 +128,15 @@ static NSString *const kGtAppSecret = @"OSSSWqbWY0ACJiUv4AHdW7";
return YES;
}
NSString *sourceApplication = options[UIApplicationOpenURLOptionsSourceApplicationKey];
if ([sourceApplication isEqualToString:@"com.apple.AppStore"]) {
// 应用是从 App Store 通过 URL Scheme 打开的
[FUSDataStatisticsManager fus_behaviorExternalCallLogWithReqType:4 reqEventType:1 reqJson:@""];
}
// 网页跳转
[[FUSHandleEventHelper shared] fus_oc_fus_handlerUrlOpenAppActionWithUrl:url];
return YES;
}
......@@ -161,6 +171,12 @@ static NSString *const kGtAppSecret = @"OSSSWqbWY0ACJiUv4AHdW7";
- (BOOL)application:(UIApplication *)app continueUserActivity:(nonnull NSUserActivity *)userActivity restorationHandler:(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler {
//其他代码
if (userActivity.activityType == NSUserActivityTypeBrowsingWeb) {
NSURL *url = userActivity.webpageURL;
if (url != nil) {
[[FUSHandleEventHelper shared] fus_oc_fus_handlerUrlOpenAppActionWithUrl:url];
}
}
return YES;
}
......@@ -259,6 +275,7 @@ static NSString *const kGtAppSecret = @"OSSSWqbWY0ACJiUv4AHdW7";
if (jsonError == nil) {
jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
}
[FUSDataStatisticsManager fus_behaviorExternalCallLogWithReqType:5 reqEventType:-1 reqJson:jsonString];
[self startJumpIntoPage:transmissionContent logExtraJson:jsonString];
}
......
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,12 +7,12 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>84</integer>
<integer>89</integer>
</dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>87</integer>
<integer>88</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>83</integer>
<integer>84</integer>
</dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/FUSHomeView.m
......@@ -190,7 +190,7 @@
[FUSLiveHelper shareInstance].rooms = self.viewModel.onlyLiveRoomList;
}
[FUSLiveHelper fus_playLiveWithRoomInfoModel:model success:nil failure:nil];
[FUSLiveHelper fus_playLiveWithRoomInfoModel:model behaviorSrc:@"" success:nil failure:nil];
[FUSDataStatisticsManager fus_behaviorJoinRoomLogWithReqType:1 reqEventType:-1 extraInfo:@"" extraJson:@"" roomId:anchor.roomId];
}
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/Main/View/Other/FUSBaoFangBroadcastView.m
......@@ -104,7 +104,7 @@
if (roomModel.roomId.intValue == 0) {
return;
}
[FUSLiveHelper fus_playLiveWithRoomInfoModel:roomModel success:nil failure:nil];
[FUSLiveHelper fus_playLiveWithRoomInfoModel:roomModel behaviorSrc:@"" success:nil failure:nil];
} else if (self.model.clickType == 2) {
// 跳转到空间
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/OpenScreenPush/Other/FUSOpenScreenPushHelp.m
......@@ -181,7 +181,7 @@ typedef NS_ENUM(NSUInteger,JumpType) {
if (roomModel.roomId.integerValue == [FUSCacheDataShare shareStore].userDetailInfo.uid.integerValue) {
[FUSLiveHelper fus_pushLive];
} else {
[FUSLiveHelper fus_playLiveWithRoomInfoModel:roomModel success:nil failure:nil];
[FUSLiveHelper fus_playLiveWithRoomInfoModel:roomModel behaviorSrc:@"" success:nil failure:nil];
}
// Firebase 统计
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Controller/FUSLiveMainViewController.m
......@@ -691,7 +691,7 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
[self.liveFunctionView.chatTableView fus_addEnterRoomSystemTipMessage];
[FUSLiveHttpHelper fus_enterRoomWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId vdoid:[FUSLiveHelper shareInstance].streamModel.vdoid password:@"" success:^(FUSRoomInfoModel *roomInfoModel,BOOL micMode, NSString *streamUrl, NSString *pkInfo) {
[FUSLiveHttpHelper fus_enterRoomWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId vdoid:[FUSLiveHelper shareInstance].streamModel.vdoid behaviorSrc:@"" password:@"" success:^(FUSRoomInfoModel *roomInfoModel,BOOL micMode, NSString *streamUrl, NSString *pkInfo) {
if (![roomInfoModel.roomId isEqualToString:[FUSLiveHelper shareInstance].roomInfoModel.roomId]) {
FUSLogInfo(@"不是当前包房");
......@@ -2119,7 +2119,7 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
if (_scrollView.offsetY == 0) {
_scrollView.offsetY = UIView.fus_screenH;
FUSRoomInfoModel *model = [FUSLiveHelper preRoomInfoModel];
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:model success:nil failure:nil];
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:model behaviorSrc:@"" success:nil failure:nil];
[self fus_setupScrollEnable:NO];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(.6 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self fus_setupScrollEnable:YES];
......@@ -2129,7 +2129,7 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
if (_scrollView.offsetY == (UIView.fus_screenH * 2)) {
_scrollView.offsetY = UIView.fus_screenH;
FUSRoomInfoModel *model = [FUSLiveHelper nextRoomInfoModel];
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:model success:nil failure:nil];
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:model behaviorSrc:@"" success:nil failure:nil];
[self fus_setupScrollEnable:NO];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(.6 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self fus_setupScrollEnable:YES];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHelper.h
......@@ -252,6 +252,7 @@ typedef NS_ENUM(NSInteger,FUSLiveRoomScopeType) {
@param roomInfoModel 包房信息model
*/
+ (void)fus_playLiveWithRoomInfoModel:(FUSRoomInfoModel *_Nullable)roomInfoModel
behaviorSrc:(NSString * _Nullable )behaviorSrc
success:(void(^_Nullable)(void))success
failure:(void(^_Nullable)(void))failure;
......@@ -275,6 +276,7 @@ typedef NS_ENUM(NSInteger,FUSLiveRoomScopeType) {
@param roomInfoModel 包房信息model
*/
- (void)fus_switchRoomWithRoomInfoModel:(nonnull FUSRoomInfoModel *)roomInfoModel
behaviorSrc:(NSString * _Nullable )behaviorSrc
success:(void(^_Nullable)(void))success
failure:(void(^_Nullable)(void))failure;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHelper.m
......@@ -377,7 +377,7 @@
roomModel.roomType = @"2";
roomModel.roomId = [FUSCacheDataShare shareStore].userDetailInfo.uid;
roomModel.faceimg = roomModel.face = [FUSCacheDataShare shareStore].userDetailInfo.face;
[FUSLiveHelper fus_playLiveWithRoomInfoModel:roomModel success:^{
[FUSLiveHelper fus_playLiveWithRoomInfoModel:roomModel behaviorSrc:@"" success:^{
FUSLogDebug(@"");
} failure:^{
FUSLogDebug(@"");
......@@ -695,7 +695,7 @@
@param roomInfoModel 包房信息model
*/
+ (void)fus_playLiveWithRoomInfoModel:(FUSRoomInfoModel *)roomInfoModel success:(void (^)(void))success failure:(void (^)(void))failure {
+ (void)fus_playLiveWithRoomInfoModel:(FUSRoomInfoModel *)roomInfoModel behaviorSrc:(NSString *)behaviorSrc success:(void (^)(void))success failure:(void (^)(void))failure {
if ([NSString isNull:roomInfoModel.roomId]) {
return;
......@@ -707,7 +707,7 @@
[[FUSLiveHelper shareInstance] fus_insertModel:roomInfoModel];
}
if ([[[FUSLiveHelper shareInstance] roomInfoModel] roomId] != roomInfoModel.roomId) {
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:roomInfoModel success:success failure:failure];
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:roomInfoModel behaviorSrc:behaviorSrc success:success failure:failure];
} else {
if ([UIViewController fus_topViewController] != [[FUSLiveHelper shareInstance] fus_getTargetViewController]) {
[[UIViewController fus_topViewController].navigationController popToRootViewControllerAnimated:YES];
......@@ -726,7 +726,7 @@
} else if ([FUSLiveHelper shareInstance].liveVC) {
[FUSLoadingView fus_showProgressViewWithMessage:@""];
[[FUSLiveHelper shareInstance].currentFunctionView fus_exitKeepLinkMicRoom:^(BOOL succeed) {
[self fus_playLiveWithRoomInfoModel:roomInfoModel success:success failure:failure];
[self fus_playLiveWithRoomInfoModel:roomInfoModel behaviorSrc:behaviorSrc success:success failure:failure];
[FUSLoadingView fus_dismissProgressView];
}];
return;
......@@ -751,7 +751,7 @@
if (buttonIndex == 1) {
[FUSRouter.chatRouter fus_initiativeHandUpConversation];
[FUSLiveHelper fus_playLiveWithRoomInfoModel:roomInfoModel success:success failure:failure];
[FUSLiveHelper fus_playLiveWithRoomInfoModel:roomInfoModel behaviorSrc:behaviorSrc success:success failure:failure];
}
}];
return;
......@@ -803,12 +803,12 @@
[[[FUSLiveHelper shareInstance] liveVC] initLiveFunctionView];
[self fus_showLiveMainVCAnimation:YES Completion:^{
[[[FUSLiveHelper shareInstance] liveVC] fus_showLiveLoadingViewWithType:liveLoadingEntering];
[[FUSLiveHelper shareInstance] fus_audienceJoinRoomWithStreamUrl:roomInfoModel.publishUrl roomId:roomInfoModel.roomId];
[[FUSLiveHelper shareInstance] fus_audienceJoinRoomWithStreamUrl:roomInfoModel.publishUrl roomId:roomInfoModel.roomId behaviorSrc:behaviorSrc];
}];
}
// 进入包房错误消息处理
- (void)joinRoomFailuerWithErrorDict:(NSDictionary *)errorDict code:(int)code msg:(NSString *)msg currentRoomId:(NSString *)currentRoomId password:(NSString *)password {
- (void)joinRoomFailuerWithErrorDict:(NSDictionary *)errorDict code:(int)code msg:(NSString *)msg currentRoomId:(NSString *)currentRoomId password:(NSString *)password behaviorSrc:(NSString *)behaviorSrc{
[[[FUSLiveHelper shareInstance] liveVC] fus_showLiveLoadingViewWithType:liveLoadingDismiss];
[[[FUSLiveHelper shareInstance]liveVC] fus_stopPlay];
......@@ -869,7 +869,7 @@
[FUSAlertView showAlertWithTitle:nil message:msg cancelButtonTitle:nil otherButtonTitles:@[[NSString fus_localString:@"确定"], [NSString fus_localString:@"退出"]] clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 0) {
[self fus_audienceJoinRoomWithRoomId:currentRoomId password:password];
[self fus_audienceJoinRoomWithRoomId:currentRoomId password:password behaviorSrc:behaviorSrc];
}else{
[FUSLiveHelper fus_quitLiveWithCompletion:nil];
}
......@@ -1100,7 +1100,7 @@
切换包房
*/
- (void)fus_switchRoomWithRoomInfoModel:(FUSRoomInfoModel *)model success:(void (^ _Nullable)(void))success failure:(void (^ _Nullable)(void))failure{
- (void)fus_switchRoomWithRoomInfoModel:(FUSRoomInfoModel *)model behaviorSrc:(NSString * _Nullable )behaviorSrc success:(void (^ _Nullable)(void))success failure:(void (^ _Nullable)(void))failure{
self.hiddenBackgroundImage = NO;
// 空值校验
......@@ -1150,7 +1150,7 @@
}
// 用户加入新直播间
[self fus_audienceJoinRoomWithStreamUrl:model.publishUrl roomId:model.roomId];
[self fus_audienceJoinRoomWithStreamUrl:model.publishUrl roomId:model.roomId behaviorSrc:behaviorSrc];
if ([FUSLiveHelper shareInstance].liveMinimizeView) {
[[FUSLiveHelper shareInstance].currentFunctionView fus_maximizeRoom];
......@@ -1206,7 +1206,7 @@
2. 调用 JoinRoom 接口
*/
- (void)fus_audienceJoinRoomWithStreamUrl:(NSString *)originalStreamUrl roomId:(NSString *)currentRoomId
- (void)fus_audienceJoinRoomWithStreamUrl:(NSString *)originalStreamUrl roomId:(NSString *)currentRoomId behaviorSrc:(NSString *)behaviorSrc
{
__weak typeof(self) weakSelf = self;
[FUSLiveHttpHelper fus_enterRoomGetPredataWithRoomId:currentRoomId success:^(NSDictionary *dataDict) {
......@@ -1252,7 +1252,7 @@
self.roomInfoModel.reminderKeys = reminderKey;
[self.currentFunctionView.chatTableView fus_addEnterRoomSystemTipMessage];
[self fus_audienceJoinRoomWithRoomId:currentRoomId password:password];
[self fus_audienceJoinRoomWithRoomId:currentRoomId password:password behaviorSrc:behaviorSrc];
}
}];
......@@ -1262,7 +1262,7 @@
self.roomInfoModel.reminderKeys = reminderKey;
[self.currentFunctionView.chatTableView fus_addEnterRoomSystemTipMessage];
[self fus_audienceJoinRoomWithRoomId:currentRoomId password:@""];
[self fus_audienceJoinRoomWithRoomId:currentRoomId password:@"" behaviorSrc:behaviorSrc];
}
......@@ -1273,7 +1273,7 @@
return;
}
[weakSelf joinRoomFailuerWithErrorDict:errorDict code:code msg:msg currentRoomId:currentRoomId password:@""];
[weakSelf joinRoomFailuerWithErrorDict:errorDict code:code msg:msg currentRoomId:currentRoomId password:@"" behaviorSrc:behaviorSrc];
}];
}
......@@ -1283,11 +1283,11 @@
2. 调用 JoinRoom 接口
*/
- (void)fus_audienceJoinRoomWithRoomId:(NSString *)currentRoomId password:(NSString *)password {
- (void)fus_audienceJoinRoomWithRoomId:(NSString *)currentRoomId password:(NSString *)password behaviorSrc:(NSString *)behaviorSrc{
__weak typeof(self) weakSelf = self;
[FUSLiveHttpHelper fus_enterRoomWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId vdoid:[FUSLiveHelper shareInstance].streamModel.vdoid password:password ?: @"" success:^(FUSRoomInfoModel *roomInfoModel,BOOL micMode, NSString *streamUrl, NSString *pkInfo) {
[FUSLiveHttpHelper fus_enterRoomWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId vdoid:[FUSLiveHelper shareInstance].streamModel.vdoid behaviorSrc:behaviorSrc password:password ?: @"" success:^(FUSRoomInfoModel *roomInfoModel,BOOL micMode, NSString *streamUrl, NSString *pkInfo) {
if (![roomInfoModel.roomId isEqualToString:[FUSLiveHelper shareInstance].roomInfoModel.roomId]) {
FUSLogInfo(@"不是当前包房");
......@@ -1396,7 +1396,7 @@
FUSLogInfo(@"不是当前包房");
return;
}
[weakSelf joinRoomFailuerWithErrorDict:errorDict code:code msg:msg currentRoomId:currentRoomId password:password];
[weakSelf joinRoomFailuerWithErrorDict:errorDict code:code msg:msg currentRoomId:currentRoomId password:password behaviorSrc:behaviorSrc];
}];
}
......@@ -1405,7 +1405,7 @@
[FUSAlertView showAlertWithTitle:nil message:[NSString fus_localString:@"网络出错，是否重新进入包房？"] cancelButtonTitle:nil otherButtonTitles:@[[NSString fus_localString:@"确定"], [NSString fus_localString:@"退出"]] clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 0) {
[self fus_audienceJoinRoomWithStreamUrl:self.roomInfoModel.publishUrl roomId:self.roomInfoModel.roomId];
[self fus_audienceJoinRoomWithStreamUrl:self.roomInfoModel.publishUrl roomId:self.roomInfoModel.roomId behaviorSrc:@""];
}else{
[FUSLiveHelper fus_quitLiveWithCompletion:nil];
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHttpHelper.h
......@@ -101,6 +101,7 @@ NS_ASSUME_NONNULL_BEGIN
*/
+ (void)fus_enterRoomWithRoomId:(NSString *)roomId
vdoid:(NSString *)vdoid
behaviorSrc:(NSString *)behaviorSrc
password:(NSString *)password
success:(void(^)(FUSRoomInfoModel *roomInfoModel, BOOL micMode,NSString *streamUrl, NSString *pkInfo))success
failure:(void(^)(NSDictionary *errorDict, NSString *msg, int code))failure;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHttpHelper.m
......@@ -412,6 +412,7 @@
*/
+ (void)fus_enterRoomWithRoomId:(NSString *)roomId
vdoid:(NSString *)vdoid
behaviorSrc:(NSString *)behaviorSrc
password:(NSString *)password
success:(void(^)(FUSRoomInfoModel *roomInfoModel, BOOL micMode, NSString *streamUrl, NSString *pkInfo))success
failure:(void(^)(NSDictionary *errorDict, NSString *msg, int code))failure
......@@ -428,10 +429,14 @@
vdoid = @"";
}
NSDictionary *params = @{@"roomid":roomId,
NSMutableDictionary *params = [[NSMutableDictionary alloc] initWithDictionary:@{@"roomid":roomId,
@"vdoid":vdoid,
@"password":password
};
}];
if (behaviorSrc != nil && behaviorSrc.length > 0) {
params[@"behaviorSrc"] = behaviorSrc;
}
[FUSHttpHelper postRequestBinaryWithUrl:FUSShowRoomURLs.fus_URL_LIVE_ENTER_ROOM params:params success:^(NSDictionary *dataDict, int code) {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/EndView/FUSVideoEndedView.m
......@@ -164,7 +164,7 @@
FUSRoomInfoModel *roomInfoModel = [FUSRoomInfoModel modelWithDictionary:[anchorModel fus_getDictionary]];
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:roomInfoModel success:nil failure:nil];
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:roomInfoModel behaviorSrc:@"" success:nil failure:nil];
}
#pragma mark - UICollectionViewDelegateFlowLayout
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSBulletsView/FUSBulletMessageGlobalView.m
......@@ -190,7 +190,7 @@
FUSRoomInfoModel *roomModel = [[FUSRoomInfoModel alloc]init];
roomModel.roomId = self.currentModel.toUid;
roomModel.face = self.currentModel.toFace;
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:roomModel success:nil failure:nil];
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:roomModel behaviorSrc:@"" success:nil failure:nil];
[FUSLiveHttpHelper fus_requestJumpToRoomStatFlowDataWithToRoomId:currentModel.toUid key:currentModel.keyId keySort:currentModel.keySort source:1 success:nil failure:nil];
[FUSDataStatisticsManager fus_behaviorJoinRoomLogWithReqType:7 reqEventType:[currentModel.msgType.description isEqualToString:@"1"] ? 2 : 1 extraInfo:@"" extraJson:@"" roomId:roomModel.roomId];
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSBulletsView/FUSBulletMessageNormalView.m
......@@ -139,7 +139,7 @@
FUSRoomInfoModel *roomModel = [[FUSRoomInfoModel alloc]init];
roomModel.roomId = self.currentModel.toUid;
roomModel.face = self.currentModel.toFace;
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:roomModel success:nil failure:nil];
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:roomModel behaviorSrc:@"" success:nil failure:nil];
[FUSLiveHttpHelper fus_requestJumpToRoomStatFlowDataWithToRoomId:currentModel.toUid key:currentModel.keyId keySort:currentModel.keySort source:1 success:nil failure:nil];
[FUSDataStatisticsManager fus_behaviorJoinRoomLogWithReqType:7 reqEventType:[currentModel.msgType.description isEqualToString:@"1"] ? 2 : 1 extraInfo:@"" extraJson:@"" roomId:roomModel.roomId];
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSBulletsView/FUSBulletMessageSystemView.m
......@@ -139,7 +139,7 @@
FUSRoomInfoModel *roomModel = [[FUSRoomInfoModel alloc]init];
roomModel.roomId = self.currentModel.toUid;
roomModel.face = self.currentModel.toFace;
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:roomModel success:nil failure:nil];
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:roomModel behaviorSrc:@"" success:nil failure:nil];
[FUSLiveHttpHelper fus_requestJumpToRoomStatFlowDataWithToRoomId:currentModel.toUid key:currentModel.keyId keySort:currentModel.keySort source:1 success:nil failure:nil];
[FUSDataStatisticsManager fus_behaviorJoinRoomLogWithReqType:7 reqEventType:[currentModel.msgType.description isEqualToString:@"1"] ? 2 : 1 extraInfo:@"" extraJson:@"" roomId:roomModel.roomId];
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
......@@ -937,7 +937,7 @@ BDAlphaPlayerMetalViewDelegate
FUSRoomInfoModel *roomModel = [[FUSRoomInfoModel alloc]init];
roomModel.roomId = model.toUid;
roomModel.face = model.toFace;
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:roomModel success:nil failure:nil];
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:roomModel behaviorSrc:@"" success:nil failure:nil];
[FUSLiveHttpHelper fus_requestJumpToRoomStatFlowDataWithToRoomId:model.toUid key:model.keyId keySort:model.keySort source:2 success:nil failure:nil];
[FUSDataStatisticsManager fus_behaviorJoinRoomLogWithReqType:7 reqEventType:[model.msgType.description isEqualToString:@"1"] ? 2 : 1 extraInfo:@"" extraJson:@"" roomId:roomModel.roomId];
}
......@@ -1224,7 +1224,7 @@ BDAlphaPlayerMetalViewDelegate
FUSRoomInfoModel *roomModel = [[FUSRoomInfoModel alloc]init];
roomModel.roomId = model.toUid;
roomModel.face = model.toFace;
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:roomModel success:nil failure:nil];
[[FUSLiveHelper shareInstance] fus_switchRoomWithRoomInfoModel:roomModel behaviorSrc:@"" success:nil failure:nil];
[FUSLiveHttpHelper fus_requestJumpToRoomStatFlowDataWithToRoomId:model.toUid key:model.keyId keySort:model.keySort source:2 success:nil failure:nil];
[FUSDataStatisticsManager fus_behaviorJoinRoomLogWithReqType:7 reqEventType:[model.msgType.description isEqualToString:@"1"] ? 2 : 1 extraInfo:@"" extraJson:@"" roomId:roomModel.roomId];
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Router/FUSShowRoomRouter.m
......@@ -135,8 +135,12 @@
}
- (void)fus_enterLiveRoomWithModel:(FUSRoomInfoModel *)roomModel {
[FUSLiveHelper fus_playLiveWithRoomInfoModel:roomModel success:nil failure:nil];
- (void)fus_enterLiveRoomWithModel:(FUSRoomInfoModel *)roomModel{
[self fus_enterLiveRoomWithModel:roomModel behaviorSrc:@""];
}
- (void)fus_enterLiveRoomWithModel:(FUSRoomInfoModel *)roomModel behaviorSrc:(nonnull NSString *)behaviorSrc {
[FUSLiveHelper fus_playLiveWithRoomInfoModel:roomModel behaviorSrc:behaviorSrc success:nil failure:nil];
}
/// 发送弹幕
......@@ -181,10 +185,13 @@
}
#pragma mark - Public Methods
- (void)fus_enterLiveRoom:(NSString *)roomId {
- (void)fus_enterLiveRoom:(NSString *)roomId{
[self fus_enterLiveRoom:roomId behaviorSrc:@""];
}
- (void)fus_enterLiveRoom:(NSString *)roomId behaviorSrc:(nonnull NSString *)behaviorSrc{
FUSRoomInfoModel *roomModel = [[FUSRoomInfoModel alloc]init];
roomModel.roomId = roomId;
[FUSLiveHelper fus_playLiveWithRoomInfoModel:roomModel success:nil failure:nil];
[FUSLiveHelper fus_playLiveWithRoomInfoModel:roomModel behaviorSrc:behaviorSrc success:nil failure:nil];
}
/**
......@@ -267,7 +274,7 @@
[FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_ROOM_ENTER_SOURCE label:@"" parameters:@{@"source":@"push",
@"room_id":model.roomId
}];
[FUSLiveHelper fus_playLiveWithRoomInfoModel:model success:nil failure:nil];
[FUSLiveHelper fus_playLiveWithRoomInfoModel:model behaviorSrc:@"" success:nil failure:nil];
[FUSLiveHelper shareInstance].pushUID = nil;
// Firebase 统计
[FIRAnalytics logEventWithName:@"enterroom" parameters:@{@"source":@"other",
......@@ -365,7 +372,7 @@
FUSRoomInfoModel *roomModel = [FUSRoomInfoModel new];
roomModel.roomType = @"2";
roomModel.roomId = [FUSCacheDataShare shareStore].userDetailInfo.uid;
[FUSLiveHelper fus_playLiveWithRoomInfoModel:roomModel success:^{
[FUSLiveHelper fus_playLiveWithRoomInfoModel:roomModel behaviorSrc:@"" success:^{
FUSLogDebug(@"");
} failure:^{
FUSLogDebug(@"");
......
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,12 +7,12 @@
<key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>89</integer>
<integer>83</integer>
</dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>86</integer>
<integer>87</integer>
</dict>
</dict>
</dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/Controller/FUSNewsFeedDetailViewController.m
......@@ -1255,6 +1255,7 @@
FUSMyZoneViewController *zoneViewCtrl = [[FUSMyZoneViewController alloc] init];
zoneViewCtrl.isFromLiveRoomChat = NO;
zoneViewCtrl.zoneUid = zoneId;
zoneViewCtrl.behaviorSrc = 4;
[[[UIViewController fus_topViewController] navigationController] pushViewController:zoneViewCtrl animated:YES];
// [self fus_hideKeyboard];
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/Other/FUSNewsFeedHttpHelper.m
......@@ -17,6 +17,8 @@
#import "FUSNewsFeedLikeModel.h"
#import "FUSNewsFeedDetailViewController.h"
#import <FUSCommon/FUSCommon-Swift.h>
#import <FUSCommon/FUSSettingConfigModel.h>
@implementation FUSNewsFeedHttpHelper
......@@ -30,6 +32,8 @@
BOOL dynamicAutoLoadingSwitch = [dataDict[@"dynamicAutoLoadingSwitch"] boolValue];
BOOL enlargeFaceSwitch = [dataDict[@"micTakeFaceEffectSwitch"] boolValue];
[FUSSwiftCacheDataShare share].oc_switchStintConfig = [FUSSwitchStintConfigModel fus_modelWithDict:dataDict];
[[NSUserDefaults standardUserDefaults] setObject:@(enlargeFaceSwitch) forKey:FUSLiveUDKeys.fus_LIVE_LINKMIC_FACE_ENLARGE_SWITCH];
[[NSUserDefaults standardUserDefaults] setObject:@(dynamicCommentLevelStint) forKey:FUSUserUDKeys.fus_DYNAMIC_COMMENT_LEVEL_STINT];
[[NSUserDefaults standardUserDefaults] setObject:@(dynamicSendShowSwitch) forKey:FUSUserUDKeys.fus_DYNAMIC_SEND_SHOW_SWITCH];
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/Controller/FireFlyMyZone/FUSMyZoneViewController.h
......@@ -15,4 +15,7 @@
@property (nonatomic,assign) BOOL needShowUserInfoCard;
/// 行为来源 1：分享加入 2：榜单加入 3：俱乐部加入 4：贴文加入
@property (nonatomic, copy) NSString *behaviorSrc;
@end
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/Controller/FireFlyMyZone/FUSMyZoneViewController.m
......@@ -582,7 +582,7 @@
roomInfoModel.roomId = _zoneModel.uid;
roomInfoModel.publishUrl = _zoneModel.streamUrl;
[FUSRouter.liveRouter fus_enterLiveRoomWithModel:roomInfoModel];
[FUSRouter.liveRouter fus_enterLiveRoomWithModel:roomInfoModel behaviorSrc:self.behaviorSrc ?: @""];
// Firebase 统计
[FIRAnalytics logEventWithName:@"enterroom" parameters:@{@"source":@"homepage",
@"useruid":[FUSCacheDataShare shareStore].userDetailInfo.uid,
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Router/FUSUserCenterRouter.m
......@@ -179,10 +179,21 @@
- (void)fus_enterUserZone:(NSString *)userId isFromLiveRoomChat:(BOOL)isFromLiveRoomChat {
[self fus_enterUserZone:userId isFromLiveRoomChat:isFromLiveRoomChat extraParm:@{}];
}
- (void)fus_enterUserZone:(NSString *)userId isFromLiveRoomChat:(BOOL)isFromLiveRoomChat extraParm:(NSDictionary *)extraParm{
FUSMyZoneViewController *zoneViewCtrl = [[FUSMyZoneViewController alloc] init];
zoneViewCtrl.isFromLiveRoomChat = isFromLiveRoomChat;
zoneViewCtrl.zoneUid = userId;
if (extraParm != nil && extraParm.allKeys.count > 0) {
NSString *behaviorSrc = extraParm[FUSCommonExtraKeys.fus_KEY_zoneBehaviorSrc];
if (behaviorSrc != nil && behaviorSrc.length > 0) {
zoneViewCtrl.behaviorSrc = behaviorSrc;
}
}
[[[UIViewController fus_topViewController] navigationController] pushViewController:zoneViewCtrl animated:YES];
}
......
Podfile.lock
......@@ -83,6 +83,7 @@ PODS:
- RxCocoa
- RxDataSources
- RxSwift
- SwiftyJSON (~> 4.0)
- TenjinSDK
- FUSFoundation (1.0.0):
- AFNetworking
......@@ -398,7 +399,7 @@ SPEC CHECKSUMS:
FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd
FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
FUSBDAlphaPlayer: 21eeb719a640eea5b40d340b340acc1e5e276509
FUSCommon: ec4a2d9032a1d12387f6094a67a0783f1d831f41
FUSCommon: 83cfb6e868d4036569abe0e6f5bcb3f1d14e3126
FUSFoundation: f64e8ce77cd42b74fe676fc1910f3c5d5af8b934
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342
......
Pods/Local Podspecs/FUSCommon.podspec.json
......@@ -55,7 +55,10 @@
],
"RxCocoa": [],
"RxSwift": [],
"RxDataSources": []
"RxDataSources": [],
"SwiftyJSON": [
"~> 4.0"
]
},
"prefix_header_contents": [
"#import <FUSFoundation/FUSFoundation.h>",
......
Pods/Manifest.lock
......@@ -83,6 +83,7 @@ PODS:
- RxCocoa
- RxDataSources
- RxSwift
- SwiftyJSON (~> 4.0)
- TenjinSDK
- FUSFoundation (1.0.0):
- AFNetworking
......@@ -398,7 +399,7 @@ SPEC CHECKSUMS:
FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd
FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
FUSBDAlphaPlayer: 21eeb719a640eea5b40d340b340acc1e5e276509
FUSCommon: ec4a2d9032a1d12387f6094a67a0783f1d831f41
FUSCommon: 83cfb6e868d4036569abe0e6f5bcb3f1d14e3126
FUSFoundation: f64e8ce77cd42b74fe676fc1910f3c5d5af8b934
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342
......
Pods/Pods.xcodeproj/project.pbxproj
This source diff could not be displayed because it is too large. You can view the blob instead.
Pods/Pods.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -109,43 +109,47 @@
<key>orderHint</key>
<integer>19</integer>
</dict>
<key>FUSBDAlphaPlayer-BDAlphaPlayer.xcscheme_^#shared#^_</key>
<key>FUSBDAlphaPlayer-BDAlphaPlayer.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>88</integer>
<integer>21</integer>
</dict>
<key>FUSBDAlphaPlayer.xcscheme_^#shared#^_</key>
<key>FUSBDAlphaPlayer.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>81</integer>
<integer>20</integer>
</dict>
<key>FUSCommon-FUSCommonBundle.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>21</integer>
<integer>23</integer>
</dict>
<key>FUSCommon.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>20</integer>
<integer>22</integer>
</dict>
<key>FUSFoundation-FUSFoundationBundle.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>23</integer>
<integer>25</integer>
</dict>
<key>FUSFoundation.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>22</integer>
<integer>24</integer>
</dict>
<key>FirebaseAnalytics.xcscheme</key>
<dict>
......@@ -180,399 +184,399 @@
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>24</integer>
<integer>26</integer>
</dict>
<key>GTCommonSDK.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>31</integer>
<integer>33</integer>
</dict>
<key>GTExtensionSDK.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>32</integer>
<integer>34</integer>
</dict>
<key>GTMAppAuth.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>33</integer>
<integer>35</integer>
</dict>
<key>GTMSessionFetcher.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>34</integer>
<integer>36</integer>
</dict>
<key>GTSDK.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>35</integer>
<integer>37</integer>
</dict>
<key>GoogleAppMeasurement.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>25</integer>
<integer>27</integer>
</dict>
<key>GoogleDataTransport-GoogleDataTransport_Privacy.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>27</integer>
<integer>29</integer>
</dict>
<key>GoogleDataTransport.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>26</integer>
<integer>28</integer>
</dict>
<key>GoogleSignIn.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>28</integer>
<integer>30</integer>
</dict>
<key>GoogleUtilities-GoogleUtilities_Privacy.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>30</integer>
<integer>32</integer>
</dict>
<key>GoogleUtilities.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>29</integer>
<integer>31</integer>
</dict>
<key>HWPanModal.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>36</integer>
<integer>38</integer>
</dict>
<key>HyphenateChat.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>37</integer>
<integer>39</integer>
</dict>
<key>LineSDKSwift-LineSDK.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>40</integer>
<integer>42</integer>
</dict>
<key>LineSDKSwift.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>39</integer>
<integer>41</integer>
</dict>
<key>M80AttributedLabel.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>41</integer>
<integer>43</integer>
</dict>
<key>MBProgressHUD.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>43</integer>
<integer>45</integer>
</dict>
<key>MGSwipeTableCell.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>44</integer>
<integer>46</integer>
</dict>
<key>MJRefresh.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>45</integer>
<integer>47</integer>
</dict>
<key>MMDrawerController.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>46</integer>
<integer>48</integer>
</dict>
<key>MOBFoundation.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>50</integer>
<integer>52</integer>
</dict>
<key>Masonry.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>42</integer>
<integer>44</integer>
</dict>
<key>Pods-FUSChatCenterModule.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>52</integer>
<integer>54</integer>
</dict>
<key>Pods-FUSShowRoomModule.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>54</integer>
<integer>56</integer>
</dict>
<key>Pods-FUSUserCenterModule.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>55</integer>
<integer>57</integer>
</dict>
<key>Pods-FuSiLive.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>53</integer>
<integer>55</integer>
</dict>
<key>Pods-NotificationService.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>56</integer>
<integer>58</integer>
</dict>
<key>PromisesObjC-FBLPromises_Privacy.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>58</integer>
<integer>60</integer>
</dict>
<key>PromisesObjC.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>57</integer>
<integer>59</integer>
</dict>
<key>RMStore.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>61</integer>
<integer>63</integer>
</dict>
<key>RangersAppLog-RangersAppLog.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>60</integer>
<integer>62</integer>
</dict>
<key>RangersAppLog.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>59</integer>
<integer>61</integer>
</dict>
<key>RxCocoa.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>62</integer>
<integer>64</integer>
</dict>
<key>RxDataSources.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>63</integer>
<integer>65</integer>
</dict>
<key>RxRelay.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>64</integer>
<integer>66</integer>
</dict>
<key>RxSwift.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>65</integer>
<integer>67</integer>
</dict>
<key>SJAttributesFactory.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>66</integer>
<integer>68</integer>
</dict>
<key>SJAttributesStringMaker.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>67</integer>
<integer>69</integer>
</dict>
<key>SSZipArchive.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>70</integer>
<integer>72</integer>
</dict>
<key>SnapKit-SnapKit_Privacy.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>69</integer>
<integer>71</integer>
</dict>
<key>SnapKit.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>68</integer>
<integer>70</integer>
</dict>
<key>SwiftyJSON.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>71</integer>
<integer>73</integer>
</dict>
<key>TTSDK.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>73</integer>
<integer>75</integer>
</dict>
<key>TTTAttributedLabel.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>74</integer>
<integer>76</integer>
</dict>
<key>TenjinSDK.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>72</integer>
<integer>74</integer>
</dict>
<key>TwitterCore.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>75</integer>
<integer>77</integer>
</dict>
<key>TwitterKit5.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>76</integer>
<integer>78</integer>
</dict>
<key>UIImage+BlurredFrame.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>77</integer>
<integer>79</integer>
</dict>
<key>YYKit.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>78</integer>
<integer>80</integer>
</dict>
<key>ZXSDK.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>80</integer>
<integer>82</integer>
</dict>
<key>ZipArchive.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>79</integer>
<integer>81</integer>
</dict>
<key>libPhoneNumber-iOS.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>38</integer>
<integer>40</integer>
</dict>
<key>mob_sharesdk-ShareSDK.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>48</integer>
<integer>50</integer>
</dict>
<key>mob_sharesdk-ShareSDK_JS_WeChat.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>49</integer>
<integer>51</integer>
</dict>
<key>mob_sharesdk.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>47</integer>
<integer>49</integer>
</dict>
<key>nanopb.xcscheme</key>
<dict>
<key>isShown</key>
<false/>
<key>orderHint</key>
<integer>51</integer>
<integer>53</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
......
Pods/Target Support Files/FUSCommon/FUSCommon.debug.xcconfig
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/FUSCommon
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/AliyunOSSiOS" "${PODS_CONFIGURATION_BUILD_DIR}/AppAuth" "${PODS_CONFIGURATION_BUILD_DIR}/Bifrost" "${PODS_CONFIGURATION_BUILD_DIR}/CocoaAsyncSocket" "${PODS_CONFIGURATION_BUILD_DIR}/Differentiator" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/FUSBDAlphaPlayer" "${PODS_CONFIGURATION_BUILD_DIR}/FUSFoundation" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations" "${PODS_CONFIGURATION_BUILD_DIR}/GTMAppAuth" "${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities" "${PODS_CONFIGURATION_BUILD_DIR}/HWPanModal" "${PODS_CONFIGURATION_BUILD_DIR}/LineSDKSwift" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MGSwipeTableCell" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/MMDrawerController" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC" "${PODS_CONFIGURATION_BUILD_DIR}/RMStore" "${PODS_CONFIGURATION_BUILD_DIR}/RangersAppLog" "${PODS_CONFIGURATION_BUILD_DIR}/RxCocoa" "${PODS_CONFIGURATION_BUILD_DIR}/RxDataSources" "${PODS_CONFIGURATION_BUILD_DIR}/RxRelay" "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift" "${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" "${PODS_CONFIGURATION_BUILD_DIR}/TTSDK" "${PODS_CONFIGURATION_BUILD_DIR}/UIImage+BlurredFrame" "${PODS_CONFIGURATION_BUILD_DIR}/YYKit" "${PODS_CONFIGURATION_BUILD_DIR}/ZipArchive" "${PODS_CONFIGURATION_BUILD_DIR}/libPhoneNumber-iOS" "${PODS_CONFIGURATION_BUILD_DIR}/nanopb" "${PODS_ROOT}/../DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/ThirdParty/ByteDanceBeauty" "${PODS_ROOT}/AgoraRtcEngine_iOS" "${PODS_ROOT}/FBAEMKit/XCFrameworks" "${PODS_ROOT}/FBSDKCoreKit/XCFrameworks" "${PODS_ROOT}/FBSDKCoreKit_Basics/XCFrameworks" "${PODS_ROOT}/FBSDKLoginKit/XCFrameworks" "${PODS_ROOT}/FBSDKShareKit/XCFrameworks" "${PODS_ROOT}/FirebaseAnalytics/Frameworks" "${PODS_ROOT}/GoogleAppMeasurement/Frameworks" "${PODS_ROOT}/GoogleSignIn/Frameworks" "${PODS_ROOT}/HyphenateChat" "${PODS_ROOT}/MOBFoundation/MOBFoundation" "${PODS_ROOT}/TTSDK/TTSDK/ByteAudio" "${PODS_ROOT}/TTSDK/TTSDK/TTFFmpeg" "${PODS_ROOT}/TTSDK/TTSDK/VCNVCloudNetwork/products/framework" "${PODS_ROOT}/TTSDK/TTSDK/boringssl" "${PODS_ROOT}/TTSDK/TTSDK/ffmpeg_dashdec_iOS" "${PODS_ROOT}/TenjinSDK" "${PODS_ROOT}/TwitterCore/iOS" "${PODS_ROOT}/TwitterKit5/iOS" "${PODS_ROOT}/YYKit/Vendor" "${PODS_ROOT}/mob_sharesdk/ShareSDK" "${PODS_ROOT}/mob_sharesdk/ShareSDK/Support/PlatformConnector" "${PODS_ROOT}/mob_sharesdk/ShareSDK/Support/Required" "${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/RtcBasic" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBAEMKit" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit_Basics" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKLoginKit" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKShareKit" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FirebaseAnalytics/AdIdSupport" "${PODS_XCFRAMEWORKS_BUILD_DIR}/GoogleAppMeasurement/AdIdSupport" "${PODS_XCFRAMEWORKS_BUILD_DIR}/MOBFoundation" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/ByteAudio" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TenjinSDK"
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/AliyunOSSiOS" "${PODS_CONFIGURATION_BUILD_DIR}/AppAuth" "${PODS_CONFIGURATION_BUILD_DIR}/Bifrost" "${PODS_CONFIGURATION_BUILD_DIR}/CocoaAsyncSocket" "${PODS_CONFIGURATION_BUILD_DIR}/Differentiator" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/FUSBDAlphaPlayer" "${PODS_CONFIGURATION_BUILD_DIR}/FUSFoundation" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations" "${PODS_CONFIGURATION_BUILD_DIR}/GTMAppAuth" "${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities" "${PODS_CONFIGURATION_BUILD_DIR}/HWPanModal" "${PODS_CONFIGURATION_BUILD_DIR}/LineSDKSwift" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MGSwipeTableCell" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/MMDrawerController" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC" "${PODS_CONFIGURATION_BUILD_DIR}/RMStore" "${PODS_CONFIGURATION_BUILD_DIR}/RangersAppLog" "${PODS_CONFIGURATION_BUILD_DIR}/RxCocoa" "${PODS_CONFIGURATION_BUILD_DIR}/RxDataSources" "${PODS_CONFIGURATION_BUILD_DIR}/RxRelay" "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift" "${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON" "${PODS_CONFIGURATION_BUILD_DIR}/TTSDK" "${PODS_CONFIGURATION_BUILD_DIR}/UIImage+BlurredFrame" "${PODS_CONFIGURATION_BUILD_DIR}/YYKit" "${PODS_CONFIGURATION_BUILD_DIR}/ZipArchive" "${PODS_CONFIGURATION_BUILD_DIR}/libPhoneNumber-iOS" "${PODS_CONFIGURATION_BUILD_DIR}/nanopb" "${PODS_ROOT}/../DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/ThirdParty/ByteDanceBeauty" "${PODS_ROOT}/AgoraRtcEngine_iOS" "${PODS_ROOT}/FBAEMKit/XCFrameworks" "${PODS_ROOT}/FBSDKCoreKit/XCFrameworks" "${PODS_ROOT}/FBSDKCoreKit_Basics/XCFrameworks" "${PODS_ROOT}/FBSDKLoginKit/XCFrameworks" "${PODS_ROOT}/FBSDKShareKit/XCFrameworks" "${PODS_ROOT}/FirebaseAnalytics/Frameworks" "${PODS_ROOT}/GoogleAppMeasurement/Frameworks" "${PODS_ROOT}/GoogleSignIn/Frameworks" "${PODS_ROOT}/HyphenateChat" "${PODS_ROOT}/MOBFoundation/MOBFoundation" "${PODS_ROOT}/TTSDK/TTSDK/ByteAudio" "${PODS_ROOT}/TTSDK/TTSDK/TTFFmpeg" "${PODS_ROOT}/TTSDK/TTSDK/VCNVCloudNetwork/products/framework" "${PODS_ROOT}/TTSDK/TTSDK/boringssl" "${PODS_ROOT}/TTSDK/TTSDK/ffmpeg_dashdec_iOS" "${PODS_ROOT}/TenjinSDK" "${PODS_ROOT}/TwitterCore/iOS" "${PODS_ROOT}/TwitterKit5/iOS" "${PODS_ROOT}/YYKit/Vendor" "${PODS_ROOT}/mob_sharesdk/ShareSDK" "${PODS_ROOT}/mob_sharesdk/ShareSDK/Support/PlatformConnector" "${PODS_ROOT}/mob_sharesdk/ShareSDK/Support/Required" "${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/RtcBasic" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBAEMKit" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit_Basics" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKLoginKit" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKShareKit" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FirebaseAnalytics/AdIdSupport" "${PODS_XCFRAMEWORKS_BUILD_DIR}/GoogleAppMeasurement/AdIdSupport" "${PODS_XCFRAMEWORKS_BUILD_DIR}/MOBFoundation" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/ByteAudio" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TenjinSDK"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public"
OTHER_CFLAGS[config=Release] = -mllvm -bcf -mllvm -sub -mllvm -split
......
Pods/Target Support Files/FUSCommon/FUSCommon.release.xcconfig
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/FUSCommon
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/AliyunOSSiOS" "${PODS_CONFIGURATION_BUILD_DIR}/AppAuth" "${PODS_CONFIGURATION_BUILD_DIR}/Bifrost" "${PODS_CONFIGURATION_BUILD_DIR}/CocoaAsyncSocket" "${PODS_CONFIGURATION_BUILD_DIR}/Differentiator" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/FUSBDAlphaPlayer" "${PODS_CONFIGURATION_BUILD_DIR}/FUSFoundation" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations" "${PODS_CONFIGURATION_BUILD_DIR}/GTMAppAuth" "${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities" "${PODS_CONFIGURATION_BUILD_DIR}/HWPanModal" "${PODS_CONFIGURATION_BUILD_DIR}/LineSDKSwift" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MGSwipeTableCell" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/MMDrawerController" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC" "${PODS_CONFIGURATION_BUILD_DIR}/RMStore" "${PODS_CONFIGURATION_BUILD_DIR}/RangersAppLog" "${PODS_CONFIGURATION_BUILD_DIR}/RxCocoa" "${PODS_CONFIGURATION_BUILD_DIR}/RxDataSources" "${PODS_CONFIGURATION_BUILD_DIR}/RxRelay" "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift" "${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" "${PODS_CONFIGURATION_BUILD_DIR}/TTSDK" "${PODS_CONFIGURATION_BUILD_DIR}/UIImage+BlurredFrame" "${PODS_CONFIGURATION_BUILD_DIR}/YYKit" "${PODS_CONFIGURATION_BUILD_DIR}/ZipArchive" "${PODS_CONFIGURATION_BUILD_DIR}/libPhoneNumber-iOS" "${PODS_CONFIGURATION_BUILD_DIR}/nanopb" "${PODS_ROOT}/../DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/ThirdParty/ByteDanceBeauty" "${PODS_ROOT}/AgoraRtcEngine_iOS" "${PODS_ROOT}/FBAEMKit/XCFrameworks" "${PODS_ROOT}/FBSDKCoreKit/XCFrameworks" "${PODS_ROOT}/FBSDKCoreKit_Basics/XCFrameworks" "${PODS_ROOT}/FBSDKLoginKit/XCFrameworks" "${PODS_ROOT}/FBSDKShareKit/XCFrameworks" "${PODS_ROOT}/FirebaseAnalytics/Frameworks" "${PODS_ROOT}/GoogleAppMeasurement/Frameworks" "${PODS_ROOT}/GoogleSignIn/Frameworks" "${PODS_ROOT}/HyphenateChat" "${PODS_ROOT}/MOBFoundation/MOBFoundation" "${PODS_ROOT}/TTSDK/TTSDK/ByteAudio" "${PODS_ROOT}/TTSDK/TTSDK/TTFFmpeg" "${PODS_ROOT}/TTSDK/TTSDK/VCNVCloudNetwork/products/framework" "${PODS_ROOT}/TTSDK/TTSDK/boringssl" "${PODS_ROOT}/TTSDK/TTSDK/ffmpeg_dashdec_iOS" "${PODS_ROOT}/TenjinSDK" "${PODS_ROOT}/TwitterCore/iOS" "${PODS_ROOT}/TwitterKit5/iOS" "${PODS_ROOT}/YYKit/Vendor" "${PODS_ROOT}/mob_sharesdk/ShareSDK" "${PODS_ROOT}/mob_sharesdk/ShareSDK/Support/PlatformConnector" "${PODS_ROOT}/mob_sharesdk/ShareSDK/Support/Required" "${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/RtcBasic" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBAEMKit" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit_Basics" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKLoginKit" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKShareKit" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FirebaseAnalytics/AdIdSupport" "${PODS_XCFRAMEWORKS_BUILD_DIR}/GoogleAppMeasurement/AdIdSupport" "${PODS_XCFRAMEWORKS_BUILD_DIR}/MOBFoundation" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/ByteAudio" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TenjinSDK"
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/AliyunOSSiOS" "${PODS_CONFIGURATION_BUILD_DIR}/AppAuth" "${PODS_CONFIGURATION_BUILD_DIR}/Bifrost" "${PODS_CONFIGURATION_BUILD_DIR}/CocoaAsyncSocket" "${PODS_CONFIGURATION_BUILD_DIR}/Differentiator" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/FUSBDAlphaPlayer" "${PODS_CONFIGURATION_BUILD_DIR}/FUSFoundation" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics" "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstallations" "${PODS_CONFIGURATION_BUILD_DIR}/GTMAppAuth" "${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport" "${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities" "${PODS_CONFIGURATION_BUILD_DIR}/HWPanModal" "${PODS_CONFIGURATION_BUILD_DIR}/LineSDKSwift" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MGSwipeTableCell" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/MMDrawerController" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC" "${PODS_CONFIGURATION_BUILD_DIR}/RMStore" "${PODS_CONFIGURATION_BUILD_DIR}/RangersAppLog" "${PODS_CONFIGURATION_BUILD_DIR}/RxCocoa" "${PODS_CONFIGURATION_BUILD_DIR}/RxDataSources" "${PODS_CONFIGURATION_BUILD_DIR}/RxRelay" "${PODS_CONFIGURATION_BUILD_DIR}/RxSwift" "${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive" "${PODS_CONFIGURATION_BUILD_DIR}/SnapKit" "${PODS_CONFIGURATION_BUILD_DIR}/SwiftyJSON" "${PODS_CONFIGURATION_BUILD_DIR}/TTSDK" "${PODS_CONFIGURATION_BUILD_DIR}/UIImage+BlurredFrame" "${PODS_CONFIGURATION_BUILD_DIR}/YYKit" "${PODS_CONFIGURATION_BUILD_DIR}/ZipArchive" "${PODS_CONFIGURATION_BUILD_DIR}/libPhoneNumber-iOS" "${PODS_CONFIGURATION_BUILD_DIR}/nanopb" "${PODS_ROOT}/../DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/ThirdParty/ByteDanceBeauty" "${PODS_ROOT}/AgoraRtcEngine_iOS" "${PODS_ROOT}/FBAEMKit/XCFrameworks" "${PODS_ROOT}/FBSDKCoreKit/XCFrameworks" "${PODS_ROOT}/FBSDKCoreKit_Basics/XCFrameworks" "${PODS_ROOT}/FBSDKLoginKit/XCFrameworks" "${PODS_ROOT}/FBSDKShareKit/XCFrameworks" "${PODS_ROOT}/FirebaseAnalytics/Frameworks" "${PODS_ROOT}/GoogleAppMeasurement/Frameworks" "${PODS_ROOT}/GoogleSignIn/Frameworks" "${PODS_ROOT}/HyphenateChat" "${PODS_ROOT}/MOBFoundation/MOBFoundation" "${PODS_ROOT}/TTSDK/TTSDK/ByteAudio" "${PODS_ROOT}/TTSDK/TTSDK/TTFFmpeg" "${PODS_ROOT}/TTSDK/TTSDK/VCNVCloudNetwork/products/framework" "${PODS_ROOT}/TTSDK/TTSDK/boringssl" "${PODS_ROOT}/TTSDK/TTSDK/ffmpeg_dashdec_iOS" "${PODS_ROOT}/TenjinSDK" "${PODS_ROOT}/TwitterCore/iOS" "${PODS_ROOT}/TwitterKit5/iOS" "${PODS_ROOT}/YYKit/Vendor" "${PODS_ROOT}/mob_sharesdk/ShareSDK" "${PODS_ROOT}/mob_sharesdk/ShareSDK/Support/PlatformConnector" "${PODS_ROOT}/mob_sharesdk/ShareSDK/Support/Required" "${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraRtcEngine_iOS/RtcBasic" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBAEMKit" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKCoreKit_Basics" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKLoginKit" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FBSDKShareKit" "${PODS_XCFRAMEWORKS_BUILD_DIR}/FirebaseAnalytics/AdIdSupport" "${PODS_XCFRAMEWORKS_BUILD_DIR}/GoogleAppMeasurement/AdIdSupport" "${PODS_XCFRAMEWORKS_BUILD_DIR}/MOBFoundation" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/ByteAudio" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TenjinSDK"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public"
OTHER_CFLAGS[config=Release] = -mllvm -bcf -mllvm -sub -mllvm -split
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment