1.0.3上架，优化蓝牙连接

diff --git a/ShenYin/Podfile.lock b/ShenYin/Podfile.lock
index 871b96f..b49030b 100644 (file)
--- a/ShenYin/Podfile.lock
+++ b/ShenYin/Podfile.lock
@@ -1,11 +1,4 @@
 PODS:
-  - AMap3DMap-NO-IDFA (10.0.700):
-    - AMapFoundation-NO-IDFA (>= 1.8.0)
-  - AMapFoundation-NO-IDFA (1.8.2)
-  - AMapLocation-NO-IDFA (2.10.0):
-    - AMapFoundation-NO-IDFA (>= 1.8.0)
-  - AMapSearch-NO-IDFA (9.7.0):
-    - AMapFoundation-NO-IDFA (>= 1.8.0)
   - CryptoSwift (1.8.4)
   - DeviceKit (5.4.0)
   - DGActivityIndicatorView (2.1.1)
@@ -77,9 +70,6 @@ PODS:
   - ZipArchive (1.4.0)
 
 DEPENDENCIES:
-  - AMap3DMap-NO-IDFA (= 10.0.700)
-  - AMapLocation-NO-IDFA
-  - AMapSearch-NO-IDFA (= 9.7.0)
   - CryptoSwift
   - DeviceKit (~> 5.4.0)
   - DGActivityIndicatorView
@@ -107,10 +97,6 @@ DEPENDENCIES:
 
 SPEC REPOS:
   https://gitee.com/mirrors/CocoaPods-Specs.git:
-    - AMap3DMap-NO-IDFA
-    - AMapFoundation-NO-IDFA
-    - AMapLocation-NO-IDFA
-    - AMapSearch-NO-IDFA
     - CryptoSwift
     - DeviceKit
     - DGActivityIndicatorView
@@ -144,10 +130,6 @@ SPEC REPOS:
     - ZipArchive
 
 SPEC CHECKSUMS:
-  AMap3DMap-NO-IDFA: e029d65ea35d3e4c0a948e1dab9e77109bf0e86a
-  AMapFoundation-NO-IDFA: 6ce0ef596d4eb8d934ff498e56747b6de1247b05
-  AMapLocation-NO-IDFA: 735791aeb1ba52dff666e4158b86caf4b68b5be7
-  AMapSearch-NO-IDFA: 749f73d5a773758f01a24eb8872f8798c8b47cb4
   CryptoSwift: e64e11850ede528a02a0f3e768cec8e9d92ecb90
   DeviceKit: bd34bb1766d926c3cc5a5f6e3e9a6dd10148b805
   DGActivityIndicatorView: ff2c76073d79692f724863c8dd38685866a03cb6
@@ -180,6 +162,6 @@ SPEC CHECKSUMS:
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
   ZipArchive: e25a4373192673e3229ac8d6e9f64a3e5713c966
 
-PODFILE CHECKSUM: 72f4eaacbe6e66655fb7c7aef1807fd74a1fd9b2
+PODFILE CHECKSUM: 8be0cb581e3b6cc73fee508087fb68b46cbcd963
 
 COCOAPODS: 1.16.2

diff --git a/ShenYin/Pods/Kingfisher/PrivacyInfo.xcprivacy b/ShenYin/Pods/Kingfisher/PrivacyInfo.xcprivacy
new file mode 100644 (file)
index 0000000..6af1641
--- /dev/null
+++ b/ShenYin/Pods/Kingfisher/PrivacyInfo.xcprivacy
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+       <key>NSPrivacyTracking</key>
+       <false/>
+       <key>NSPrivacyCollectedDataTypes</key>
+       <array/>
+       <key>NSPrivacyTrackingDomains</key>
+       <array/>
+       <key>NSPrivacyAccessedAPITypes</key>
+       <array/>
+</dict>
+</plist>

diff --git a/ShenYin/Pods/MBProgressHUD/PrivacyInfo.xcprivacy b/ShenYin/Pods/MBProgressHUD/PrivacyInfo.xcprivacy
new file mode 100644 (file)
index 0000000..6af1641
--- /dev/null
+++ b/ShenYin/Pods/MBProgressHUD/PrivacyInfo.xcprivacy
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+       <key>NSPrivacyTracking</key>
+       <false/>
+       <key>NSPrivacyCollectedDataTypes</key>
+       <array/>
+       <key>NSPrivacyTrackingDomains</key>
+       <array/>
+       <key>NSPrivacyAccessedAPITypes</key>
+       <array/>
+</dict>
+</plist>

diff --git a/ShenYin/ShenYin.xcodeproj/project.pbxproj b/ShenYin/ShenYin.xcodeproj/project.pbxproj
index 2abcf03..5bc2888 100644 (file)
--- a/ShenYin/ShenYin.xcodeproj/project.pbxproj
+++ b/ShenYin/ShenYin.xcodeproj/project.pbxproj
@@ -118,6 +118,21 @@
                                Sdk/DcSdk/VC/HomeDeviceVC.swift,
                                Sdk/DcSdk/VC/ModeVC.swift,
                                "ShenYin copy-Info.plist",
