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

“张旭”
2 parents 4c561164 2a80d1d8
Showing 3 changed files with 18 additions and 10 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Other/AppDelegate.swift
@@ -35,6 +35,8 @@ target &#39;metaCode&#39; do
   pod 'HXPHPicker'
   #七牛
   pod 'Qiniu'
+  #支付组件
+  pod 'CNLivePayCostModule'
   #加载GIF
   pod 'SwiftGifOrigin', '~> 1.7.0'
   #数据库存储
@@ -145,3 +147,4 @@ post_install do |installer|
     end
   end
 end
+
@@ -2382,6 +2382,7 @@
 					"-weak_framework",
 					"\"SwiftUI\"",
 				);
+				OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -Xcc -Wno-error=non-modular-include-in-framework-module";
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2636,6 +2637,7 @@
 					"-weak_framework",
 					"\"SwiftUI\"",
 				);
+				OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -Xcc -Wno-error=non-modular-include-in-framework-module";
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -9,7 +9,8 @@ import UIKit
 import CNLiveRequestBastKit
 import IQKeyboardManagerSwift
 import CNLiveShareToolKit
-import RangersAPM
+//import RangersAPM
+import CNLivePayCostModule
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -48,20 +49,22 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         window?.makeKeyAndVisible()
         ///设置APM监控SDK
-        let apmConfig = RangersAPMConfig.init(appID: "591048", appToken: "8dcc7f8b0a3a4aee8ef698311ef89a62")
-        apmConfig.channel = "App Store"
-        apmConfig.deviceIDSource = .fromAPMService
-        apmConfig.defaultMonitors = .apmCrashMonitorSwitch
-        RangersAPM.setUserID(is_login ? UserInfoManager.shared.userInfo.uid : "userID")
-        RangersAPM.allowDebugLog { log in
-            print("APMPlus : %@",log)
-        }
-        RangersAPM.start(with: apmConfig)
+//        let apmConfig = RangersAPMConfig.init(appID: "591048", appToken: "8dcc7f8b0a3a4aee8ef698311ef89a62")
+//        apmConfig.channel = "App Store"
+//        apmConfig.deviceIDSource = .fromAPMService
+//        apmConfig.defaultMonitors = .apmCrashMonitorSwitch
+//        RangersAPM.setUserID(is_login ? UserInfoManager.shared.userInfo.uid : "userID")
+//        RangersAPM.allowDebugLog { log in
+//            print("APMPlus : %@",log)
+//        }
+//        RangersAPM.start(with: apmConfig)
         AppDelegate_configRequestManager()
         AppDelegate_configIQKeyboardManager()
+        CNLivePayCostModule.finishLaunchingWithPayPluginSettings(withWWXAppId: "wx82209bed331a549b", hostURL: "https://metacode.cnlive.com")
+        
         //认证-下滑原生页数据库
         let databasePath = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true).first!
         let filePath = "\(databasePath)/CNLiveDownSlideModelDataBase.db"