Skip to content

Commit

Permalink
iOS 升级8.8
Browse files Browse the repository at this point in the history
  • Loading branch information
abyyxwang committed Jun 21, 2021
1 parent 30ef3ce commit b80f98c
Show file tree
Hide file tree
Showing 76 changed files with 932 additions and 152 deletions.
4 changes: 2 additions & 2 deletions Demo/ReplaykitUpload/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>8.8.1062</string>
<string>8.8.1075</string>
<key>CFBundleVersion</key>
<string>1062</string>
<string>1075</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
5 changes: 4 additions & 1 deletion Demo/ReplaykitUpload/SampleHandler.m
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@ - (void)broadcastFinished {


- (void)processSampleBuffer:(CMSampleBufferRef)sampleBuffer withType:(RPSampleBufferType)sampleBufferType {
[[TXReplayKitExt sharedInstance] sendSampleBuffer:sampleBuffer withType:sampleBufferType];
if (sampleBufferType != RPSampleBufferTypeAudioMic) {
/// 声音由主APP采集发送
[[TXReplayKitExt sharedInstance] sendSampleBuffer:sampleBuffer withType:sampleBufferType];
}
}

#pragma mark - TXReplayKitExtDelegate
Expand Down
4 changes: 2 additions & 2 deletions Demo/ReplaykitUpload/TRTCInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>8.8.1062</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>1062</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
350 changes: 269 additions & 81 deletions Demo/TXLiteAVDemo.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Demo/TXLiteAVDemo/App/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>8.8.1062</string>
<string>8.8.1075</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -36,7 +36,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1062</string>
<string>1075</string>
<key>IMSDKCrashReporterEnable</key>
<false/>
<key>LSRequiresIPhoneOS</key>
Expand Down
36 changes: 11 additions & 25 deletions Demo/TXLiteAVDemo/App/Main/MainViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -131,24 +131,10 @@ -(void)viewDidAppear:(BOOL)animated {
#endif
}

- (IBAction)logout:(id)sender {
- (IBAction)userInfoButtonClick:(id)sender {
#if !defined(UGC) && !defined(PLAYER)
UIAlertController *alert = [UIAlertController alertControllerWithTitle:V2Localize(@"V2.Live.LinkMicNew.suretologout") message:nil preferredStyle:UIAlertControllerStyleAlert];
UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:V2Localize(@"V2.Live.LinkMicNew.cancel") style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {

}];
UIAlertAction *okAction = [UIAlertAction actionWithTitle:V2Localize(@"V2.Live.LinkMicNew.confirm") style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
[[ProfileManager shared] removeLoginCache];
[[AppUtils shared] showLoginController];
[[V2TIMManager sharedInstance] logout:^{

} fail:^(int code, NSString *msg) {

}];
}];
[alert addAction:cancelAction];
[alert addAction:okAction];
[self presentViewController:alert animated:YES completion:nil];
MineViewController *mineVC = [[MineViewController alloc] init];
[self.navigationController pushViewController:mineVC animated:YES];
#endif
}

Expand Down Expand Up @@ -406,17 +392,17 @@ - (void)initUI
pressGesture.numberOfTouchesRequired = 1;
[self.view addGestureRecognizer:pressGesture];

// 退出登录按钮
UIButton* logoutButton = [UIButton buttonWithType:UIButtonTypeCustom];
logoutButton.frame = CGRectMake(20, 0, 32, 32);
CGPoint center = logoutButton.center;
// 用户个人信息按钮
UIButton* userInfoButton = [UIButton buttonWithType:UIButtonTypeCustom];
userInfoButton.frame = CGRectMake(20, 0, 32, 32);
CGPoint center = userInfoButton.center;
center.y = lbHeadLine.center.y;
logoutButton.center = center;
[logoutButton setImage:[UIImage imageNamed:@"ic_logout"] forState:UIControlStateNormal];
[logoutButton addTarget:self action:@selector(logout:) forControlEvents:UIControlEventTouchUpInside];
userInfoButton.center = center;
[userInfoButton setImage:[UIImage imageNamed:@"ic_logout"] forState:UIControlStateNormal];
[userInfoButton addTarget:self action:@selector(userInfoButtonClick:) forControlEvents:UIControlEventTouchUpInside];

#if !defined(UGC) && !defined(PLAYER)
[self.view addSubview:logoutButton];
[self.view addSubview:userInfoButton];
#endif


Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "bgm_back.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "bgm_back@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "bgm_back@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "checkbox_nor.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "checkbox_nor@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "checkbox_nor@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "checkbox_sel.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "checkbox_sel@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "checkbox_sel@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "exitRoom.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "exitRoom@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "exitRoom@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "关于.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "关于@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "关于@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "black_back.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "black_back@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "black_back@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "详情.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "详情@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "详情@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "免责申明.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "免责申明@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "免责申明@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "编辑.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "编辑@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "编辑@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "隐私条款.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "隐私条款@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "隐私条款@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "resign.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "userAgreement.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "userAgreement@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "userAgreement@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading

0 comments on commit b80f98c

Please sign in to comment.