Commit e68face1 by ludi

完成basemodel底层兼容

parent 209ac1af
Showing with 178 additions and 147 deletions
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
UIImage *image = nil; UIImage *image = nil;
if ([imageOrUrl isKindOfClass:[NSString class]] && ![NSString isNull:imageOrUrl]) { if ([imageOrUrl isKindOfClass:[NSString class]] && ![NSString isNull:imageOrUrl]) {
// 取内存 // 取内存
[FUSLoadingView fus_showProgressViewWithContentMessage:nil withView:viewController.view]; // [FUSLoadingView fus_showProgressViewWithContentMessage:nil withView:viewController.view];
NSString *downloadUrl; NSString *downloadUrl;
if (from == FUSFromTopic ||[(NSString *)imageOrUrl containsString:@"https://"] || [(NSString *)imageOrUrl containsString:@"http://"]) { if (from == FUSFromTopic ||[(NSString *)imageOrUrl containsString:@"https://"] || [(NSString *)imageOrUrl containsString:@"http://"]) {
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
[[YYWebImageManager sharedManager] requestImageWithURL:[NSURL URLWithString:downloadUrl] options:0 progress:nil transform:nil completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType cacheFrom, YYWebImageStage stage, NSError * _Nullable error) { [[YYWebImageManager sharedManager] requestImageWithURL:[NSURL URLWithString:downloadUrl] options:0 progress:nil transform:nil completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType cacheFrom, YYWebImageStage stage, NSError * _Nullable error) {
dispatch_async(dispatch_get_main_queue(), ^{ dispatch_async(dispatch_get_main_queue(), ^{
UIImage *shareImage = image; UIImage *shareImage = image;
[FUSLoadingView fus_dismissProgressViewWithView:viewController.view]; // [FUSLoadingView fus_dismissProgressViewWithView:viewController.view];
if (!shareImage) { if (!shareImage) {
shareImage = [UIImage com_ImageNamed:@"FUSShareImage"]; shareImage = [UIImage com_ImageNamed:@"FUSShareImage"];
}else { }else {
......
...@@ -87,7 +87,7 @@ extension Observable where Element == FUSSocketMessageModel { ...@@ -87,7 +87,7 @@ extension Observable where Element == FUSSocketMessageModel {
/// - Returns: json /// - Returns: json
public func mapToJSON() -> Observable<JSON> { public func mapToJSON() -> Observable<JSON> {
return map({ model in return map({ model in
return .init(model.jsondata) return .init(model.jsonDict)
}) })
} }
} }
......
...@@ -54,6 +54,7 @@ Pod::Spec.new do |s| ...@@ -54,6 +54,7 @@ Pod::Spec.new do |s|
s.dependency 'CocoaAsyncSocket' s.dependency 'CocoaAsyncSocket'
s.dependency 'RMStore','~>0.7.1' s.dependency 'RMStore','~>0.7.1'
s.dependency 'YYKit' s.dependency 'YYKit'
s.dependency 'SwiftyJSON'
# 海外社会化组件相关框架 # 海外社会化组件相关框架
......
...@@ -105,10 +105,11 @@ ...@@ -105,10 +105,11 @@
*/ */
- (NSDictionary *)fus_getDictionary - (NSDictionary *)fus_getDictionary
{ {
NSString *json = [self modelToJSONString]; // NSString *json = [self modelToJSONString];
//
// 返回字典对象 // // 返回字典对象
return [NSString converToDictionaryWithJsonString:json]; // return [NSString converToDictionaryWithJsonString:json];
return [self modelToJSONObject];
} }
...@@ -165,13 +166,34 @@ ...@@ -165,13 +166,34 @@
Ivar iva = ivar[i]; Ivar iva = ivar[i];
// 获取字段名 // 获取字段名
const char *fieldName = ivar_getName(iva); const char *fieldName = ivar_getName(iva);
NSString *fieldNameStr = [[NSString stringWithUTF8String:fieldName] substringFromIndex:1]; NSString *fieldFullString = [NSString stringWithUTF8String:fieldName];
NSString *fieldNameStr = fieldFullString;
if ([fieldFullString hasPrefix:@"_"]) {
fieldNameStr = [fieldFullString substringFromIndex:1];
}
// 将字段名称存入数组中 // 将字段名称存入数组中
[array addObject:fieldNameStr]; [array addObject:fieldNameStr];
} }
free(ivar); free(ivar);
return array; return array;
// NSMutableArray *array = [[NSMutableArray alloc] init];
//
// // 获取类中成员变量数量
// unsigned int count = 0;
// Ivar *ivar = class_copyIvarList([self class], &count);
// // 遍历所有成员变量
// for (int i = 0; i < count; i++) {
// Ivar iva = ivar[i];
// // 获取字段名
// const char *fieldName = ivar_getName(iva);
// NSString *fieldNameStr = [[NSString stringWithUTF8String:fieldName] substringFromIndex:1];
// // 将字段名称存入数组中
// [array addObject:fieldNameStr];
// }
// free(ivar);
//
// return array;
} }
- (BOOL)fus_modelEqual:(FUSBaseModel *)model{ - (BOOL)fus_modelEqual:(FUSBaseModel *)model{
......
//
// FUSSwiftBaseModel.swift
// FUSFoundation
//
// Created by aaa on 2026/3/3.
//
import UIKit
import SwiftyJSON
@objcMembers open class FUSSwiftBaseModel: FUSBaseModel, NSCoding {
@objc public func encode(with coder: NSCoder) {
self.modelInit(with: coder)
}
@objc required convenience public init?(coder: NSCoder) {
self.init()
self.modelInit(with: coder)
}
@objc public override init() {
super.init()
}
public convenience init(json: JSON) {
self.init()
self.modelSet(with: json.dictionaryObject ?? [:])
}
@objc public convenience init(dictionary: Dictionary<AnyHashable, Any>) {
self.init()
self.modelSet(with: dictionary)
}
}
...@@ -8516,14 +8516,10 @@ ...@@ -8516,14 +8516,10 @@
inputFileListPaths = ( inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FUSShowRoomModule/Pods-FUSShowRoomModule-resources-${CONFIGURATION}-input-files.xcfilelist", "${PODS_ROOT}/Target Support Files/Pods-FUSShowRoomModule/Pods-FUSShowRoomModule-resources-${CONFIGURATION}-input-files.xcfilelist",
); );
inputPaths = (
);
name = "[CP] Copy Pods Resources"; name = "[CP] Copy Pods Resources";
outputFileListPaths = ( outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FUSShowRoomModule/Pods-FUSShowRoomModule-resources-${CONFIGURATION}-output-files.xcfilelist", "${PODS_ROOT}/Target Support Files/Pods-FUSShowRoomModule/Pods-FUSShowRoomModule-resources-${CONFIGURATION}-output-files.xcfilelist",
); );
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FUSShowRoomModule/Pods-FUSShowRoomModule-resources.sh\"\n"; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FUSShowRoomModule/Pods-FUSShowRoomModule-resources.sh\"\n";
......
...@@ -2267,6 +2267,13 @@ typedef NS_ENUM(NSInteger, FUSStreamState) { ...@@ -2267,6 +2267,13 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
@param liveLoadingType liveLoadingView Type @param liveLoadingType liveLoadingView Type
*/ */
- (void)fus_showLiveLoadingViewWithType:(LiveLoadingType)liveLoadingType { - (void)fus_showLiveLoadingViewWithType:(LiveLoadingType)liveLoadingType {
MJWeakSelf
dispatch_async_on_main_queue(^{
[weakSelf p_showLiveLoadingViewWithType:liveLoadingType];
});
}
- (void)p_showLiveLoadingViewWithType:(LiveLoadingType)liveLoadingType {
if (!_liveLoadingView) { if (!_liveLoadingView) {
_liveLoadingView = [[FUSLiveLoadingView alloc] initWithFrame:CGRectMake(UIView.fus_screenW / 2 - 40, UIView.fus_screenH * (1 - 0.618) - 35, 80, 120)]; _liveLoadingView = [[FUSLiveLoadingView alloc] initWithFrame:CGRectMake(UIView.fus_screenW / 2 - 40, UIView.fus_screenH * (1 - 0.618) - 35, 80, 120)];
_liveLoadingView.hidden = YES; _liveLoadingView.hidden = YES;
......
...@@ -118,7 +118,7 @@ import UIKit ...@@ -118,7 +118,7 @@ import UIKit
make.width.equalTo(btnTextMaxWidth) make.width.equalTo(btnTextMaxWidth)
} }
followBtn.style = .gradientLeftToRight followBtn.style = .blue
followBtn.titleLabel?.font = .fus_themeMediumFont(14) followBtn.titleLabel?.font = .fus_themeMediumFont(14)
followBtn.setTitle(followText, for: .normal) followBtn.setTitle(followText, for: .normal)
btnCenterView.addSubview(followBtn) btnCenterView.addSubview(followBtn)
......
...@@ -25,7 +25,7 @@ extension FFPKSideColor { ...@@ -25,7 +25,7 @@ extension FFPKSideColor {
} }
@objcMembers public class FFPKAnchorModel: FUSBaseModel { @objcMembers public class FFPKAnchorModel: FUSSwiftBaseModel {
let disposeBag = DisposeBag() let disposeBag = DisposeBag()
...@@ -106,15 +106,26 @@ extension FFPKSideColor { ...@@ -106,15 +106,26 @@ extension FFPKSideColor {
static func fus_createLocalAnchorModel() -> FFPKAnchorModel { static func fus_createLocalAnchorModel() -> FFPKAnchorModel {
let anchorModel = FFPKAnchorModel() let anchorModel = FFPKAnchorModel()
anchorModel.uid = FUSSwiftLiveHelper.shared.roomInfoModel?.roomId anchorModel.uid = FUSSwiftLiveHelper.shared.roomInfoModel?.roomId ?? ""
anchorModel.nickname = FUSSwiftLiveHelper.shared.roomInfoModel?.nickName anchorModel.nickname = FUSSwiftLiveHelper.shared.roomInfoModel?.nickName ?? ""
anchorModel.face = FUSSwiftLiveHelper.shared.roomInfoModel?.face anchorModel.face = FUSSwiftLiveHelper.shared.roomInfoModel?.face ?? ""
anchorModel.level = FUSSwiftLiveHelper.shared.roomInfoModel?.level?.intValue ?? 0 anchorModel.level = FUSSwiftLiveHelper.shared.roomInfoModel?.level?.intValue ?? 0
anchorModel.age = FUSSwiftLiveHelper.shared.roomInfoModel?.age.intValue ?? 0 anchorModel.age = FUSSwiftLiveHelper.shared.roomInfoModel?.age?.intValue ?? 0
anchorModel.sex = FUSSwiftLiveHelper.shared.roomInfoModel?.sex?.intValue ?? 0 anchorModel.sex = FUSSwiftLiveHelper.shared.roomInfoModel?.sex?.intValue ?? 0
return anchorModel return anchorModel
} }
// func fus_setModelValue(model: FFPKUserModel) {
// self.uid = model.uid
// self.nickname = model.nickname
// self.face = model.face
// self.level = model.level
// self.age = model.age
// self.sex = model.sex
// self.vip = model.vip
// self.publishUrl = model.pullUrl
// }
func ff_cleanMatchDatas() { func ff_cleanMatchDatas() {
self.userContributeQueue.cancelAllOperations() self.userContributeQueue.cancelAllOperations()
......
...@@ -2,7 +2,7 @@ import SwiftyJSON ...@@ -2,7 +2,7 @@ import SwiftyJSON
// MARK: - FFPKVsPointModel // MARK: - FFPKVsPointModel
class FFPKContributeUserModel: FUSBaseModel { class FFPKContributeUserModel: FUSSwiftBaseModel {
/// 用户ID /// 用户ID
@objc var uid: Int = 0 @objc var uid: Int = 0
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
import UIKit import UIKit
import SwiftyJSON import SwiftyJSON
@objc public class FFPKMessageDisplayControlModel: FUSBaseModel { @objc public class FFPKMessageDisplayControlModel: FUSSwiftBaseModel {
/// 迎新PK入场消息折叠开关 /// 迎新PK入场消息折叠开关
@objc public var joinMsgDisplayData: FFPKMessageDisplayControlItemModel = .init() @objc public var joinMsgDisplayData: FFPKMessageDisplayControlItemModel = .init()
...@@ -24,7 +24,7 @@ import SwiftyJSON ...@@ -24,7 +24,7 @@ import SwiftyJSON
} }
@objc public class FFPKMessageDisplayControlItemModel: FUSBaseModel { @objc public class FFPKMessageDisplayControlItemModel: FUSSwiftBaseModel {
/// 0不可以控制 1可以控制 /// 0不可以控制 1可以控制
@objc public var isControl: Int = 1 @objc public var isControl: Int = 1
......
...@@ -2,7 +2,7 @@ import SwiftyJSON ...@@ -2,7 +2,7 @@ import SwiftyJSON
// MARK: - FFPKNextStepModel // MARK: - FFPKNextStepModel
class FFPKNextStepModel: FUSBaseModel { class FFPKNextStepModel: FUSSwiftBaseModel {
/// 下一阶段 /// 下一阶段
/// 5:惩罚阶段 /// 5:惩罚阶段
......
...@@ -8,7 +8,7 @@ import SwiftyJSON ...@@ -8,7 +8,7 @@ import SwiftyJSON
/// matchId:比赛ID /// matchId:比赛ID
/// type:类型 /// type:类型
/// gameplay:玩法 /// gameplay:玩法
@objc public class FFPKVsdataModel: FUSBaseModel { @objc public class FFPKVsdataModel: FUSSwiftBaseModel {
/// PK频道ID /// PK频道ID
var vsChannelId: String = "" var vsChannelId: String = ""
...@@ -71,7 +71,7 @@ import SwiftyJSON ...@@ -71,7 +71,7 @@ import SwiftyJSON
/// 对战阵营信息 /// 对战阵营信息
/// userId:用户ID /// userId:用户ID
/// sideColor:所属阵营颜色 /// sideColor:所属阵营颜色
@objc public class FFPKVsteamsItem: FUSBaseModel { @objc public class FFPKVsteamsItem: FUSSwiftBaseModel {
/// 用户ID /// 用户ID
var userId: String = "" var userId: String = ""
...@@ -92,7 +92,7 @@ import SwiftyJSON ...@@ -92,7 +92,7 @@ import SwiftyJSON
// MARK: - FFPKModelUserModel // MARK: - FFPKModelUserModel
class FFPKUserModel: FUSBaseModel { class FFPKUserModel: FUSSwiftBaseModel {
/// 用户ID /// 用户ID
var uid: String = "" var uid: String = ""
...@@ -127,7 +127,7 @@ class FFPKUserModel: FUSBaseModel { ...@@ -127,7 +127,7 @@ class FFPKUserModel: FUSBaseModel {
// MARK: - FFPKModel // MARK: - FFPKModel
class FFPKSocketModel: FUSBaseModel { class FFPKSocketModel: FUSSwiftBaseModel {
/// 超时时间(毫秒) /// 超时时间(毫秒)
var timeout: Int = 0 var timeout: Int = 0
...@@ -197,7 +197,7 @@ class FFPKSocketModel: FUSBaseModel { ...@@ -197,7 +197,7 @@ class FFPKSocketModel: FUSBaseModel {
} }
/// 团队数据信息 /// 团队数据信息
@objc public class FFPKVsValueModel: FUSBaseModel { @objc public class FFPKVsValueModel: FUSSwiftBaseModel {
/// 房间ID /// 房间ID
var userId: String = "" var userId: String = ""
...@@ -223,7 +223,7 @@ class FFPKSocketModel: FUSBaseModel { ...@@ -223,7 +223,7 @@ class FFPKSocketModel: FUSBaseModel {
} }
// MARK: - FFPKPointChangedSocketModel // MARK: - FFPKPointChangedSocketModel
class FFPKPointChangedSocketModel: FUSBaseModel { class FFPKPointChangedSocketModel: FUSSwiftBaseModel {
/// VS信息 /// VS信息
/// vsChannelId:PK频道 /// vsChannelId:PK频道
...@@ -290,7 +290,7 @@ class FFPKPointChangedSocketModel: FUSBaseModel { ...@@ -290,7 +290,7 @@ class FFPKPointChangedSocketModel: FUSBaseModel {
} }
class FFPKPointChangedIncrmultiModel: FUSBaseModel{ class FFPKPointChangedIncrmultiModel: FUSSwiftBaseModel{
var lang: Int = 0 var lang: Int = 0
...@@ -306,7 +306,7 @@ class FFPKPointChangedIncrmultiModel: FUSBaseModel{ ...@@ -306,7 +306,7 @@ class FFPKPointChangedIncrmultiModel: FUSBaseModel{
} }
class FFPKVSMultiRoundModel: FUSBaseModel{ class FFPKVSMultiRoundModel: FUSSwiftBaseModel{
/// 总的回合 /// 总的回合
var allTotal: Int = 0 var allTotal: Int = 0
/// 胜利回合 /// 胜利回合
...@@ -327,7 +327,7 @@ class FFPKVSMultiRoundModel: FUSBaseModel{ ...@@ -327,7 +327,7 @@ class FFPKVSMultiRoundModel: FUSBaseModel{
} }
} }
class FFPKVSMultiRoundRoundResultModel: FUSBaseModel{ class FFPKVSMultiRoundRoundResultModel: FUSSwiftBaseModel{
/// 场次ID /// 场次ID
var mid: String = "" var mid: String = ""
/// 场次顺序 /// 场次顺序
...@@ -344,7 +344,7 @@ class FFPKVSMultiRoundRoundResultModel: FUSBaseModel{ ...@@ -344,7 +344,7 @@ class FFPKVSMultiRoundRoundResultModel: FUSBaseModel{
} }
} }
class FFPKVSMultiRoundRewardListModel: FUSBaseModel{ class FFPKVSMultiRoundRewardListModel: FUSSwiftBaseModel{
/// 数量 /// 数量
var num: Int = 0 var num: Int = 0
/// 分类 /// 分类
......
...@@ -50,7 +50,7 @@ import SwiftyJSON ...@@ -50,7 +50,7 @@ import SwiftyJSON
} }
@objcMembers public class FFPKViewModel: FUSBaseModel { @objcMembers public class FFPKViewModel: FUSSwiftBaseModel {
let disposeBag = DisposeBag() let disposeBag = DisposeBag()
...@@ -487,7 +487,7 @@ import SwiftyJSON ...@@ -487,7 +487,7 @@ import SwiftyJSON
func ff_update(_ user: FFPKUserModel? = nil, func ff_update(_ user: FFPKUserModel? = nil,
vsTeams:[FFPKVsteamsItem]? = nil, vsTeams:[FFPKVsteamsItem]? = nil,
vsData:FFPKVsdataModel? = nil) { vsData:FFPKVsdataModel? = nil) {
FUSLog.info("pidan pk log: ff_updateUser:\(user), vsData:\(vsData)") FUSLog.info("pidan pk log: ff_updateUser:\(user?.modelToJSONString()), vsData:\(vsData?.modelToJSONString())")
var userChanged = false var userChanged = false
if let userData = user { if let userData = user {
if user?.uid != FUSCacheDataShare.shareStore().userDetailInfo.uid if user?.uid != FUSCacheDataShare.shareStore().userDetailInfo.uid
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
import UIKit import UIKit
import SwiftyJSON import SwiftyJSON
class FFPKWinUserListModel: FUSBaseModel { class FFPKWinUserListModel: FUSSwiftBaseModel {
/// 用户ID /// 用户ID
var uid: String = "" var uid: String = ""
...@@ -32,7 +32,7 @@ class FFPKWinUserListModel: FUSBaseModel { ...@@ -32,7 +32,7 @@ class FFPKWinUserListModel: FUSBaseModel {
} }
/// 胜者主播奖励 /// 胜者主播奖励
class FUSPKWinHostDataModel: FUSBaseModel { class FUSPKWinHostDataModel: FUSSwiftBaseModel {
/// 奖励ID /// 奖励ID
public var sid: String = "" public var sid: String = ""
......
...@@ -58,7 +58,7 @@ import RxSwift ...@@ -58,7 +58,7 @@ import RxSwift
self.anchorListView.snp.makeConstraints { make in self.anchorListView.snp.makeConstraints { make in
make.top.left.right.equalToSuperview() make.top.left.right.equalToSuperview()
make.height.equalTo(FUSStreamKitPKConfig.fus_pkAnchorViewHeight()) make.height.equalTo(FUSStreamKitPKConfig.fus_pkAnchorViewHeight())
make.height.equalTo(UIView.fus_screenW() / 2 * (16.0 / 11.0)) // make.height.equalTo(UIView.fus_screenW() / 2 * (16.0 / 11.0))
} }
self.pkStateView.snp.makeConstraints { make in self.pkStateView.snp.makeConstraints { make in
......
...@@ -10,7 +10,7 @@ import RxSwift ...@@ -10,7 +10,7 @@ import RxSwift
import RxCocoa import RxCocoa
import SwiftyJSON import SwiftyJSON
public class FUSVSGiftBombModel: FUSBaseModel { public class FUSVSGiftBombModel: FUSSwiftBaseModel {
public enum FUSVSGiftBombStage { public enum FUSVSGiftBombStage {
case other case other
......
...@@ -47,7 +47,7 @@ class FFPKControlOpponentView: FFPKControlSubBaseView { ...@@ -47,7 +47,7 @@ class FFPKControlOpponentView: FFPKControlSubBaseView {
make.height.equalTo(68) make.height.equalTo(68)
} }
endPKBtn.style = .gradientLeftToRight endPKBtn.style = .blue
endPKBtn.titleLabel?.font = .fus_themeMediumFont(17) endPKBtn.titleLabel?.font = .fus_themeMediumFont(17)
endPKBtn.setTitle(.fus_versionLocalString("结束PK"), for: .normal) endPKBtn.setTitle(.fus_versionLocalString("结束PK"), for: .normal)
self.contentView.addSubview(endPKBtn) self.contentView.addSubview(endPKBtn)
......
...@@ -76,6 +76,8 @@ extension FFPKMessageAlertView{ ...@@ -76,6 +76,8 @@ extension FFPKMessageAlertView{
} }
contentView.backgroundColor = .white contentView.backgroundColor = .white
contentView.layer.cornerRadius = 8
contentView.layer.masksToBounds = true
contentView.isUserInteractionEnabled = true contentView.isUserInteractionEnabled = true
self.addSubview(contentView) self.addSubview(contentView)
contentView.snp.makeConstraints { make in contentView.snp.makeConstraints { make in
...@@ -105,7 +107,7 @@ extension FFPKMessageAlertView{ ...@@ -105,7 +107,7 @@ extension FFPKMessageAlertView{
countDownLabel.isHidden = true countDownLabel.isHidden = true
countDownLabel.font = .fus_themeMediumFont(15) countDownLabel.font = .fus_themeMediumFont(15)
countDownLabel.textColor = .white.withAlphaComponent(0.5) countDownLabel.textColor = .fus_textColorMedium()
contentView.addSubview(countDownLabel) contentView.addSubview(countDownLabel)
countDownLabel.snp.makeConstraints { make in countDownLabel.snp.makeConstraints { make in
make.right.equalTo(-20) make.right.equalTo(-20)
...@@ -113,9 +115,9 @@ extension FFPKMessageAlertView{ ...@@ -113,9 +115,9 @@ extension FFPKMessageAlertView{
} }
cancelBtn.titleLabel?.font = .fus_themeMediumFont(14) cancelBtn.titleLabel?.font = .fus_themeMediumFont(14)
cancelBtn.setTitleColor(.white, for: .normal) cancelBtn.setTitleColor(.fus_textColorRich(), for: .normal)
cancelBtn.setTitle(.fus_versionLocalString("拒绝"), for: .normal) cancelBtn.setTitle(.fus_versionLocalString("拒绝"), for: .normal)
cancelBtn.backgroundColor = .white.withAlphaComponent(0.2) cancelBtn.backgroundColor = .init(hex: "#E5E5E5")
cancelBtn.layer.cornerRadius = 42 / 2.0 cancelBtn.layer.cornerRadius = 42 / 2.0
cancelBtn.layer.masksToBounds = true cancelBtn.layer.masksToBounds = true
contentView.addSubview(cancelBtn) contentView.addSubview(cancelBtn)
...@@ -127,7 +129,7 @@ extension FFPKMessageAlertView{ ...@@ -127,7 +129,7 @@ extension FFPKMessageAlertView{
make.top.greaterThanOrEqualTo(titleLabel.snp.bottom).offset(10) make.top.greaterThanOrEqualTo(titleLabel.snp.bottom).offset(10)
} }
okBtn.style = .gradientLeftToRight okBtn.style = .blue
okBtn.titleLabel?.font = .fus_themeMediumFont(14) okBtn.titleLabel?.font = .fus_themeMediumFont(14)
okBtn.setTitle(.fus_versionLocalString("接受"), for: .normal) okBtn.setTitle(.fus_versionLocalString("接受"), for: .normal)
contentView.addSubview(okBtn) contentView.addSubview(okBtn)
...@@ -178,7 +180,7 @@ extension FFPKMessageAlertView{ ...@@ -178,7 +180,7 @@ extension FFPKMessageAlertView{
make.image = FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_MessageAlert_pk_title") make.image = FUSShowRoomCenterBunble.versionImageNamed("live_pk_control_MessageAlert_pk_title")
make.alignment = .center make.alignment = .center
} }
make.append(.fus_versionLocalString("邀请")).textColor(.white) make.append(.fus_versionLocalString("邀请")).textColor(.fus_textColorRich())
make.font(.fus_themeBoldFont(20)) make.font(.fus_themeBoldFont(20))
}) })
self.titleLabel.sizeToFit() self.titleLabel.sizeToFit()
...@@ -240,7 +242,7 @@ extension FFPKMessageAlertView{ ...@@ -240,7 +242,7 @@ extension FFPKMessageAlertView{
} }
nickNameLabel.font = .fus_themeMediumFont(15) nickNameLabel.font = .fus_themeMediumFont(15)
nickNameLabel.textColor = .white nickNameLabel.textColor = .fus_textColorRich()
contentView.addSubview(nickNameLabel) contentView.addSubview(nickNameLabel)
nickNameLabel.snp.makeConstraints { make in nickNameLabel.snp.makeConstraints { make in
make.top.equalTo(progressBgView.snp.bottom).offset(12) make.top.equalTo(progressBgView.snp.bottom).offset(12)
...@@ -265,7 +267,7 @@ extension FFPKMessageAlertView{ ...@@ -265,7 +267,7 @@ extension FFPKMessageAlertView{
} }
make.append(" ") make.append(" ")
make.append(acceptAgainText) make.append(acceptAgainText)
make.font(.fus_themeMediumFont(13)).textColor(.white.withAlphaComponent(0.5)) make.font(.fus_themeMediumFont(13)).textColor(.fus_textColorRich())
}), for: .normal) }), for: .normal)
acceptAgainBtn.setAttributedTitle(.sj.makeText({ make in acceptAgainBtn.setAttributedTitle(.sj.makeText({ make in
make.append { make in make.append { make in
...@@ -275,7 +277,7 @@ extension FFPKMessageAlertView{ ...@@ -275,7 +277,7 @@ extension FFPKMessageAlertView{
} }
make.append(" ") make.append(" ")
make.append(acceptAgainText) make.append(acceptAgainText)
make.font(.fus_themeMediumFont(13)).textColor(.white.withAlphaComponent(0.5)) make.font(.fus_themeMediumFont(13)).textColor(.fus_textColorRich())
}), for: .selected) }), for: .selected)
contentView.addSubview(acceptAgainBtn) contentView.addSubview(acceptAgainBtn)
acceptAgainBtn.snp.makeConstraints { make in acceptAgainBtn.snp.makeConstraints { make in
...@@ -340,7 +342,7 @@ extension FFPKMessageAlertView{ ...@@ -340,7 +342,7 @@ extension FFPKMessageAlertView{
make.append(.fus_versionLocalString(.fus_versionLocalString("模式") + ": " + typeModel.name)) make.append(.fus_versionLocalString(.fus_versionLocalString("模式") + ": " + typeModel.name))
make.append("\n") make.append("\n")
make.append(.fus_versionLocalString(.fus_versionLocalString("玩法") + ": " + vsGameModel.name)) make.append(.fus_versionLocalString(.fus_versionLocalString("玩法") + ": " + vsGameModel.name))
make.font(.fus_themeMediumFont(13)).textColor(.white.withAlphaComponent(0.5)).lineSpacing(6) make.font(.fus_themeMediumFont(13)).textColor(.fus_textColorRich()).lineSpacing(6)
}) })
}) })
.disposed(by: pkModeRequestDisposeBag) .disposed(by: pkModeRequestDisposeBag)
...@@ -357,7 +359,7 @@ extension FFPKMessageAlertView{ ...@@ -357,7 +359,7 @@ extension FFPKMessageAlertView{
self.nickNameLabel.text = nickName self.nickNameLabel.text = nickName
self.descLabel.attributedText = .sj.makeText({ make in self.descLabel.attributedText = .sj.makeText({ make in
make.append(.fus_versionLocalString("邀请你再来一场")).font(.fus_themeMediumFont(15)).textColor(.white) make.append(.fus_versionLocalString("邀请你再来一场")).font(.fus_themeMediumFont(15)).textColor(.fus_textColorRich())
}) })
// 倒数 // 倒数
...@@ -397,7 +399,7 @@ extension FFPKMessageAlertView{ ...@@ -397,7 +399,7 @@ extension FFPKMessageAlertView{
super.makeUI() super.makeUI()
textLabel.font = .fus_themeMediumFont(15) textLabel.font = .fus_themeMediumFont(15)
textLabel.textColor = .white textLabel.textColor = .fus_textColorRich()
textLabel.numberOfLines = 0 textLabel.numberOfLines = 0
textLabel.textAlignment = .center textLabel.textAlignment = .center
contentView.addSubview(textLabel) contentView.addSubview(textLabel)
...@@ -413,7 +415,7 @@ extension FFPKMessageAlertView{ ...@@ -413,7 +415,7 @@ extension FFPKMessageAlertView{
self.ff_setTitle(type: 1) self.ff_setTitle(type: 1)
textLabel.attributedText = .sj.makeText({ make in textLabel.attributedText = .sj.makeText({ make in
make.append(nickName).textColor(.init(hex: "#9C9B9E")) make.append(nickName).textColor(.fus_textColorRich())
make.append(" ") make.append(" ")
make.append(.fus_versionLocalString("拒绝了您的PK邀请")).textColor(.white) make.append(.fus_versionLocalString("拒绝了您的PK邀请")).textColor(.white)
make.font(.fus_themeMediumFont(15)) make.font(.fus_themeMediumFont(15))
...@@ -443,7 +445,7 @@ extension FFPKMessageAlertView{ ...@@ -443,7 +445,7 @@ extension FFPKMessageAlertView{
self.ff_setTitle(type: 2) self.ff_setTitle(type: 2)
textLabel.attributedText = .sj.makeText({ make in textLabel.attributedText = .sj.makeText({ make in
make.append(text).font(.fus_themeMediumFont(15)).textColor(.white) make.append(text).font(.fus_themeMediumFont(15)).textColor(.fus_textColorRich())
}) })
cancelBtn.setTitle(.fus_versionLocalString("取消"), for: .normal) cancelBtn.setTitle(.fus_versionLocalString("取消"), for: .normal)
......
...@@ -144,7 +144,7 @@ class FFPKResaultRewardAlertView: FUSBaseView { ...@@ -144,7 +144,7 @@ class FFPKResaultRewardAlertView: FUSBaseView {
layout.itemSize = itemSize layout.itemSize = itemSize
} }
drawBtn.style = .gradientLeftToRight drawBtn.style = .blue
drawBtn.titleLabel?.font = .fus_themeMediumFont(15) drawBtn.titleLabel?.font = .fus_themeMediumFont(15)
contentView.addSubview(drawBtn) contentView.addSubview(drawBtn)
drawBtn.snp.makeConstraints { make in drawBtn.snp.makeConstraints { make in
......
...@@ -10,7 +10,7 @@ import SwiftyJSON ...@@ -10,7 +10,7 @@ import SwiftyJSON
import RxSwift import RxSwift
import RxCocoa import RxCocoa
@objcMembers public class FFVSPunishGetListDataModel: FUSBaseModel { @objcMembers public class FFVSPunishGetListDataModel: FUSSwiftBaseModel {
/// 惩罚ID /// 惩罚ID
public var pid: String = "" public var pid: String = ""
...@@ -42,7 +42,7 @@ import RxCocoa ...@@ -42,7 +42,7 @@ import RxCocoa
} }
} }
@objcMembers public class FFVSPunishResultDataModel: FUSBaseModel { @objcMembers public class FFVSPunishResultDataModel: FUSSwiftBaseModel {
/// 惩罚ID /// 惩罚ID
var punishId: String = "" var punishId: String = ""
...@@ -60,7 +60,7 @@ import RxCocoa ...@@ -60,7 +60,7 @@ import RxCocoa
} }
/// pk选择激活的模型 /// pk选择激活的模型
@objcMembers public class FFVSPunishSelectActivatedModel: NSObject { @objcMembers public class FFVSPunishSelectActivatedModel: FUSSwiftBaseModel {
/// 房间ID /// 房间ID
public var roomId: String = "" public var roomId: String = ""
......
...@@ -488,7 +488,7 @@ ...@@ -488,7 +488,7 @@
/// @param failure 0 /// @param failure 0
+ (void)fus_requestVSInviteReply:(BOOL)receive matchid:(NSString *)matchid oncemore:(BOOL)oncemore refuseflag:(BOOL)refuseflag success:(void (^)(NSDictionary * _Nonnull))success failure:(void (^)(NSString * _Nonnull, int))failure{ + (void)fus_requestVSInviteReply:(BOOL)receive matchid:(NSString *)matchid oncemore:(BOOL)oncemore refuseflag:(BOOL)refuseflag success:(void (^)(NSDictionary * _Nonnull))success failure:(void (^)(NSString * _Nonnull, int))failure{
NSDictionary *parm = @{@"receive": (receive == YES ? @"1": @"-1"), NSDictionary *parm = @{@"status": (receive == YES ? @"1": @"-1"),
@"matchId": matchid, @"matchId": matchid,
@"refuseflag": (refuseflag == YES ? @"1": @"0"), @"refuseflag": (refuseflag == YES ? @"1": @"0"),
@"oncemore": (oncemore == YES? @"1": @"0")}; @"oncemore": (oncemore == YES? @"1": @"0")};
......
...@@ -33,6 +33,8 @@ import FUSCommon ...@@ -33,6 +33,8 @@ import FUSCommon
// let wechatShareBtn = UIButton(type: .custom) // let wechatShareBtn = UIButton(type: .custom)
// let wcCircleShareBtn = UIButton(type: .custom) // let wcCircleShareBtn = UIButton(type: .custom)
var btnList:[UIButton] = [] var btnList:[UIButton] = []
/// 规定可以选择的类型
var canSelectType:[FUSLiveStartShareType] = []
public var type:FUSLiveStartShareType = .facebook { public var type:FUSLiveStartShareType = .facebook {
didSet { didSet {
...@@ -54,8 +56,10 @@ import FUSCommon ...@@ -54,8 +56,10 @@ import FUSCommon
if FUSCacheDataShare.shareStore().areaCountryInfo.rating.intValue == 1 { if FUSCacheDataShare.shareStore().areaCountryInfo.rating.intValue == 1 {
btnList = [facebookShareBtn,twitterShareBtn,lineShareBtn/*,wechatShareBtn,wcCircleShareBtn*/] btnList = [facebookShareBtn,twitterShareBtn,lineShareBtn/*,wechatShareBtn,wcCircleShareBtn*/]
canSelectType = [.none,.facebook,.twitter,.line]
} else { } else {
btnList = [facebookShareBtn,twitterShareBtn,lineShareBtn] btnList = [facebookShareBtn,twitterShareBtn,lineShareBtn]
canSelectType = [.none,.facebook,.twitter,.line]
} }
let btnImgList = ["live_start_share_facebook","live_start_share_twitter","live_start_share_line"/*,"live_start_share_wechat","live_start_share_wx_circle"*/] let btnImgList = ["live_start_share_facebook","live_start_share_twitter","live_start_share_line"/*,"live_start_share_wechat","live_start_share_wx_circle"*/]
...@@ -92,6 +96,12 @@ import FUSCommon ...@@ -92,6 +96,12 @@ import FUSCommon
} }
public func setCurrentShareType(type: FUSLiveStartShareType) { public func setCurrentShareType(type: FUSLiveStartShareType) {
if self.canSelectType.count > 0 && self.canSelectType.contains(type) == false {
self.type = canSelectType[0]
return
}
for btn in self.btnList { for btn in self.btnList {
if btn.tag == type.rawValue { if btn.tag == type.rawValue {
btn.isSelected = true btn.isSelected = true
......
...@@ -119,6 +119,7 @@ PODS: ...@@ -119,6 +119,7 @@ PODS:
- RxSwift - RxSwift
- SnapKit - SnapKit
- SSZipArchive - SSZipArchive
- SwiftyJSON
- TTSDK/LivePull (= 1.47.1.10-premium) - TTSDK/LivePull (= 1.47.1.10-premium)
- TTSDK/LivePush (= 1.47.1.10-premium) - TTSDK/LivePush (= 1.47.1.10-premium)
- TTSDK/Player-SR (= 1.47.1.10-premium) - TTSDK/Player-SR (= 1.47.1.10-premium)
...@@ -479,8 +480,8 @@ SPEC CHECKSUMS: ...@@ -479,8 +480,8 @@ SPEC CHECKSUMS:
FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd
FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
FUSBDAlphaPlayer: 21eeb719a640eea5b40d340b340acc1e5e276509 FUSBDAlphaPlayer: 21eeb719a640eea5b40d340b340acc1e5e276509
FUSCommon: 48d5604250c81d12215ad2f3f60aac2aeb5560d1 FUSCommon: e7598553badadfbd0d88ab2ee26aab907e225a04
FUSFoundation: be886481dcdb45cf7e60d22922ee0ed84d9b8be1 FUSFoundation: 9f3a9c7003650b82fc942f23d87363e6f0517b35
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4 GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342 GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
......
...@@ -40,39 +40,21 @@ ...@@ -40,39 +40,21 @@
] ]
}, },
"dependencies": { "dependencies": {
"Bifrost": [ "Bifrost": [],
"FUSFoundation": [],
], "FUSBDAlphaPlayer": [],
"FUSFoundation": [ "MGSwipeTableCell": [],
"MMDrawerController": [],
],
"FUSBDAlphaPlayer": [
],
"MGSwipeTableCell": [
],
"MMDrawerController": [
],
"FirebaseAnalytics": [ "FirebaseAnalytics": [
"8.4.0" "8.4.0"
], ],
"AliyunOSSiOS": [ "AliyunOSSiOS": [],
],
"HyphenateChat": [ "HyphenateChat": [
"3.8.3.1" "3.8.3.1"
], ],
"RxCocoa": [ "RxCocoa": [],
"RxSwift": [],
], "RxDataSources": [],
"RxSwift": [
],
"RxDataSources": [
],
"SwiftyJSON": [ "SwiftyJSON": [
"~> 4.0" "~> 4.0"
] ]
......
...@@ -90,66 +90,39 @@ ...@@ -90,66 +90,39 @@
"bz2" "bz2"
], ],
"dependencies": { "dependencies": {
"AFNetworking": [ "AFNetworking": [],
],
"FMDB": [ "FMDB": [
"~>2.6.2" "~>2.6.2"
], ],
"CocoaAsyncSocket": [ "CocoaAsyncSocket": [],
],
"RMStore": [ "RMStore": [
"~>0.7.1" "~>0.7.1"
], ],
"YYKit": [ "YYKit": [],
"SwiftyJSON": [],
], "FBSDKCoreKit": [],
"FBSDKCoreKit": [ "FBSDKLoginKit": [],
"FBSDKShareKit": [],
], "TwitterKit5": [],
"FBSDKLoginKit": [
],
"FBSDKShareKit": [
],
"TwitterKit5": [
],
"GoogleSignIn": [ "GoogleSignIn": [
"5.0.2" "5.0.2"
], ],
"libPhoneNumber-iOS": [ "libPhoneNumber-iOS": [
"~> 0.8" "~> 0.8"
], ],
"mob_sharesdk": [ "mob_sharesdk": [],
"mob_sharesdk/ShareSDKPlatforms/WeChat": [],
], "LineSDKSwift": [],
"mob_sharesdk/ShareSDKPlatforms/WeChat": [
],
"LineSDKSwift": [
],
"MBProgressHUD": [ "MBProgressHUD": [
"~>1.0.0" "~>1.0.0"
], ],
"UIImage+BlurredFrame": [ "UIImage+BlurredFrame": [],
],
"MJRefresh": [ "MJRefresh": [
"3.1.17" "3.1.17"
], ],
"ZipArchive": [ "ZipArchive": [],
"HWPanModal": [],
], "Masonry": [],
"HWPanModal": [
],
"Masonry": [
],
"TTSDK/LivePull": [ "TTSDK/LivePull": [
"1.47.1.10-premium" "1.47.1.10-premium"
], ],
...@@ -162,21 +135,11 @@ ...@@ -162,21 +135,11 @@
"TTSDK/RTCSDK": [ "TTSDK/RTCSDK": [
"1.47.1.10-premium" "1.47.1.10-premium"
], ],
"SSZipArchive": [ "SSZipArchive": [],
"RxCocoa": [],
], "RxSwift": [],
"RxCocoa": [ "RxDataSources": [],
"SnapKit": [],
],
"RxSwift": [
],
"RxDataSources": [
],
"SnapKit": [
],
"AgoraRtcEngine_iOS/RtcBasic": [ "AgoraRtcEngine_iOS/RtcBasic": [
"4.2.6" "4.2.6"
] ]
......
...@@ -119,6 +119,7 @@ PODS: ...@@ -119,6 +119,7 @@ PODS:
- RxSwift - RxSwift
- SnapKit - SnapKit
- SSZipArchive - SSZipArchive
- SwiftyJSON
- TTSDK/LivePull (= 1.47.1.10-premium) - TTSDK/LivePull (= 1.47.1.10-premium)
- TTSDK/LivePush (= 1.47.1.10-premium) - TTSDK/LivePush (= 1.47.1.10-premium)
- TTSDK/Player-SR (= 1.47.1.10-premium) - TTSDK/Player-SR (= 1.47.1.10-premium)
...@@ -479,8 +480,8 @@ SPEC CHECKSUMS: ...@@ -479,8 +480,8 @@ SPEC CHECKSUMS:
FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd
FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
FUSBDAlphaPlayer: 21eeb719a640eea5b40d340b340acc1e5e276509 FUSBDAlphaPlayer: 21eeb719a640eea5b40d340b340acc1e5e276509
FUSCommon: 48d5604250c81d12215ad2f3f60aac2aeb5560d1 FUSCommon: e7598553badadfbd0d88ab2ee26aab907e225a04
FUSFoundation: be886481dcdb45cf7e60d22922ee0ed84d9b8be1 FUSFoundation: 9f3a9c7003650b82fc942f23d87363e6f0517b35
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4 GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342 GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
......
This source diff could not be displayed because it is too large. You can view the blob instead.
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/FUSFoundation CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/FUSFoundation
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/AppAuth" "${PODS_CONFIGURATION_BUILD_DIR}/CocoaAsyncSocket" "${PODS_CONFIGURATION_BUILD_DIR}/Differentiator" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/GTMAppAuth" "${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher" "${PODS_CONFIGURATION_BUILD_DIR}/HWPanModal" "${PODS_CONFIGURATION_BUILD_DIR}/LineSDKSwift" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${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_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}/GoogleSignIn/Frameworks" "${PODS_ROOT}/MOBFoundation/MOBFoundation" "${PODS_ROOT}/RangersAppLog/BDAutoTracker/Classes/Encryptor/Volc/Vendor" "${PODS_ROOT}/TTSDK/TTSDK/ByteAudio" "${PODS_ROOT}/TTSDK/TTSDK/ByteRtcSDK" "${PODS_ROOT}/TTSDK/TTSDK/TTFFmpeg" "${PODS_ROOT}/TTSDK/TTSDK/TTPlayerSDK/TTPlayerSDK/TTPlayer" "${PODS_ROOT}/TTSDK/TTSDK/VCBaseKit" "${PODS_ROOT}/TTSDK/TTSDK/VCNVCloudNetwork/products/framework" "${PODS_ROOT}/TTSDK/TTSDK/VolcBaseLog" "${PODS_ROOT}/TTSDK/TTSDK/boringssl" "${PODS_ROOT}/TTSDK/TTSDK/libbytevc0enc/lib" "${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}/MOBFoundation" "${PODS_XCFRAMEWORKS_BUILD_DIR}/RangersAppLog/Encryptor/VOLC" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/ByteAudio" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/Encode/h265" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/RTCFFmpeg" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/RTCSDK" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/RealXBase" FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/AppAuth" "${PODS_CONFIGURATION_BUILD_DIR}/CocoaAsyncSocket" "${PODS_CONFIGURATION_BUILD_DIR}/Differentiator" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/GTMAppAuth" "${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher" "${PODS_CONFIGURATION_BUILD_DIR}/HWPanModal" "${PODS_CONFIGURATION_BUILD_DIR}/LineSDKSwift" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${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_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}/GoogleSignIn/Frameworks" "${PODS_ROOT}/MOBFoundation/MOBFoundation" "${PODS_ROOT}/RangersAppLog/BDAutoTracker/Classes/Encryptor/Volc/Vendor" "${PODS_ROOT}/TTSDK/TTSDK/ByteAudio" "${PODS_ROOT}/TTSDK/TTSDK/ByteRtcSDK" "${PODS_ROOT}/TTSDK/TTSDK/TTFFmpeg" "${PODS_ROOT}/TTSDK/TTSDK/TTPlayerSDK/TTPlayerSDK/TTPlayer" "${PODS_ROOT}/TTSDK/TTSDK/VCBaseKit" "${PODS_ROOT}/TTSDK/TTSDK/VCNVCloudNetwork/products/framework" "${PODS_ROOT}/TTSDK/TTSDK/VolcBaseLog" "${PODS_ROOT}/TTSDK/TTSDK/boringssl" "${PODS_ROOT}/TTSDK/TTSDK/libbytevc0enc/lib" "${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}/MOBFoundation" "${PODS_XCFRAMEWORKS_BUILD_DIR}/RangersAppLog/Encryptor/VOLC" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/ByteAudio" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/Encode/h265" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/RTCFFmpeg" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/RTCSDK" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/RealXBase"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/Core/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/PlayerCore/Normal/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/PlayerCore/Normal/Headers" HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/Core/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/PlayerCore/Normal/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/PlayerCore/Normal/Headers"
OTHER_CFLAGS[config=Release] = -mllvm -bcf -mllvm -sub -mllvm -split OTHER_CFLAGS[config=Release] = -mllvm -bcf -mllvm -sub -mllvm -split
......
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/FUSFoundation CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/FUSFoundation
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/AppAuth" "${PODS_CONFIGURATION_BUILD_DIR}/CocoaAsyncSocket" "${PODS_CONFIGURATION_BUILD_DIR}/Differentiator" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/GTMAppAuth" "${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher" "${PODS_CONFIGURATION_BUILD_DIR}/HWPanModal" "${PODS_CONFIGURATION_BUILD_DIR}/LineSDKSwift" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${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_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}/GoogleSignIn/Frameworks" "${PODS_ROOT}/MOBFoundation/MOBFoundation" "${PODS_ROOT}/RangersAppLog/BDAutoTracker/Classes/Encryptor/Volc/Vendor" "${PODS_ROOT}/TTSDK/TTSDK/ByteAudio" "${PODS_ROOT}/TTSDK/TTSDK/ByteRtcSDK" "${PODS_ROOT}/TTSDK/TTSDK/TTFFmpeg" "${PODS_ROOT}/TTSDK/TTSDK/TTPlayerSDK/TTPlayerSDK/TTPlayer" "${PODS_ROOT}/TTSDK/TTSDK/VCBaseKit" "${PODS_ROOT}/TTSDK/TTSDK/VCNVCloudNetwork/products/framework" "${PODS_ROOT}/TTSDK/TTSDK/VolcBaseLog" "${PODS_ROOT}/TTSDK/TTSDK/boringssl" "${PODS_ROOT}/TTSDK/TTSDK/libbytevc0enc/lib" "${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}/MOBFoundation" "${PODS_XCFRAMEWORKS_BUILD_DIR}/RangersAppLog/Encryptor/VOLC" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/ByteAudio" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/Encode/h265" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/RTCFFmpeg" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/RTCSDK" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/RealXBase" FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/AppAuth" "${PODS_CONFIGURATION_BUILD_DIR}/CocoaAsyncSocket" "${PODS_CONFIGURATION_BUILD_DIR}/Differentiator" "${PODS_CONFIGURATION_BUILD_DIR}/FMDB" "${PODS_CONFIGURATION_BUILD_DIR}/GTMAppAuth" "${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher" "${PODS_CONFIGURATION_BUILD_DIR}/HWPanModal" "${PODS_CONFIGURATION_BUILD_DIR}/LineSDKSwift" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/Masonry" "${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_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}/GoogleSignIn/Frameworks" "${PODS_ROOT}/MOBFoundation/MOBFoundation" "${PODS_ROOT}/RangersAppLog/BDAutoTracker/Classes/Encryptor/Volc/Vendor" "${PODS_ROOT}/TTSDK/TTSDK/ByteAudio" "${PODS_ROOT}/TTSDK/TTSDK/ByteRtcSDK" "${PODS_ROOT}/TTSDK/TTSDK/TTFFmpeg" "${PODS_ROOT}/TTSDK/TTSDK/TTPlayerSDK/TTPlayerSDK/TTPlayer" "${PODS_ROOT}/TTSDK/TTSDK/VCBaseKit" "${PODS_ROOT}/TTSDK/TTSDK/VCNVCloudNetwork/products/framework" "${PODS_ROOT}/TTSDK/TTSDK/VolcBaseLog" "${PODS_ROOT}/TTSDK/TTSDK/boringssl" "${PODS_ROOT}/TTSDK/TTSDK/libbytevc0enc/lib" "${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}/MOBFoundation" "${PODS_XCFRAMEWORKS_BUILD_DIR}/RangersAppLog/Encryptor/VOLC" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/ByteAudio" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/Encode/h265" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/RTCFFmpeg" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/RTCSDK" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/RealXBase"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/Core/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/PlayerCore/Normal/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/PlayerCore/Normal/Headers" HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/Core/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/PlayerCore/Normal/Headers" "${PODS_XCFRAMEWORKS_BUILD_DIR}/TTSDK/PlayerCore/Normal/Headers"
OTHER_CFLAGS[config=Release] = -mllvm -bcf -mllvm -sub -mllvm -split 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