接入火山APM监控SDK , 登录按钮关闭刷新状态

“张旭”
1 parent a05ff01c
Showing 5 changed files with 74 additions and 2 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
metaCode/Classes/Main/LoginPage/ViewModel/CNLiveLoginViewModel.swift
metaCode/Classes/Other/AppDelegate.swift
@@ -6,6 +6,8 @@ source &#39;https://cdn.cocoapods.org&#39;
  
 source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
 source 'http://bj.gitlab.cnlive.com/DSIOSTeam/DSSpecRepos.git'
+source 'https://github.com/volcengine/volcengine-specs.git'
+
 use_frameworks!
  
 target 'metaCode' do
@@ -74,6 +76,31 @@ target &#39;metaCode&#39; do
    #数据库
    pod 'FMDB'
  
+   #火山APM监控
+   pod 'RangersAPM', '3.9.2', :subspecs => [
+       'Crash',
+       'WatchDog',
+       'OOM',
+       'LAG',
+       'UserException',
+       'Monitors',
+       'UITrackers',
+       'Hybrid',
+       'MemoryGraph',
+       'NetworkPro',
+       'EventMonitor',
+       'SessionTracker',
+       'APMLog',
+       'CrashProtector',
+       'CPUException',
+       'MetricKit',
+       'Disk',
+       'GWPASan',
+       'Coredump',
+       'CloudCommand',
+       'CN'  #必须引入
+   ]
+   
    #依赖三方私有库,如果里面有.a的时候加上这个
    pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
    end
@@ -1506,6 +1506,7 @@
 				818163B62A25CFCC00579C86 /* Resources */,
 				E0FAE2296315BED785FA507E /* [CP] Embed Pods Frameworks */,
 				43270B0E3FD1AFD4E05616D0 /* [CP] Copy Pods Resources */,
+				19AB90652BB669AF00B6A79B /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -1628,6 +1629,23 @@
 /* End PBXResourcesBuildPhase section */
  
 /* Begin PBXShellScriptBuildPhase section */
+		19AB90652BB669AF00B6A79B /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh ${PODS_ROOT}/RangersAPM/RangersAPM/Core/APMPlus_DSYMUploader.sh \"591048\"\n";
+		};
 		43270B0E3FD1AFD4E05616D0 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -286,11 +286,15 @@ extension CNLiveLoginViewController {
         }
         view.endEditing(true)
         loginButton.startAnimating()
-        CNLiveLoginViewModel.requestLoginAction(userName: phoneText.text ?? "", countryCode: country, verCode: veriText.text ?? "") { [self] in
+        
+        CNLiveLoginViewModel.requestLoginAction(userName: phoneText.text ?? "", countryCode: country, verCode: veriText.text ?? "") {[self] in
             loginButton.stopAnimating()
             let window = UIApplication.shared.delegate?.window
             window??.rootViewController = CNLiveBaseTabBarViewController.init()
+        } endrefreshBlock: {[self] in
+            loginButton.stopAnimating()
         }
+
     }
  
     @objc func pushAgreeActionMothod() {
@@ -8,11 +8,15 @@
 import Foundation
 import CNLiveRequestBastKit
 import HandyJSON
+import RangersAPM
  
 //验证码发送成功回调
 typealias resultCodeBlock = () -> Void
 //登陆成功回调
 typealias resultLoginBlock = () -> Void
+//结束登录按钮刷新回调
+typealias endRefreshBlock = () -> Void
+
  
 class CNLiveLoginViewModel : NSObject {
  
@@ -67,29 +71,36 @@ class CNLiveLoginViewModel : NSObject {
     ///   - countryCode: 国家区号
     ///   - verCode: 验证码
     ///   - resultBlock: 结果回调
-    static func requestLoginAction(userName: String, countryCode: String, verCode: String, resultBlock: @escaping resultLoginBlock) {
+    static func requestLoginAction(userName: String, countryCode: String, verCode: String, resultBlock: @escaping resultLoginBlock ,endrefreshBlock: @escaping endRefreshBlock) {
+        
         if !userName.isNotBlank() {
             showMessage(message: "请输入手机号")
+            endrefreshBlock()
             return
         }
         if userName.lengthOfBytes(using: .utf8) >= 20 {
             showMessage(message: "手机号格式不正确")
+            endrefreshBlock()
             return
         }
         if !userName.isPurnInt() {
             showMessage(message: "手机号格式不正确")
+            endrefreshBlock()
             return
         }
         if !verCode.isNotBlank() {
             showMessage(message: "请输入验证码")
+            endrefreshBlock()
             return
         }
         if verCode.lengthOfBytes(using: .utf8) >= 20 {
             showMessage(message: "验证码格式不正确")
+            endrefreshBlock()
             return
         }
         if !verCode.isPurnInt() {
             showMessage(message: "验证码格式不正确")
+            endrefreshBlock()
             return
         }
  
@@ -113,13 +124,16 @@ class CNLiveLoginViewModel : NSObject {
                         let userInfoModel = dictionaryToModel(resp as! [String : Any], UserInfoModel.self,"data")
                         UserInfoManager.cacheUserInfo(userInfo: userInfoModel as! UserInfoModel)
                         UserDefaults.standard.set(true,forKey: "is_login")
+                        RangersAPM.setUserID(UserInfoManager.shared.userInfo.uid)
                         resultBlock()
                     }
                 } else {
                     showMessage(message: resp["errorMessage"] as! String)
+                    endrefreshBlock()
                 }
             } else {
                 showMessage(message: "登陆失败")
+                endrefreshBlock()
             }
         }
     }
@@ -9,6 +9,7 @@ import UIKit
 import CNLiveRequestBastKit
 import IQKeyboardManagerSwift
 import CNLiveShareToolKit
+import RangersAPM
  
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -46,6 +47,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         window?.rootViewController = is_login ? CNLiveBaseTabBarViewController.init() : CNLiveLoginViewController.init()
         window?.makeKeyAndVisible()
  
+        ///设置APM监控SDK
+        let apmConfig = RangersAPMConfig.init(appID: "591048", appToken: "8dcc7f8b0a3a4aee8ef698311ef89a62")
+        apmConfig.channel = "App Store"
+        apmConfig.deviceIDSource = .fromAPMService
+        apmConfig.defaultMonitors = .apmCrashMonitorSwitch
+        RangersAPM.start(with: apmConfig)
+        RangersAPM.setUserID(is_login ? UserInfoManager.shared.userInfo.uid : "userID")
+        
         AppDelegate_configRequestManager()
         AppDelegate_configIQKeyboardManager()