Skip to content

pidan / FuSiLive

Go to a project
Commit 94ca29e4 by ludi
Options

完成修改用户名以及退出相关页面刷新userinfo

parent 4ced11b2
Expand all
Inline Side-by-side
Showing with 264 additions and 25 deletions
FuSiLive/Assets.xcassets/fusiPart/common/fus_common_imageCropper_rotation_icon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_common_imageCropper_rotation_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_common_imageCropper_rotation_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Classes/Foundation/Http/FUSURLDictionary.h
...@@ -748,6 +748,9 @@ ...@@ -748,6 +748,9 @@
#define URL_USER_MANAGER_CHANGE_VOICE_SIGN DNS_FUS_API(@"/userManager/changeVoiceSign") #define URL_USER_MANAGER_CHANGE_VOICE_SIGN DNS_FUS_API(@"/userManager/changeVoiceSign")
// Fusi-修改用户昵称
#define URL_USER_UPDATE_NICKNAME DNS_FUS_API(@"/user/update/nickname")
#pragma mark -- 榜单相关 #pragma mark -- 榜单相关
// 贵人守护榜 // 贵人守护榜
......
FuSiLive/Classes/FusiLive-Bridging-Header.h
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#import "FUSMyZoneViewController.h" #import "FUSMyZoneViewController.h"
#import "FUSBaoFangHttpHelper.h" #import "FUSBaoFangHttpHelper.h"
#import "FUSSingleDailyCheckInView.h" #import "FUSSingleDailyCheckInView.h"
#import "FUSMyEditNameAlertView.h"
// MARK: -- 直播间 // MARK: -- 直播间
#import "FUSLiveChatInputView.h" #import "FUSLiveChatInputView.h"
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/MyEditName/FUSMyEditNameAlertView.h
...@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
/// - onView: 显示在哪 /// - onView: 显示在哪
/// - type: 0=修改用户名，1=修改珍爱团名 /// - type: 0=修改用户名，1=修改珍爱团名
/// - clickHandler: 回调 /// - clickHandler: 回调
+(void)fus_showOn:(UIView * _Nullable )onView type:(NSInteger)type clickHandler:(void(^)(BOOL suc, NSInteger code, NSString *msg))clickHandler; +(void)fus_showOn:(UIView * _Nullable )onView type:(NSInteger)type oldValue:(NSString *)oldValue clickHandler:(void(^)(BOOL suc, NSInteger code, NSString *msg))clickHandler;
@end @end
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/MyEditName/FUSMyEditNameAlertView.m
...@@ -6,11 +6,14 @@ ...@@ -6,11 +6,14 @@
// //
#import "FUSMyEditNameAlertView.h" #import "FUSMyEditNameAlertView.h"
#import "FUSZoneHttpRequest.h"
#import "FUSDefine.h"
@interface FUSMyEditNameAlertView () @interface FUSMyEditNameAlertView ()
/// 0=修改用户名，1=修改珍爱团名 /// 0=修改用户名，1=修改珍爱团名
@property (nonatomic, assign) NSInteger viewType; @property (nonatomic, assign) NSInteger viewType;
@property (nonatomic, strong) NSString *oldValue;
@property (nonatomic, copy) void(^clickHandler)(BOOL, NSInteger, NSString *); @property (nonatomic, copy) void(^clickHandler)(BOOL, NSInteger, NSString *);
@property (nonatomic, assign) CGFloat contentViewHeight; @property (nonatomic, assign) CGFloat contentViewHeight;
...@@ -27,7 +30,7 @@ ...@@ -27,7 +30,7 @@
@implementation FUSMyEditNameAlertView @implementation FUSMyEditNameAlertView
+ (void)fus_showOn:(UIView *)onView type:(NSInteger)type clickHandler:(void (^)(BOOL, NSInteger, NSString * _Nonnull))clickHandler{ + (void)fus_showOn:(UIView *)onView type:(NSInteger)type oldValue:(NSString *)oldValue clickHandler:(void (^)(BOOL, NSInteger, NSString * _Nonnull))clickHandler{
UIView *showView = [UINavigationController fus_topViewController].view; UIView *showView = [UINavigationController fus_topViewController].view;
if (onView) { if (onView) {
showView = onView; showView = onView;
...@@ -35,6 +38,7 @@ ...@@ -35,6 +38,7 @@
FUSMyEditNameAlertView *sv = [[FUSMyEditNameAlertView alloc] initWithFrame:showView.bounds]; FUSMyEditNameAlertView *sv = [[FUSMyEditNameAlertView alloc] initWithFrame:showView.bounds];
sv.clickHandler = clickHandler; sv.clickHandler = clickHandler;
sv.viewType = type; sv.viewType = type;
sv.oldValue = oldValue;
[showView addSubview:sv]; [showView addSubview:sv];
[sv fus_showWithAnimate]; [sv fus_showWithAnimate];
} }
...@@ -140,7 +144,7 @@ ...@@ -140,7 +144,7 @@
[UIView animateWithDuration:duration animations:^{ [UIView animateWithDuration:duration animations:^{
self.alpha = 1; self.alpha = 1;
self.contentView.y = keyboardFrame.origin.y - self.contentViewHeight; self.contentView.y = self.height - (UIView.fus_screenH - keyboardFrame.origin.y) - self.contentViewHeight;
}]; }];
} }
-(void)fus_keyboardWillHideNotification:(NSNotification *)notification{ -(void)fus_keyboardWillHideNotification:(NSNotification *)notification{
...@@ -157,7 +161,24 @@ ...@@ -157,7 +161,24 @@
#pragma mark --- button did clicked #pragma mark --- button did clicked
-(void)fus_okButonDidClicked:(UIButton *)btn{ -(void)fus_okButonDidClicked:(UIButton *)btn{
if (self.inpuTextField.text.length <= 0) {
FUSLocalizationHelper.versionLocalString(@"昵称不能为空");
return;
}else if ([self.inpuTextField.text isEqualToString:_oldValue]){
return;
}
FUSWeakSelf(weakself);
[FUSLoadingView fus_showProgressViewWithMessage:@""];
[FUSZoneHttpRequest fus_requestUserUpdateNickname:self.inpuTextField.text success:^{
[FUSLoadingView fus_dismissProgressView];
weakself.clickHandler(YES, 1, weakself.inpuTextField.text);
[weakself.inpuTextField resignFirstResponder];
} failure:^(NSString *msg, int code) {
[FUSLoadingView fus_dismissProgressView];
weakself.clickHandler(NO, code, msg);
}];
} }
#pragma mark --- method #pragma mark --- method
...@@ -238,6 +259,11 @@ ...@@ -238,6 +259,11 @@
} }
- (void)setOldValue:(NSString *)oldValue{
_oldValue = oldValue;
self.inpuTextField.text = oldValue;
}
- (void)dealloc - (void)dealloc
{ {
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/FUSHomePageViewController.m
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
@property (nonatomic, assign) BOOL scrollViewDidDrag; @property (nonatomic, assign) BOOL scrollViewDidDrag;
@property (nonatomic, assign) BOOL firstLoad;
@end @end
@implementation FUSHomePageViewController @implementation FUSHomePageViewController
...@@ -29,6 +31,7 @@ ...@@ -29,6 +31,7 @@
[super viewDidLoad]; [super viewDidLoad];
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
self.hiddenNavigationBar = YES; self.hiddenNavigationBar = YES;
self.firstLoad = YES;
[self fus_setupProperties]; [self fus_setupProperties];
[self fus_createHomeScrollView]; [self fus_createHomeScrollView];
...@@ -80,6 +83,15 @@ ...@@ -80,6 +83,15 @@
[self.tabbarView fus_setSelect:1 autoCall:NO]; [self.tabbarView fus_setSelect:1 autoCall:NO];
} }
-(void)viewWillAppear:(BOOL)animated{
[super viewWillAppear:animated];
if (!self.firstLoad) {
[[self.viewModel fus_currentContentView] fus_viewWillShow];
}
self.firstLoad = NO;
}
#pragma mark --- FUSFloatTabbarViewDelegate #pragma mark --- FUSFloatTabbarViewDelegate
- (void)fus_floatTabbarView:(FUSFloatTabbarView *)tabbarView didClick:(NSInteger)index lastClick:(NSInteger)lastIndex{ - (void)fus_floatTabbarView:(FUSFloatTabbarView *)tabbarView didClick:(NSInteger)index lastClick:(NSInteger)lastIndex{
...@@ -94,6 +106,7 @@ ...@@ -94,6 +106,7 @@
[self.scrollView scrollRectToVisible:scFrame animated:NO]; [self.scrollView scrollRectToVisible:scFrame animated:NO];
[self.viewModel fus_turnToPageView:index needReload:NO]; [self.viewModel fus_turnToPageView:index needReload:NO];
[[self.viewModel fus_currentContentView] fus_viewWillShow];
if (index == 1) { if (index == 1) {
[tabbarView fus_setNormalItemImageNames:self.viewModel.barItemImageNameWhiteList]; [tabbarView fus_setNormalItemImageNames:self.viewModel.barItemImageNameWhiteList];
...@@ -113,6 +126,7 @@ ...@@ -113,6 +126,7 @@
} }
[self.viewModel fus_turnToPageView:index needReload:NO]; [self.viewModel fus_turnToPageView:index needReload:NO];
[[self.viewModel fus_currentContentView] fus_viewWillShow];
if (index == 1) { if (index == 1) {
[self.tabbarView fus_setNormalItemImageNames:self.viewModel.barItemImageNameWhiteList]; [self.tabbarView fus_setNormalItemImageNames:self.viewModel.barItemImageNameWhiteList];
}else { }else {
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSHomePageBaseView.h
...@@ -28,6 +28,8 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -28,6 +28,8 @@ NS_ASSUME_NONNULL_BEGIN
-(void)fus_tabbarDidClicked:(BOOL)isRefresh; -(void)fus_tabbarDidClicked:(BOOL)isRefresh;
-(void)fus_viewWillShow;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSHomePageBaseView.m
...@@ -14,4 +14,8 @@ ...@@ -14,4 +14,8 @@
} }
- (void)fus_viewWillShow{
}
@end @end
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyView.m
...@@ -80,6 +80,10 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){ ...@@ -80,6 +80,10 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
return self; return self;
} }
- (void)fus_viewWillShow{
[self fus_updateDataSourceWithType:ReadMemoryBegin];
}
-(void)fus_createUI{ -(void)fus_createUI{
_tableView = [[FUSSettingTableView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH)]; _tableView = [[FUSSettingTableView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH)];
self.tableView.backgroundColor = [UIColor clearColor]; self.tableView.backgroundColor = [UIColor clearColor];
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/ViewModel/FUSHomePageViewModel.h
...@@ -34,6 +34,9 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -34,6 +34,9 @@ NS_ASSUME_NONNULL_BEGIN
/// - reload: 是否需要刷新 /// - reload: 是否需要刷新
-(void)fus_turnToPageView:(NSInteger)index needReload:(BOOL)reload; -(void)fus_turnToPageView:(NSInteger)index needReload:(BOOL)reload;
/// 获取当前显示的页面
-(FUSHomePageBaseView *)fus_currentContentView;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/ViewModel/FUSHomePageViewModel.m
...@@ -44,5 +44,11 @@ ...@@ -44,5 +44,11 @@
[tempView fus_tabbarDidClicked:YES]; [tempView fus_tabbarDidClicked:YES];
} }
} }
- (FUSHomePageBaseView *)fus_currentContentView{
if (self.currentIndex >= self.contentViewList.count) {
return nil;
}
return self.contentViewList[self.currentIndex];
}
@end @end
FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSZoneUserInfoEditViewController.swift
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
// //
import UIKit import UIKit
import SnapKit
class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelegate, UITextFieldDelegate { class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelegate, UITextFieldDelegate {
...@@ -210,6 +211,10 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega ...@@ -210,6 +211,10 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
// self.nickNameTextField.addTarget(self, action:#selector(fus_nickNameTextFieldDidEndEdit(_:)), for: .editingDidEnd) // self.nickNameTextField.addTarget(self, action:#selector(fus_nickNameTextFieldDidEndEdit(_:)), for: .editingDidEnd)
// self.nickNameTextField.addTarget(self, action:#selector(fus_nickNameTextFieldDidChanged(_:)), for: .editingChanged) // self.nickNameTextField.addTarget(self, action:#selector(fus_nickNameTextFieldDidChanged(_:)), for: .editingChanged)
self.nickNameTextField.addSubview(self.nickNameBtn) self.nickNameTextField.addSubview(self.nickNameBtn)
self.nickNameBtn.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
self.nickNameBtn.addTarget(self, action: #selector(fus_nickNameDidClicked(_:)), for: .touchUpInside)
self.careerTextField.addTarget(self, action:#selector(fus_careerTextFieldDidEndEdit(_:)), for: .editingDidEnd) self.careerTextField.addTarget(self, action:#selector(fus_careerTextFieldDidEndEdit(_:)), for: .editingDidEnd)
self.careerTextField.addTarget(self, action:#selector(fus_careerTextFieldDidChanged(_:)), for: .editingChanged) self.careerTextField.addTarget(self, action:#selector(fus_careerTextFieldDidChanged(_:)), for: .editingChanged)
...@@ -242,8 +247,8 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega ...@@ -242,8 +247,8 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
@objc private func fus_onClickLeftBtnAction(_ sender:FUSButton?) { @objc private func fus_onClickLeftBtnAction(_ sender:FUSButton?) {
self.view.endEditing(true) self.view.endEditing(true)
if self.nickNameTextField.text != self.userInfoModel?.nickname // if self.nickNameTextField.text != self.userInfoModel?.nickname
|| self.signTextView.text != self.userInfoModel?.sign if self.signTextView.text != self.userInfoModel?.sign
|| self.infoDict["sex"] != nil || self.infoDict["sex"] != nil
|| self.infoDict["birth"] != nil || self.infoDict["birth"] != nil
|| self.infoDict["height"] != nil || self.infoDict["height"] != nil
...@@ -558,6 +563,37 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega ...@@ -558,6 +563,37 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
self.navigationController?.pushViewController(voiceSignRecordVC, animated: true) self.navigationController?.pushViewController(voiceSignRecordVC, animated: true)
} }
/// 点击了昵称
/// - Parameter sender: 按钮
@objc private func fus_nickNameDidClicked(_ sender: UIButton) {
FUSMyEditNameAlertView.fus_show(on: self.view, type: 0, oldValue: self.nickNameTextField.text ?? "") {[weak self] suc, code, msg in
if suc {
self?.nickNameTextField.text = msg;
}else {
if code == -100 {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
FUSAlertView.fus_dismissAllAlertView(withAnimate: false)
FUSAlertView.showAlert(withTitle: FUSLocalizationHelper.localString("您的宝石不足，无法更改昵称"),
message: "",
cancelButtonTitle: FUSLocalizationHelper.localString("我没钱"),
otherButtonTitles: [FUSLocalizationHelper.localString("前往储值")])
{
(buttonIndex) in
if buttonIndex == 0 {
} else {
FUSRechargeViewController.fus_show(forRootVC: self)
}
}
}
} else {
FUSDialogView.fus_showDialog(msg)
}
}
}
}
/// 昵称编辑结束 /// 昵称编辑结束
/// - Parameter sender: textfield对象 /// - Parameter sender: textfield对象
@objc private func fus_nickNameTextFieldDidEndEdit(_ sender:UITextField) { @objc private func fus_nickNameTextFieldDidEndEdit(_ sender:UITextField) {
......
FuSiLive/Classes/Zone/Other/FUSZoneHttpRequest.h
...@@ -325,4 +325,10 @@ typedef NS_ENUM(NSInteger, FUSZoneHttpUploadImageType) ...@@ -325,4 +325,10 @@ typedef NS_ENUM(NSInteger, FUSZoneHttpUploadImageType)
success:(void (^)(int code))success success:(void (^)(int code))success
failure:(void (^)(NSString *msg, int code))failure; failure:(void (^)(NSString *msg, int code))failure;
/// Fusi-修改用户昵称
/// @param nickname 用户昵称
/// @param success 1
/// @param failure 1
+(void)fus_requestUserUpdateNickname:(NSString *)nickname success:(void (^)(void))success failure:(void (^)(NSString *msg, int code))failure;
@end @end
FuSiLive/Classes/Zone/Other/FUSZoneHttpRequest.m
...@@ -876,4 +876,19 @@ ...@@ -876,4 +876,19 @@
}]; }];
} }
+(void)fus_requestUserUpdateNickname:(NSString *)nickname success:(void (^)(void))success failure:(void (^)(NSString *msg, int code))failure{
if (nickname.length <= 0) {
failure(FUSLocalizationHelper.versionLocalString(@"昵称不能为空"), -1);
return;
}
NSDictionary *params = @{@"nickname": nickname};
[FUSHttpHelper postRequestBinaryWithUrl:URL_USER_UPDATE_NICKNAME params:params success:^(NSDictionary * _Nullable dataDict, int code) {
success();
} failure:^(NSDictionary * _Nullable dataDict, int code) {
if (failure) {
failure(FAILURE_MESSAGE,code);
}
}];
}
@end @end
Podfile
...@@ -13,6 +13,7 @@ target 'FuSiLive' do ...@@ -13,6 +13,7 @@ target 'FuSiLive' do
pod 'MMDrawerController' pod 'MMDrawerController'
pod 'TTTAttributedLabel' pod 'TTTAttributedLabel'
pod 'Masonry' pod 'Masonry'
pod 'SnapKit'
pod 'MGSwipeTableCell' pod 'MGSwipeTableCell'
pod 'M80AttributedLabel' pod 'M80AttributedLabel'
pod 'HyphenateChat','3.8.3.1' pod 'HyphenateChat','3.8.3.1'
......
Podfile.lock
...@@ -148,7 +148,7 @@ PODS: ...@@ -148,7 +148,7 @@ PODS:
- AppAuth/Core (~> 1.6) - AppAuth/Core (~> 1.6)
- GTMSessionFetcher/Core (< 3.0, >= 1.5) - GTMSessionFetcher/Core (< 3.0, >= 1.5)
- GTMSessionFetcher/Core (1.7.2) - GTMSessionFetcher/Core (1.7.2)
- HWPanModal (0.9.8) - HWPanModal (0.9.9)
- HyphenateChat (3.8.3.1) - HyphenateChat (3.8.3.1)
- libPhoneNumber-iOS (0.9.15) - libPhoneNumber-iOS (0.9.15)
- LineSDK (4.0.3) - LineSDK (4.0.3)
...@@ -191,6 +191,7 @@ PODS: ...@@ -191,6 +191,7 @@ PODS:
- RMStore/Core (= 0.7.1) - RMStore/Core (= 0.7.1)
- RMStore/Core (0.7.1) - RMStore/Core (0.7.1)
- SharetraceSDK (2.3.4) - SharetraceSDK (2.3.4)
- SnapKit (5.7.1)
- TalkingData/Full (5.0.5) - TalkingData/Full (5.0.5)
- TenjinSDK (1.14.3) - TenjinSDK (1.14.3)
- TTSDK/ByteAudio (1.37.2.6-premium-sft) - TTSDK/ByteAudio (1.37.2.6-premium-sft)
...@@ -254,6 +255,7 @@ DEPENDENCIES: ...@@ -254,6 +255,7 @@ DEPENDENCIES:
- MGSwipeTableCell - MGSwipeTableCell
- MMDrawerController - MMDrawerController
- SharetraceSDK - SharetraceSDK
- SnapKit
- TenjinSDK - TenjinSDK
- TTSDK/LivePull (= 1.37.2.6-premium-sft) - TTSDK/LivePull (= 1.37.2.6-premium-sft)
- TTSDK/LivePush (= 1.37.2.6-premium-sft) - TTSDK/LivePush (= 1.37.2.6-premium-sft)
...@@ -298,6 +300,7 @@ SPEC REPOS: ...@@ -298,6 +300,7 @@ SPEC REPOS:
- PromisesObjC - PromisesObjC
- RMStore - RMStore
- SharetraceSDK - SharetraceSDK
- SnapKit
- TalkingData - TalkingData
- TenjinSDK - TenjinSDK
- TTTAttributedLabel - TTTAttributedLabel
...@@ -338,7 +341,7 @@ SPEC CHECKSUMS: ...@@ -338,7 +341,7 @@ SPEC CHECKSUMS:
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd
GTMSessionFetcher: 5595ec75acf5be50814f81e9189490412bad82ba GTMSessionFetcher: 5595ec75acf5be50814f81e9189490412bad82ba
HWPanModal: 6951685ca7bdf147ff8a68e7d93d61f08a06dead HWPanModal: b57a6717d3cdcd666bff44f9dd2a5be9f4d6f5d2
HyphenateChat: dc9bedc84c610b9031c86a36b3231604d01026b4 HyphenateChat: dc9bedc84c610b9031c86a36b3231604d01026b4
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
LineSDK: 01a0e7206b2c459f20a2bee888553ae5dc74a709 LineSDK: 01a0e7206b2c459f20a2bee888553ae5dc74a709
...@@ -355,6 +358,7 @@ SPEC CHECKSUMS: ...@@ -355,6 +358,7 @@ SPEC CHECKSUMS:
RangersAppLog: 4f23c696b728f0d1cf252ebff5e3886281e164c8 RangersAppLog: 4f23c696b728f0d1cf252ebff5e3886281e164c8
RMStore: 64ba13a9c040e3b7572765d169f77175cd3243e5 RMStore: 64ba13a9c040e3b7572765d169f77175cd3243e5
SharetraceSDK: 6371cd201f679a585f6a5ecf5bf713124d12b4f6 SharetraceSDK: 6371cd201f679a585f6a5ecf5bf713124d12b4f6
SnapKit: d612e99e678a2d3b95bf60b0705ed0a35c03484a
TalkingData: aee0d72497b921a9648213d65ba9939a1114d88d TalkingData: aee0d72497b921a9648213d65ba9939a1114d88d
TenjinSDK: ece2612ebe7c02f3ca39712f0977c942f6f604ab TenjinSDK: ece2612ebe7c02f3ca39712f0977c942f6f604ab
TTSDK: 62840afeaafc0d7b2797267597c96bd6d0bfddf0 TTSDK: 62840afeaafc0d7b2797267597c96bd6d0bfddf0
...@@ -369,6 +373,6 @@ SPEC CHECKSUMS: ...@@ -369,6 +373,6 @@ SPEC CHECKSUMS:
YYKit: 7cda43304a8dc3696c449041e2cb3107b4e236e7 YYKit: 7cda43304a8dc3696c449041e2cb3107b4e236e7
ZipArchive: e25a4373192673e3229ac8d6e9f64a3e5713c966 ZipArchive: e25a4373192673e3229ac8d6e9f64a3e5713c966
PODFILE CHECKSUM: cd8970ddaa1e8b6d7324812f5e64c45976b33d9e PODFILE CHECKSUM: d3d94afcf8e2c0c0c2f43c9c2fe9aa92c6b6bdeb
COCOAPODS: 1.15.2 COCOAPODS: 1.12.1
Pods/HWPanModal/Sources/Controller/HWPanModalPresentationController.m
...@@ -83,11 +83,18 @@ ...@@ -83,11 +83,18 @@
} }
__weak typeof(self) wkSelf = self; __weak typeof(self) wkSelf = self;
__block BOOL isAnimated = NO;
[self.presentedViewController.transitionCoordinator animateAlongsideTransition:^(id <UIViewControllerTransitionCoordinatorContext> context) { [self.presentedViewController.transitionCoordinator animateAlongsideTransition:^(id <UIViewControllerTransitionCoordinatorContext> context) {
wkSelf.backgroundView.dimState = DimStateMax; wkSelf.backgroundView.dimState = DimStateMax;
[wkSelf.presentedViewController setNeedsStatusBarAppearanceUpdate]; [wkSelf.presentedViewController setNeedsStatusBarAppearanceUpdate];
isAnimated = YES;
} completion:^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) { } completion:^(id<UIViewControllerTransitionCoordinatorContext> _Nonnull context) {
if (!isAnimated) {
/// In some cases, for example, present a `hw` when a navigation controller is pushing a new vc, `animateAlongsideTransition` will not call.
/// If not called, call it here.
wkSelf.backgroundView.dimState = DimStateMax;
[wkSelf.presentedViewController setNeedsStatusBarAppearanceUpdate];
}
if ([[wkSelf presentable] allowsTouchEventsPassingThroughTransitionView]) { if ([[wkSelf presentable] allowsTouchEventsPassingThroughTransitionView]) {
// hack TransitionView // hack TransitionView
[wkSelf.containerView setValue:@(YES) forKey:@"ignoreDirectTouchEvents"]; [wkSelf.containerView setValue:@(YES) forKey:@"ignoreDirectTouchEvents"];
......
Pods/HWPanModal/Sources/Presentable/HWPanModalPresentationUpdateProtocol.h
...@@ -58,6 +58,6 @@ ...@@ -58,6 +58,6 @@
/** /**
* call this method to dismiss your presented VC directly * call this method to dismiss your presented VC directly
*/ */
- (void)hw_dismissAnimated:(BOOL)animated completion:(void (^)(void))completion NS_SWIFT_NAME(dismissAnimated(animated:completion:)); - (void)hw_dismissAnimated:(BOOL)animated completion:(void (^)(void))completion NS_SWIFT_NAME(panModalDismissAnimated(animated:completion:));
@end @end
Pods/HWPanModal/Sources/View/PanModal/HWPanModalContainerView.m
...@@ -87,6 +87,25 @@ ...@@ -87,6 +87,25 @@
} }
} }
- (void)willMoveToSuperview:(UIView *)newSuperview {
[super willMoveToSuperview:newSuperview];
if (UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad) {
[self.superview removeObserver:self forKeyPath:@"frame"];
[newSuperview addObserver:self forKeyPath:@"frame" options:NSKeyValueObservingOptionNew context:nil];
}
}
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
if (object == self.presentingView && [keyPath isEqualToString:@"frame"]) {
self.frame = self.presentingView.bounds;
[self setNeedsLayoutUpdate];
[self updateDragIndicatorViewFrame];
[self.contentView hw_panModalTransitionTo:self.contentView.hw_presentationState animated:NO];
} else {
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
}
}
- (void)presentAnimationWillBegin { - (void)presentAnimationWillBegin {
[[self presentable] panModalTransitionWillBegin]; [[self presentable] panModalTransitionWillBegin];
[self layoutBackgroundView]; [self layoutBackgroundView];
...@@ -251,31 +270,35 @@ ...@@ -251,31 +270,35 @@
- (void)updateDragIndicatorView { - (void)updateDragIndicatorView {
if ([self.presentable showDragIndicator]) { if ([self.presentable showDragIndicator]) {
[self addDragIndicatorViewToView:self.panContainerView]; [self addDragIndicatorView];
} else { } else {
self.dragIndicatorView.hidden = YES; self.dragIndicatorView.hidden = YES;
} }
} }
- (void)addDragIndicatorViewToView:(UIView *)view { - (void)addDragIndicatorView {
// if has been add, won't update it. // if has been add, won't update it.
self.dragIndicatorView.hidden = NO; self.dragIndicatorView.hidden = NO;
if (self.dragIndicatorView.superview == view) { if (self.dragIndicatorView.superview == self.panContainerView) {
[self updateDragIndicatorViewFrame];
[self.dragIndicatorView didChangeToState:HWIndicatorStateNormal]; [self.dragIndicatorView didChangeToState:HWIndicatorStateNormal];
return; return;
} }
self.handler.dragIndicatorView = self.dragIndicatorView; self.handler.dragIndicatorView = self.dragIndicatorView;
[view addSubview:self.dragIndicatorView]; [self.panContainerView addSubview:self.dragIndicatorView];
CGSize indicatorSize = [self.dragIndicatorView indicatorSize]; [self updateDragIndicatorViewFrame];
self.dragIndicatorView.frame = CGRectMake((view.hw_width - indicatorSize.width) / 2, -kIndicatorYOffset - indicatorSize.height, indicatorSize.width, indicatorSize.height);
[self.dragIndicatorView setupSubviews]; [self.dragIndicatorView setupSubviews];
[self.dragIndicatorView didChangeToState:HWIndicatorStateNormal]; [self.dragIndicatorView didChangeToState:HWIndicatorStateNormal];
} }
- (void)updateDragIndicatorViewFrame {
CGSize indicatorSize = [self.dragIndicatorView indicatorSize];
self.dragIndicatorView.frame = CGRectMake((self.panContainerView.hw_width - indicatorSize.width) / 2, -kIndicatorYOffset - indicatorSize.height, indicatorSize.width, indicatorSize.height);
}
- (void)updateContainerViewShadow { - (void)updateContainerViewShadow {
HWPanModalShadow *shadow = [[self presentable] contentShadow]; HWPanModalShadow *shadow = [[self presentable] contentShadow];
if (shadow.shadowColor) { if (shadow.shadowColor) {
......
Pods/Manifest.lock
...@@ -148,7 +148,7 @@ PODS: ...@@ -148,7 +148,7 @@ PODS:
- AppAuth/Core (~> 1.6) - AppAuth/Core (~> 1.6)
- GTMSessionFetcher/Core (< 3.0, >= 1.5) - GTMSessionFetcher/Core (< 3.0, >= 1.5)
- GTMSessionFetcher/Core (1.7.2) - GTMSessionFetcher/Core (1.7.2)
- HWPanModal (0.9.8) - HWPanModal (0.9.9)
- HyphenateChat (3.8.3.1) - HyphenateChat (3.8.3.1)
- libPhoneNumber-iOS (0.9.15) - libPhoneNumber-iOS (0.9.15)
- LineSDK (4.0.3) - LineSDK (4.0.3)
...@@ -191,6 +191,7 @@ PODS: ...@@ -191,6 +191,7 @@ PODS:
- RMStore/Core (= 0.7.1) - RMStore/Core (= 0.7.1)
- RMStore/Core (0.7.1) - RMStore/Core (0.7.1)
- SharetraceSDK (2.3.4) - SharetraceSDK (2.3.4)
- SnapKit (5.7.1)
- TalkingData/Full (5.0.5) - TalkingData/Full (5.0.5)
- TenjinSDK (1.14.3) - TenjinSDK (1.14.3)
- TTSDK/ByteAudio (1.37.2.6-premium-sft) - TTSDK/ByteAudio (1.37.2.6-premium-sft)
...@@ -254,6 +255,7 @@ DEPENDENCIES: ...@@ -254,6 +255,7 @@ DEPENDENCIES:
- MGSwipeTableCell - MGSwipeTableCell
- MMDrawerController - MMDrawerController
- SharetraceSDK - SharetraceSDK
- SnapKit
- TenjinSDK - TenjinSDK
- TTSDK/LivePull (= 1.37.2.6-premium-sft) - TTSDK/LivePull (= 1.37.2.6-premium-sft)
- TTSDK/LivePush (= 1.37.2.6-premium-sft) - TTSDK/LivePush (= 1.37.2.6-premium-sft)
...@@ -298,6 +300,7 @@ SPEC REPOS: ...@@ -298,6 +300,7 @@ SPEC REPOS:
- PromisesObjC - PromisesObjC
- RMStore - RMStore
- SharetraceSDK - SharetraceSDK
- SnapKit
- TalkingData - TalkingData
- TenjinSDK - TenjinSDK
- TTTAttributedLabel - TTTAttributedLabel
...@@ -338,7 +341,7 @@ SPEC CHECKSUMS: ...@@ -338,7 +341,7 @@ SPEC CHECKSUMS:
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd
GTMSessionFetcher: 5595ec75acf5be50814f81e9189490412bad82ba GTMSessionFetcher: 5595ec75acf5be50814f81e9189490412bad82ba
HWPanModal: 6951685ca7bdf147ff8a68e7d93d61f08a06dead HWPanModal: b57a6717d3cdcd666bff44f9dd2a5be9f4d6f5d2
HyphenateChat: dc9bedc84c610b9031c86a36b3231604d01026b4 HyphenateChat: dc9bedc84c610b9031c86a36b3231604d01026b4
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75 libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
LineSDK: 01a0e7206b2c459f20a2bee888553ae5dc74a709 LineSDK: 01a0e7206b2c459f20a2bee888553ae5dc74a709
...@@ -355,6 +358,7 @@ SPEC CHECKSUMS: ...@@ -355,6 +358,7 @@ SPEC CHECKSUMS:
RangersAppLog: 4f23c696b728f0d1cf252ebff5e3886281e164c8 RangersAppLog: 4f23c696b728f0d1cf252ebff5e3886281e164c8
RMStore: 64ba13a9c040e3b7572765d169f77175cd3243e5 RMStore: 64ba13a9c040e3b7572765d169f77175cd3243e5
SharetraceSDK: 6371cd201f679a585f6a5ecf5bf713124d12b4f6 SharetraceSDK: 6371cd201f679a585f6a5ecf5bf713124d12b4f6
SnapKit: d612e99e678a2d3b95bf60b0705ed0a35c03484a
TalkingData: aee0d72497b921a9648213d65ba9939a1114d88d TalkingData: aee0d72497b921a9648213d65ba9939a1114d88d
TenjinSDK: ece2612ebe7c02f3ca39712f0977c942f6f604ab TenjinSDK: ece2612ebe7c02f3ca39712f0977c942f6f604ab
TTSDK: 62840afeaafc0d7b2797267597c96bd6d0bfddf0 TTSDK: 62840afeaafc0d7b2797267597c96bd6d0bfddf0
...@@ -369,6 +373,6 @@ SPEC CHECKSUMS: ...@@ -369,6 +373,6 @@ SPEC CHECKSUMS:
YYKit: 7cda43304a8dc3696c449041e2cb3107b4e236e7 YYKit: 7cda43304a8dc3696c449041e2cb3107b4e236e7
ZipArchive: e25a4373192673e3229ac8d6e9f64a3e5713c966 ZipArchive: e25a4373192673e3229ac8d6e9f64a3e5713c966
PODFILE CHECKSUM: cd8970ddaa1e8b6d7324812f5e64c45976b33d9e PODFILE CHECKSUM: d3d94afcf8e2c0c0c2f43c9c2fe9aa92c6b6bdeb
COCOAPODS: 1.15.2 COCOAPODS: 1.12.1
Pods/Pods.xcodeproj/project.pbxproj
This source diff could not be displayed because it is too large. You can view the blob instead.
Pods/Target Support Files/HWPanModal/HWPanModal-Info.plist
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.9.8</string> <string>0.9.9</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
Pods/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-acknowledgements.markdown
...@@ -2440,6 +2440,29 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ...@@ -2440,6 +2440,29 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
## SnapKit
Copyright (c) 2011-Present SnapKit Team - https://github.com/SnapKit
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
## TTTAttributedLabel ## TTTAttributedLabel
Copyright (c) 2011 Mattt Thompson (http://mattt.me/) Copyright (c) 2011 Mattt Thompson (http://mattt.me/)
......
Pods/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-acknowledgements.plist
...@@ -2645,6 +2645,35 @@ SOFTWARE. ...@@ -2645,6 +2645,35 @@ SOFTWARE.
</dict> </dict>
<dict> <dict>
<key>FooterText</key> <key>FooterText</key>
<string>Copyright (c) 2011-Present SnapKit Team - https://github.com/SnapKit
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
</string>
<key>License</key>
<string>MIT</string>
<key>Title</key>
<string>SnapKit</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>FooterText</key>
<string>Copyright (c) 2011 Mattt Thompson (http://mattt.me/) <string>Copyright (c) 2011 Mattt Thompson (http://mattt.me/)
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
......
Pods/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks-Debug-input-files.xcfilelist
...@@ -31,6 +31,7 @@ ${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework ...@@ -31,6 +31,7 @@ ${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework
${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework ${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework
${BUILT_PRODUCTS_DIR}/RMStore/RMStore.framework ${BUILT_PRODUCTS_DIR}/RMStore/RMStore.framework
${PODS_ROOT}/SharetraceSDK/lib/SharetraceSDK.framework ${PODS_ROOT}/SharetraceSDK/lib/SharetraceSDK.framework
${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework
${PODS_ROOT}/TTSDK/TTSDK/ffmpeg_dashdec_iOS/ffmpeg_dashdec.framework ${PODS_ROOT}/TTSDK/TTSDK/ffmpeg_dashdec_iOS/ffmpeg_dashdec.framework
${PODS_ROOT}/TTSDK/TTSDK/TTFFmpeg/TTFFmpeg.framework ${PODS_ROOT}/TTSDK/TTSDK/TTFFmpeg/TTFFmpeg.framework
${PODS_ROOT}/TTSDK/TTSDK/boringssl/boringssl.framework ${PODS_ROOT}/TTSDK/TTSDK/boringssl/boringssl.framework
......
Pods/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks-Debug-output-files.xcfilelist
...@@ -30,6 +30,7 @@ ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework ...@@ -30,6 +30,7 @@ ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RMStore.framework ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RMStore.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SharetraceSDK.framework ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SharetraceSDK.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ffmpeg_dashdec.framework ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ffmpeg_dashdec.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TTFFmpeg.framework ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TTFFmpeg.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/boringssl.framework ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/boringssl.framework
......
Pods/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks-Release-input-files.xcfilelist
...@@ -31,6 +31,7 @@ ${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework ...@@ -31,6 +31,7 @@ ${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework
${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework ${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework
${BUILT_PRODUCTS_DIR}/RMStore/RMStore.framework ${BUILT_PRODUCTS_DIR}/RMStore/RMStore.framework
${PODS_ROOT}/SharetraceSDK/lib/SharetraceSDK.framework ${PODS_ROOT}/SharetraceSDK/lib/SharetraceSDK.framework
${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework
${PODS_ROOT}/TTSDK/TTSDK/ffmpeg_dashdec_iOS/ffmpeg_dashdec.framework ${PODS_ROOT}/TTSDK/TTSDK/ffmpeg_dashdec_iOS/ffmpeg_dashdec.framework
${PODS_ROOT}/TTSDK/TTSDK/TTFFmpeg/TTFFmpeg.framework ${PODS_ROOT}/TTSDK/TTSDK/TTFFmpeg/TTFFmpeg.framework
${PODS_ROOT}/TTSDK/TTSDK/boringssl/boringssl.framework ${PODS_ROOT}/TTSDK/TTSDK/boringssl/boringssl.framework
......
Pods/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks-Release-output-files.xcfilelist
...@@ -30,6 +30,7 @@ ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework ...@@ -30,6 +30,7 @@ ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RMStore.framework ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RMStore.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SharetraceSDK.framework ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SharetraceSDK.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ffmpeg_dashdec.framework ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ffmpeg_dashdec.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TTFFmpeg.framework ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TTFFmpeg.framework
${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/boringssl.framework ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/boringssl.framework
......
Pods/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks.sh
...@@ -18,7 +18,7 @@ echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" ...@@ -18,7 +18,7 @@ echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}" COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
SWIFT_STDLIB_PATH="${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
BCSYMBOLMAP_DIR="BCSymbolMaps" BCSYMBOLMAP_DIR="BCSymbolMaps"
...@@ -208,6 +208,7 @@ if [[ "$CONFIGURATION" == "Debug" ]]; then ...@@ -208,6 +208,7 @@ if [[ "$CONFIGURATION" == "Debug" ]]; then
install_framework "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework" install_framework "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework"
install_framework "${BUILT_PRODUCTS_DIR}/RMStore/RMStore.framework" install_framework "${BUILT_PRODUCTS_DIR}/RMStore/RMStore.framework"
install_framework "${PODS_ROOT}/SharetraceSDK/lib/SharetraceSDK.framework" install_framework "${PODS_ROOT}/SharetraceSDK/lib/SharetraceSDK.framework"
install_framework "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework"
install_framework "${PODS_ROOT}/TTSDK/TTSDK/ffmpeg_dashdec_iOS/ffmpeg_dashdec.framework" install_framework "${PODS_ROOT}/TTSDK/TTSDK/ffmpeg_dashdec_iOS/ffmpeg_dashdec.framework"
install_framework "${PODS_ROOT}/TTSDK/TTSDK/TTFFmpeg/TTFFmpeg.framework" install_framework "${PODS_ROOT}/TTSDK/TTSDK/TTFFmpeg/TTFFmpeg.framework"
install_framework "${PODS_ROOT}/TTSDK/TTSDK/boringssl/boringssl.framework" install_framework "${PODS_ROOT}/TTSDK/TTSDK/boringssl/boringssl.framework"
...@@ -257,6 +258,7 @@ if [[ "$CONFIGURATION" == "Release" ]]; then ...@@ -257,6 +258,7 @@ if [[ "$CONFIGURATION" == "Release" ]]; then
install_framework "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework" install_framework "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework"
install_framework "${BUILT_PRODUCTS_DIR}/RMStore/RMStore.framework" install_framework "${BUILT_PRODUCTS_DIR}/RMStore/RMStore.framework"
install_framework "${PODS_ROOT}/SharetraceSDK/lib/SharetraceSDK.framework" install_framework "${PODS_ROOT}/SharetraceSDK/lib/SharetraceSDK.framework"
install_framework "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework"
install_framework "${PODS_ROOT}/TTSDK/TTSDK/ffmpeg_dashdec_iOS/ffmpeg_dashdec.framework" install_framework "${PODS_ROOT}/TTSDK/TTSDK/ffmpeg_dashdec_iOS/ffmpeg_dashdec.framework"
install_framework "${PODS_ROOT}/TTSDK/TTSDK/TTFFmpeg/TTFFmpeg.framework" install_framework "${PODS_ROOT}/TTSDK/TTSDK/TTFFmpeg/TTFFmpeg.framework"
install_framework "${PODS_ROOT}/TTSDK/TTSDK/boringssl/boringssl.framework" install_framework "${PODS_ROOT}/TTSDK/TTSDK/boringssl/boringssl.framework"
......
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