关掉ota日志

diff --git a/ShenYin/ShenYin/Api/LogManager.swift b/ShenYin/ShenYin/Api/LogManager.swift
index fb229e2..f61e054 100644 (file)
--- a/ShenYin/ShenYin/Api/LogManager.swift
+++ b/ShenYin/ShenYin/Api/LogManager.swift
@@ -45,17 +45,16 @@ class Logger {
 
 extension Logger {
     static func debug(_ logs: Any..., line: Int = #line, separator: String = " ", terminator: String = "\n") {
-        objc_sync_enter(Logger.shared)
+        
         if Logger.isDebug {
+            objc_sync_enter(Logger.shared)
             print(Logger.shared.dateString, terminator: " [DeepChords-\(String(format: "%03d", line))]: ")
             print(logs, separator: separator, terminator: terminator)
             let logString = Logger.shared.dateString + " [DeepChords-\(String(format: "%03d", line))]: " + logs.map({ "\($0)" }).joined(separator: separator) + terminator
             Self.logs.append(logString)
             Logger.shared.saveLog(log: logString)
+            objc_sync_exit(Logger.shared)
         }
-        objc_sync_exit(Logger.shared)
-        
-        
     }
     
     private func saveLog(log:String){

diff --git a/ShenYin/ShenYin/JoySdk/JoyCallRecord.swift b/ShenYin/ShenYin/JoySdk/JoyCallRecord.swift
index 0326720..ed725e5 100644 (file)
--- a/ShenYin/ShenYin/JoySdk/JoyCallRecord.swift
+++ b/ShenYin/ShenYin/JoySdk/JoyCallRecord.swift
@@ -109,7 +109,6 @@ extension JoyCallRecord : JoyGemCallManagerDelegate {
 
 extension JoyCallRecord:JoyGemCallStereoDelegate{
     func callManager(_ manager: JoyGemCallManager, didUpdateStereoAsr model: JoyGemAsrModel, channel index: UInt) {
-        debugPrint("text: \(model.text),index: \(model.index)")
         if (index == 1) {
             let msg = self.selfList.firstIndex (where: { (str,idx) in
                 return idx == model.index;

diff --git a/ShenYin/ShenYin/JoySdk/JoyDevice.swift b/ShenYin/ShenYin/JoySdk/JoyDevice.swift
index 02c4978..49006b5 100644 (file)
--- a/ShenYin/ShenYin/JoySdk/JoyDevice.swift
+++ b/ShenYin/ShenYin/JoySdk/JoyDevice.swift
@@ -125,7 +125,7 @@ class JoyDevice{
     }
     static func setCustomEQ(index:Int,value:Int){
         JoyGemAIManager.shared().device.setCustomEQ(UInt(index), withGain: value) { err in
-            debugPrint("setCustomEQ:\(err)");
+            Logger.debug("setCustomEQ:\(err)");
         }
     }
 }

diff --git a/ShenYin/ShenYin/Ota/JLBleAssistManager.m b/ShenYin/ShenYin/Ota/JLBleAssistManager.m
index 376d3fc..80169d4 100644 (file)
--- a/ShenYin/ShenYin/Ota/JLBleAssistManager.m
+++ b/ShenYin/ShenYin/Ota/JLBleAssistManager.m
@@ -4,7 +4,7 @@
 //
 //  Created by 凌煊峰 on 2021/10/11.
 //
-
+#import <JLLogHelper/JLLogManager.h>
 #import "JLBleAssistManager.h"
 \
 NSString *kFLT_BLE_FOUND        = @"FLT_BLE_FOUND";            //发现设备
@@ -38,6 +38,11 @@ NSString *FLT_BLE_RCSP_R  = @"AE02"; //命令“读”通道
 - (instancetype)init {
     self = [super init];
     if (self) {
+        [JLLogManager clearLog]; // 清空日志
+        [JLLogManager setLog:false IsMore:false Level:JLLOG_COMPLETE]; // 关闭日志打印
+        [JLLogManager saveLogAsFile:false]; // 关闭日志存储
+        [JLLogManager logWithTimestamp:false]; // 关闭日志打印时间
+        
         _isFilter = YES;
         _isPaired = YES;
         
@@ -56,6 +61,7 @@ NSString *FLT_BLE_RCSP_R  = @"AE02"; //命令“读”通道
         _mAssist.mRcsp_W     = FLT_BLE_RCSP_W;  //特征「写」
         _mAssist.mRcsp_R     = FLT_BLE_RCSP_R;  //特征「读」
         _connectByUUID = nil;
+
     }
     return self;
 }

diff --git a/ShenYin/ShenYin/Ota/OtaManager.swift b/ShenYin/ShenYin/Ota/OtaManager.swift
index 3d0334a..5c1ef35 100644 (file)
--- a/ShenYin/ShenYin/Ota/OtaManager.swift
+++ b/ShenYin/ShenYin/Ota/OtaManager.swift
@@ -14,6 +14,8 @@ class OtaMananger:NSObject{
     override init() {
         super.init()
         otaManager.addDelegate(self)
+        
+        
     }
     
     static var otaServiceUUId:String{

diff --git a/ShenYin/ShenYin/Ota/update.ufw b/ShenYin/ShenYin/Ota/update.ufw
deleted file mode 100644 (file)
index 91fa5a9..0000000
Binary files a/ShenYin/ShenYin/Ota/update.ufw and /dev/null differ

diff --git a/ShenYin/ShenYin/UI/Home/Dialog/DialogTranlateVC.swift b/ShenYin/ShenYin/UI/Home/Dialog/DialogTranlateVC.swift
index 65316a1..bb1331e 100644 (file)
--- a/ShenYin/ShenYin/UI/Home/Dialog/DialogTranlateVC.swift
+++ b/ShenYin/ShenYin/UI/Home/Dialog/DialogTranlateVC.swift
@@ -305,7 +305,7 @@ extension DialogTranslateVC : JoyGemSIDeviceManagerDelegate {
     }
     
     func siDeviceManager(_ manager: JoyGemSIDeviceManager, didUpdateRaw model: JoyGemAsrModel) {
-        debugPrint("text: \(model.text),index: \(model.index)")
+        Logger.debug("text: \(model.text),index: \(model.index)")
         let msg = tmpList.firstIndex (where: { (str,idx) in
             return idx == model.index;
         })
@@ -363,11 +363,11 @@ extension DialogTranslateVC : JoyGemSIDeviceManagerDelegate {
     }
     
     func siDeviceManager(_ manager: JoyGemSIDeviceManager, saveFile path: String) {
-        debugPrint("path: \(path)")
+        Logger.debug("path: \(path)")
     }
     
     func siDeviceManager(_ manager: JoyGemSIDeviceManager, stateChange code: JoyGemStateCode) {
-        debugPrint("code: \(code)")
+        Logger.debug("code: \(code)")
     }
     
     func siDeviceManager(_ manager: JoyGemSIDeviceManager, onError code: JoyGemErrorCode) {
@@ -379,6 +379,6 @@ extension DialogTranslateVC : JoyGemSIDeviceManagerDelegate {
 extension DialogTranslateVC : PcmSoundDelegate {
     
     func remaining(_ frames: UInt) {
-        debugPrint("[frame:\(frames)]");
+        Logger.debug("[frame:\(frames)]");
     }
 }

diff --git a/ShenYin/ShenYin/UI/Home/RecordTranslateVC.swift b/ShenYin/ShenYin/UI/Home/RecordTranslateVC.swift
index 8e028ae..8046078 100644 (file)
--- a/ShenYin/ShenYin/UI/Home/RecordTranslateVC.swift
+++ b/ShenYin/ShenYin/UI/Home/RecordTranslateVC.swift
@@ -179,7 +179,7 @@ extension RecordTranslateVC : JoyGemSIManagerDelegate {
     }
     
     func siManager(_ manager: JoyGemSIManager, didUpdateTranslate model: JoyGemAsrModel) {
-        debugPrint("translate text: \(model.text),index: \(model.index)")
+        Logger.debug("translate text: \(model.text),index: \(model.index)")
         let msg = translateList.firstIndex (where: { (str,idx) in
             return idx == model.index;
         })

diff --git a/ShenYin/ShenYin/UI/Home/Scan/DeviceVM.swift b/ShenYin/ShenYin/UI/Home/Scan/DeviceVM.swift
index ff1b9ec..29e2313 100644 (file)
--- a/ShenYin/ShenYin/UI/Home/Scan/DeviceVM.swift
+++ b/ShenYin/ShenYin/UI/Home/Scan/DeviceVM.swift
@@ -166,7 +166,7 @@ extension DeviceVM{
         JoyGemAIManager.shared().device.software { version in
             finished(version)
         } error: { error in
-            debugPrint("\(error!.localizedDescription)");
+            Logger.debug("\(error!.localizedDescription)");
             finished(nil)
         }
     }