iOS Team / CNLiveMateCode · Commits

Commit 353a13e95c4e0293ed2e027dbd9fc490fbb58ac1

Authored by “张旭”
2 parents 4c561164 2a80d1d8

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

Inline Side-by-side
Showing 3 changed files with 18 additions and 10 deletions
... ... @@ -35,6 +35,8 @@ target 'metaCode' do
35 35 pod 'HXPHPicker'
36 36 #七牛
37 37 pod 'Qiniu'
  38 + #支付组件
  39 + pod 'CNLivePayCostModule'
38 40 #加载GIF
39 41 pod 'SwiftGifOrigin', '~> 1.7.0'
40 42 #数据库存储
... ... @@ -145,3 +147,4 @@ post_install do |installer|
145 147 end
146 148 end
147 149 end
  150 +
... ...
metaCode.xcodeproj/project.pbxproj
  View file @353a13e
... ... @@ -2382,6 +2382,7 @@
2382 2382 "-weak_framework",
2383 2383 "\"SwiftUI\"",
2384 2384 );
  2385 + OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -Xcc -Wno-error=non-modular-include-in-framework-module";
2385 2386 PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
2386 2387 PRODUCT_NAME = "$(TARGET_NAME)";
2387 2388 PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -2636,6 +2637,7 @@
2636 2637 "-weak_framework",
2637 2638 "\"SwiftUI\"",
2638 2639 );
  2640 + OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -Xcc -Wno-error=non-modular-include-in-framework-module";
2639 2641 PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
2640 2642 PRODUCT_NAME = "$(TARGET_NAME)";
2641 2643 PROVISIONING_PROFILE_SPECIFIER = "";
... ...
metaCode/Classes/Other/AppDelegate.swift
  View file @353a13e
... ... @@ -9,7 +9,8 @@ import UIKit
9 9 import CNLiveRequestBastKit
10 10 import IQKeyboardManagerSwift
11 11 import CNLiveShareToolKit
12   -import RangersAPM
  12 +//import RangersAPM
  13 +import CNLivePayCostModule
13 14  
14 15 @main
15 16 class AppDelegate: UIResponder, UIApplicationDelegate {
... ... @@ -48,20 +49,22 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
48 49 window?.makeKeyAndVisible()
49 50  
50 51 ///设置APM监控SDK
51   - let apmConfig = RangersAPMConfig.init(appID: "591048", appToken: "8dcc7f8b0a3a4aee8ef698311ef89a62")
52   - apmConfig.channel = "App Store"
53   - apmConfig.deviceIDSource = .fromAPMService
54   - apmConfig.defaultMonitors = .apmCrashMonitorSwitch
55   - RangersAPM.setUserID(is_login ? UserInfoManager.shared.userInfo.uid : "userID")
56   - RangersAPM.allowDebugLog { log in
57   - print("APMPlus : %@",log)
58   - }
59   - RangersAPM.start(with: apmConfig)
  52 +// let apmConfig = RangersAPMConfig.init(appID: "591048", appToken: "8dcc7f8b0a3a4aee8ef698311ef89a62")
  53 +// apmConfig.channel = "App Store"
  54 +// apmConfig.deviceIDSource = .fromAPMService
  55 +// apmConfig.defaultMonitors = .apmCrashMonitorSwitch
  56 +// RangersAPM.setUserID(is_login ? UserInfoManager.shared.userInfo.uid : "userID")
  57 +// RangersAPM.allowDebugLog { log in
  58 +// print("APMPlus : %@",log)
  59 +// }
  60 +// RangersAPM.start(with: apmConfig)
60 61  
61 62  
62 63 AppDelegate_configRequestManager()
63 64 AppDelegate_configIQKeyboardManager()
64 65  
  66 + CNLivePayCostModule.finishLaunchingWithPayPluginSettings(withWWXAppId: "wx82209bed331a549b", hostURL: "https://metacode.cnlive.com")
  67 +
65 68 //认证-下滑原生页数据库
66 69 let databasePath = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true).first!
67 70 let filePath = "\(databasePath)/CNLiveDownSlideModelDataBase.db"
... ...