diff --git a/Demo/ReplaykitUpload/Info.plist b/Demo/ReplaykitUpload/Info.plist index daa51036..23234462 100644 --- a/Demo/ReplaykitUpload/Info.plist +++ b/Demo/ReplaykitUpload/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 8.8.1062 + 8.8.1075 CFBundleVersion - 1062 + 1075 NSExtension NSExtensionPointIdentifier diff --git a/Demo/ReplaykitUpload/SampleHandler.m b/Demo/ReplaykitUpload/SampleHandler.m index 52d1de8d..96f6fbee 100644 --- a/Demo/ReplaykitUpload/SampleHandler.m +++ b/Demo/ReplaykitUpload/SampleHandler.m @@ -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 diff --git a/Demo/ReplaykitUpload/TRTCInfo.plist b/Demo/ReplaykitUpload/TRTCInfo.plist index 7a67dffd..9ac6b9c6 100644 --- a/Demo/ReplaykitUpload/TRTCInfo.plist +++ b/Demo/ReplaykitUpload/TRTCInfo.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 8.8.1062 + $(MARKETING_VERSION) CFBundleVersion - 1062 + $(CURRENT_PROJECT_VERSION) NSExtension NSExtensionPointIdentifier diff --git a/Demo/TXLiteAVDemo.xcodeproj/project.pbxproj b/Demo/TXLiteAVDemo.xcodeproj/project.pbxproj index 12e61126..dec3b905 100644 --- a/Demo/TXLiteAVDemo.xcodeproj/project.pbxproj +++ b/Demo/TXLiteAVDemo.xcodeproj/project.pbxproj @@ -3,22 +3,22 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ - 11C97B640ED564F90D4F52E1 /* ProfileManager_Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 541D849CCCD407FB1E830687 /* ProfileManager_Mock.swift */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 1A0999698646A0ED4D7FCDCF /* CommonUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F6FD2235631028E9A43835F /* CommonUtils.swift */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 1B75F95C473835383E579229 /* ProfileViewController+UI.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAD85AD407F5E41EFC08E96B /* ProfileViewController+UI.swift */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 1DC7F349A2B6380DCA056281 /* libPods-TXReplaykitUpload_Professional.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00809C5850F41459EC8EE3D8 /* libPods-TXReplaykitUpload_Professional.a */; }; 1EA0A986FB03B486F983DE95 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + 26CA056C2B5EAF97435CB4DB /* CommonUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C9363B15A42D514D9FEC21D /* CommonUtils.swift */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 272367962B3FB11D461F0EB3 /* LoginViewController_Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99A7949BC83A56B2873FA213 /* LoginViewController_Mock.swift */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 2840D91C24B8562200723FBC /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2840D91B24B8562200723FBC /* AudioToolbox.framework */; }; 2840D92924B85E2A00723FBC /* SDWebImagePlaceholderImageManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2840D92824B85E2A00723FBC /* SDWebImagePlaceholderImageManager.swift */; }; 2840D92A24B85E2A00723FBC /* SDWebImagePlaceholderImageManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2840D92824B85E2A00723FBC /* SDWebImagePlaceholderImageManager.swift */; }; 2840D92E24B8801800723FBC /* SDWebImagePlaceholderImageManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2840D92824B85E2A00723FBC /* SDWebImagePlaceholderImageManager.swift */; }; 2840D93124B880EF00723FBC /* SDWebImagePlaceholderImageManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2840D92824B85E2A00723FBC /* SDWebImagePlaceholderImageManager.swift */; }; 285FB46824BEA52F00FFB2BC /* TXVoiceRoomService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4046B13924B36AD700F27349 /* TXVoiceRoomService.m */; }; - 392559BA3338285DFC3EE6AB /* AppUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = F06C689724512B55F5388435 /* AppUtils.swift */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 2A773200264FF58658A6A84C /* LoginViewController+UI_Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = F754D2EA167EECA124B0837E /* LoginViewController+UI_Mock.swift */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 3C08D085252EDAAA3AD68E1A /* ProfileManager_Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = D01A44BFE08D94C32493CEFD /* ProfileManager_Mock.swift */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 40091E6B1F4FCBB9009B882D /* ScanQRController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 40F853561EE8FCDF00EE47D7 /* ScanQRController.mm */; }; 40091E6F1F4FCBB9009B882D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 40F853261EE8FC8400EE47D7 /* AppDelegate.m */; }; 40091E761F4FCBB9009B882D /* AppLogMgr.m in Sources */ = {isa = PBXBuildFile; fileRef = 40F853281EE8FC8400EE47D7 /* AppLogMgr.m */; }; @@ -494,6 +494,8 @@ 40AC7316246D35A300FAF33D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 40F853221EE8FC7300EE47D7 /* Assets.xcassets */; }; 40AC7319246D35A300FAF33D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 40F853331EE8FC9B00EE47D7 /* Main.storyboard */; }; 40AC7324246D361100FAF33D /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + 40B18A5C2670AEA500553049 /* PhotoUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 40B18A592670AEA500553049 /* PhotoUtil.m */; }; + 40B18A5D2670AEA500553049 /* TXColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 40B18A5B2670AEA500553049 /* TXColor.m */; }; 40B3F6762446E518000C37A3 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 40F853261EE8FC8400EE47D7 /* AppDelegate.m */; }; 40B3F6942446E518000C37A3 /* AppLogMgr.m in Sources */ = {isa = PBXBuildFile; fileRef = 40F853281EE8FC8400EE47D7 /* AppLogMgr.m */; }; 40B3F6AE2446E518000C37A3 /* TCBeautyPanel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40AA536524458EC800303EF7 /* TCBeautyPanel.framework */; }; @@ -800,6 +802,10 @@ 45E74D9B23B22BCD00C22B31 /* ThemeConfigurator.m in Sources */ = {isa = PBXBuildFile; fileRef = 45E74D9A23B22BCD00C22B31 /* ThemeConfigurator.m */; }; 45E74D9C23B22BCD00C22B31 /* ThemeConfigurator.m in Sources */ = {isa = PBXBuildFile; fileRef = 45E74D9A23B22BCD00C22B31 /* ThemeConfigurator.m */; }; 45F3B3A1232A239D00666F7C /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40F855361EE8FDAD00EE47D7 /* AssetsLibrary.framework */; }; + 4717325126705C4A005F772E /* SoundTouch.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4717324E26705C4A005F772E /* SoundTouch.xcframework */; }; + 4717325626705C77005F772E /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + 4717325726705CE4005F772E /* BuildFile in Embed Frameworks */ = {isa = PBXBuildFile; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 4717325926705CE8005F772E /* SoundTouch.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4717324E26705C4A005F772E /* SoundTouch.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 47642A9B261491B90020F1BA /* launchimage_en@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 47642A99261491B90020F1BA /* launchimage_en@3x.png */; }; 47642A9C261491B90020F1BA /* launchimage_en@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 47642A99261491B90020F1BA /* launchimage_en@3x.png */; }; 47642A9D261491B90020F1BA /* launchimage_en@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 47642A99261491B90020F1BA /* launchimage_en@3x.png */; }; @@ -1027,7 +1033,6 @@ 51A289FB230FB95800B9B73F /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51A289F8230FB93A00B9B73F /* OpenAL.framework */; }; 51A289FC230FB96000B9B73F /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51A289F8230FB93A00B9B73F /* OpenAL.framework */; }; 51CE9F98231944BE00B620BD /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51A289F8230FB93A00B9B73F /* OpenAL.framework */; }; - 65E5919DA1DCFD22C796EE08 /* ProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68A61D570DF3D76F2CB443FA /* ProfileViewController.swift */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 6A1C109B2281A675005D7BD9 /* PushLogView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6A1C109A2281A674005D7BD9 /* PushLogView.m */; }; 6A1C109C2281A675005D7BD9 /* PushLogView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6A1C109A2281A674005D7BD9 /* PushLogView.m */; }; 6A1C109D2281A675005D7BD9 /* PushLogView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6A1C109A2281A674005D7BD9 /* PushLogView.m */; }; @@ -1054,14 +1059,6 @@ 6A5031CA249D122800701E6B /* TXLiteAVSDK_ReplayKitExt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6AAEC38A2499E08100B57D86 /* TXLiteAVSDK_ReplayKitExt.framework */; }; 6A5031D7249D132F00701E6B /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; 6A50320F24A0E72200701E6B /* TRTCMeetingDef.m in Sources */ = {isa = PBXBuildFile; fileRef = 6AAEC2642497807200B57D86 /* TRTCMeetingDef.m */; }; - 6A50323F24A1AF6B00701E6B /* UserAgreementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A50323E24A1AF6B00701E6B /* UserAgreementViewController.swift */; }; - 6A50324124A1AF6B00701E6B /* UserAgreementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A50323E24A1AF6B00701E6B /* UserAgreementViewController.swift */; }; - 6A50324224A1AF6B00701E6B /* UserAgreementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A50323E24A1AF6B00701E6B /* UserAgreementViewController.swift */; }; - 6A50324324A1AF6B00701E6B /* UserAgreementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A50323E24A1AF6B00701E6B /* UserAgreementViewController.swift */; }; - 6A50324524A1B03700701E6B /* UserAgreementViewController+UI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A50324424A1B03700701E6B /* UserAgreementViewController+UI.swift */; }; - 6A50324724A1B03700701E6B /* UserAgreementViewController+UI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A50324424A1B03700701E6B /* UserAgreementViewController+UI.swift */; }; - 6A50324824A1B03700701E6B /* UserAgreementViewController+UI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A50324424A1B03700701E6B /* UserAgreementViewController+UI.swift */; }; - 6A50324924A1B03700701E6B /* UserAgreementViewController+UI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A50324424A1B03700701E6B /* UserAgreementViewController+UI.swift */; }; 6A5032A524A25E2100701E6B /* GenerateTestUserSig.m in Sources */ = {isa = PBXBuildFile; fileRef = 40B3F8DC2446E6C5000C37A3 /* GenerateTestUserSig.m */; }; 6AAEC26B2497807200B57D86 /* TRTCMeetingRoomDemo.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6AAEC24C2497807100B57D86 /* TRTCMeetingRoomDemo.xcassets */; }; 6AAEC26C2497807200B57D86 /* TRTCMeetingRoomDemo.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6AAEC24C2497807100B57D86 /* TRTCMeetingRoomDemo.xcassets */; }; @@ -1195,6 +1192,71 @@ 7B5A2DE525B0355400B4B469 /* v2live.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7B5A2DBA25B0355400B4B469 /* v2live.xcassets */; }; 7B5A2DE625B0355400B4B469 /* V2LiveUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B5A2DBB25B0355400B4B469 /* V2LiveUtils.m */; }; 7B5A2DE725B0355400B4B469 /* V2LiveUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B5A2DBB25B0355400B4B469 /* V2LiveUtils.m */; }; + 88ABB5F0266DCB0D0050C38A /* TRTCWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB5EF266DCB0D0050C38A /* TRTCWebViewController.swift */; }; + 88ABB5F2266DCB0D0050C38A /* TRTCWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB5EF266DCB0D0050C38A /* TRTCWebViewController.swift */; }; + 88ABB5F3266DCB0D0050C38A /* TRTCWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB5EF266DCB0D0050C38A /* TRTCWebViewController.swift */; }; + 88ABB5F4266DCB0D0050C38A /* TRTCWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB5EF266DCB0D0050C38A /* TRTCWebViewController.swift */; }; + 88ABB5F5266DCB0D0050C38A /* TRTCWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB5EF266DCB0D0050C38A /* TRTCWebViewController.swift */; }; + 88ABB61D266DD0E80050C38A /* PrivacyPolicy.html in Resources */ = {isa = PBXBuildFile; fileRef = 88ABB61C266DD0E80050C38A /* PrivacyPolicy.html */; }; + 88ABB61F266DD0E80050C38A /* PrivacyPolicy.html in Resources */ = {isa = PBXBuildFile; fileRef = 88ABB61C266DD0E80050C38A /* PrivacyPolicy.html */; }; + 88ABB620266DD0E80050C38A /* PrivacyPolicy.html in Resources */ = {isa = PBXBuildFile; fileRef = 88ABB61C266DD0E80050C38A /* PrivacyPolicy.html */; }; + 88ABB621266DD0E80050C38A /* PrivacyPolicy.html in Resources */ = {isa = PBXBuildFile; fileRef = 88ABB61C266DD0E80050C38A /* PrivacyPolicy.html */; }; + 88ABB622266DD0E80050C38A /* PrivacyPolicy.html in Resources */ = {isa = PBXBuildFile; fileRef = 88ABB61C266DD0E80050C38A /* PrivacyPolicy.html */; }; + 88ABB630266DD0FB0050C38A /* UserAgreement.html in Resources */ = {isa = PBXBuildFile; fileRef = 88ABB62F266DD0FA0050C38A /* UserAgreement.html */; }; + 88ABB632266DD0FB0050C38A /* UserAgreement.html in Resources */ = {isa = PBXBuildFile; fileRef = 88ABB62F266DD0FA0050C38A /* UserAgreement.html */; }; + 88ABB633266DD0FB0050C38A /* UserAgreement.html in Resources */ = {isa = PBXBuildFile; fileRef = 88ABB62F266DD0FA0050C38A /* UserAgreement.html */; }; + 88ABB634266DD0FB0050C38A /* UserAgreement.html in Resources */ = {isa = PBXBuildFile; fileRef = 88ABB62F266DD0FA0050C38A /* UserAgreement.html */; }; + 88ABB635266DD0FB0050C38A /* UserAgreement.html in Resources */ = {isa = PBXBuildFile; fileRef = 88ABB62F266DD0FA0050C38A /* UserAgreement.html */; }; + 88ABB64C266DFE220050C38A /* MineRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB643266DFE220050C38A /* MineRootView.swift */; }; + 88ABB64E266DFE220050C38A /* MineRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB643266DFE220050C38A /* MineRootView.swift */; }; + 88ABB64F266DFE220050C38A /* MineRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB643266DFE220050C38A /* MineRootView.swift */; }; + 88ABB650266DFE220050C38A /* MineRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB643266DFE220050C38A /* MineRootView.swift */; }; + 88ABB651266DFE220050C38A /* MineRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB643266DFE220050C38A /* MineRootView.swift */; }; + 88ABB652266DFE220050C38A /* MineViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB644266DFE220050C38A /* MineViewModel.swift */; }; + 88ABB654266DFE220050C38A /* MineViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB644266DFE220050C38A /* MineViewModel.swift */; }; + 88ABB655266DFE220050C38A /* MineViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB644266DFE220050C38A /* MineViewModel.swift */; }; + 88ABB656266DFE220050C38A /* MineViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB644266DFE220050C38A /* MineViewModel.swift */; }; + 88ABB657266DFE220050C38A /* MineViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB644266DFE220050C38A /* MineViewModel.swift */; }; + 88ABB658266DFE220050C38A /* MineAboutResignViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB645266DFE220050C38A /* MineAboutResignViewController.swift */; }; + 88ABB65A266DFE220050C38A /* MineAboutResignViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB645266DFE220050C38A /* MineAboutResignViewController.swift */; }; + 88ABB65B266DFE220050C38A /* MineAboutResignViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB645266DFE220050C38A /* MineAboutResignViewController.swift */; }; + 88ABB65C266DFE220050C38A /* MineAboutResignViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB645266DFE220050C38A /* MineAboutResignViewController.swift */; }; + 88ABB65D266DFE220050C38A /* MineAboutResignViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB645266DFE220050C38A /* MineAboutResignViewController.swift */; }; + 88ABB65E266DFE220050C38A /* MineAboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB646266DFE220050C38A /* MineAboutViewController.swift */; }; + 88ABB660266DFE230050C38A /* MineAboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB646266DFE220050C38A /* MineAboutViewController.swift */; }; + 88ABB661266DFE230050C38A /* MineAboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB646266DFE220050C38A /* MineAboutViewController.swift */; }; + 88ABB662266DFE230050C38A /* MineAboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB646266DFE220050C38A /* MineAboutViewController.swift */; }; + 88ABB663266DFE230050C38A /* MineAboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB646266DFE220050C38A /* MineAboutViewController.swift */; }; + 88ABB664266DFE230050C38A /* MineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB647266DFE220050C38A /* MineViewController.swift */; }; + 88ABB666266DFE230050C38A /* MineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB647266DFE220050C38A /* MineViewController.swift */; }; + 88ABB667266DFE230050C38A /* MineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB647266DFE220050C38A /* MineViewController.swift */; }; + 88ABB668266DFE230050C38A /* MineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB647266DFE220050C38A /* MineViewController.swift */; }; + 88ABB669266DFE230050C38A /* MineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB647266DFE220050C38A /* MineViewController.swift */; }; + 88ABB66A266DFE230050C38A /* TRTCAlerts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB649266DFE220050C38A /* TRTCAlerts.swift */; }; + 88ABB66C266DFE230050C38A /* TRTCAlerts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB649266DFE220050C38A /* TRTCAlerts.swift */; }; + 88ABB66D266DFE230050C38A /* TRTCAlerts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB649266DFE220050C38A /* TRTCAlerts.swift */; }; + 88ABB66E266DFE230050C38A /* TRTCAlerts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB649266DFE220050C38A /* TRTCAlerts.swift */; }; + 88ABB66F266DFE230050C38A /* TRTCAlerts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB649266DFE220050C38A /* TRTCAlerts.swift */; }; + 88ABB670266DFE230050C38A /* MineAlertContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB64A266DFE220050C38A /* MineAlertContentView.swift */; }; + 88ABB672266DFE230050C38A /* MineAlertContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB64A266DFE220050C38A /* MineAlertContentView.swift */; }; + 88ABB673266DFE230050C38A /* MineAlertContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB64A266DFE220050C38A /* MineAlertContentView.swift */; }; + 88ABB674266DFE230050C38A /* MineAlertContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB64A266DFE220050C38A /* MineAlertContentView.swift */; }; + 88ABB675266DFE230050C38A /* MineAlertContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB64A266DFE220050C38A /* MineAlertContentView.swift */; }; + 88ABB676266DFE230050C38A /* TRTCAlertControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB64B266DFE220050C38A /* TRTCAlertControl.swift */; }; + 88ABB678266DFE230050C38A /* TRTCAlertControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB64B266DFE220050C38A /* TRTCAlertControl.swift */; }; + 88ABB679266DFE230050C38A /* TRTCAlertControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB64B266DFE220050C38A /* TRTCAlertControl.swift */; }; + 88ABB67A266DFE230050C38A /* TRTCAlertControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB64B266DFE220050C38A /* TRTCAlertControl.swift */; }; + 88ABB67B266DFE230050C38A /* TRTCAlertControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB64B266DFE220050C38A /* TRTCAlertControl.swift */; }; + 88ABB689266E01870050C38A /* LayoutDefine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB688266E01870050C38A /* LayoutDefine.swift */; }; + 88ABB68B266E01870050C38A /* LayoutDefine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB688266E01870050C38A /* LayoutDefine.swift */; }; + 88ABB68C266E01870050C38A /* LayoutDefine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB688266E01870050C38A /* LayoutDefine.swift */; }; + 88ABB68D266E01870050C38A /* LayoutDefine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB688266E01870050C38A /* LayoutDefine.swift */; }; + 88ABB68E266E01870050C38A /* LayoutDefine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB688266E01870050C38A /* LayoutDefine.swift */; }; + 88ABB6C8266F17900050C38A /* PrivacyPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB6C7266F17900050C38A /* PrivacyPopView.swift */; }; + 88ABB6CA266F17900050C38A /* PrivacyPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB6C7266F17900050C38A /* PrivacyPopView.swift */; }; + 88ABB6CB266F17900050C38A /* PrivacyPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB6C7266F17900050C38A /* PrivacyPopView.swift */; }; + 88ABB6CC266F17900050C38A /* PrivacyPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB6C7266F17900050C38A /* PrivacyPopView.swift */; }; + 88ABB6CD266F17900050C38A /* PrivacyPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88ABB6C7266F17900050C38A /* PrivacyPopView.swift */; }; 8D6AAF4C1D56E796151BFC2B /* libPods-TXLiteAVDemo_Professional.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FE920CB89622A1ED8E88E9B0 /* libPods-TXLiteAVDemo_Professional.a */; }; 910E179F2080A27500178D86 /* TXMoviePlayerNetApi.m in Sources */ = {isa = PBXBuildFile; fileRef = 910E179E2080A27500178D86 /* TXMoviePlayerNetApi.m */; }; 910E17A02080A27500178D86 /* TXMoviePlayerNetApi.m in Sources */ = {isa = PBXBuildFile; fileRef = 910E179E2080A27500178D86 /* TXMoviePlayerNetApi.m */; }; @@ -1226,6 +1288,7 @@ 91F87A801FF4A101001644B1 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F87A7E1FF4A0FC001644B1 /* libsqlite3.tbd */; }; 91F87A811FF4A109001644B1 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 91F87A7E1FF4A0FC001644B1 /* libsqlite3.tbd */; }; 944B0A98D288A86246E2C14B /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + 944DD883F4A49CD0299FAA14 /* AppUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC7BFCBD506661470A487E35 /* AppUtils.swift */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; A035040820D20A01007E61C6 /* QRCode.m in Sources */ = {isa = PBXBuildFile; fileRef = A035040720D20A01007E61C6 /* QRCode.m */; }; A035040920D20A01007E61C6 /* QRCode.m in Sources */ = {isa = PBXBuildFile; fileRef = A035040720D20A01007E61C6 /* QRCode.m */; }; A035040A20D20A01007E61C6 /* QRCode.m in Sources */ = {isa = PBXBuildFile; fileRef = A035040720D20A01007E61C6 /* QRCode.m */; }; @@ -1313,12 +1376,10 @@ BAD147E325FB570400FB40DD /* UIButton+V2.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B5A2DA625B0355400B4B469 /* UIButton+V2.m */; }; BAD147F125FB570400FB40DD /* V2PusherViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B5A2DB725B0355400B4B469 /* V2PusherViewController.m */; }; BAD147F425FB570400FB40DD /* V2PlayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B5A2DB125B0355400B4B469 /* V2PlayerViewController.m */; }; - BAD147F525FB570400FB40DD /* TXColor.m in Sources */ = {isa = PBXBuildFile; fileRef = A06E8559214F9EC200DF949B /* TXColor.m */; }; BAD147FA25FB570400FB40DD /* SmallButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A0428A3620D3CFDB00CA79D5 /* SmallButton.m */; }; BAD147FC25FB570400FB40DD /* V2PusherSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B5A2D9325B0355400B4B469 /* V2PusherSettingViewController.m */; }; BAD147FE25FB570400FB40DD /* UISegmentedControl+V2.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B5A2DA825B0355400B4B469 /* UISegmentedControl+V2.m */; }; BAD1480025FB570400FB40DD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 402A010024506F740037A219 /* main.m */; }; - BAD1480325FB570400FB40DD /* PhotoUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 4540802B23292D4400C3CAD5 /* PhotoUtil.m */; }; BAD1480525FB570400FB40DD /* SimpleIPC.m in Sources */ = {isa = PBXBuildFile; fileRef = 45CC58AA246290BB002A914E /* SimpleIPC.m */; }; BAD1480925FB570400FB40DD /* V2QRGenerateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B5A2DB225B0355400B4B469 /* V2QRGenerateViewController.m */; }; BAD1480D25FB570400FB40DD /* V2QRScanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B5A2D8F25B0355400B4B469 /* V2QRScanViewController.m */; }; @@ -1359,14 +1420,12 @@ BAD14CA925FB655B00FB40DD /* CommonUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40B3F9DC2446EF11000C37A3 /* CommonUtils.swift */; }; BAD14CAA25FB655B00FB40DD /* AppUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40B3F9DB2446EF11000C37A3 /* AppUtils.swift */; }; BAD14CAB25FB655B00FB40DD /* ProfileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40495B3E2459466900AF53CB /* ProfileManager.swift */; }; - BAD14CAC25FB655F00FB40DD /* UserAgreementViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A50323E24A1AF6B00701E6B /* UserAgreementViewController.swift */; }; BAD14CAD25FB655F00FB40DD /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40495B3A2459466900AF53CB /* LoginViewController.swift */; }; BAD14CAE25FB655F00FB40DD /* LoginViewController+UI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40495B392459466900AF53CB /* LoginViewController+UI.swift */; }; BAD14CAF25FB655F00FB40DD /* ProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40495B3B2459466900AF53CB /* ProfileViewController.swift */; }; BAD14CB025FB655F00FB40DD /* ProfileViewController+UI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40495B3C2459466900AF53CB /* ProfileViewController+UI.swift */; }; - BAD14CB125FB655F00FB40DD /* UserAgreementViewController+UI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A50324424A1B03700701E6B /* UserAgreementViewController+UI.swift */; }; BD32F8A6AF7CC2FF9A53096E /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; - C148E61E768B1CED0F7A975F /* LoginViewController_Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2ABE8D5E998B7DB57305C22 /* LoginViewController_Mock.swift */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + C4562573B939FB9145A22DCC /* ProfileViewController+UI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A4EEE061A3AC7EBFEFCE418 /* ProfileViewController+UI.swift */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; C600497825ECE75C00EAEB17 /* TRTCChatSalonHandsUpTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C600497725ECE75C00EAEB17 /* TRTCChatSalonHandsUpTipsView.swift */; }; C600497925ECE75C00EAEB17 /* TRTCChatSalonHandsUpTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C600497725ECE75C00EAEB17 /* TRTCChatSalonHandsUpTipsView.swift */; }; C600497A25ECE75C00EAEB17 /* TRTCChatSalonHandsUpTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C600497725ECE75C00EAEB17 /* TRTCChatSalonHandsUpTipsView.swift */; }; @@ -1406,7 +1465,6 @@ C6D2073A262FCCD0001A80D7 /* TRTCLoginAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6D20736262FCCD0001A80D7 /* TRTCLoginAlertView.swift */; }; C6D2073D262FCCD0001A80D7 /* TRTCLoginAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6D20736262FCCD0001A80D7 /* TRTCLoginAlertView.swift */; }; C6D2073E262FCCD0001A80D7 /* TRTCLoginAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6D20736262FCCD0001A80D7 /* TRTCLoginAlertView.swift */; }; - C8CC1B3723EA78643028BBEF /* LoginViewController+UI_Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8CA421C7BC0F09C78CFD710 /* LoginViewController+UI_Mock.swift */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; CE01F53E206DDE060056D693 /* VideoCompressPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE01F53D206DDE060056D693 /* VideoCompressPreviewController.m */; }; CE01F53F206DDE060056D693 /* VideoCompressPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE01F53D206DDE060056D693 /* VideoCompressPreviewController.m */; }; CE01F541206DDE060056D693 /* VideoCompressPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE01F53D206DDE060056D693 /* VideoCompressPreviewController.m */; }; @@ -1539,6 +1597,7 @@ D6E5D1C420B7B62000812B2F /* ScreenPushViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D6E5D1C220B7B62000812B2F /* ScreenPushViewController.m */; }; D6E5D1C520B7B62000812B2F /* ScreenPushViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D6E5D1C220B7B62000812B2F /* ScreenPushViewController.m */; }; EF69648B8809D6DEA1B7139D /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + F234A78348C62D731B4522D9 /* ProfileViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EFDDF786F6B18379B894100D /* ProfileViewController.swift */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; FDD4BF2B24A1F8AE0015388B /* VideoEditor.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FDD4BF2824A1F8AD0015388B /* VideoEditor.xcassets */; }; FDD4BF2C24A1F8AE0015388B /* VideoEditor.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FDD4BF2824A1F8AD0015388B /* VideoEditor.xcassets */; }; FDD4BF2D24A1F8AE0015388B /* VideoEditor.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FDD4BF2824A1F8AD0015388B /* VideoEditor.xcassets */; }; @@ -1802,6 +1861,7 @@ 249D634FA6178E4A3058F65B /* Pods-TXLiteAVDemo_Professional.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TXLiteAVDemo_Professional.debug.xcconfig"; path = "Target Support Files/Pods-TXLiteAVDemo_Professional/Pods-TXLiteAVDemo_Professional.debug.xcconfig"; sourceTree = ""; }; 2840D91B24B8562200723FBC /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 2840D92824B85E2A00723FBC /* SDWebImagePlaceholderImageManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SDWebImagePlaceholderImageManager.swift; sourceTree = ""; }; + 3A4EEE061A3AC7EBFEFCE418 /* ProfileViewController+UI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "ProfileViewController+UI.swift"; sourceTree = ""; }; 4009207D1F4FCBBE009B882D /* TXLiteAVDemo_Professional.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TXLiteAVDemo_Professional.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4011CC0E24E4DDB600C543D7 /* TRTCCallingCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TRTCCallingCell.swift; sourceTree = ""; }; 4011CC0F24E4DDB600C543D7 /* CallUserModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallUserModel.swift; sourceTree = ""; }; @@ -1903,6 +1963,10 @@ 40AA52C0244554BA00303EF7 /* TXReplaykitUpload_Professional.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = TXReplaykitUpload_Professional.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 40AA533524458EC800303EF7 /* TCBeautyPanel.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = TCBeautyPanel.xcodeproj; sourceTree = ""; }; 40AA539724459DF900303EF7 /* UGCKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = UGCKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 40B18A582670AEA500553049 /* TXColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXColor.h; sourceTree = ""; }; + 40B18A592670AEA500553049 /* PhotoUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PhotoUtil.m; sourceTree = ""; }; + 40B18A5A2670AEA500553049 /* PhotoUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhotoUtil.h; sourceTree = ""; }; + 40B18A5B2670AEA500553049 /* TXColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TXColor.m; sourceTree = ""; }; 40B3F8DC2446E6C5000C37A3 /* GenerateTestUserSig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GenerateTestUserSig.m; sourceTree = ""; }; 40B3F8DD2446E6C5000C37A3 /* GenerateTestUserSig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenerateTestUserSig.h; sourceTree = ""; }; 40B3F9272446E6C6000C37A3 /* LiveRoomMainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LiveRoomMainViewController.swift; sourceTree = ""; }; @@ -2055,6 +2119,8 @@ 45D8448C23B64395001CD3A9 /* UGCUploadList.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UGCUploadList.m; sourceTree = ""; }; 45E74D9923B22BCD00C22B31 /* ThemeConfigurator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ThemeConfigurator.h; sourceTree = ""; }; 45E74D9A23B22BCD00C22B31 /* ThemeConfigurator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ThemeConfigurator.m; sourceTree = ""; }; + 4717324D26705C4A005F772E /* FFmpeg.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FFmpeg.xcframework; path = ../SDK/FFmpeg.xcframework; sourceTree = ""; }; + 4717324E26705C4A005F772E /* SoundTouch.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = SoundTouch.xcframework; path = ../SDK/SoundTouch.xcframework; sourceTree = ""; }; 47642A8C261490960020F1BA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 47642A99261491B90020F1BA /* launchimage_en@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "launchimage_en@3x.png"; sourceTree = ""; }; 47642A9A261491B90020F1BA /* launchimage_en@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "launchimage_en@2x.png"; sourceTree = ""; }; @@ -2129,8 +2195,6 @@ 51A289F8230FB93A00B9B73F /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; 51A4AD391F1F8AE300B4A806 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; }; 524ADBFC998A6699CABE35B8 /* Pods-TXLiteAVDemo_Professional.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TXLiteAVDemo_Professional.release.xcconfig"; path = "Target Support Files/Pods-TXLiteAVDemo_Professional/Pods-TXLiteAVDemo_Professional.release.xcconfig"; sourceTree = ""; }; - 541D849CCCD407FB1E830687 /* ProfileManager_Mock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ProfileManager_Mock.swift; sourceTree = ""; }; - 68A61D570DF3D76F2CB443FA /* ProfileViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ProfileViewController.swift; sourceTree = ""; }; 6A1C108A2281A674005D7BD9 /* PushLogView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PushLogView.h; sourceTree = ""; }; 6A1C109A2281A674005D7BD9 /* PushLogView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PushLogView.m; sourceTree = ""; }; 6A3105C922682A06002F6115 /* ImageUploadViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ImageUploadViewController.m; sourceTree = ""; }; @@ -2138,8 +2202,6 @@ 6A3107172272E31A002F6115 /* PushBgmControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PushBgmControl.h; sourceTree = ""; }; 6A3107182272E31A002F6115 /* PushBgmControl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PushBgmControl.m; sourceTree = ""; }; 6A503178249D03B200701E6B /* TRTCInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = TRTCInfo.plist; sourceTree = ""; }; - 6A50323E24A1AF6B00701E6B /* UserAgreementViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAgreementViewController.swift; sourceTree = ""; }; - 6A50324424A1B03700701E6B /* UserAgreementViewController+UI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserAgreementViewController+UI.swift"; sourceTree = ""; }; 6AAEC24C2497807100B57D86 /* TRTCMeetingRoomDemo.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = TRTCMeetingRoomDemo.xcassets; sourceTree = ""; }; 6AAEC24E2497807100B57D86 /* TRTCMeetingNewViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TRTCMeetingNewViewController.swift; sourceTree = ""; }; 6AAEC24F2497807100B57D86 /* CenterSegmentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CenterSegmentView.swift; sourceTree = ""; }; @@ -2169,7 +2231,6 @@ 6AAEC2692497807200B57D86 /* IMProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IMProtocol.h; sourceTree = ""; }; 6AAEC26A2497807200B57D86 /* TRTCMeetingDef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TRTCMeetingDef.h; sourceTree = ""; }; 6AAEC38A2499E08100B57D86 /* TXLiteAVSDK_ReplayKitExt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = TXLiteAVSDK_ReplayKitExt.framework; sourceTree = ""; }; - 6F6FD2235631028E9A43835F /* CommonUtils.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CommonUtils.swift; sourceTree = ""; }; 7B4C917A24B4B0C80095C041 /* TXLaunchMoviePlayProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TXLaunchMoviePlayProtocol.h; sourceTree = ""; }; 7B5A2D8D25B0355400B4B469 /* V2QRGenerateViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = V2QRGenerateViewController.xib; sourceTree = ""; }; 7B5A2D8E25B0355400B4B469 /* V2MainItemCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = V2MainItemCell.m; sourceTree = ""; }; @@ -2213,6 +2274,20 @@ 7B5A2DB925B0355400B4B469 /* V2QRGenerateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V2QRGenerateViewController.h; sourceTree = ""; }; 7B5A2DBA25B0355400B4B469 /* v2live.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = v2live.xcassets; sourceTree = ""; }; 7B5A2DBB25B0355400B4B469 /* V2LiveUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = V2LiveUtils.m; sourceTree = ""; }; + 88ABB5EF266DCB0D0050C38A /* TRTCWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TRTCWebViewController.swift; sourceTree = ""; }; + 88ABB61C266DD0E80050C38A /* PrivacyPolicy.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = PrivacyPolicy.html; sourceTree = ""; }; + 88ABB62F266DD0FA0050C38A /* UserAgreement.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = UserAgreement.html; sourceTree = ""; }; + 88ABB643266DFE220050C38A /* MineRootView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MineRootView.swift; sourceTree = ""; }; + 88ABB644266DFE220050C38A /* MineViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MineViewModel.swift; sourceTree = ""; }; + 88ABB645266DFE220050C38A /* MineAboutResignViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MineAboutResignViewController.swift; sourceTree = ""; }; + 88ABB646266DFE220050C38A /* MineAboutViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MineAboutViewController.swift; sourceTree = ""; }; + 88ABB647266DFE220050C38A /* MineViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MineViewController.swift; sourceTree = ""; }; + 88ABB649266DFE220050C38A /* TRTCAlerts.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TRTCAlerts.swift; sourceTree = ""; }; + 88ABB64A266DFE220050C38A /* MineAlertContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MineAlertContentView.swift; sourceTree = ""; }; + 88ABB64B266DFE220050C38A /* TRTCAlertControl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TRTCAlertControl.swift; sourceTree = ""; }; + 88ABB688266E01870050C38A /* LayoutDefine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayoutDefine.swift; sourceTree = ""; }; + 88ABB6C7266F17900050C38A /* PrivacyPopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyPopView.swift; sourceTree = ""; }; + 8C9363B15A42D514D9FEC21D /* CommonUtils.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CommonUtils.swift; sourceTree = ""; }; 910E179D2080A27500178D86 /* TXMoviePlayerNetApi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TXMoviePlayerNetApi.h; sourceTree = ""; }; 910E179E2080A27500178D86 /* TXMoviePlayerNetApi.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TXMoviePlayerNetApi.m; sourceTree = ""; }; 910E17A52080A2EB00178D86 /* TXMoviePlayerNetDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TXMoviePlayerNetDelegate.h; sourceTree = ""; }; @@ -2233,6 +2308,7 @@ 91EEB3492060AF6C00BD01DB /* DownloadViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DownloadViewController.h; sourceTree = ""; }; 91EEB34A2060AF6C00BD01DB /* DownloadViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DownloadViewController.m; sourceTree = ""; }; 91F87A7E1FF4A0FC001644B1 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; + 99A7949BC83A56B2873FA213 /* LoginViewController_Mock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LoginViewController_Mock.swift; sourceTree = ""; }; A035040620D20A01007E61C6 /* QRCode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QRCode.h; sourceTree = ""; }; A035040720D20A01007E61C6 /* QRCode.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QRCode.m; sourceTree = ""; }; A035042E20D24F99007E61C6 /* AddressBarController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AddressBarController.h; sourceTree = ""; }; @@ -2270,8 +2346,7 @@ A0B8FC0A207E24F2008D7982 /* TVCUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVCUtils.h; sourceTree = ""; }; A0FFAD92213791B70087FF45 /* TVCHttpMessageURLProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TVCHttpMessageURLProtocol.h; sourceTree = ""; }; A0FFAD93213791B70087FF45 /* TVCHttpMessageURLProtocol.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TVCHttpMessageURLProtocol.m; sourceTree = ""; }; - A2ABE8D5E998B7DB57305C22 /* LoginViewController_Mock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = LoginViewController_Mock.swift; sourceTree = ""; }; - AAD85AD407F5E41EFC08E96B /* ProfileViewController+UI.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "ProfileViewController+UI.swift"; sourceTree = ""; }; + BC7BFCBD506661470A487E35 /* AppUtils.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AppUtils.swift; sourceTree = ""; }; C600497725ECE75C00EAEB17 /* TRTCChatSalonHandsUpTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TRTCChatSalonHandsUpTipsView.swift; sourceTree = ""; }; C603F8A726034EA0009E3AB2 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = "zh-Hans"; path = "zh-Hans.lproj/UserProtocol.html"; sourceTree = ""; }; C603F939260372A7009E3AB2 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = ""; }; @@ -2281,7 +2356,6 @@ C6D20717262FC6C2001A80D7 /* VerifyPicture.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = VerifyPicture.html; sourceTree = ""; }; C6D2071F262FC6C6001A80D7 /* LoginCountryList.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = LoginCountryList.json; sourceTree = ""; }; C6D20736262FCCD0001A80D7 /* TRTCLoginAlertView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TRTCLoginAlertView.swift; sourceTree = ""; }; - C8CA421C7BC0F09C78CFD710 /* LoginViewController+UI_Mock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "LoginViewController+UI_Mock.swift"; sourceTree = ""; }; C8E643F175AE44DEDBA06255 /* Pods-TXReplaykitUpload_Professional.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TXReplaykitUpload_Professional.release.xcconfig"; path = "Target Support Files/Pods-TXReplaykitUpload_Professional/Pods-TXReplaykitUpload_Professional.release.xcconfig"; sourceTree = ""; }; CE01F53C206DDE060056D693 /* VideoCompressPreviewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VideoCompressPreviewController.h; sourceTree = ""; }; CE01F53D206DDE060056D693 /* VideoCompressPreviewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VideoCompressPreviewController.m; sourceTree = ""; }; @@ -2290,6 +2364,7 @@ CE59D391206CD11400583727 /* VideoCompressViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VideoCompressViewController.m; sourceTree = ""; }; CE7C6E4A1FC2C5320095663F /* FilterResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = FilterResource.bundle; sourceTree = ""; }; CF31F0EB1FBB2A7E0066BF7D /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; }; + D01A44BFE08D94C32493CEFD /* ProfileManager_Mock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ProfileManager_Mock.swift; sourceTree = ""; }; D50292D42272BAFE00C052B7 /* RoomUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RoomUtil.m; sourceTree = ""; }; D50292D52272BAFE00C052B7 /* RoomUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoomUtil.h; sourceTree = ""; }; D50292D62272BAFE00C052B7 /* IMMsgManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IMMsgManager.m; sourceTree = ""; }; @@ -2348,7 +2423,8 @@ D6E5D1C120B7B62000812B2F /* ScreenPushViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreenPushViewController.h; sourceTree = ""; }; D6E5D1C220B7B62000812B2F /* ScreenPushViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScreenPushViewController.m; sourceTree = ""; }; EBEC989F47F9D57C638FDC46 /* Pods-TXReplaykitUpload_Professional.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TXReplaykitUpload_Professional.debug.xcconfig"; path = "Target Support Files/Pods-TXReplaykitUpload_Professional/Pods-TXReplaykitUpload_Professional.debug.xcconfig"; sourceTree = ""; }; - F06C689724512B55F5388435 /* AppUtils.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AppUtils.swift; sourceTree = ""; }; + EFDDF786F6B18379B894100D /* ProfileViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ProfileViewController.swift; sourceTree = ""; }; + F754D2EA167EECA124B0837E /* LoginViewController+UI_Mock.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "LoginViewController+UI_Mock.swift"; sourceTree = ""; }; FDD4BF2824A1F8AD0015388B /* VideoEditor.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = VideoEditor.xcassets; sourceTree = ""; }; FE920CB89622A1ED8E88E9B0 /* libPods-TXLiteAVDemo_Professional.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-TXLiteAVDemo_Professional.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -2847,6 +2923,17 @@ path = UGCKit; sourceTree = ""; }; + 40B18A562670AE7A00553049 /* V2CommonUtils */ = { + isa = PBXGroup; + children = ( + 40B18A5A2670AEA500553049 /* PhotoUtil.h */, + 40B18A592670AEA500553049 /* PhotoUtil.m */, + 40B18A582670AEA500553049 /* TXColor.h */, + 40B18A5B2670AEA500553049 /* TXColor.m */, + ); + path = V2CommonUtils; + sourceTree = ""; + }; 40B3F8DB2446E6C5000C37A3 /* Debug */ = { isa = PBXGroup; children = ( @@ -3305,7 +3392,7 @@ 402A00EA245068240037A219 /* UGCVideoJoinDemo */, 402A00E9245068160037A219 /* UGCVideoEditDemo */, 402A00E5245065500037A219 /* UGCVideoUploadDemo */, - 698FAED0FFF4E3E537C12633 /* Login */, + 62623612F9A9BBED2794EAB5 /* Login */, ); path = TXLiteAVDemo; sourceTree = ""; @@ -3366,6 +3453,8 @@ 40F854FF1EE8FD2F00EE47D7 /* Frameworks */ = { isa = PBXGroup; children = ( + 4717324D26705C4A005F772E /* FFmpeg.xcframework */, + 4717324E26705C4A005F772E /* SoundTouch.xcframework */, 2840D91B24B8562200723FBC /* AudioToolbox.framework */, 40802A272484BBBE008151C1 /* AudioEffectSettingKit.framework */, 40AA539724459DF900303EF7 /* UGCKit.framework */, @@ -3575,16 +3664,16 @@ path = TRTCInfoPlist; sourceTree = ""; }; - 698FAED0FFF4E3E537C12633 /* Login */ = { + 62623612F9A9BBED2794EAB5 /* Login */ = { isa = PBXGroup; children = ( - A2ABE8D5E998B7DB57305C22 /* LoginViewController_Mock.swift */, - 541D849CCCD407FB1E830687 /* ProfileManager_Mock.swift */, - C8CA421C7BC0F09C78CFD710 /* LoginViewController+UI_Mock.swift */, - F06C689724512B55F5388435 /* AppUtils.swift */, - 6F6FD2235631028E9A43835F /* CommonUtils.swift */, - 68A61D570DF3D76F2CB443FA /* ProfileViewController.swift */, - AAD85AD407F5E41EFC08E96B /* ProfileViewController+UI.swift */, + 99A7949BC83A56B2873FA213 /* LoginViewController_Mock.swift */, + D01A44BFE08D94C32493CEFD /* ProfileManager_Mock.swift */, + F754D2EA167EECA124B0837E /* LoginViewController+UI_Mock.swift */, + BC7BFCBD506661470A487E35 /* AppUtils.swift */, + 8C9363B15A42D514D9FEC21D /* CommonUtils.swift */, + EFDDF786F6B18379B894100D /* ProfileViewController.swift */, + 3A4EEE061A3AC7EBFEFCE418 /* ProfileViewController+UI.swift */, ); name = Login; path = TXLiteAVDemo/Login; @@ -3651,6 +3740,7 @@ 7B5A2D8C25B0355400B4B469 /* LiveLinkMicDemoNew */ = { isa = PBXGroup; children = ( + 40B18A562670AE7A00553049 /* V2CommonUtils */, 7B5A2D9025B0355400B4B469 /* V2Setting */, 7B5A2DAF25B0355400B4B469 /* V2MainViewController.h */, 7B5A2DB825B0355400B4B469 /* V2MainViewController.m */, @@ -3737,6 +3827,16 @@ path = CommonWidgets; sourceTree = ""; }; + 88ABB648266DFE220050C38A /* subview */ = { + isa = PBXGroup; + children = ( + 88ABB649266DFE220050C38A /* TRTCAlerts.swift */, + 88ABB64A266DFE220050C38A /* MineAlertContentView.swift */, + 88ABB64B266DFE220050C38A /* TRTCAlertControl.swift */, + ); + path = subview; + sourceTree = ""; + }; 912A62052160D78A00C16E41 /* CFDanmaku */ = { isa = PBXGroup; children = ( @@ -4612,13 +4712,13 @@ D6BEF75B2040353E00CBE2BD /* MoviePlayerViewController.m in Sources */, 40C5665F264ABB5000B85C1C /* LebSettingBottomBar.m in Sources */, 7B5A2DCD25B0355400B4B469 /* V2MainProtocolSelectSegmentView.m in Sources */, - C148E61E768B1CED0F7A975F /* LoginViewController_Mock.swift in Sources */, - 11C97B640ED564F90D4F52E1 /* ProfileManager_Mock.swift in Sources */, - C8CC1B3723EA78643028BBEF /* LoginViewController+UI_Mock.swift in Sources */, - 392559BA3338285DFC3EE6AB /* AppUtils.swift in Sources */, - 1A0999698646A0ED4D7FCDCF /* CommonUtils.swift in Sources */, - 65E5919DA1DCFD22C796EE08 /* ProfileViewController.swift in Sources */, - 1B75F95C473835383E579229 /* ProfileViewController+UI.swift in Sources */, + 272367962B3FB11D461F0EB3 /* LoginViewController_Mock.swift in Sources */, + 3C08D085252EDAAA3AD68E1A /* ProfileManager_Mock.swift in Sources */, + 2A773200264FF58658A6A84C /* LoginViewController+UI_Mock.swift in Sources */, + 944DD883F4A49CD0299FAA14 /* AppUtils.swift in Sources */, + 26CA056C2B5EAF97435CB4DB /* CommonUtils.swift in Sources */, + F234A78348C62D731B4522D9 /* ProfileViewController.swift in Sources */, + C4562573B939FB9145A22DCC /* ProfileViewController+UI.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4805,7 +4905,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = 5GHU44CJHG; + DEVELOPMENT_TEAM = F8A3GH6Q4W; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -4843,7 +4943,10 @@ INFOPLIST_FILE = TXLiteAVDemo/App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_GENERATE_MAP_FILE = NO; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/TXLiteAVDemo/Resource/Beauty/pitu", @@ -4859,7 +4962,7 @@ OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Material/Material.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Motion/Motion.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView/NVActivityIndicatorView.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/RxCocoa/RxCocoa.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/RxRelay/RxRelay.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/RxSwift/RxSwift.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Toast-Swift/Toast_Swift.modulemap\""; PRODUCT_BUNDLE_IDENTIFIER = com.tencent.fx.rtmpdemo2; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "Wildcard Dev"; + PROVISIONING_PROFILE_SPECIFIER = abyWildcardDev; STRIP_INSTALLED_PRODUCT = NO; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/TXLiteAVDemo/App/TXLiteAVDemo-Bridging-Header.h"; @@ -4921,7 +5024,10 @@ INFOPLIST_FILE = TXLiteAVDemo/App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_GENERATE_MAP_FILE = YES; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/TXLiteAVDemo/Resource/Beauty/pitu", @@ -4955,7 +5061,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = 5GHU44CJHG; + DEVELOPMENT_TEAM = F8A3GH6Q4W; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -4987,7 +5093,10 @@ ); INFOPLIST_FILE = TXLiteAVDemo/App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/TXLiteAVDemo/VideoUpload/COSSDK", @@ -5001,7 +5110,7 @@ OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Material/Material.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Motion/Motion.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView/NVActivityIndicatorView.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/RxCocoa/RxCocoa.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/RxRelay/RxRelay.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/RxSwift/RxSwift.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Toast-Swift/Toast_Swift.modulemap\""; PRODUCT_BUNDLE_IDENTIFIER = com.tencent.fx.rtmpdemo2; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "Wildcard Dev"; + PROVISIONING_PROFILE_SPECIFIER = abyWildcardDev; STRIP_INSTALLED_PRODUCT = NO; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/TXLiteAVDemo/App/TXLiteAVDemo-Bridging-Header.h"; @@ -5056,7 +5165,10 @@ INFOPLIST_FILE = TXLiteAVDemo/App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_GENERATE_MAP_FILE = YES; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/TXLiteAVDemo/VideoUpload/COSSDK", @@ -5113,7 +5225,10 @@ ); INFOPLIST_FILE = TXLiteAVDemo/App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MARKETING_VERSION = 7.2.1; OTHER_LDFLAGS = ( "$(inherited)", @@ -5168,7 +5283,10 @@ INFOPLIST_FILE = TXLiteAVDemo/App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_GENERATE_MAP_FILE = YES; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MARKETING_VERSION = 7.2.1; OTHER_LDFLAGS = ( "$(inherited)", @@ -5221,7 +5339,10 @@ ); INFOPLIST_FILE = TXLiteAVDemo/App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LOCALIZED_STRING_SWIFTUI_SUPPORT = YES; MARKETING_VERSION = 7.2.1; OTHER_LDFLAGS = ( @@ -5281,7 +5402,10 @@ INFOPLIST_FILE = TXLiteAVDemo/App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_GENERATE_MAP_FILE = YES; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LOCALIZED_STRING_SWIFTUI_SUPPORT = YES; MARKETING_VERSION = 7.2.1; OTHER_LDFLAGS = ( @@ -5315,7 +5439,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = 5GHU44CJHG; + DEVELOPMENT_TEAM = F8A3GH6Q4W; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -5337,10 +5461,14 @@ ); INFOPLIST_FILE = ReplaykitUpload/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.tencent.fx.rtmpdemo2.Upload; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "Wildcard Dev"; + PROVISIONING_PROFILE_SPECIFIER = abyWildcardDev; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 1; }; @@ -5383,7 +5511,11 @@ ); INFOPLIST_FILE = ReplaykitUpload/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.tencent.fx.rtmpdemo2.Upload; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = com.tencent.fx.rtmpdemo2.Upload_Production_SignProvision; @@ -5432,7 +5564,10 @@ ); INFOPLIST_FILE = "TXLiteAVDemo/App/TRTC-Appstore-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MARKETING_VERSION = 7.4.269; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.tencent.trtcScenesDemo; @@ -5490,7 +5625,10 @@ INFOPLIST_FILE = "TXLiteAVDemo/App/TRTC-Appstore-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_GENERATE_MAP_FILE = YES; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MARKETING_VERSION = 7.4.269; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.tencent.mrtc; @@ -5543,7 +5681,10 @@ ); INFOPLIST_FILE = "TXLiteAVDemo/App/TRTC-Appstore-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MARKETING_VERSION = 7.4.278; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.tencent.trtcScenesDemo; @@ -5600,7 +5741,10 @@ INFOPLIST_FILE = "TXLiteAVDemo/App/TRTC-Appstore-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_GENERATE_MAP_FILE = YES; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MARKETING_VERSION = 7.4.278; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.tencent.mrtc; @@ -5748,7 +5892,11 @@ ); INFOPLIST_FILE = ReplaykitUpload/TRTCInfo.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); MARKETING_VERSION = 7.4.269; PRODUCT_BUNDLE_IDENTIFIER = com.tencent.trtcScenesDemo.Upload; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -5797,7 +5945,11 @@ ); INFOPLIST_FILE = ReplaykitUpload/TRTCInfo.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); MARKETING_VERSION = 7.4.269; PRODUCT_BUNDLE_IDENTIFIER = com.tencent.mrtc.Upload; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -5845,7 +5997,11 @@ ); INFOPLIST_FILE = ReplaykitUpload/TRTCInfo.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); MARKETING_VERSION = 7.4.269; PRODUCT_BUNDLE_IDENTIFIER = com.tencent.trtcScenesDemo.Upload; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -5893,7 +6049,11 @@ ); INFOPLIST_FILE = ReplaykitUpload/TRTCInfo.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); MARKETING_VERSION = 7.4.269; PRODUCT_BUNDLE_IDENTIFIER = com.tencent.mrtc.Upload; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -5917,7 +6077,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = 5GHU44CJHG; + DEVELOPMENT_TEAM = F8A3GH6Q4W; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -5939,10 +6099,14 @@ ); INFOPLIST_FILE = ReplaykitUpload/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.tencent.fx.rtmpdemo2.Upload; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "Wildcard Dev"; + PROVISIONING_PROFILE_SPECIFIER = abyWildcardDev; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 1; }; @@ -5984,7 +6148,11 @@ ); INFOPLIST_FILE = ReplaykitUpload/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.tencent.fx.rtmpdemo2.Upload; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = com.tencent.fx.rtmpdemo2.Upload_Production_SignProvision; @@ -6001,7 +6169,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = 5GHU44CJHG; + DEVELOPMENT_TEAM = F8A3GH6Q4W; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -6028,7 +6196,10 @@ ); INFOPLIST_FILE = TXLiteAVDemo/App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/TXLiteAVDemo/VideoUpload/COSSDK", @@ -6042,7 +6213,7 @@ OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Alamofire/Alamofire.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Material/Material.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Motion/Motion.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/NVActivityIndicatorView/NVActivityIndicatorView.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/RxCocoa/RxCocoa.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/RxRelay/RxRelay.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/RxSwift/RxSwift.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/SnapKit/SnapKit.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/Toast-Swift/Toast_Swift.modulemap\""; PRODUCT_BUNDLE_IDENTIFIER = com.tencent.fx.rtmpdemo2; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = "Wildcard Dev"; + PROVISIONING_PROFILE_SPECIFIER = abyWildcardDev; STRIP_INSTALLED_PRODUCT = NO; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG ENABLE_INTERNATIONAL"; SWIFT_OBJC_BRIDGING_HEADER = "$(PROJECT_DIR)/TXLiteAVDemo/App/TXLiteAVDemo-Bridging-Header.h"; @@ -6091,7 +6262,10 @@ INFOPLIST_FILE = TXLiteAVDemo/App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_GENERATE_MAP_FILE = YES; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/TXLiteAVDemo/VideoUpload/COSSDK", @@ -6154,7 +6328,10 @@ INFOPLIST_FILE = TXLiteAVDemo/App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_GENERATE_MAP_FILE = YES; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/TXLiteAVDemo/VideoUpload/COSSDK", @@ -6220,7 +6397,10 @@ INFOPLIST_FILE = TXLiteAVDemo/App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_GENERATE_MAP_FILE = YES; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/TXLiteAVDemo/VideoUpload/COSSDK", @@ -6276,7 +6456,11 @@ ); INFOPLIST_FILE = ReplaykitUpload/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.tencent.fx.rtmpdemo2.ReplaykitUpload; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Wildcard Dev"; @@ -6317,7 +6501,11 @@ ); INFOPLIST_FILE = ReplaykitUpload/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 11.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.tencent.fx.rtmpdemo2.Upload; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = com.tencent.fx.rtmpdemo2.Upload_Production_SignProvision; diff --git a/Demo/TXLiteAVDemo/App/Info.plist b/Demo/TXLiteAVDemo/App/Info.plist index 7609a61f..ec384b1b 100644 --- a/Demo/TXLiteAVDemo/App/Info.plist +++ b/Demo/TXLiteAVDemo/App/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 8.8.1062 + 8.8.1075 CFBundleSignature ???? CFBundleURLTypes @@ -36,7 +36,7 @@ CFBundleVersion - 1062 + 1075 IMSDKCrashReporterEnable LSRequiresIPhoneOS diff --git a/Demo/TXLiteAVDemo/App/Main/MainViewController.m b/Demo/TXLiteAVDemo/App/Main/MainViewController.m index 92352319..52ed78f4 100644 --- a/Demo/TXLiteAVDemo/App/Main/MainViewController.m +++ b/Demo/TXLiteAVDemo/App/Main/MainViewController.m @@ -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 } @@ -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 diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/back.imageset/Contents.json b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/back.imageset/Contents.json new file mode 100644 index 00000000..694bc882 --- /dev/null +++ b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/back.imageset/Contents.json @@ -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 + } +} diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/back.imageset/bgm_back.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/back.imageset/bgm_back.png new file mode 100644 index 00000000..4d4b18a9 Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/back.imageset/bgm_back.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/back.imageset/bgm_back@2x.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/back.imageset/bgm_back@2x.png new file mode 100644 index 00000000..b4613b53 Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/back.imageset/bgm_back@2x.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/back.imageset/bgm_back@3x.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/back.imageset/bgm_back@3x.png new file mode 100644 index 00000000..9b854fe5 Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/back.imageset/bgm_back@3x.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_nor.imageset/Contents.json b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_nor.imageset/Contents.json new file mode 100644 index 00000000..411c85d6 --- /dev/null +++ b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_nor.imageset/Contents.json @@ -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 + } +} diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_nor.imageset/checkbox_nor.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_nor.imageset/checkbox_nor.png new file mode 100644 index 00000000..1ce76947 Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_nor.imageset/checkbox_nor.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_nor.imageset/checkbox_nor@2x.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_nor.imageset/checkbox_nor@2x.png new file mode 100644 index 00000000..d72f1939 Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_nor.imageset/checkbox_nor@2x.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_nor.imageset/checkbox_nor@3x.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_nor.imageset/checkbox_nor@3x.png new file mode 100644 index 00000000..53941936 Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_nor.imageset/checkbox_nor@3x.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_sel.imageset/Contents.json b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_sel.imageset/Contents.json new file mode 100644 index 00000000..6e6f73a5 --- /dev/null +++ b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_sel.imageset/Contents.json @@ -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 + } +} diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_sel.imageset/checkbox_sel.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_sel.imageset/checkbox_sel.png new file mode 100644 index 00000000..3fa79af2 Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_sel.imageset/checkbox_sel.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_sel.imageset/checkbox_sel@2x.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_sel.imageset/checkbox_sel@2x.png new file mode 100644 index 00000000..099c72b4 Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_sel.imageset/checkbox_sel@2x.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_sel.imageset/checkbox_sel@3x.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_sel.imageset/checkbox_sel@3x.png new file mode 100644 index 00000000..129c8043 Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/checkbox_sel.imageset/checkbox_sel@3x.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/exit.imageset/Contents.json b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/exit.imageset/Contents.json new file mode 100644 index 00000000..2a47bea1 --- /dev/null +++ b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/exit.imageset/Contents.json @@ -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 + } +} diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/exit.imageset/exitRoom.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/exit.imageset/exitRoom.png new file mode 100644 index 00000000..09a9d510 Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/exit.imageset/exitRoom.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/exit.imageset/exitRoom@2x.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/exit.imageset/exitRoom@2x.png new file mode 100644 index 00000000..b68e5266 Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/exit.imageset/exitRoom@2x.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/exit.imageset/exitRoom@3x.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/exit.imageset/exitRoom@3x.png new file mode 100644 index 00000000..ea03892a Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/exit.imageset/exitRoom@3x.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about.imageset/Contents.json b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about.imageset/Contents.json new file mode 100644 index 00000000..68b78de0 --- /dev/null +++ b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about.imageset/Contents.json @@ -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 + } +} diff --git "a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about.imageset/\345\205\263\344\272\216.png" "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about.imageset/\345\205\263\344\272\216.png" new file mode 100644 index 00000000..670eb270 Binary files /dev/null and "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about.imageset/\345\205\263\344\272\216.png" differ diff --git "a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about.imageset/\345\205\263\344\272\216@2x.png" "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about.imageset/\345\205\263\344\272\216@2x.png" new file mode 100644 index 00000000..568ab30d Binary files /dev/null and "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about.imageset/\345\205\263\344\272\216@2x.png" differ diff --git "a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about.imageset/\345\205\263\344\272\216@3x.png" "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about.imageset/\345\205\263\344\272\216@3x.png" new file mode 100644 index 00000000..bc6063a2 Binary files /dev/null and "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about.imageset/\345\205\263\344\272\216@3x.png" differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about_back.imageset/Contents.json b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about_back.imageset/Contents.json new file mode 100644 index 00000000..e275b755 --- /dev/null +++ b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about_back.imageset/Contents.json @@ -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 + } +} diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about_back.imageset/black_back.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about_back.imageset/black_back.png new file mode 100644 index 00000000..c1b18270 Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about_back.imageset/black_back.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about_back.imageset/black_back@2x.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about_back.imageset/black_back@2x.png new file mode 100644 index 00000000..e0d845d1 Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about_back.imageset/black_back@2x.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about_back.imageset/black_back@3x.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about_back.imageset/black_back@3x.png new file mode 100644 index 00000000..ed992662 Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_about_back.imageset/black_back@3x.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_detail.imageset/Contents.json b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_detail.imageset/Contents.json new file mode 100644 index 00000000..131cd427 --- /dev/null +++ b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_detail.imageset/Contents.json @@ -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 + } +} diff --git "a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_detail.imageset/\350\257\246\346\203\205.png" "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_detail.imageset/\350\257\246\346\203\205.png" new file mode 100644 index 00000000..a0c90c23 Binary files /dev/null and "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_detail.imageset/\350\257\246\346\203\205.png" differ diff --git "a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_detail.imageset/\350\257\246\346\203\205@2x.png" "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_detail.imageset/\350\257\246\346\203\205@2x.png" new file mode 100644 index 00000000..b36478ec Binary files /dev/null and "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_detail.imageset/\350\257\246\346\203\205@2x.png" differ diff --git "a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_detail.imageset/\350\257\246\346\203\205@3x.png" "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_detail.imageset/\350\257\246\346\203\205@3x.png" new file mode 100644 index 00000000..a6b56da7 Binary files /dev/null and "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_detail.imageset/\350\257\246\346\203\205@3x.png" differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_disclaimer.imageset/Contents.json b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_disclaimer.imageset/Contents.json new file mode 100644 index 00000000..9fc65ce3 --- /dev/null +++ b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_disclaimer.imageset/Contents.json @@ -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 + } +} diff --git "a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_disclaimer.imageset/\345\205\215\350\264\243\347\224\263\346\230\216.png" "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_disclaimer.imageset/\345\205\215\350\264\243\347\224\263\346\230\216.png" new file mode 100644 index 00000000..5409d7ff Binary files /dev/null and "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_disclaimer.imageset/\345\205\215\350\264\243\347\224\263\346\230\216.png" differ diff --git "a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_disclaimer.imageset/\345\205\215\350\264\243\347\224\263\346\230\216@2x.png" "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_disclaimer.imageset/\345\205\215\350\264\243\347\224\263\346\230\216@2x.png" new file mode 100644 index 00000000..10589577 Binary files /dev/null and "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_disclaimer.imageset/\345\205\215\350\264\243\347\224\263\346\230\216@2x.png" differ diff --git "a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_disclaimer.imageset/\345\205\215\350\264\243\347\224\263\346\230\216@3x.png" "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_disclaimer.imageset/\345\205\215\350\264\243\347\224\263\346\230\216@3x.png" new file mode 100644 index 00000000..eb8ee9aa Binary files /dev/null and "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_disclaimer.imageset/\345\205\215\350\264\243\347\224\263\346\230\216@3x.png" differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_edit.imageset/Contents.json b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_edit.imageset/Contents.json new file mode 100644 index 00000000..7eb1aab0 --- /dev/null +++ b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_edit.imageset/Contents.json @@ -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 + } +} diff --git "a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_edit.imageset/\347\274\226\350\276\221.png" "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_edit.imageset/\347\274\226\350\276\221.png" new file mode 100644 index 00000000..4a42d37a Binary files /dev/null and "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_edit.imageset/\347\274\226\350\276\221.png" differ diff --git "a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_edit.imageset/\347\274\226\350\276\221@2x.png" "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_edit.imageset/\347\274\226\350\276\221@2x.png" new file mode 100644 index 00000000..2ffa392a Binary files /dev/null and "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_edit.imageset/\347\274\226\350\276\221@2x.png" differ diff --git "a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_edit.imageset/\347\274\226\350\276\221@3x.png" "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_edit.imageset/\347\274\226\350\276\221@3x.png" new file mode 100644 index 00000000..e2df4a85 Binary files /dev/null and "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_edit.imageset/\347\274\226\350\276\221@3x.png" differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_privacy.imageset/Contents.json b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_privacy.imageset/Contents.json new file mode 100644 index 00000000..1d7fa2a8 --- /dev/null +++ b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_privacy.imageset/Contents.json @@ -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 + } +} diff --git "a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_privacy.imageset/\351\232\220\347\247\201\346\235\241\346\254\276.png" "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_privacy.imageset/\351\232\220\347\247\201\346\235\241\346\254\276.png" new file mode 100644 index 00000000..d5aa2c62 Binary files /dev/null and "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_privacy.imageset/\351\232\220\347\247\201\346\235\241\346\254\276.png" differ diff --git "a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_privacy.imageset/\351\232\220\347\247\201\346\235\241\346\254\276@2x.png" "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_privacy.imageset/\351\232\220\347\247\201\346\235\241\346\254\276@2x.png" new file mode 100644 index 00000000..b57fdc69 Binary files /dev/null and "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_privacy.imageset/\351\232\220\347\247\201\346\235\241\346\254\276@2x.png" differ diff --git "a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_privacy.imageset/\351\232\220\347\247\201\346\235\241\346\254\276@3x.png" "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_privacy.imageset/\351\232\220\347\247\201\346\235\241\346\254\276@3x.png" new file mode 100644 index 00000000..2938604f Binary files /dev/null and "b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/main_mine_privacy.imageset/\351\232\220\347\247\201\346\235\241\346\254\276@3x.png" differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/resign.imageset/Contents.json b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/resign.imageset/Contents.json new file mode 100644 index 00000000..198454d4 --- /dev/null +++ b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/resign.imageset/Contents.json @@ -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 + } +} diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/resign.imageset/resign.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/resign.imageset/resign.png new file mode 100644 index 00000000..dcbda04f Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/resign.imageset/resign.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/userAgreement.imageset/Contents.json b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/userAgreement.imageset/Contents.json new file mode 100644 index 00000000..9e615c64 --- /dev/null +++ b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/userAgreement.imageset/Contents.json @@ -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 + } +} diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/userAgreement.imageset/userAgreement.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/userAgreement.imageset/userAgreement.png new file mode 100644 index 00000000..6aabdf4f Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/userAgreement.imageset/userAgreement.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/userAgreement.imageset/userAgreement@2x.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/userAgreement.imageset/userAgreement@2x.png new file mode 100644 index 00000000..0e494e25 Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/userAgreement.imageset/userAgreement@2x.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/userAgreement.imageset/userAgreement@3x.png b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/userAgreement.imageset/userAgreement@3x.png new file mode 100644 index 00000000..bf8228b3 Binary files /dev/null and b/Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/userAgreement.imageset/userAgreement@3x.png differ diff --git a/Demo/TXLiteAVDemo/App/Resource/Localized/AppPortalLocalized/en.lproj/AppPortalLocalized.strings b/Demo/TXLiteAVDemo/App/Resource/Localized/AppPortalLocalized/en.lproj/AppPortalLocalized.strings index 2cbdbed7..da5d34d3 100644 --- a/Demo/TXLiteAVDemo/App/Resource/Localized/AppPortalLocalized/en.lproj/AppPortalLocalized.strings +++ b/Demo/TXLiteAVDemo/App/Resource/Localized/AppPortalLocalized/en.lproj/AppPortalLocalized.strings @@ -29,3 +29,34 @@ "AppCommon.TCUtil.sendhttprequest" = "Unable to convert parameter value to JSON string due to sendHttpRequest failure"; "AppCommon.TCUtil.parametererror" = "Parameter error"; "AppCommon.TCUtil.serverrequesterror" = "Server request error"; + + +"Demo.TRTC.Portal.Home.logout" = "Log out"; +"Demo.TRTC.Portal.Mine.personalcenter" = "Personal Center"; +"Demo.TRTC.Portal.Mine.about" = "About"; +"Demo.TRTC.Portal.Main.home" = "Home"; +"Demo.TRTC.Portal.Main.mine" = "Me"; +"Demo.TRTC.Portal.confirm" = "Done"; +"Demo.TRTC.Portal.enterusername" = "Please enter a nickname"; +"Demo.TRTC.Portal.privacy" = "Privacy"; +"Demo.TRTC.Portal.disclaimer" = "Disclaimer"; +"Demo.TRTC.Portal.sdkversion" = "SDK Version"; +"Demo.TRTC.Portal.appversion" = "Application Version"; +"Demo.TRTC.Portal.limit20count" = "Chinese characters, letters, numbers and underscores, 2 - 20 words"; +"Demo.TRTC.Portal.changenickname" = "Change Your Nickname"; +"Demo.TRTC.Portal.disclaimerdesc" = "this app is a tryout app, whose copyright is owned by Tencent Cloud. This app is for tryout only and must not be used commercially.\nIn accordance with relevant regulations, this app forbids pornographic, abusive, terrorism, and politically sensitive content. All audio/video interactions are recorded and archived."; + +"Demo.TRTC.Portal.resignaccount" = "Delete Account"; +"Demo.TRTC.Portal.resignsuccess" = "Account deleted"; +"Demo.TRTC.Portal.resigntips" = "You can no longer use this account after deletion. Its data will also be deleted and cannot be retrieved."; +"Demo.TRTC.Portal.currentaccount" = "Account:xxx"; +"Demo.TRTC.Portal.confirmresign" = "Delete"; +"Demo.TRTC.Portal.alerttoresign" = "Are you sure you want to delete this account?"; +"Demo.TRTC.Portal.privateandagreement" = "I have read and agree to the Privacy Policy and Terms of Use, and I authorize Tencent Cloud to manage the data (nickname, profile photo, phone number) of this account ."; +"Demo.TRTC.Portal.agreeprivatefirst" = "You must agree to the Privacy Policy and Terms of Use first."; +"Demo.TRTC.Portal.agree" = "agree"; +"Demo.TRTC.Portal.disagree" = "disagree"; +"Demo.TRTC.Portal.popTitle" = "Welcome to Tencent Cloud Video Toolkit"; +"Demo.TRTC.Portal.popMessage" = + "Welcome to Tencent Cloud Video Toolkit. We will help you understand our collection, use, and storage of personal information through the \"Privacy Regulations\" and \"User Agreement\". +In addition, you can also learn about your related rights and implementation methods. If you agree, please click the button below to start accepting our services;"; diff --git a/Demo/TXLiteAVDemo/App/Resource/Localized/AppPortalLocalized/zh-Hans.lproj/AppPortalLocalized.strings b/Demo/TXLiteAVDemo/App/Resource/Localized/AppPortalLocalized/zh-Hans.lproj/AppPortalLocalized.strings index a27d727a..21eee357 100644 --- a/Demo/TXLiteAVDemo/App/Resource/Localized/AppPortalLocalized/zh-Hans.lproj/AppPortalLocalized.strings +++ b/Demo/TXLiteAVDemo/App/Resource/Localized/AppPortalLocalized/zh-Hans.lproj/AppPortalLocalized.strings @@ -29,3 +29,34 @@ "AppCommon.TCUtil.sendhttprequest" = "sendHttpRequest failed，参数转成json格式失败"; "AppCommon.TCUtil.parametererror" = "参数错误"; "AppCommon.TCUtil.serverrequesterror" = "服务请求失败"; + +"Demo.TRTC.Portal.Home.logout" = "退出登录"; +"Demo.TRTC.Portal.Mine.personalcenter" = "个人中心"; +"Demo.TRTC.Portal.Mine.about" = "关于"; +"Demo.TRTC.Portal.Main.home" = "主页"; +"Demo.TRTC.Portal.Main.mine" = "我的"; +"Demo.TRTC.Portal.confirm" = "确认"; +"Demo.TRTC.Portal.enterusername" = "请输入用户昵称"; +"Demo.TRTC.Portal.privacy" = "隐私条例"; +"Demo.TRTC.Portal.disclaimer" = "免责声明"; +"Demo.TRTC.Portal.sdkversion" = "SDK 版本"; +"Demo.TRTC.Portal.appversion" = "商店版本"; +"Demo.TRTC.Portal.limit20count" = "仅限中文、字母、数字和下划线，2-20个字"; +"Demo.TRTC.Portal.changenickname" = "修改用户昵称"; +"Demo.TRTC.Portal.disclaimerdesc" = "视频云工具包(\"本产品\")是由腾讯云提供的一款测试产品，腾讯云享有本产品的著作权和所有权。本产品仅用于功能体验，不得用于任何商业用途。\n为配合相关部门监管要求，本产品音视频互动全程均有录音录像存档，严禁在使用中有任何但不限于色情、辱骂、暴恐、涉政等违规内容的传播。"; + +"Demo.TRTC.Portal.resignaccount" = "注销账户"; +"Demo.TRTC.Portal.resignsuccess" = "注销成功"; +"Demo.TRTC.Portal.resigntips" = "注销后，您将无法使用当前账号，相关数据也将删除无法找回"; +"Demo.TRTC.Portal.currentaccount" = "当前账号 xxx"; +"Demo.TRTC.Portal.confirmresign" = "确认注销"; +"Demo.TRTC.Portal.alerttoresign" = "确定要注销账户吗？"; +"Demo.TRTC.Portal.privateandagreement" = "我已阅读并同意《隐私条例》和《用户协议》，并授权腾讯云使用该账号（昵称、头像、电话号码）进行统一管理"; +"Demo.TRTC.Portal.agreeprivatefirst" = "请先同意隐私条款条款和用户协议。"; +"Demo.TRTC.Portal.agree" = "同意"; +"Demo.TRTC.Portal.disagree" = "不同意"; +"Demo.TRTC.Portal.popTitle" = "欢迎使用腾讯云视频工具包"; +"Demo.TRTC.Portal.popMessage" = + "欢迎使用腾讯云视频工具包，我们将通过xxx和yyy帮助您了解我们收集，使用，存储个人信息的情况， + 此外，您还可以了解到您所享有的相关权利和实现途径，如您同意请点击下方按钮开始接受我们的服务；"; + diff --git a/Demo/TXLiteAVDemo/App/Resource/Localized/TRTCLocalized/en.lproj/TRTCDemoLocalized.strings b/Demo/TXLiteAVDemo/App/Resource/Localized/TRTCLocalized/en.lproj/TRTCDemoLocalized.strings index 8820b82f..b95cd9b8 100644 --- a/Demo/TXLiteAVDemo/App/Resource/Localized/TRTCLocalized/en.lproj/TRTCDemoLocalized.strings +++ b/Demo/TXLiteAVDemo/App/Resource/Localized/TRTCLocalized/en.lproj/TRTCDemoLocalized.strings @@ -324,3 +324,6 @@ "Demo.TRTC.Streaming.call" = "Call"; "Demo.TRTC.Home.loginimsuccess" = "Logged in to IM"; "Demo.TRTC.Home.loginimfailed" = "Failed to log in to IM"; + +"Demo.TRTC.Login.setavatar" = "Change Profile Picture"; +"Demo.TRTC.Login.done" = "Done"; diff --git a/Demo/TXLiteAVDemo/App/Resource/Localized/TRTCLocalized/zh-Hans.lproj/TRTCDemoLocalized.strings b/Demo/TXLiteAVDemo/App/Resource/Localized/TRTCLocalized/zh-Hans.lproj/TRTCDemoLocalized.strings index c681e4b3..37a5b7eb 100644 --- a/Demo/TXLiteAVDemo/App/Resource/Localized/TRTCLocalized/zh-Hans.lproj/TRTCDemoLocalized.strings +++ b/Demo/TXLiteAVDemo/App/Resource/Localized/TRTCLocalized/zh-Hans.lproj/TRTCDemoLocalized.strings @@ -365,3 +365,6 @@ "Demo.TRTC." = "用户接受"; "Demo.TRTC." = "用户拒绝"; "Demo.TRTC." = "录音文件路径已复制"; + +"Demo.TRTC.Login.setavatar" = "设置头像"; +"Demo.TRTC.Login.done" = "确认"; diff --git a/Demo/TXLiteAVDemo/App/Resource/Localized/V2Localized/en.lproj/V2LiveLocalized.strings b/Demo/TXLiteAVDemo/App/Resource/Localized/V2Localized/en.lproj/V2LiveLocalized.strings index 223f18fa..753791d1 100644 --- a/Demo/TXLiteAVDemo/App/Resource/Localized/V2Localized/en.lproj/V2LiveLocalized.strings +++ b/Demo/TXLiteAVDemo/App/Resource/Localized/V2Localized/en.lproj/V2LiveLocalized.strings @@ -173,3 +173,10 @@ "MLVB.lebLauncher.inputLebUrl" = "Enter a playback address started with webrtc://"; "MLVB.lebLauncher.enterplayeraddress" = "Enter a valid playback address"; + +"Demo.TRTC.Portal.privateandagreement" = "I have read and agree to the xxx and yyy, and I authorize Tencent Cloud to manage the data (nickname, profile photo, phone number) of this account ."; +"Demo.TRTC.Portal.agreeprivatefirst" = "You must agree to the Privacy Policy and Terms of Use first."; +"Demo.TRTC.Portal." = "Privacy Policy"; +"Demo.TRTC.Portal." = "Terms of Use"; +"Demo.TRTC.Portal.private" = "Privacy Policy"; +"Demo.TRTC.Portal.agreement" = "Terms of Use"; diff --git a/Demo/TXLiteAVDemo/App/Resource/Localized/V2Localized/zh-Hans.lproj/V2LiveLocalized.strings b/Demo/TXLiteAVDemo/App/Resource/Localized/V2Localized/zh-Hans.lproj/V2LiveLocalized.strings index 4f070f4f..1892a962 100644 --- a/Demo/TXLiteAVDemo/App/Resource/Localized/V2Localized/zh-Hans.lproj/V2LiveLocalized.strings +++ b/Demo/TXLiteAVDemo/App/Resource/Localized/V2Localized/zh-Hans.lproj/V2LiveLocalized.strings @@ -171,3 +171,11 @@ "MLVB.lebLauncher.inputUrl" = "请输入播放地址"; "MLVB.lebLauncher.inputLebUrl" = "请输入以 webtrc:// 开头的播放地址"; "MLVB.lebLauncher.enterplayeraddress" = "请输入正确的播放地址"; + + +"Demo.TRTC.Portal.privateandagreement" = "我已阅读并同意xxx和yyy，并授权腾讯云使用该账号（昵称、头像、电话号码）进行统一管理"; +"Demo.TRTC.Portal.agreeprivatefirst" = "请先同意隐私条款条款和用户协议。"; +"Demo.TRTC.Portal." = "《隐私条例》"; +"Demo.TRTC.Portal." = "《用户协议》"; +"Demo.TRTC.Portal.private" = "隐私条例"; +"Demo.TRTC.Portal.agreement" = "用户协议"; diff --git a/Demo/TXLiteAVDemo/App/TRTC-Appstore-Info.plist b/Demo/TXLiteAVDemo/App/TRTC-Appstore-Info.plist index 69416166..d3cf5234 100644 --- a/Demo/TXLiteAVDemo/App/TRTC-Appstore-Info.plist +++ b/Demo/TXLiteAVDemo/App/TRTC-Appstore-Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 8.8.1062 + $(MARKETING_VERSION) CFBundleSignature BNDL CFBundleURLTypes @@ -36,7 +36,7 @@ CFBundleVersion - 1062 + $(CURRENT_PROJECT_VERSION) IMSDKCrashReporterEnable LSRequiresIPhoneOS diff --git a/Demo/TXLiteAVDemo/AudioSettingKit/AudioEffectSettingKit.xcodeproj/project.pbxproj b/Demo/TXLiteAVDemo/AudioSettingKit/AudioEffectSettingKit.xcodeproj/project.pbxproj index 8e93b048..08773d94 100644 --- a/Demo/TXLiteAVDemo/AudioSettingKit/AudioEffectSettingKit.xcodeproj/project.pbxproj +++ b/Demo/TXLiteAVDemo/AudioSettingKit/AudioEffectSettingKit.xcodeproj/project.pbxproj @@ -62,10 +62,11 @@ 40E25FB6248029F8005EB543 /* ASNSLayoutConstraint+MASDebugAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 40E25F9D248029F8005EB543 /* ASNSLayoutConstraint+MASDebugAdditions.m */; }; 40E25FB924803F68005EB543 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 401A9A47247FB78F00C0763B /* libc++.tbd */; }; 40E25FBE24804490005EB543 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; - 6CBCE3802542B743A179935F /* TXLiteAVSDK_Professional.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C4D5A7DE2D03EC3763B34F8 /* TXLiteAVSDK_Professional.framework */; }; + FAAD7792A8D0F05842065198 /* TXLiteAVSDK_Professional.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F0EF99E5E005A74DE2933E0 /* TXLiteAVSDK_Professional.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 0F0EF99E5E005A74DE2933E0 /* TXLiteAVSDK_Professional.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TXLiteAVSDK_Professional.framework; path = ../../../SDK/TXLiteAVSDK_Professional.framework; sourceTree = ""; }; 401A9A40247FACAF00C0763B /* TCAudioSettingManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TCAudioSettingManager.h; sourceTree = ""; }; 401A9A41247FACAF00C0763B /* TCAudioSettingManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TCAudioSettingManager.m; sourceTree = ""; }; 401A9A47247FB78F00C0763B /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; @@ -130,7 +131,6 @@ 40E25F9B248029F8005EB543 /* ASMASLayoutConstraint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASMASLayoutConstraint.h; sourceTree = ""; }; 40E25F9C248029F8005EB543 /* ASViewController+MASAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ASViewController+MASAdditions.h"; sourceTree = ""; }; 40E25F9D248029F8005EB543 /* ASNSLayoutConstraint+MASDebugAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "ASNSLayoutConstraint+MASDebugAdditions.m"; sourceTree = ""; }; - 4C4D5A7DE2D03EC3763B34F8 /* TXLiteAVSDK_Professional.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TXLiteAVSDK_Professional.framework; path = ../../../SDK/TXLiteAVSDK_Professional.framework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -142,7 +142,7 @@ 40E25FBE24804490005EB543 /* BuildFile in Frameworks */, 40E25FB924803F68005EB543 /* libc++.tbd in Frameworks */, 40D08707249C9D460055F9A6 /* AssetsLibrary.framework in Frameworks */, - 6CBCE3802542B743A179935F /* TXLiteAVSDK_Professional.framework in Frameworks */, + FAAD7792A8D0F05842065198 /* TXLiteAVSDK_Professional.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -199,7 +199,7 @@ 40D08706249C9D460055F9A6 /* AssetsLibrary.framework */, 40D08703249C9C130055F9A6 /* Accelerate.framework */, 401A9A47247FB78F00C0763B /* libc++.tbd */, - 4C4D5A7DE2D03EC3763B34F8 /* TXLiteAVSDK_Professional.framework */, + 0F0EF99E5E005A74DE2933E0 /* TXLiteAVSDK_Professional.framework */, ); name = Frameworks; sourceTree = ""; diff --git a/Demo/TXLiteAVDemo/AudioSettingKit/AudioSettingKit/View/AudioEffectSettingView.h b/Demo/TXLiteAVDemo/AudioSettingKit/AudioSettingKit/View/AudioEffectSettingView.h index ac75d1e3..c29939f2 100644 --- a/Demo/TXLiteAVDemo/AudioSettingKit/AudioSettingKit/View/AudioEffectSettingView.h +++ b/Demo/TXLiteAVDemo/AudioSettingKit/AudioSettingKit/View/AudioEffectSettingView.h @@ -36,6 +36,7 @@ typedef NS_ENUM(NSUInteger, AudioEffectSettingViewType) { - (void)show; - (void)hide; +- (BOOL)isShow; /// 停止播放音乐 - (void)stopPlay; diff --git a/Demo/TXLiteAVDemo/AudioSettingKit/AudioSettingKit/View/AudioEffectSettingView.m b/Demo/TXLiteAVDemo/AudioSettingKit/AudioSettingKit/View/AudioEffectSettingView.m index 684b5fdb..791f2aef 100644 --- a/Demo/TXLiteAVDemo/AudioSettingKit/AudioSettingKit/View/AudioEffectSettingView.m +++ b/Demo/TXLiteAVDemo/AudioSettingKit/AudioSettingKit/View/AudioEffectSettingView.m @@ -530,4 +530,8 @@ - (NSString *)switchSecondToTimeStr:(NSInteger)secondNum { NSString *secondString = sec > 9 ? [NSString stringWithFormat:@"%ld", sec] : [NSString stringWithFormat:@"0%ld", (long)sec]; return [NSString stringWithFormat:@"%@:%@", minString, secondString]; } + +- (BOOL)isShow { + return _isShow; +} @end diff --git a/Demo/TXLiteAVDemo/BeautySettingKit/TCBeautyPanel/TCBeautyPanelView.m b/Demo/TXLiteAVDemo/BeautySettingKit/TCBeautyPanel/TCBeautyPanelView.m index cce1c16f..6c3531f3 100644 --- a/Demo/TXLiteAVDemo/BeautySettingKit/TCBeautyPanel/TCBeautyPanelView.m +++ b/Demo/TXLiteAVDemo/BeautySettingKit/TCBeautyPanel/TCBeautyPanelView.m @@ -122,7 +122,7 @@ @interface TCBeautyPanel() @property (nonatomic, strong) UISlider *slider; ///< 数值调节滑杆 @property (nonatomic, strong) NSURLSessionDownloadTask *operation; ///< 资源下载 @property (nonatomic, assign) TCBeautyStyle beautyStyle; - +@property (nonatomic, assign) NSString *pituName; @end @implementation TCBeautyPanel @@ -626,8 +626,9 @@ - (void)onSetMotionWithIndex:(NSInteger)index if (index == 0){ [self.actionPerformer setMotionTmpl:nil inDir:localPackageDir]; } else{ - TCBeautyPanelItem *item = _optionsContainer[_menu.menuIndex][_menu.optionIndex]; + TCBeautyPanelItem *item = _optionsContainer[_menu.menuIndex][_menu.optionIndex]; TCPituMotion *motion = item.userInfo; + self.pituName = motion.identifier; NSString *pituPath = [NSString stringWithFormat:@"%@/%@", localPackageDir, motion.identifier]; if ([[NSFileManager defaultManager] fileExistsAtPath:pituPath]) { [self.actionPerformer setMotionTmpl:motion.identifier inDir:localPackageDir]; @@ -710,6 +711,10 @@ - (void)URLSession:(NSURLSession *)session } if (unzipSuccess) { [self.pituDelegate onLoadPituFinished]; + if (![self.pituName isEqualToString:pituName]) { + return; + } + if ([self.actionPerformer respondsToSelector:@selector(setMotionTmpl:inDir:)]) { [self.actionPerformer setMotionTmpl:pituName inDir:pituDir]; } diff --git a/Demo/TXLiteAVDemo/LebPlayerDemo/LebPlayerViewController.m b/Demo/TXLiteAVDemo/LebPlayerDemo/LebPlayerViewController.m index 3d0a8432..868304db 100644 --- a/Demo/TXLiteAVDemo/LebPlayerDemo/LebPlayerViewController.m +++ b/Demo/TXLiteAVDemo/LebPlayerDemo/LebPlayerViewController.m @@ -59,7 +59,6 @@ - (void)viewDidLoad { [self addSettingContainerView]; [self addVolumeIndicator]; - self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"rtc_back"] style:UIBarButtonItemStylePlain target:self diff --git a/Demo/TXLiteAVDemo/LiveLinkMicDemoNew/V2CommonUtils/PhotoUtil.h b/Demo/TXLiteAVDemo/LiveLinkMicDemoNew/V2CommonUtils/PhotoUtil.h new file mode 100644 index 00000000..73612530 --- /dev/null +++ b/Demo/TXLiteAVDemo/LiveLinkMicDemoNew/V2CommonUtils/PhotoUtil.h @@ -0,0 +1,24 @@ +// +// PhotoUtil.h +// TXLiteAVDemo_Enterprise +// +// Created by cui on 2019/9/11. +// Copyright © 2019 Tencent. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN +extern NSString * const PhotoAlbumToolErrorDomain; + +typedef NS_ENUM(NSInteger, PhotoAlbumToolErrorCode) { + PhotoAlbumToolNotAuthorized +}; + +@interface PhotoUtil : NSObject ++ (void)saveAssetToAlbum:(NSURL *)assetURL completion:(void(^)(BOOL success, NSError * _Nullable error))completion; ++ (void)saveDataToAlbum:(NSData *)data completion:(void(^)(BOOL success, NSError * _Nullable error))completion; + +@end + +NS_ASSUME_NONNULL_END diff --git a/Demo/TXLiteAVDemo/LiveLinkMicDemoNew/V2CommonUtils/PhotoUtil.m b/Demo/TXLiteAVDemo/LiveLinkMicDemoNew/V2CommonUtils/PhotoUtil.m new file mode 100644 index 00000000..996ff014 --- /dev/null +++ b/Demo/TXLiteAVDemo/LiveLinkMicDemoNew/V2CommonUtils/PhotoUtil.m @@ -0,0 +1,71 @@ +// +// PhotoUtil.m +// TXLiteAVDemo_Enterprise +// +// Created by cui on 2019/9/11. +// Copyright © 2019 Tencent. All rights reserved. +// + +#import "PhotoUtil.h" +#import +#import "AppLocalized.h" + +NSString * const PhotoAlbumToolErrorDomain = @"PhotoAlbumToolErrorDomain"; + +@implementation PhotoUtil + ++ (void)saveAssetToAlbum:(NSURL *)assetURL completion:(void(^)(BOOL success, NSError * _Nullable error))completion +{ + [self _saveAssetToAlbum:assetURL completion:completion]; +} + ++ (void)saveDataToAlbum:(NSData *)data completion:(void(^)(BOOL success, NSError * _Nullable error))completion; +{ + [self _saveAssetToAlbum:data completion:completion]; +} + ++ (void)_saveAssetToAlbum:(id)urlOrData + completion:(void(^)(BOOL success, NSError * _Nullable error))completion +{ + PHPhotoLibrary *library = [PHPhotoLibrary sharedPhotoLibrary]; + [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) { + if (status == PHAuthorizationStatusAuthorized) { + [library performChanges:^{ + PHAssetCreationRequest *request = [PHAssetCreationRequest creationRequestForAsset]; + if ([urlOrData isKindOfClass:[NSURL class]]) { + [request addResourceWithType:PHAssetResourceTypeVideo fileURL:urlOrData options:nil]; + } else { + [request addResourceWithType:PHAssetResourceTypePhoto data:urlOrData options:nil]; + } + } completionHandler:^(BOOL success, NSError * _Nullable error) { + if (completion) { + completion(success, error); + } + }]; + } else { + NSError *error = [NSError errorWithDomain:PhotoAlbumToolErrorDomain + code:PhotoAlbumToolNotAuthorized + userInfo:@{NSLocalizedFailureReasonErrorKey: UGCLocalize(@"UGCKit.PhotoUtil.notwritephoto")}]; + if (completion) { + completion(NO, error); + } + } + }]; + + + /* + PHPhotoLibrary.shared performChanges({ + let request = PHAssetCreationRequest.forAsset() + request.addResource(with: .photo, fileURL: 'YOUR_GIF_URL', options: nil) + }) { (success, error) in + if let error = error { + print(error.localizedDescription) + } else { + print("GIF has saved") + } + } +*/ + +} + +@end diff --git a/Demo/TXLiteAVDemo/LiveLinkMicDemoNew/V2CommonUtils/TXColor.h b/Demo/TXLiteAVDemo/LiveLinkMicDemoNew/V2CommonUtils/TXColor.h new file mode 100644 index 00000000..3c8642c9 --- /dev/null +++ b/Demo/TXLiteAVDemo/LiveLinkMicDemoNew/V2CommonUtils/TXColor.h @@ -0,0 +1,21 @@ +// +// TXColor.h +// TXLiteAVDemo +// +// Created by shengcui on 2018/9/12. +// Copyright © 2018年 Tencent. All rights reserved. +// + +#import + +@interface TXColor : NSObject +@property (class, readonly, nonatomic) UIColor *cyan; +@property (class, readonly, nonatomic) UIColor *darkCyan; +@property (class, readonly, nonatomic) UIColor *controlBackground; +@property (class, readonly, nonatomic) UIColor *lightGray; +@property (class, readonly, nonatomic) UIColor *gray; +@property (class, readonly, nonatomic) UIColor *darkGray; +@property (class, readonly, nonatomic) UIColor *grayBorder; +@property (class, readonly, nonatomic) UIColor *black; +@property (class, readonly, nonatomic) UIColor *progressColor; +@end diff --git a/Demo/TXLiteAVDemo/LiveLinkMicDemoNew/V2CommonUtils/TXColor.m b/Demo/TXLiteAVDemo/LiveLinkMicDemoNew/V2CommonUtils/TXColor.m new file mode 100644 index 00000000..42811209 --- /dev/null +++ b/Demo/TXLiteAVDemo/LiveLinkMicDemoNew/V2CommonUtils/TXColor.m @@ -0,0 +1,44 @@ +// +// TXUGCColor.m +// TXLiteAVDemo +// +// Created by shengcui on 2018/9/12. +// Copyright © 2018年 Tencent. All rights reserved. +// + +#import "TXColor.h" +#define HexColor(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 \ +green:((float)((rgbValue & 0xFF00) >> 8))/255.0 \ +blue:((float)(rgbValue & 0xFF))/255.0 \ +alpha:1.0] + +@implementation TXColor ++ (UIColor*)cyan { + return HexColor(0x0ACCAC); +} ++ (UIColor*)darkCyan { + return HexColor(0x10acc0); +} ++ (UIColor*)controlBackground { + return HexColor(0x0BC59C); +} ++ (UIColor*)gray { + return HexColor(0x777777); +} ++ (UIColor *)lightGray { + return HexColor(0xcccccc); +} ++ (UIColor *)darkGray { + return HexColor(0x555555); +} ++ (UIColor *)grayBorder { + return HexColor(0x999999); +} ++ (UIColor *)black { + return HexColor(0x181818); +} ++ (UIColor *)progressColor { + return HexColor(0x00f5ac); +} + +@end diff --git a/Demo/TXLiteAVDemo/LiveLinkMicDemoOld/LiveRoom/MLVBLiveRoom.m b/Demo/TXLiteAVDemo/LiveLinkMicDemoOld/LiveRoom/MLVBLiveRoom.m index 42c47869..2561877c 100644 --- a/Demo/TXLiteAVDemo/LiveLinkMicDemoOld/LiveRoom/MLVBLiveRoom.m +++ b/Demo/TXLiteAVDemo/LiveLinkMicDemoOld/LiveRoom/MLVBLiveRoom.m @@ -65,6 +65,7 @@ @interface MLVBLiveRoom() *_roomList; // 保存最近一次拉回的房间列表，这里仅仅使用里面的房间混流地址和创建者信息 NSMutableArray *_audienceList; // 保存最近一次拉回的房间观众列表 AFHTTPSessionManager *_httpSession; + AFNetworkReachabilityManager *_reachabilityManager; NSString *_serverDomain; // 保存业务服务器域名 NSMutableDictionary *_apiAddr; // 保存业务服务器相关的rest api @@ -137,13 +138,14 @@ - (instancetype)initInternal { _roomInfo = [[MLVBRoomInfo alloc] init]; _audienceList = [[NSMutableArray alloc] init]; _httpSession = [AFHTTPSessionManager manager]; + _reachabilityManager = [AFNetworkReachabilityManager sharedManager]; + [_reachabilityManager startMonitoring]; [_httpSession setRequestSerializer:[AFJSONRequestSerializer serializer]]; [_httpSession setResponseSerializer:[AFJSONResponseSerializer serializer]]; [_httpSession.requestSerializer willChangeValueForKey:@"timeoutInterval"]; _httpSession.requestSerializer.timeoutInterval = 5.0; [_httpSession.requestSerializer didChangeValueForKey:@"timeoutInterval"]; _httpSession.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"application/json", @"text/json", @"text/javascript", @"text/html", @"text/xml", @"text/plain", nil]; - _queue = dispatch_queue_create("LiveRoomQueue", DISPATCH_QUEUE_SERIAL); [_httpSession setCompletionQueue:_queue]; @@ -1315,7 +1317,6 @@ - (void)startPlayAcc:(MLVBAnchorInfo *)anchor inView:(UIView *)view playBegin:(I - (void)handleUpdatedAnchorList:(NSArray *)updatedAnchorList { NSArray* oldAnchorList = _roomInfo.anchorInfoArray; - NSMutableSet *leftAnchorSet = [[NSMutableSet alloc] initWithArray:oldAnchorList]; NSSet *updatedAnchorSet = [NSSet setWithArray:updatedAnchorList]; if ([updatedAnchorSet isEqualToSet:leftAnchorSet]) { @@ -1608,7 +1609,14 @@ - (void)getUrlAndPushing:(void(^)(int errCode, NSString *errMsg))completion { */ - (void)_updateAnchorList:(void (^)(int errCode, NSString *errMsg, NSArray *anchorList))completion { [self asyncRun:^(MLVBLiveRoom *self) { - NSDictionary *params = @{@"roomID": self.roomInfo.roomID}; + NSDictionary *params; + if (self.roomInfo == nil || self.roomInfo.roomID == nil) { + if (completion) { + completion(-1, @"roomID is nil", nil); + } + } else { + params = @{@"roomID": self.roomInfo.roomID}; + } [self requestWithName:kHttpServerAddr_GetAnchors params:params completion:^(MLVBLiveRoom *self, int errCode, NSString *errMsg, NSDictionary *responseObject) { if (errCode == 0) { NSArray * anchorList = [self parseAnchorsFromJsonArray:responseObject[@"pushers"]]; @@ -2008,8 +2016,47 @@ - (void)onRecvPKFinishRequest:(NSString *)roomID userID:(NSString *)userID { } - (void)updateAnchorList { - [self _updateAnchorList:^(int errCode, NSString *errMsg, NSArray *updatedAnchorList) { - [self handleUpdatedAnchorList:updatedAnchorList]; + if ([_reachabilityManager networkReachabilityStatus] == AFNetworkReachabilityStatusNotReachable) { + //无网状态时需要情况之前的小主播列表，待有网时重新请求当前房间的小主播列表，否则不会更新小主播UI窗口 + _roomInfo.anchorInfoArray = @[]; + __weak __typeof(self)weakSelf = self; + [self startNetworkReachability:^(BOOL hasNetwork) { + __strong __typeof(weakSelf)strongSelf = weakSelf; + if (hasNetwork) { + [strongSelf _updateAnchorList:^(int errCode, NSString *errMsg, NSArray *updatedAnchorList) { + [strongSelf handleUpdatedAnchorList:updatedAnchorList]; + }]; + } else { + [strongSelf updateAnchorList]; + } + }]; + } else { + __weak __typeof(self)weakSelf = self; + [self _updateAnchorList:^(int errCode, NSString *errMsg, NSArray *updatedAnchorList) { + __strong __typeof(weakSelf)strongSelf = weakSelf; + [strongSelf handleUpdatedAnchorList:updatedAnchorList]; + }]; + } +} + +- (void)startNetworkReachability:(void (^)(BOOL hasNetwork)) block { + [_reachabilityManager setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) { + switch (status) { + case AFNetworkReachabilityStatusUnknown: + block(false); + break; + case AFNetworkReachabilityStatusNotReachable: + block(false); + break; + case AFNetworkReachabilityStatusReachableViaWWAN: + block(true); + break; + case AFNetworkReachabilityStatusReachableViaWiFi: + block(true); + break; + default: + break; + } }]; } diff --git a/Demo/TXLiteAVDemo/LivePlayerDemo/PlayViewController.m b/Demo/TXLiteAVDemo/LivePlayerDemo/PlayViewController.m index 2d05def9..dedcb728 100644 --- a/Demo/TXLiteAVDemo/LivePlayerDemo/PlayViewController.m +++ b/Demo/TXLiteAVDemo/LivePlayerDemo/PlayViewController.m @@ -95,7 +95,7 @@ - (void)initUI { self.title = LivePlayerLocalize(@"LivePlayerDemo.PlayViewController.livestreamingplayer"); [self.view setBackgroundImage:[UIImage imageNamed:@"background"]]; - int buttonCount = 5; // 底部一排按钮的数量 + int buttonCount = 4; // 底部一排按钮的数量 CGSize size = [[UIScreen mainScreen] bounds].size; int ICON_WITH = size.width / (buttonCount + 1); ICON_WITH = MIN(ICON_WITH, 40); /// 最大40*40 @@ -133,8 +133,6 @@ - (void)initUI { center:CGPointMake(startSpace + ICON_WITH / 2 + centerInterVal*index++, iconY) size:iconSize]; _btnRenderMode = [self createButton:@"fill" action:@selector(clickRenderMode:) center:CGPointMake(startSpace + ICON_WITH / 2 + centerInterVal*index++, iconY) size:iconSize]; - _btnRealtime = [self createButton:@"jisu_off" action:@selector(clickRealtime:) - center:CGPointMake(startSpace + ICON_WITH / 2 + centerInterVal*index++, iconY) size:iconSize]; // 菊花 float width = 34; @@ -267,7 +265,7 @@ -(BOOL)checkPlayUrl:(NSString*)playUrl { _playType = PLAY_TYPE_LIVE_FLV; } else if (([playUrl hasPrefix:@"https:"] || [playUrl hasPrefix:@"http:"]) && [playUrl rangeOfString:@".m3u8"].length > 0) { _playType = PLAY_TYPE_VOD_HLS; - } else{ + } else { [self toastTip:LivePlayerLocalize(@"LivePlayerDemo.PlayViewController.playaddressisnotlegal")]; return NO; } @@ -368,6 +366,9 @@ - (void)onAudioPlayStatusUpdate:(id)player status:(V2TXLivePlayS case V2TXLivePlayStatusLoading: [self startLoadingAnimation]; break; + case V2TXLivePlayStatusStopped: + [self clickPlay:_btnPlay]; + break; default: break; } diff --git a/Demo/TXLiteAVDemo/LivePusherDemo/CameraPushDemo/CameraPushViewController.m b/Demo/TXLiteAVDemo/LivePusherDemo/CameraPushDemo/CameraPushViewController.m index ff92e8b7..45b40af1 100644 --- a/Demo/TXLiteAVDemo/LivePusherDemo/CameraPushDemo/CameraPushViewController.m +++ b/Demo/TXLiteAVDemo/LivePusherDemo/CameraPushDemo/CameraPushViewController.m @@ -92,7 +92,7 @@ - (void)viewDidLoad { // 创建推流器 _pusher = [self createPusher]; - + _isMute = [PushMoreSettingViewController isMuteAudio]; // 界面布局 [self initUI]; if (@available(iOS 13.0, *)) { @@ -126,17 +126,19 @@ - (void)viewDidDisappear:(BOOL)animated { - (void)onAppWillResignActive:(NSNotification *)notification { _appIsInActive = YES; + [_pusher startVirtualCamera:[UIImage imageNamed:@"background"]]; } - (void)onAppDidBecomeActive:(NSNotification *)notification { _appIsInActive = NO; if (!_appIsBackground && !_appIsInActive) { + [_pusher stopVirtualCamera]; } } - (void)onAppDidEnterBackGround:(NSNotification *)notification { [[UIApplication sharedApplication] beginBackgroundTaskWithExpirationHandler:^{ - + [_pusher startVirtualCamera:[UIImage imageNamed:@"background"]]; }]; _appIsBackground = YES; } @@ -144,6 +146,7 @@ - (void)onAppDidEnterBackGround:(NSNotification *)notification { - (void)onAppWillEnterForeground:(NSNotification *)notification { _appIsBackground = NO; if (!_appIsBackground && !_appIsInActive) { + [_pusher stopVirtualCamera]; } } @@ -263,11 +266,6 @@ - (UIButton *)createButton:(NSString*)icon action:(SEL)action center:(CGPoint)ce // 创建推流器，并使用本地配置初始化它 - (V2TXLivePusher *)createPusher { - NSInteger audioQuality = [PushSettingViewController getAudioQuality]; - [_pusher setAudioQuality:audioQuality]; - if ([PushMoreSettingViewController isEnableWaterMark]) { - [_pusher setWatermark:[UIImage imageNamed:@"watermark"] x:0.05 y:0.05 scale:1]; - } // 推流器初始化 V2TXLivePusher *pusher = [[V2TXLivePusher alloc] initWithLiveMode:V2TXLiveMode_RTMP]; [pusher.getDeviceManager enableCameraTorch:[PushMoreSettingViewController isOpenTorch]]; @@ -283,7 +281,11 @@ - (V2TXLivePusher *)createPusher { @"right":@(10) }]; [pusher showDebugView:[PushMoreSettingViewController isShowDebugLog]]; - + NSInteger audioQuality = [PushSettingViewController getAudioQuality]; + [pusher setAudioQuality:audioQuality]; + if ([PushMoreSettingViewController isEnableWaterMark]) { + [pusher setWatermark:[UIImage imageNamed:@"watermark"] x:0.05 y:0.05 scale:1]; + } return pusher; } @@ -328,6 +330,13 @@ - (void)clickCamera:(UIButton *)btn { - (void)clickBeauty:(UIButton *)btn { _beautyPanel.hidden = NO; [self hideToolButtons:YES]; + if (_moreSettingVC) { + [_moreSettingVC willMoveToParentViewController:self]; + [_moreSettingVC.view removeFromSuperview]; + [_moreSettingVC removeFromParentViewController]; + _moreSettingVC.delegate = nil; + _moreSettingVC = nil; + } } - (void)clickBgm:(UIButton *)btn { @@ -355,7 +364,7 @@ - (void)clickSetting:(UIButton *)btn { - (void)clickMoreSetting:(UIButton *)btn { if (!_moreSettingVC) { _moreSettingVC = [[PushMoreSettingViewController alloc] init]; - [_moreSettingVC setDelegate:self]; + _moreSettingVC.delegate = self; [self addChildViewController:_moreSettingVC]; _moreSettingVC.view.frame = CGRectMake(0, self.view.height * 0.2, self.view.width, self.view.height * 0.7); @@ -367,8 +376,7 @@ - (void)clickMoreSetting:(UIButton *)btn { [_moreSettingVC willMoveToParentViewController:self]; [_moreSettingVC.view removeFromSuperview]; [_moreSettingVC removeFromParentViewController]; - - [_moreSettingVC setDelegate:nil]; + _moreSettingVC.delegate = nil; _moreSettingVC = nil; } } @@ -388,7 +396,15 @@ - (void)hideToolButtons:(BOOL)hide { - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event { [self.view endEditing:YES]; _beautyPanel.hidden = YES; - [self hideToolButtons:NO]; + UITouch *touch = [touches.allObjects lastObject]; + BOOL result = [touch.view isDescendantOfView:_audioEffectView]; + if (!result) { + [_audioEffectView hide]; + } + if (![_audioEffectView isShow]) { + [self hideToolButtons:NO]; + } + } #pragma mark - 推流逻辑 @@ -425,7 +441,13 @@ - (BOOL)startPush { // 开启预览 [_pusher setRenderView:_localView]; [_pusher startCamera:_btnCamera.tag == 0]; - [_pusher startMicrophone]; + + if (_isMute) { + [_pusher stopMicrophone]; + } else { + [_pusher startMicrophone]; + } + // 开始推流 V2TXLiveCode ret = [_pusher startPush:rtmpUrl]; if (ret != V2TXLIVE_OK) { @@ -457,6 +479,7 @@ - (void)showInProgressText:(NSString *)text } hud.mode = MBProgressHUDModeIndeterminate; hud.label.text = text; + hud.userInteractionEnabled = NO; [hud showAnimated:YES]; } @@ -469,8 +492,6 @@ - (void)showText:(NSString *)text withDetailText:(NSString *)detail { hud.mode = MBProgressHUDModeText; hud.label.text = text; hud.detailsLabel.text = detail; - [hud.button addTarget:self action:@selector(onCloseHUD:) forControlEvents:UIControlEventTouchUpInside]; - [hud.button setTitle:LivePlayerLocalize(@"LivePusherDemo.CameraPush.off") forState:UIControlStateNormal]; [hud showAnimated:YES]; [hud hideAnimated:YES afterDelay:2]; } @@ -676,7 +697,7 @@ - (void)onPushSetting:(PushSettingViewController *)vc audioQuality:(NSInteger)qu #pragma mark - PushMoreSettingDelegate // 是否开启静音模式（发送静音数据，但是不关闭麦克风） -- (void)onPushMoreSetting:(PushMoreSettingViewController *)vc pauseAudio:(BOOL)mute { +- (void)onPushMoreSetting:(PushMoreSettingViewController *)vc muteAudio:(BOOL)mute { [self pauseAudio:mute]; _isMute = mute; } diff --git a/Demo/TXLiteAVDemo/LivePusherDemo/ScreenPushDemo/ScreenPushViewController.m b/Demo/TXLiteAVDemo/LivePusherDemo/ScreenPushDemo/ScreenPushViewController.m index d61d04e3..d64d1d32 100644 --- a/Demo/TXLiteAVDemo/LivePusherDemo/ScreenPushDemo/ScreenPushViewController.m +++ b/Demo/TXLiteAVDemo/LivePusherDemo/ScreenPushDemo/ScreenPushViewController.m @@ -327,6 +327,8 @@ - (void)clickStartReplaykit:(UIButton*)btn [self.livePusher startScreenCapture:kReplayKit2AppGroupId]; } [self refreshResolutionAndRotation]; + [[self.livePusher getDeviceManager] setSystemVolumeType:TXSystemVolumeTypeMedia]; + [self.livePusher startMicrophone]; [self.livePusher startPush:self.addressBarController.text]; [btn setTitle:LivePlayerLocalize(@"LivePusherDemo.ScreenPush.pushoverflow") forState:UIControlStateNormal]; }]; diff --git a/Demo/TXLiteAVDemo/UGCKit/UGCKit/Source/Record/UGCKitRecordViewController.m b/Demo/TXLiteAVDemo/UGCKit/UGCKit/Source/Record/UGCKitRecordViewController.m index 1965a11e..3e69dc05 100644 --- a/Demo/TXLiteAVDemo/UGCKit/UGCKit/Source/Record/UGCKitRecordViewController.m +++ b/Demo/TXLiteAVDemo/UGCKit/UGCKit/Source/Record/UGCKitRecordViewController.m @@ -702,6 +702,12 @@ -(IBAction)onBtnDeleteClicked [_controlView.progressView comfirmDeletePart]; [[TXUGCRecord shareInstance].partsManager deleteLastPart]; _isBackDelete = YES; + if (0 == [TXUGCRecord shareInstance].partsManager.getVideoPathList.count) { + _bgmRecording = NO; + _BGMPath = nil; + [[TXUGCRecord shareInstance] stopBGM]; + [_bgmListVC clearSelectStatus]; + } } if (2 == ++ _deleteCount) { _deleteCount = 0; diff --git a/Demo/TXLiteAVDemo/UGCKit/UGCKit/UGCKit.xcodeproj/project.pbxproj b/Demo/TXLiteAVDemo/UGCKit/UGCKit/UGCKit.xcodeproj/project.pbxproj index 8b8c8b02..f1ebd6af 100644 --- a/Demo/TXLiteAVDemo/UGCKit/UGCKit/UGCKit.xcodeproj/project.pbxproj +++ b/Demo/TXLiteAVDemo/UGCKit/UGCKit/UGCKit.xcodeproj/project.pbxproj @@ -131,11 +131,12 @@ 45E8294E2384ED1200702418 /* UGCKitAudioEffectPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = 45E8294C2384ED1200702418 /* UGCKitAudioEffectPanel.h */; }; 45E8294F2384ED1200702418 /* UGCKitAudioEffectPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = 45E8294D2384ED1200702418 /* UGCKitAudioEffectPanel.m */; }; 45E907AB239E253000CEC8F1 /* TXLiteAVSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = 45E90782239E253000CEC8F1 /* TXLiteAVSDK.h */; }; - 61F7EEB516AEB3ED0B919ACE /* TXLiteAVSDK_UGC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 643A4F74EA84B51E9D5E1954 /* TXLiteAVSDK_UGC.framework */; }; + 6128C6373B9BDE6807B4004C /* TXLiteAVSDK_UGC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0952BB2688D2E32E210BA8F2 /* TXLiteAVSDK_UGC.framework */; }; F2DA415A23917DA200EB0AAB /* UGCKitBGMCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 45D52F12238D231A006F71FA /* UGCKitBGMCell.xib */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 0952BB2688D2E32E210BA8F2 /* TXLiteAVSDK_UGC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TXLiteAVSDK_UGC.framework; path = ../../../../SDK/TXLiteAVSDK_UGC.framework; sourceTree = ""; }; 40A49D7F24598E3200BFCB18 /* TXLiteAVSDK_Enterprise.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TXLiteAVSDK_Enterprise.framework; path = ../../../../SDK/TXLiteAVSDK_Professional.framework; sourceTree = ""; }; 40F4D69C2474CA2100847F5B /* TCBeautyPanel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TCBeautyPanel.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4507F44C23AB707600804AD5 /* UGCKitPieProgressView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UGCKitPieProgressView.h; sourceTree = ""; }; @@ -276,7 +277,6 @@ 45E8294D2384ED1200702418 /* UGCKitAudioEffectPanel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UGCKitAudioEffectPanel.m; sourceTree = ""; }; 45E90782239E253000CEC8F1 /* TXLiteAVSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXLiteAVSDK.h; sourceTree = ""; }; 45E9FFC52399FEAD00CEC8F1 /* UGCKitLocalization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UGCKitLocalization.h; sourceTree = ""; }; - 643A4F74EA84B51E9D5E1954 /* TXLiteAVSDK_UGC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TXLiteAVSDK_UGC.framework; path = ../../../../SDK/TXLiteAVSDK_UGC.framework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -288,7 +288,7 @@ 40DD579A247383E200C72F27 /* TXLiteAVSDK_Enterprise.framework in Frameworks */, 453DE40C23794ECD0083E759 /* AssetsLibrary.framework in Frameworks */, 453DE40A23794E900083E759 /* OpenAL.framework in Frameworks */, - 61F7EEB516AEB3ED0B919ACE /* TXLiteAVSDK_UGC.framework in Frameworks */, + 6128C6373B9BDE6807B4004C /* TXLiteAVSDK_UGC.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -577,7 +577,7 @@ 453DE40723794E8A0083E759 /* libresolv.tbd */, 453DE40523794E800083E759 /* libsqlite3.tbd */, 453DE40323794E020083E759 /* libc++.tbd */, - 643A4F74EA84B51E9D5E1954 /* TXLiteAVSDK_UGC.framework */, + 0952BB2688D2E32E210BA8F2 /* TXLiteAVSDK_UGC.framework */, ); name = Frameworks; sourceTree = ""; diff --git a/Demo/TXLiteAVDemo/UGCVideoUploadDemo/VideoUpload/COSSDK/libmtasdk.a b/Demo/TXLiteAVDemo/UGCVideoUploadDemo/VideoUpload/COSSDK/libmtasdk.a old mode 100755 new mode 100644 diff --git a/Demo/TXLiteAVDemo/UGCVideoUploadDemo/VideoUpload/TVCClientInner.h b/Demo/TXLiteAVDemo/UGCVideoUploadDemo/VideoUpload/TVCClientInner.h index 2d0d3271..afb71131 100644 --- a/Demo/TXLiteAVDemo/UGCVideoUploadDemo/VideoUpload/TVCClientInner.h +++ b/Demo/TXLiteAVDemo/UGCVideoUploadDemo/VideoUpload/TVCClientInner.h @@ -21,7 +21,7 @@ #define kMessage @"message" #define kData @"data" -#define TVCVersion @"8.7.10223" +#define TVCVersion @"8.8.10257" #pragma mark - COS config //字段废弃，作为InitUploadUGC的占位字段