增加app日志和sdk日志入口

diff --git a/ShenYin/ShenYin/UI/Base/BaseVC.swift b/ShenYin/ShenYin/UI/Base/BaseVC.swift
index db53fd8..d78dcce 100644 (file)
--- a/ShenYin/ShenYin/UI/Base/BaseVC.swift
+++ b/ShenYin/ShenYin/UI/Base/BaseVC.swift
@@ -7,10 +7,12 @@
 
 import UIKit
 import Kingfisher
+import DeepChordsSdk
 
 open class BaseVC:UIViewController {
     
-    let logBtn = UIButton(type: .custom)
+    let appLogBtn = UIButton(type: .custom)
+    let sdkLogBtn = UIButton(type: .custom)
     let navBar = BaseNavigationBar()
 
     public init() {
@@ -49,7 +51,8 @@ open class BaseVC:UIViewController {
     }
     open override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        self.view.bringSubviewToFront(logBtn)
+        self.view.bringSubviewToFront(appLogBtn)
+        self.view.bringSubviewToFront(sdkLogBtn)
     }
     open override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
@@ -84,17 +87,31 @@ open class BaseVC:UIViewController {
     }
     
     func addLog(){
-        logBtn.frame = CGRect(x:  UIScreen.main.bounds.size.width - 80, y: kScreenHei - 200, width:60, height: 60)
-        logBtn.backgroundColor = .blue
-        logBtn.layer.cornerRadius = 30
-        logBtn.layer.masksToBounds = true
-        logBtn.setTitle("log", for: .normal)
-        logBtn.addTarget(self, action: #selector(logAction), for: .touchUpInside)
-        view.addSubview(logBtn)
-        logBtn.isHidden = !Logger.isDebug
-    }
-    @objc func logAction(){
-        App.shared.goToPage(LogVC())
+        appLogBtn.frame = CGRect(x:  UIScreen.main.bounds.size.width - 80, y: kScreenHei - 270, width:60, height: 60)
+        appLogBtn.backgroundColor = .blue
+        appLogBtn.layer.cornerRadius = 30
+        appLogBtn.layer.masksToBounds = true
+        appLogBtn.setTitle("app log", for: .normal)
+        appLogBtn.titleLabel?.font = .regular(10)
+        appLogBtn.addTarget(self, action: #selector(appLogAction), for: .touchUpInside)
+        view.addSubview(appLogBtn)
+        appLogBtn.isHidden = !Logger.isDebug
+        
+        sdkLogBtn.frame = CGRect(x:  UIScreen.main.bounds.size.width - 80, y: kScreenHei - 200, width:60, height: 60)
+        sdkLogBtn.backgroundColor = .blue
+        sdkLogBtn.layer.cornerRadius = 30
+        sdkLogBtn.layer.masksToBounds = true
+        sdkLogBtn.setTitle("sdk log", for: .normal)
+        sdkLogBtn.titleLabel?.font = .regular(10)
+        sdkLogBtn.addTarget(self, action: #selector(sdkLogAction), for: .touchUpInside)
+        view.addSubview(sdkLogBtn)
+        sdkLogBtn.isHidden = !DCLogger.isDebug
+    }
+    @objc func appLogAction(){
+        App.shared.goToPage(LogVC(logType: .app))
+    }
+    @objc func sdkLogAction(){
+        App.shared.goToPage(LogVC(logType: .deepchordsSdk))
     }
     func enablePopGesture(){
         navigationController?.fd_fullscreenPopGestureRecognizer?.isEnabled = true

diff --git a/ShenYin/ShenYin/UI/common/LogVC.swift b/ShenYin/ShenYin/UI/common/LogVC.swift
index 4ed5c50..7c2e193 100644 (file)
--- a/ShenYin/ShenYin/UI/common/LogVC.swift
+++ b/ShenYin/ShenYin/UI/common/LogVC.swift
@@ -6,19 +6,27 @@
 //
 
 import UIKit
-//import DeepChordsSdk
+import DeepChordsSdk
+
+enum LogType{
+    case deepchordsSdk
+    case app
+}
+
+
+
 class LogVC: BaseVC {
-    
     var textView =  UITextView()
+    var type:LogType = .app
     
-    override func viewDidLoad() {
-        super.viewDidLoad()
+    init(logType :LogType) {
+        self.type = logType
+        super.init()
     }
     
     override func setupViews() {
         navBar.title = "log"
         view.backgroundColor = .white
-        navBar.title = "log"
         navBar.rightView.isHidden = false
         navBar.rightView.setTitle("保存", for: .normal)
         
@@ -33,14 +41,16 @@ class LogVC: BaseVC {
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         
-        if CCConfig.appType == .deepchords {
-            
-        }
-        else{
+        if type == .app {
             textView.text = Logger.logs.joined()
         }
+        else if type == .deepchordsSdk{
+            textView.text = DCLogger.logs.joined()
+        }
         let range = NSMakeRange(textView.text.count - 1, 1)
         textView.scrollRangeToVisible(range)
+        self.appLogBtn.isHidden = true
+        self.sdkLogBtn.isHidden = true
     }
     
     override func navRightViewTapped() {
@@ -55,11 +65,16 @@ class LogVC: BaseVC {
         let build_version = Bundle.main.appBuild ?? "1"
         let version = "\(app_version)_\(build_version)"
         
-        let fileName = "DeepChords_" + version + "_\(name).txt"
+        var fileName = "DeepChords_"
+        if type == .deepchordsSdk{
+            fileName = "DeepchordsSdk_"
+        }
+        fileName = fileName + version + "_\(name).txt"
         
+        let text = version + "\n" + self.textView.text
         let filePath = "\(NSHomeDirectory())/Documents/\(fileName)"
         let url = URL(fileURLWithPath: filePath)
-        let data = self.textView.text.data(using:.utf8)
+        let data = text.data(using:.utf8)
         do {
             try data?.write(to: url, options:.atomic)
             Logger.debug(filePath)