Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[iOS] update version to relesse-11.4.0.4162 #81

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[iOS] update version to relesse-11.4.0.4162 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions iOS/Example/App/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>11.2.0</string>
<string>11.4.0</string>
<key>CFBundleVersion</key>
<string>3963</string>
<string>4162</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
Expand Down
144 changes: 72 additions & 72 deletions iOS/Example/TUIVoiceRoomApp.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions iOS/Source/TUIVoiceRoomKit_TRTC/TUIVoiceRoomKit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#ifndef TUIVoiceRoomKit_h
#define TUIVoiceRoomKit_h

#import <TXLiteAVSDK_TRTC/TRTCCloud.h>

@import TXLiteAVSDK_TRTC;
@import TXAppBasic;

Expand Down
4 changes: 2 additions & 2 deletions iOS/Source/model/Impl/TRTCVoiceRoom.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#import "VoiceRoomTRTCService.h"
#import "TXVoiceRoomService.h"
#import "TXVoiceRoomCommonDef.h"
#import "TXLiteAVSDK_TRTC/TRTCCloud.h"
#import "TUIVoiceRoomKit.h"
#import "VoiceRoomLocalized.h"
#import "TUICore.h"
#import "TUIDefine.h"
Expand Down Expand Up @@ -562,7 +562,7 @@ - (void)enterSeat:(NSInteger)seatIndex callback:(ActionCallback)callback {
if ([self isOnSeatWithUserId:self.userId]) {
[self runOnDelegateQueue:^{
if (callback) {
callback(-1, @"you are alread in the seat.");
callback(0, @"take seat callback success.");
}
}];
return;
Expand Down
2 changes: 1 addition & 1 deletion iOS/Source/model/Impl/base/TXBaseDef.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import "TXBaseDef.h"
#import "TXLiteAVSDK_TRTC/TRTCCloud.h"
#import "TUIVoiceRoomKit.h"

@interface TRTCCloud (VoiceRoomLog)

Expand Down
2 changes: 1 addition & 1 deletion iOS/Source/model/Impl/trtc/VoiceRoomTRTCService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

#import "VoiceRoomTRTCService.h"
#import "TXLiteAVSDK_TRTC/TRTCCloud.h"
#import "TUIVoiceRoomKit.h"

static const int TC_COMPONENT_VOICEROOM = 6;
static const int TC_TRTC_FRAMEWORK = 1;
Expand Down
2 changes: 1 addition & 1 deletion iOS/Source/ui/TRTCCreateVoiceRoomViewController/TRTCCreateVoiceRoomRootView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class TRTCCreateVoiceRoomRootView: UIView {
super.init(frame: frame)
bindInteraction()
NotificationCenter.default.addObserver(self, selector: #selector(keyboardFrameChange(noti:)),
name: UIResponder.keyboardWillChangeFrameNotification, object: nil)
name: UIResponder.keyboardWillChangeFrameNotification, object: nil)
}

deinit {
Expand Down
4 changes: 2 additions & 2 deletions iOS/Source/ui/TRTCCreateVoiceRoomViewController/TRTCCreateVoiceRoomViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import UIKit
import ImSDK_Plus
import TUICore

public enum VoiceRoomRole {
case anchor
Expand Down Expand Up @@ -38,7 +38,7 @@ class TRTCCreateVoiceRoomViewModel {
var roomName: String = ""
var userName: String {
get {
return TRTCVoiceRoomIMManager.shared.curUserName
return TUILogin.getNickName() ?? ""
}
}
var userID: String? {
Expand Down
2 changes: 2 additions & 0 deletions iOS/Source/ui/TRTCVoiceRoomViewController/SubViews/TRTCVoiceRoomSoundEffectViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ class TRTCVoiceRoomSoundEffectViewModel: NSObject {
DispatchQueue.main.async {
self.isPlaying = true
self.isPlayingComplete = false
self.setVolume(music: self.currentMusicVolum)
self.setPitch(person: self.currentPitchVolum)
self.viewResponder?.bgmOnPrepareToPlay()
}
} onProgress: { [weak self] (progress, duration) in
Expand Down
3 changes: 2 additions & 1 deletion iOS/Source/ui/TRTCVoiceRoomViewController/TRTCVoiceRoomViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//

import Foundation
import TUICore

protocol TRTCVoiceRoomViewResponder: class {
func showToast(message: String)
Expand Down Expand Up @@ -222,7 +223,7 @@ class TRTCVoiceRoomViewModel: NSObject {
}
}
public func createRoom(toneQuality: Int = 0) {
let faceUrl = TRTCVoiceRoomIMManager.shared.curUserAvatar
let faceUrl = TUILogin.getFaceUrl() ?? ""
voiceRoom.setAuidoQuality(quality: toneQuality)
voiceRoom.setSelfProfile(userName: roomInfo.ownerName, avatarURL: faceUrl) { [weak self] (code, message) in
guard let `self` = self else { return }
Expand Down