+                               UI/Sport/MusicRootView.swift,
+                               UI/Sport/RecordRootView.swift,
+                               UI/Sport/Sport/Ready/CountdownView.swift,
+                               UI/Sport/Sport/Ready/CustomMapView.swift,
+                               UI/Sport/Sport/Ready/FooterView.swift,
+                               UI/Sport/Sport/Ready/ReadyVC.swift,
+                               UI/Sport/Sport/root/DataView.swift,
+                               UI/Sport/Sport/root/GroupView.swift,
+                               UI/Sport/Sport/root/PlanView.swift,
+                               UI/Sport/Sport/root/RouteView.swift,
+                               UI/Sport/Sport/root/SportRootView.swift,
+                               UI/Sport/Sport/root/SportTypeView.swift,
+                               UI/Sport/Sport/Tools/MapManager.swift,
+                               UI/Sport/SportHomeVC.swift,
+                               UI/Sport/TranslateRootView.swift,
                        );
                        target = 3F887B9B2E38D8DC00C98658 /* ShenYin */;
                };
@@ -151,6 +166,21 @@
                                Sdk/JoySdk/VC/JoyTctyVC.swift,
                                Sdk/JoySdk/VC/JoyXclyVC.swift,
                                Sdk/JoySdk/VC/ModeVC.swift,
+                               UI/Sport/MusicRootView.swift,
+                               UI/Sport/RecordRootView.swift,
+                               UI/Sport/Sport/Ready/CountdownView.swift,
+                               UI/Sport/Sport/Ready/CustomMapView.swift,
+                               UI/Sport/Sport/Ready/FooterView.swift,
+                               UI/Sport/Sport/Ready/ReadyVC.swift,
+                               UI/Sport/Sport/root/DataView.swift,
+                               UI/Sport/Sport/root/GroupView.swift,
+                               UI/Sport/Sport/root/PlanView.swift,
+                               UI/Sport/Sport/root/RouteView.swift,
+                               UI/Sport/Sport/root/SportRootView.swift,
+                               UI/Sport/Sport/root/SportTypeView.swift,
+                               UI/Sport/Sport/Tools/MapManager.swift,
+                               UI/Sport/SportHomeVC.swift,
+                               UI/Sport/TranslateRootView.swift,
                        );
                        target = 3FD1DFE32F0E00BF00A62733 /* playboy */;
                };
@@ -347,7 +377,6 @@
                                3F887B9A2E38D8DC00C98658 /* Resources */,
                                5A934A35F54A5620CFD3C08A /* [CP] Embed Pods Frameworks */,
                                3FEFE9092F1B252000D82F17 /* Embed Frameworks */,
-                               C952A11BAF04A31F5BE85A2D /* [CP] Copy Pods Resources */,
                        );
                        buildRules = (
                        );
@@ -537,27 +566,6 @@
                        shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-frameworks.sh\"\n";
                        showEnvVarsInLog = 0;
                };
