diff --git a/iOS/AgoraEntScenarios/Common/Manager/NetworkManager/NetworkManager.swift b/iOS/AgoraEntScenarios/Common/Manager/NetworkManager/NetworkManager.swift index 278623fa6a..51af734255 100644 --- a/iOS/AgoraEntScenarios/Common/Manager/NetworkManager/NetworkManager.swift +++ b/iOS/AgoraEntScenarios/Common/Manager/NetworkManager/NetworkManager.swift @@ -451,7 +451,7 @@ extension NetworkManager { "src": src, "ts": ts, "sign": "src=\(src)&ts=\(ts)".md5Encrypt] as [String: Any] - let url = "https://report-ad.agoralab.co/v1/report" + let url = "https://report-ad.shengwang.cn/v1/report" NetworkManager.shared.postRequest(urlString: url, params: params, success: { response in diff --git a/iOS/AgoraEntScenarios/Common/Manager/VLDefine/VLURLPathConfig.h b/iOS/AgoraEntScenarios/Common/Manager/VLDefine/VLURLPathConfig.h index 45b6392bfc..ffd7cfd383 100644 --- a/iOS/AgoraEntScenarios/Common/Manager/VLDefine/VLURLPathConfig.h +++ b/iOS/AgoraEntScenarios/Common/Manager/VLDefine/VLURLPathConfig.h @@ -22,7 +22,7 @@ static NSString * const kURLPathVerifyCode = @"/api-login/users/verificationCode #pragma mark - H5相关 static NSString * const kURLPathH5UserAgreement = @"https://accktvpic.oss-cn-beijing.aliyuncs.com/pic/meta/demo/fulldemoStatic/privacy/service.html"; static NSString * const kURLPathH5Privacy = @"https://fullapp.oss-cn-beijing.aliyuncs.com/scenarios/privacy.html"; -static NSString * const kURLPathH5AboutUS = @"https://www.agora.io/cn/about-us/"; +static NSString * const kURLPathH5AboutUS = @"https://www.shengwang.cn/aboutus/"; static NSString * const kURLPathH5PersonInfo = @"http://fullapp.oss-cn-beijing.aliyuncs.com/ent-scenarios/pages/manifest/index.html"; static NSString * const kURLPathH5ThirdInfoShared = @"https://fullapp.oss-cn-beijing.aliyuncs.com/scenarios/libraries.html"; diff --git a/iOS/AgoraEntScenarios/HomeMenu/Home/VLHomeView.m b/iOS/AgoraEntScenarios/HomeMenu/Home/VLHomeView.m index 4e58531546..e2da1c9d95 100644 --- a/iOS/AgoraEntScenarios/HomeMenu/Home/VLHomeView.m +++ b/iOS/AgoraEntScenarios/HomeMenu/Home/VLHomeView.m @@ -10,8 +10,8 @@ #import "MenuUtils.h" #import "AESMacro.h" @import YYCategories; -@import Pure1v1; -@import ShowTo1v1; +//@import Pure1v1; +//@import ShowTo1v1; @import Joy; @interface VLHomeView () diff --git a/iOS/AgoraEntScenarios/HomeMenu/Home/VLHomeViewController.m b/iOS/AgoraEntScenarios/HomeMenu/Home/VLHomeViewController.m index 9c23aeda2e..168e75b919 100644 --- a/iOS/AgoraEntScenarios/HomeMenu/Home/VLHomeViewController.m +++ b/iOS/AgoraEntScenarios/HomeMenu/Home/VLHomeViewController.m @@ -12,8 +12,8 @@ #import "VLToast.h" #import "VLSBGOnLineListVC.h" -@import Pure1v1; -@import ShowTo1v1; +//@import Pure1v1; +//@import ShowTo1v1; @import Joy; @interface VLHomeViewController () diff --git a/iOS/AgoraEntScenarios/HomeMenu/Mine/ViewController/AboutAgoraEntertainmentViewController.swift b/iOS/AgoraEntScenarios/HomeMenu/Mine/ViewController/AboutAgoraEntertainmentViewController.swift index 3dfa2d5125..e6a37b9144 100644 --- a/iOS/AgoraEntScenarios/HomeMenu/Mine/ViewController/AboutAgoraEntertainmentViewController.swift +++ b/iOS/AgoraEntScenarios/HomeMenu/Mine/ViewController/AboutAgoraEntertainmentViewController.swift @@ -16,17 +16,20 @@ import AgoraRtcKit ["title": NSLocalizedString("app_about_official_website", comment: ""), "detail":"https://www.shengwang.cn"]], "sectionName": ""], - ["contents": [["title": NSLocalizedString("app_voice_chat", comment: ""), "detail":"YL-2.1.0"], - ["title": NSLocalizedString("app_about_chat_room_spatial", comment: ""), "detail":"YLKJ-2.1.0"], - ["title": NSLocalizedString("app_about_karaoke", comment: ""),"detail":"KTV-2.3.0"], - ["title": NSLocalizedString("app_about_show", comment: ""), "detail":"ZB-2.4.0"], - ["title": NSLocalizedString("app_about_1v1", comment: ""), "detail":"1V1-3.6.0"], - ["title": NSLocalizedString("app_about_live_to_1v1", comment: ""), "detail":"LiveTo1V1-3.7.0"]], + ["contents": [ +// ["title": NSLocalizedString("app_voice_chat", comment: ""), "detail":"YL-2.1.0"], +// ["title": NSLocalizedString("app_about_chat_room_spatial", comment: ""), "detail":"YLKJ-2.1.0"], +// ["title": NSLocalizedString("app_about_karaoke", comment: ""),"detail":"KTV-2.3.0"], +// ["title": NSLocalizedString("app_about_show", comment: ""), "detail":"ZB-2.4.0"], +// ["title": NSLocalizedString("app_about_1v1", comment: ""), "detail":"1V1-3.6.0"], +// ["title": NSLocalizedString("app_about_live_to_1v1", comment: ""), "detail":"LiveTo1V1-3.7.0"] + ["title": NSLocalizedString("app_about_live_to_joy", comment: ""), "detail":"Joy-4.10.0"] + ], "sectionName": NSLocalizedString("app_mine_current_version", comment: "")]] let tableHeader = AboutAgoraHeader(frame: CGRect(x: 0, y: 0, width: ScreenWidth, height: 220), name: NSLocalizedString("app_about_name", comment: ""), - versionText: NSLocalizedString("app_about_version", comment: "")+": "+"20230928-"+UIDevice.current.appVersion+"-\(AgoraRtcEngineKit.getSdkVersion())") + versionText: NSLocalizedString("app_about_version", comment: "")+": "+"20240201-"+UIDevice.current.appVersion+"-\(AgoraRtcEngineKit.getSdkVersion())") lazy var infoList: UITableView = { UITableView(frame: CGRect(x: 0, y: 0, width: ScreenWidth, height: ScreenHeight-ZNavgationHeight), style: .plain) diff --git a/iOS/AgoraEntScenarios/KeyCenter.swift b/iOS/AgoraEntScenarios/KeyCenter.swift index 5846080c6d..b2dbb08ff2 100644 --- a/iOS/AgoraEntScenarios/KeyCenter.swift +++ b/iOS/AgoraEntScenarios/KeyCenter.swift @@ -15,25 +15,25 @@ class KeyCenter: NSObject { If you have multiple completely separate apps in your organization, for example built by different teams, you should use different App IDs. If applications need to communicate with each other, they should use the same App ID. - In order to get the APP ID, you can open the agora console (https://console.agora.io/) to create a project, + In order to get the APP ID, you can open the agora console (https://console.shengwang.cn/) to create a project, then the APP ID can be found in the project detail page. 声网APP ID Agora 给应用程序开发人员分配 App ID,以识别项目和组织。如果组织中有多个完全分开的应用程序,例如由不同的团队构建, 则应使用不同的 App ID。如果应用程序需要相互通信,则应使用同一个App ID。 - 进入声网控制台(https://console.agora.io/),创建一个项目,进入项目配置页,即可看到APP ID。 + 进入声网控制台(https://console.shengwang.cn/),创建一个项目,进入项目配置页,即可看到APP ID。 */ - static let AppId: String = <#Your AppId#> + /** Certificate. Agora provides App certificate to generate Token. You can deploy and generate a token on your server, or use the console to generate a temporary token. - In order to get the APP ID, you can open the agora console (https://console.agora.io/) to create a project with the App Certificate enabled, + In order to get the APP ID, you can open the agora console (https://console.shengwang.cn/) to create a project with the App Certificate enabled, then the APP Certificate can be found in the project detail page. PS: If the project does not have certificates enabled, leave this field blank. 声网APP证书 Agora 提供 App certificate 用以生成 Token。您可以在您的服务器部署并生成,或者使用控制台生成临时的 Token。 - 进入声网控制台(https://console.agora.io/),创建一个带证书鉴权的项目,进入项目配置页,即可看到APP证书。 + 进入声网控制台(https://console.shengwang.cn/),创建一个带证书鉴权的项目,进入项目配置页,即可看到APP证书。 注意:如果项目没有开启证书鉴权,这个字段留空。 */ static let Certificate: String? = <#YOUR Certificate#> @@ -51,7 +51,7 @@ class KeyCenter: NSObject { static var Token: String? = nil - static var HostUrl: String = "https://gateway-fulldemo.agoralab.co" + static var HostUrl: String = "https://gateway-fulldemo.shengwang.cn/" /** EaseMob APPKEY. The application name filled in when creating an application on the EaseMob console. @@ -94,7 +94,7 @@ class KeyCenter: NSObject { static let CloudPlayerKey: String? = nil static let CloudPlayerSecret: String? = nil - static var baseServerUrl: String? = "https://service.agora.io/toolbox/" + static var baseServerUrl: String? = "https://service.shengwang.cn/toolbox" static var onlineBaseServerUrl: String? = baseServerUrl } diff --git a/iOS/AgoraEntScenarios/Resource/en.lproj/Localizable.strings b/iOS/AgoraEntScenarios/Resource/en.lproj/Localizable.strings index a2f15b3f59..3d94202f2d 100644 --- a/iOS/AgoraEntScenarios/Resource/en.lproj/Localizable.strings +++ b/iOS/AgoraEntScenarios/Resource/en.lproj/Localizable.strings @@ -60,6 +60,7 @@ "app_about_show"="秀场直播"; "app_about_1v1"="1v1私密房"; "app_about_live_to_1v1"="秀场转1v1私密房"; +"app_about_live_to_joy"="弹幕游戏"; "app_about_customer_service"="联系客服"; "app_about_official_website"="官网地址"; "app_about_phone_cancel"="取消"; diff --git a/iOS/AgoraEntScenarios/Resource/zh-Hans.lproj/Localizable.strings b/iOS/AgoraEntScenarios/Resource/zh-Hans.lproj/Localizable.strings index 30c1753b76..b082c9ac19 100644 --- a/iOS/AgoraEntScenarios/Resource/zh-Hans.lproj/Localizable.strings +++ b/iOS/AgoraEntScenarios/Resource/zh-Hans.lproj/Localizable.strings @@ -60,6 +60,7 @@ "app_about_show"="秀场直播"; "app_about_1v1"="1v1私密房"; "app_about_live_to_1v1"="秀场转1v1私密房"; +"app_about_live_to_joy"="弹幕游戏"; "app_about_customer_service"="联系客服"; "app_about_official_website"="官网地址"; "app_about_phone_cancel"="取消"; diff --git a/iOS/AgoraEntScenarios/Scenes/Joy/Joy/Classes/Core/CloudBarrageAPI/CloudBarrageAPI.swift b/iOS/AgoraEntScenarios/Scenes/Joy/Joy/Classes/Core/CloudBarrageAPI/CloudBarrageAPI.swift index 18ca989ba0..e3430eb5a3 100644 --- a/iOS/AgoraEntScenarios/Scenes/Joy/Joy/Classes/Core/CloudBarrageAPI/CloudBarrageAPI.swift +++ b/iOS/AgoraEntScenarios/Scenes/Joy/Joy/Classes/Core/CloudBarrageAPI/CloudBarrageAPI.swift @@ -23,7 +23,7 @@ public enum UserGameStatus: String { public struct CloudBarrageConfig { var appId: String? var basicAuth: String? - var host: String? = "https://service-staging.agora.io/toolbox/v1/" + var host: String? = "https://service.shengwang.cn/toolbox/v1/" var engine: AgoraRtcEngineKit? var rtmToken: String? } diff --git a/iOS/AgoraEntScenarios/Scenes/Joy/Joy/Classes/Core/NetworkManager.swift b/iOS/AgoraEntScenarios/Scenes/Joy/Joy/Classes/Core/NetworkManager.swift index 81b87e974d..1fd5e9fcca 100644 --- a/iOS/AgoraEntScenarios/Scenes/Joy/Joy/Classes/Core/NetworkManager.swift +++ b/iOS/AgoraEntScenarios/Scenes/Joy/Joy/Classes/Core/NetworkManager.swift @@ -40,7 +40,7 @@ class NetworkManager:NSObject { }() @objc static let shared = NetworkManager() - private let baseServerUrl: String = "https://service.agora.io/toolbox/" + private let baseServerUrl: String = "https://service.shengwang.cn/toolbox/" private func basicAuth(key: String, password: String) -> String { let loginString = String(format: "%@:%@", key, password) diff --git a/iOS/Podfile b/iOS/Podfile index 6f6a7fcfa2..a440bc6e3e 100644 --- a/iOS/Podfile +++ b/iOS/Podfile @@ -44,8 +44,8 @@ def all_pods pod 'CallAPI', :path => 'AgoraEntScenarios/Common/API/CallAPI' pod 'VideoLoaderAPI', :path => 'AgoraEntScenarios/Common/API/VideoLoaderAPI' - pod 'Pure1v1', :path => 'AgoraEntScenarios/Scenes/Pure1v1' - pod 'ShowTo1v1', :path => 'AgoraEntScenarios/Scenes/ShowTo1v1' +# pod 'Pure1v1', :path => 'AgoraEntScenarios/Scenes/Pure1v1' +# pod 'ShowTo1v1', :path => 'AgoraEntScenarios/Scenes/ShowTo1v1' pod 'Joy', :path => 'AgoraEntScenarios/Scenes/Joy' #ThirdParty diff --git a/iOS/Podfile.lock b/iOS/Podfile.lock index 88225d3659..d0aff2f024 100644 --- a/iOS/Podfile.lock +++ b/iOS/Podfile.lock @@ -25,7 +25,6 @@ PODS: - CallAPI (0.1.0): - AgoraRtcEngine_Special_iOS - AgoraRtm_iOS (= 2.1.4) - - FLAnimatedImage (1.0.17) - Joy (0.1.0): - AgoraRtcEngine_Special_iOS - AgoraSyncManager @@ -48,36 +47,12 @@ PODS: - Masonry (1.1.0) - MJRefresh (3.7.6) - Protobuf (3.22.1) - - Pure1v1 (0.1.0): - - AgoraSyncManager - - CallAPI - - FLAnimatedImage - - SDWebImage - - SDWebImage/GIF - - SnapKit - - SwiftyBeaver - - YYCategories - - YYModel - ScoreEffectUI (1.0.2) - SDWebImage (4.4.8): - SDWebImage/Core (= 4.4.8) - SDWebImage/Core (4.4.8) - - SDWebImage/GIF (4.4.8): - - FLAnimatedImage (~> 1.0) - - SDWebImage/Core - SDWebImageAPNGCoder (0.1.1): - SDWebImage/Core (~> 4.2) - - ShowTo1v1 (0.1.0): - - AgoraSyncManager - - CallAPI - - FLAnimatedImage - - SDWebImage - - SDWebImage/GIF - - SnapKit - - SwiftyBeaver - - VideoLoaderAPI - - YYCategories - - YYModel - SnapKit (5.6.0) - SocketRocket (0.7.0) - SSZipArchive (2.4.3) @@ -118,11 +93,9 @@ DEPENDENCIES: - Masonry (= 1.1.0) - MJRefresh - Protobuf (= 3.22.1) - - Pure1v1 (from `AgoraEntScenarios/Scenes/Pure1v1`) - ScoreEffectUI (= 1.0.2) - SDWebImage (= 4.4.8) - SDWebImageAPNGCoder - - ShowTo1v1 (from `AgoraEntScenarios/Scenes/ShowTo1v1`) - SnapKit - SocketRocket (= 0.7.0) - SVGAPlayer @@ -144,7 +117,6 @@ SPEC REPOS: - AgoraRtm_iOS - AgoraSyncManager - Bugly - - FLAnimatedImage - JXCategoryView - KakaJSON - LEEAlert @@ -173,10 +145,6 @@ EXTERNAL SOURCES: :path: AgoraEntScenarios/Common/API/CallAPI Joy: :path: AgoraEntScenarios/Scenes/Joy - Pure1v1: - :path: AgoraEntScenarios/Scenes/Pure1v1 - ShowTo1v1: - :path: AgoraEntScenarios/Scenes/ShowTo1v1 VideoLoaderAPI: :path: AgoraEntScenarios/Common/API/VideoLoaderAPI @@ -190,7 +158,6 @@ SPEC CHECKSUMS: AgoraSyncManager: 4e2f2e64db24dd0839e12a64b475c7e094347dd2 Bugly: b8715e6ec4004b7f7fbffab0643ba80545aee3da CallAPI: f40f9694c310b613f20958fabdbe69f8bc1d6ca5 - FLAnimatedImage: bbf914596368867157cc71b38a8ec834b3eeb32b Joy: 3deda8672a197f760ba6c840c8c20657a5278df3 JXCategoryView: 7b1ee69ede4843c581688afe84d0f047723262f2 KakaJSON: cc5ff50a8c1cfbb09413db8496cb709a209e6137 @@ -200,11 +167,9 @@ SPEC CHECKSUMS: Masonry: 678fab65091a9290e40e2832a55e7ab731aad201 MJRefresh: 2fe7fb43a5167ceda20bb7e63f130c04fd1814a5 Protobuf: d7f7c8329edf5eb8af65547a8ba3e9c1cee927d5 - Pure1v1: a29e30be7dfe87afdda85cfd5b8845e719c29d3f ScoreEffectUI: bf1195b4d41a73d43c236450b5d7f958989844aa SDWebImage: 783af2c3fa36291a250030c4752ee370a9a51d13 SDWebImageAPNGCoder: 3e4c684c8223eef2f45a50bdd0beaab345e4eb24 - ShowTo1v1: 4da6561d6f12576ce61d05add891595d18bc08d0 SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25 SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef @@ -218,6 +183,6 @@ SPEC CHECKSUMS: Zip: b3fef584b147b6e582b2256a9815c897d60ddc67 ZSwiftBaseLib: f5d039af0c4be833bb86c6d382930775c4087ab9 -PODFILE CHECKSUM: eef7ecee0c52e8089bdcfbefa11c9e93728ebbde +PODFILE CHECKSUM: 2f802ae56a54521a8465e57553cff251eb769963 COCOAPODS: 1.12.1