From 6ad4a9912c2dbd4a7eeb2bedc5695f534afc19f1 Mon Sep 17 00:00:00 2001 From: adamsfliu Date: Tue, 29 Aug 2023 11:04:40 +0800 Subject: [PATCH] [iOS] update version to relesse-11.4.0.4162 --- iOS/Example/App/Info.plist | 4 +- .../TUIVoiceRoomApp.xcodeproj/project.pbxproj | 144 +++++++++--------- .../TUIVoiceRoomKit_TRTC/TUIVoiceRoomKit.h | 2 + iOS/Source/model/Impl/TRTCVoiceRoom.m | 4 +- iOS/Source/model/Impl/base/TXBaseDef.m | 2 +- .../model/Impl/trtc/VoiceRoomTRTCService.m | 2 +- .../TRTCCreateVoiceRoomRootView.swift | 2 +- .../TRTCCreateVoiceRoomViewModel.swift | 4 +- .../TRTCVoiceRoomSoundEffectViewModel.swift | 2 + .../TRTCVoiceRoomViewModel.swift | 3 +- 10 files changed, 87 insertions(+), 82 deletions(-) diff --git a/iOS/Example/App/Info.plist b/iOS/Example/App/Info.plist index 863aae0..ee35b1a 100644 --- a/iOS/Example/App/Info.plist +++ b/iOS/Example/App/Info.plist @@ -15,9 +15,9 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 11.2.0 + 11.4.0 CFBundleVersion - 3963 + 4162 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/iOS/Example/TUIVoiceRoomApp.xcodeproj/project.pbxproj b/iOS/Example/TUIVoiceRoomApp.xcodeproj/project.pbxproj index 528a7c4..9800af3 100644 --- a/iOS/Example/TUIVoiceRoomApp.xcodeproj/project.pbxproj +++ b/iOS/Example/TUIVoiceRoomApp.xcodeproj/project.pbxproj @@ -7,7 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - 3DAD409FDD1E07DF467542D6 /* LoginLocalized.strings in Resources */ = {isa = PBXBuildFile; fileRef = EF863A91613CDFB7D8016F08 /* LoginLocalized.strings */; }; + 1A5AC26D990C0806A2885497 /* ProfileManager_Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8B2D47CE140474624B17E0D /* ProfileManager_Mock.swift */; }; + 1FC8D8FFBC8A7C8C7D5ADC92 /* LoginLocalized.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1CA1E5365985063AAC0A3EAF /* LoginLocalized.strings */; }; + 25C39B6B3ACF0D1F8F3A9EE6 /* TRTCLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F605C1D3C72263719EFE53CC /* TRTCLoginViewController.swift */; }; 40DD29A62643959A00DC4BA8 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40DD29A52643959A00DC4BA8 /* AppDelegate.swift */; }; 40DD29A82643959A00DC4BA8 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40DD29A72643959A00DC4BA8 /* SceneDelegate.swift */; }; 40DD29AA2643959A00DC4BA8 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40DD29A92643959A00DC4BA8 /* ViewController.swift */; }; @@ -25,24 +27,21 @@ 470EB6D5266A47DF0072071F /* LaunchImage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 470EB6D1266A47DF0072071F /* LaunchImage@2x.png */; }; 470EB6D8266A47E70072071F /* LaunchScreen_en.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 470EB6D6266A47E70072071F /* LaunchScreen_en.storyboard */; }; 470EB6DB266A47FA0072071F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 470EB6DD266A47FA0072071F /* InfoPlist.strings */; }; - 4B35403107F21C13282C9CFC /* LoginLocalized.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCA66CB31831934BAD1060C4 /* LoginLocalized.swift */; }; - 4F0D0F160C2A654CD83B2941 /* TRTCRegisterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17DDD9616058AE4194B3583C /* TRTCRegisterViewController.swift */; }; + 4A0875E8E28D3D2A988A82BA /* AppUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = D441982FE12FFDCF477F60B6 /* AppUtils.swift */; }; 6156CECA841D2F3F58AADE75 /* Pods_TUIVoiceRoomApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C0B83629490FE130A44B34B /* Pods_TUIVoiceRoomApp.framework */; }; - 777D47D35B5BED8C097BE3DA /* TRTCLoginRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AECF5843EAAB72C86330E71 /* TRTCLoginRootView.swift */; }; - 957E9EBE20694190B154BCFA /* TRTCRegisterRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE85FC244F5B198A8D10CFF7 /* TRTCRegisterRootView.swift */; }; - 9EC57C6A338B0801C1A2FEB0 /* AppUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68DF00B0E068F0446C1A0DB2 /* AppUtils.swift */; }; - A2F25A53CA17D27DACF1CB80 /* LayoutDefine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C6C0C7DC70DF4159F3831AD /* LayoutDefine.swift */; }; - A963A3BDFBAD04C398CB8474 /* UserAgreementViewController+UI.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB18C865E942AB60D38D3089 /* UserAgreementViewController+UI.swift */; }; - AC2E56BAA454C0CDA447FA72 /* ProfileManager_Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 345D7F6D649A4DFCB10C0B15 /* ProfileManager_Mock.swift */; }; - AE4F016CE9DAFF1A92CA0DD4 /* TRTCLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96715E0F8AD1D8C9C93A3E2D /* TRTCLoginViewController.swift */; }; - DAD772D996DD5672FCC200E8 /* LoginLocalized.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9EDD8B2FC85D119CD28EA4F1 /* LoginLocalized.strings */; }; - EAE99C56670832EF6DEA3D64 /* UserAgreementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD9EBFE430A46E0081411B7 /* UserAgreementViewController.swift */; }; + 6BA6282908A9D2698244C688 /* TRTCRegisterRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7328267266AC1A190FA6991 /* TRTCRegisterRootView.swift */; }; + 6ECD03F2FFC943622E8C22DB /* LayoutDefine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63ACBE03C097CCBED35FBF99 /* LayoutDefine.swift */; }; + A1AE58E25F97B08FC074B981 /* TRTCRegisterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB87271BBEA144DC684C17FD /* TRTCRegisterViewController.swift */; }; + A37E68B5A49783E537339426 /* LoginLocalized.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2000103D556609F59467FF86 /* LoginLocalized.swift */; }; + B3B36D581D750A95601C525D /* UserAgreementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D834A12966299FF24C243881 /* UserAgreementViewController.swift */; }; + B8561707BCCCB1D99CC59064 /* LoginLocalized.strings in Resources */ = {isa = PBXBuildFile; fileRef = 826E987B6B65233501ADB5EA /* LoginLocalized.strings */; }; + BD090BA9CA6D4EA352E15F96 /* UserAgreementViewController+UI.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98F538BD31836EF871B4487 /* UserAgreementViewController+UI.swift */; }; + D0DB980B8C9604BF8AE7AB93 /* TRTCLoginRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69C3F9C3E283C58786A7EDF6 /* TRTCLoginRootView.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 17DDD9616058AE4194B3583C /* TRTCRegisterViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = TRTCRegisterViewController.swift; sourceTree = ""; }; - 1AECF5843EAAB72C86330E71 /* TRTCLoginRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = TRTCLoginRootView.swift; sourceTree = ""; }; - 345D7F6D649A4DFCB10C0B15 /* ProfileManager_Mock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ProfileManager_Mock.swift; sourceTree = ""; }; + 1CA1E5365985063AAC0A3EAF /* LoginLocalized.strings */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.strings; path = LoginLocalized.strings; sourceTree = ""; }; + 2000103D556609F59467FF86 /* LoginLocalized.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LoginLocalized.swift; sourceTree = ""; }; 3C0B83629490FE130A44B34B /* Pods_TUIVoiceRoomApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TUIVoiceRoomApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3E808B877223D2A00E1AF098 /* Pods-TRTCVoiceRoomApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TRTCVoiceRoomApp.debug.xcconfig"; path = "Target Support Files/Pods-TRTCVoiceRoomApp/Pods-TRTCVoiceRoomApp.debug.xcconfig"; sourceTree = ""; }; 40DD29A22643959A00DC4BA8 /* TUIVoiceRoomApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TUIVoiceRoomApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -71,16 +70,17 @@ 50AF24CC202C741150F42FDA /* Pods-TUIVoiceRoomApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TUIVoiceRoomApp.debug.xcconfig"; path = "Target Support Files/Pods-TUIVoiceRoomApp/Pods-TUIVoiceRoomApp.debug.xcconfig"; sourceTree = ""; }; 5234C576E3DD25D4F4446BBD /* Pods-TRTCVoiceRoom.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TRTCVoiceRoom.release.xcconfig"; path = "Target Support Files/Pods-TRTCVoiceRoom/Pods-TRTCVoiceRoom.release.xcconfig"; sourceTree = ""; }; 5C0C6C1E8FB00F13FE521403 /* Pods-TRTCVoiceRoomApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TRTCVoiceRoomApp.release.xcconfig"; path = "Target Support Files/Pods-TRTCVoiceRoomApp/Pods-TRTCVoiceRoomApp.release.xcconfig"; sourceTree = ""; }; - 68DF00B0E068F0446C1A0DB2 /* AppUtils.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AppUtils.swift; sourceTree = ""; }; + 63ACBE03C097CCBED35FBF99 /* LayoutDefine.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LayoutDefine.swift; sourceTree = ""; }; + 69C3F9C3E283C58786A7EDF6 /* TRTCLoginRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = TRTCLoginRootView.swift; sourceTree = ""; }; 7A9774C00A00F3E96CE1E81B /* Pods-TUIVoiceRoomApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TUIVoiceRoomApp.release.xcconfig"; path = "Target Support Files/Pods-TUIVoiceRoomApp/Pods-TUIVoiceRoomApp.release.xcconfig"; sourceTree = ""; }; - 7C6C0C7DC70DF4159F3831AD /* LayoutDefine.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LayoutDefine.swift; sourceTree = ""; }; - 96715E0F8AD1D8C9C93A3E2D /* TRTCLoginViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = TRTCLoginViewController.swift; sourceTree = ""; }; - 9EDD8B2FC85D119CD28EA4F1 /* LoginLocalized.strings */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.strings; path = LoginLocalized.strings; sourceTree = ""; }; - 9FD9EBFE430A46E0081411B7 /* UserAgreementViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UserAgreementViewController.swift; sourceTree = ""; }; - BCA66CB31831934BAD1060C4 /* LoginLocalized.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LoginLocalized.swift; sourceTree = ""; }; - CE85FC244F5B198A8D10CFF7 /* TRTCRegisterRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = TRTCRegisterRootView.swift; sourceTree = ""; }; - DB18C865E942AB60D38D3089 /* UserAgreementViewController+UI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "UserAgreementViewController+UI.swift"; sourceTree = ""; }; - EF863A91613CDFB7D8016F08 /* LoginLocalized.strings */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.strings; path = LoginLocalized.strings; sourceTree = ""; }; + 826E987B6B65233501ADB5EA /* LoginLocalized.strings */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.strings; path = LoginLocalized.strings; sourceTree = ""; }; + A98F538BD31836EF871B4487 /* UserAgreementViewController+UI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "UserAgreementViewController+UI.swift"; sourceTree = ""; }; + D441982FE12FFDCF477F60B6 /* AppUtils.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AppUtils.swift; sourceTree = ""; }; + D7328267266AC1A190FA6991 /* TRTCRegisterRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = TRTCRegisterRootView.swift; sourceTree = ""; }; + D834A12966299FF24C243881 /* UserAgreementViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = UserAgreementViewController.swift; sourceTree = ""; }; + D8B2D47CE140474624B17E0D /* ProfileManager_Mock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ProfileManager_Mock.swift; sourceTree = ""; }; + EB87271BBEA144DC684C17FD /* TRTCRegisterViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = TRTCRegisterViewController.swift; sourceTree = ""; }; + F605C1D3C72263719EFE53CC /* TRTCLoginViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = TRTCLoginViewController.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,15 +95,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 1B44C2CB44854513E6859A48 /* zh-Hans.lproj */ = { - isa = PBXGroup; - children = ( - 9EDD8B2FC85D119CD28EA4F1 /* LoginLocalized.strings */, - ); - name = "zh-Hans.lproj"; - path = "zh-Hans.lproj"; - sourceTree = ""; - }; 40BD8685264582F000E98054 /* Debug */ = { isa = PBXGroup; children = ( @@ -147,7 +138,7 @@ 40DD29B02643959C00DC4BA8 /* LaunchScreen.storyboard */, 40DD29B32643959C00DC4BA8 /* Info.plist */, 470EB6DD266A47FA0072071F /* InfoPlist.strings */, - 8AE000A629AD878ECA568142 /* Login */, + FA3B9BF3C5FAAC0D15C9DA28 /* Login */, ); path = App; sourceTree = ""; @@ -196,50 +187,41 @@ path = assets; sourceTree = ""; }; - 503DAC1FB5F9880868149412 /* Frameworks */ = { + 4F8610A3584C633B1737C735 /* zh-Hans.lproj */ = { isa = PBXGroup; children = ( - 3C0B83629490FE130A44B34B /* Pods_TUIVoiceRoomApp.framework */, + 1CA1E5365985063AAC0A3EAF /* LoginLocalized.strings */, ); - name = Frameworks; + name = "zh-Hans.lproj"; + path = "zh-Hans.lproj"; sourceTree = ""; }; - 5C034A45BC0983B6E4F18E83 /* en.lproj */ = { + 503DAC1FB5F9880868149412 /* Frameworks */ = { isa = PBXGroup; children = ( - EF863A91613CDFB7D8016F08 /* LoginLocalized.strings */, + 3C0B83629490FE130A44B34B /* Pods_TUIVoiceRoomApp.framework */, ); - name = en.lproj; - path = en.lproj; + name = Frameworks; sourceTree = ""; }; - 8AE000A629AD878ECA568142 /* Login */ = { + 5EE4DD1FB7C0155454345A02 /* AppLocalized */ = { isa = PBXGroup; children = ( - CE85FC244F5B198A8D10CFF7 /* TRTCRegisterRootView.swift */, - 1AECF5843EAAB72C86330E71 /* TRTCLoginRootView.swift */, - DB18C865E942AB60D38D3089 /* UserAgreementViewController+UI.swift */, - 96BA03994B05EA3A5DC252F6 /* AppLocalized */, - 96715E0F8AD1D8C9C93A3E2D /* TRTCLoginViewController.swift */, - 345D7F6D649A4DFCB10C0B15 /* ProfileManager_Mock.swift */, - 68DF00B0E068F0446C1A0DB2 /* AppUtils.swift */, - 17DDD9616058AE4194B3583C /* TRTCRegisterViewController.swift */, - 9FD9EBFE430A46E0081411B7 /* UserAgreementViewController.swift */, - 7C6C0C7DC70DF4159F3831AD /* LayoutDefine.swift */, + 4F8610A3584C633B1737C735 /* zh-Hans.lproj */, + C97E3951847FE28A54618696 /* en.lproj */, + 2000103D556609F59467FF86 /* LoginLocalized.swift */, ); - name = Login; - path = ../Login; + name = AppLocalized; + path = AppLocalized; sourceTree = ""; }; - 96BA03994B05EA3A5DC252F6 /* AppLocalized */ = { + C97E3951847FE28A54618696 /* en.lproj */ = { isa = PBXGroup; children = ( - 1B44C2CB44854513E6859A48 /* zh-Hans.lproj */, - 5C034A45BC0983B6E4F18E83 /* en.lproj */, - BCA66CB31831934BAD1060C4 /* LoginLocalized.swift */, + 826E987B6B65233501ADB5EA /* LoginLocalized.strings */, ); - name = AppLocalized; - path = AppLocalized; + name = en.lproj; + path = en.lproj; sourceTree = ""; }; F5C9E2BF182A74B00EBC1AAA /* Pods */ = { @@ -255,6 +237,24 @@ path = Pods; sourceTree = ""; }; + FA3B9BF3C5FAAC0D15C9DA28 /* Login */ = { + isa = PBXGroup; + children = ( + D7328267266AC1A190FA6991 /* TRTCRegisterRootView.swift */, + 69C3F9C3E283C58786A7EDF6 /* TRTCLoginRootView.swift */, + A98F538BD31836EF871B4487 /* UserAgreementViewController+UI.swift */, + 5EE4DD1FB7C0155454345A02 /* AppLocalized */, + F605C1D3C72263719EFE53CC /* TRTCLoginViewController.swift */, + D8B2D47CE140474624B17E0D /* ProfileManager_Mock.swift */, + D441982FE12FFDCF477F60B6 /* AppUtils.swift */, + EB87271BBEA144DC684C17FD /* TRTCRegisterViewController.swift */, + D834A12966299FF24C243881 /* UserAgreementViewController.swift */, + 63ACBE03C097CCBED35FBF99 /* LayoutDefine.swift */, + ); + name = Login; + path = ../Login; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -326,8 +326,8 @@ 470EB691266A29730072071F /* LiveRoomAssets.xcassets in Resources */, 470EB6DB266A47FA0072071F /* InfoPlist.strings in Resources */, 470EB692266A2BBB0072071F /* Assets.xcassets in Resources */, - DAD772D996DD5672FCC200E8 /* LoginLocalized.strings in Resources */, - 3DAD409FDD1E07DF467542D6 /* LoginLocalized.strings in Resources */, + 1FC8D8FFBC8A7C8C7D5ADC92 /* LoginLocalized.strings in Resources */, + B8561707BCCCB1D99CC59064 /* LoginLocalized.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -404,16 +404,16 @@ 40DD29A82643959A00DC4BA8 /* SceneDelegate.swift in Sources */, 470769D726491E26004F4347 /* GenerateTestUserSig.swift in Sources */, 470EB68D266A29730072071F /* VoiceRoomMainViewController.swift in Sources */, - 957E9EBE20694190B154BCFA /* TRTCRegisterRootView.swift in Sources */, - 777D47D35B5BED8C097BE3DA /* TRTCLoginRootView.swift in Sources */, - A963A3BDFBAD04C398CB8474 /* UserAgreementViewController+UI.swift in Sources */, - 4B35403107F21C13282C9CFC /* LoginLocalized.swift in Sources */, - AE4F016CE9DAFF1A92CA0DD4 /* TRTCLoginViewController.swift in Sources */, - AC2E56BAA454C0CDA447FA72 /* ProfileManager_Mock.swift in Sources */, - 9EC57C6A338B0801C1A2FEB0 /* AppUtils.swift in Sources */, - 4F0D0F160C2A654CD83B2941 /* TRTCRegisterViewController.swift in Sources */, - EAE99C56670832EF6DEA3D64 /* UserAgreementViewController.swift in Sources */, - A2F25A53CA17D27DACF1CB80 /* LayoutDefine.swift in Sources */, + 6BA6282908A9D2698244C688 /* TRTCRegisterRootView.swift in Sources */, + D0DB980B8C9604BF8AE7AB93 /* TRTCLoginRootView.swift in Sources */, + BD090BA9CA6D4EA352E15F96 /* UserAgreementViewController+UI.swift in Sources */, + A37E68B5A49783E537339426 /* LoginLocalized.swift in Sources */, + 25C39B6B3ACF0D1F8F3A9EE6 /* TRTCLoginViewController.swift in Sources */, + 1A5AC26D990C0806A2885497 /* ProfileManager_Mock.swift in Sources */, + 4A0875E8E28D3D2A988A82BA /* AppUtils.swift in Sources */, + A1AE58E25F97B08FC074B981 /* TRTCRegisterViewController.swift in Sources */, + B3B36D581D750A95601C525D /* UserAgreementViewController.swift in Sources */, + 6ECD03F2FFC943622E8C22DB /* LayoutDefine.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/iOS/Source/TUIVoiceRoomKit_TRTC/TUIVoiceRoomKit.h b/iOS/Source/TUIVoiceRoomKit_TRTC/TUIVoiceRoomKit.h index 701af32..3de7f6d 100644 --- a/iOS/Source/TUIVoiceRoomKit_TRTC/TUIVoiceRoomKit.h +++ b/iOS/Source/TUIVoiceRoomKit_TRTC/TUIVoiceRoomKit.h @@ -9,6 +9,8 @@ #ifndef TUIVoiceRoomKit_h #define TUIVoiceRoomKit_h +#import + @import TXLiteAVSDK_TRTC; @import TXAppBasic; diff --git a/iOS/Source/model/Impl/TRTCVoiceRoom.m b/iOS/Source/model/Impl/TRTCVoiceRoom.m index d1d1c8d..b82159f 100644 --- a/iOS/Source/model/Impl/TRTCVoiceRoom.m +++ b/iOS/Source/model/Impl/TRTCVoiceRoom.m @@ -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" @@ -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; diff --git a/iOS/Source/model/Impl/base/TXBaseDef.m b/iOS/Source/model/Impl/base/TXBaseDef.m index d961185..2962374 100644 --- a/iOS/Source/model/Impl/base/TXBaseDef.m +++ b/iOS/Source/model/Impl/base/TXBaseDef.m @@ -7,7 +7,7 @@ // #import "TXBaseDef.h" -#import "TXLiteAVSDK_TRTC/TRTCCloud.h" +#import "TUIVoiceRoomKit.h" @interface TRTCCloud (VoiceRoomLog) diff --git a/iOS/Source/model/Impl/trtc/VoiceRoomTRTCService.m b/iOS/Source/model/Impl/trtc/VoiceRoomTRTCService.m index 39ca88a..428e0f7 100644 --- a/iOS/Source/model/Impl/trtc/VoiceRoomTRTCService.m +++ b/iOS/Source/model/Impl/trtc/VoiceRoomTRTCService.m @@ -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; diff --git a/iOS/Source/ui/TRTCCreateVoiceRoomViewController/TRTCCreateVoiceRoomRootView.swift b/iOS/Source/ui/TRTCCreateVoiceRoomViewController/TRTCCreateVoiceRoomRootView.swift index 49f1f61..b2dc318 100644 --- a/iOS/Source/ui/TRTCCreateVoiceRoomViewController/TRTCCreateVoiceRoomRootView.swift +++ b/iOS/Source/ui/TRTCCreateVoiceRoomViewController/TRTCCreateVoiceRoomRootView.swift @@ -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 { diff --git a/iOS/Source/ui/TRTCCreateVoiceRoomViewController/TRTCCreateVoiceRoomViewModel.swift b/iOS/Source/ui/TRTCCreateVoiceRoomViewController/TRTCCreateVoiceRoomViewModel.swift index 6b893ab..9f6ed08 100644 --- a/iOS/Source/ui/TRTCCreateVoiceRoomViewController/TRTCCreateVoiceRoomViewModel.swift +++ b/iOS/Source/ui/TRTCCreateVoiceRoomViewController/TRTCCreateVoiceRoomViewModel.swift @@ -7,7 +7,7 @@ // import UIKit -import ImSDK_Plus +import TUICore public enum VoiceRoomRole { case anchor @@ -38,7 +38,7 @@ class TRTCCreateVoiceRoomViewModel { var roomName: String = "" var userName: String { get { - return TRTCVoiceRoomIMManager.shared.curUserName + return TUILogin.getNickName() ?? "" } } var userID: String? { diff --git a/iOS/Source/ui/TRTCVoiceRoomViewController/SubViews/TRTCVoiceRoomSoundEffectViewModel.swift b/iOS/Source/ui/TRTCVoiceRoomViewController/SubViews/TRTCVoiceRoomSoundEffectViewModel.swift index a836262..852e110 100644 --- a/iOS/Source/ui/TRTCVoiceRoomViewController/SubViews/TRTCVoiceRoomSoundEffectViewModel.swift +++ b/iOS/Source/ui/TRTCVoiceRoomViewController/SubViews/TRTCVoiceRoomSoundEffectViewModel.swift @@ -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 diff --git a/iOS/Source/ui/TRTCVoiceRoomViewController/TRTCVoiceRoomViewModel.swift b/iOS/Source/ui/TRTCVoiceRoomViewController/TRTCVoiceRoomViewModel.swift index 4514917..06d9d2a 100644 --- a/iOS/Source/ui/TRTCVoiceRoomViewController/TRTCVoiceRoomViewModel.swift +++ b/iOS/Source/ui/TRTCVoiceRoomViewController/TRTCVoiceRoomViewModel.swift @@ -7,6 +7,7 @@ // import Foundation +import TUICore protocol TRTCVoiceRoomViewResponder: class { func showToast(message: String) @@ -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 }