-               C952A11BAF04A31F5BE85A2D /* [CP] Copy Pods Resources */ = {
-                       isa = PBXShellScriptBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       inputFileListPaths = (
-                               "${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-resources-${CONFIGURATION}-input-files.xcfilelist",
-                       );
-                       inputPaths = (
-                       );
-                       name = "[CP] Copy Pods Resources";
-                       outputFileListPaths = (
-                               "${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-resources-${CONFIGURATION}-output-files.xcfilelist",
-                       );
-                       outputPaths = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-                       shellPath = /bin/sh;
-                       shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-resources.sh\"\n";
-                       showEnvVarsInLog = 0;
-               };
                FEE3A20D8A2FA81E622C488B /* [CP] Check Pods Manifest.lock */ = {
                        isa = PBXShellScriptBuildPhase;
                        buildActionMask = 2147483647;

diff --git a/ShenYin/ShenYin/Launch/SceneDelegate.swift b/ShenYin/ShenYin/Launch/SceneDelegate.swift
index f166788..13273e9 100644 (file)
--- a/ShenYin/ShenYin/Launch/SceneDelegate.swift
+++ b/ShenYin/ShenYin/Launch/SceneDelegate.swift
@@ -18,9 +18,9 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         
         App.shared.window = window
 //        window?.rootViewController = BaseTC()
-        MapManager.shared.setupSdk()
-        window?.rootViewController = UINavigationController(rootViewController: ReadyVC())
-//        AppLaunch.start()
+//        MapManager.shared.setupSdk()
+//        window?.rootViewController = UINavigationController(rootViewController: ReadyVC())
+        AppLaunch.start()
     }
 
     func sceneDidDisconnect(_ scene: UIScene) {

diff --git a/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyCallingRecordVC.swift b/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyCallingRecordVC.swift
index 2be5333..29e4bba 100644 (file)
--- a/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyCallingRecordVC.swift
+++ b/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyCallingRecordVC.swift
@@ -74,6 +74,12 @@ class JoyCallingRecordVC:BaseVC{
     func setupSdk(){
         JoySdkManager.shared.callRecord.recordFinish = {[weak self] path in
             guard let self = self else { return  }
+            if textView.text.isEmpty {
+                YLprogressHUD.showAutoHiden(text: "未识别到语音内容".l10n) {
+                    App.shared.popPage()
+                }
+                return
+            }
             if !needSave {
                 return
             }

diff --git a/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyStereoCallVC.swift b/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyStereoCallVC.swift
index a173051..7950009 100644 (file)
--- a/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyStereoCallVC.swift
+++ b/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyStereoCallVC.swift
@@ -130,6 +130,12 @@ class JoyStereoCallVC:BaseVC{
     func setupSdk(){
         JoySdkManager.shared.callRecord.recordFinish = {[weak self] path in
             guard let self = self else { return  }
+            if selfTextView.text.isEmpty && otherTextView.text.isEmpty{
+                YLprogressHUD.showAutoHiden(text: "未识别到语音内容".l10n) {
+                    App.shared.popPage()
+                }
+                return
+            }
             if !needSave {
                 return
             }

diff --git a/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyTctyVC.swift b/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyTctyVC.swift
index fd897f7..cd98e53 100644 (file)
--- a/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyTctyVC.swift
+++ b/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyTctyVC.swift
@@ -82,6 +82,12 @@ class JoyTctyVC:BaseVC{
         }
         sdk.filePathCallback = { [weak self] path in
             guard let self = self else{return}
+            if textView.text == nil || textView.text!.isEmpty {
+                YLprogressHUD.showAutoHiden(text: "未识别到语音内容".l10n) {
+                    App.shared.popPage()
+                }
+                return
+            }
             guard let wavPath = DCFolder.recordFileResave(srcPath: path) else{return}
             let v = PopTextField()
             v.show()

diff --git a/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyXclyVC.swift b/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyXclyVC.swift
index 24eb739..8a9662e 100644 (file)
--- a/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyXclyVC.swift
+++ b/ShenYin/ShenYin/Sdk/JoySdk/VC/JoyXclyVC.swift
@@ -71,6 +71,12 @@ class JoyXclyVC:BaseVC{
             if !needSave {
                 return
             }
+            if textView.text.isEmpty {
+                YLprogressHUD.showAutoHiden(text: "未识别到语音内容".l10n) {
+                    App.shared.popPage()
+                }
+                return
+            }
             let v = PopTextField()
             v.show()
             v.cancelTap = {

diff --git a/ShenYin/ShenYin/lan/chinese.swift b/ShenYin/ShenYin/lan/chinese.swift
index 55a24c9..fa2ab45 100644 (file)
--- a/ShenYin/ShenYin/lan/chinese.swift
+++ b/ShenYin/ShenYin/lan/chinese.swift
@@ -268,5 +268,6 @@ let chineseMap:[String:String] =
     "嗨！我是":"",
     "查找眼镜":"",
     "眼镜响铃":"",
+    "未识别到语音内容":"",
 ]
 

diff --git a/ShenYin/podfile b/ShenYin/podfile
index 52aaa18..4e4b133 100644 (file)
--- a/ShenYin/podfile
+++ b/ShenYin/podfile
@@ -51,9 +51,9 @@ target 'ShenYin' do
   pod 'HorizonCalendar'#日历
 
   #高德地图
-  pod 'AMap3DMap-NO-IDFA', '10.0.700'
-  pod 'AMapLocation-NO-IDFA'
-  pod 'AMapSearch-NO-IDFA', '9.7.0'
+#  pod 'AMap3DMap-NO-IDFA', '10.0.700'
+#  pod 'AMapLocation-NO-IDFA'
+#  pod 'AMapSearch-NO-IDFA', '9.7.0'
   
 end
 

diff --git a/document/PrivacyInfo.xcprivacy b/document/PrivacyInfo.xcprivacy
index 148b97e..6af1641 100644 (file)
--- a/document/PrivacyInfo.xcprivacy
+++ b/document/PrivacyInfo.xcprivacy
@@ -4,20 +4,11 @@
 <dict>
        <key>NSPrivacyTracking</key>
        <false/>
+       <key>NSPrivacyCollectedDataTypes</key>
+       <array/>
        <key>NSPrivacyTrackingDomains</key>
        <array/>
        <key>NSPrivacyAccessedAPITypes</key>
-       <array>
-               <dict>
-                       <key>NSPrivacyAccessedAPIType</key>
-                       <string>NSPrivacyAccessedAPICategoryDiskSpace</string>
-                       <key>NSPrivacyAccessedAPITypeReasons</key>
-                       <array>
-                               <string>E174.1</string>
-                       </array>
-               </dict>
-       </array>
-       <key>NSPrivacyCollectedDataTypes</key>
        <array/>
 </dict>
 </plist>