playboy打包测试

diff --git a/ShenYin/ShenYin.xcodeproj/project.pbxproj b/ShenYin/ShenYin.xcodeproj/project.pbxproj
index 9de0b86..4dab2b8 100644 (file)
--- a/ShenYin/ShenYin.xcodeproj/project.pbxproj
+++ b/ShenYin/ShenYin.xcodeproj/project.pbxproj
@@ -16,7 +16,6 @@
                3F8F58292EBCA2B800FFC00B /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3F8F58282EBCA2B800FFC00B /* PrivacyInfo.xcprivacy */; };
                3FD1DFED2F0E00BF00A62733 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3F8F58282EBCA2B800FFC00B /* PrivacyInfo.xcprivacy */; };
                3FFB77C12F179F3100EF9A60 /* DeepChordsSdk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D54E0EF2F0A61E600A80EE7 /* DeepChordsSdk.framework */; };
-               3FFB77C22F179F3100EF9A60 /* DeepChordsSdk.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0D54E0EF2F0A61E600A80EE7 /* DeepChordsSdk.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
                644D1BB5EDD3EA1D77C57786 /* Pods_DeepChordsSdk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 248D8B53B5A178ACA5867275 /* Pods_DeepChordsSdk.framework */; };
                7A6613B4B617D6E71D34944C /* Pods_ShenYin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 90FF0C8B0D4D6AE0933FA672 /* Pods_ShenYin.framework */; };
                817510A595D00CAD05E3772C /* (null) in Frameworks */ = {isa = PBXBuildFile; };
@@ -58,7 +57,6 @@
                        dstPath = "";
                        dstSubfolderSpec = 10;
                        files = (
-                               3FFB77C22F179F3100EF9A60 /* DeepChordsSdk.framework in Embed Frameworks */,
                        );
                        name = "Embed Frameworks";
                        runOnlyForDeploymentPostprocessing = 0;
@@ -484,6 +482,18 @@
                                UI/Sleep/SleepVM.swift,
                                UI/Sport/MusicRootView.swift,
                                UI/Sport/RecordRootView.swift,
+                               UI/Sport/Sport/Group/add/AddGroupVC.swift,
+                               UI/Sport/Sport/Group/Create/AddGroupHeader.swift,
+                               UI/Sport/Sport/Group/Create/CreateGroupVC.swift,
+                               UI/Sport/Sport/Group/Create/SportInputItem.swift,
+                               UI/Sport/Sport/Group/Create/SportSelectItem.swift,
+                               UI/Sport/Sport/Group/Create/SportSwitchItem.swift,
+                               UI/Sport/Sport/Group/MyGroup/MyGroupCell.swift,
+                               UI/Sport/Sport/Group/MyGroup/MyGroupModel.swift,
+                               UI/Sport/Sport/Group/MyGroup/MyGroupVC.swift,
+                               UI/Sport/Sport/Group/MyGroup/MyGroupView.swift,
+                               UI/Sport/Sport/Group/Other/GroupRoleVC.swift,
+                               UI/Sport/Sport/Group/Other/GroupTypeVC.swift,
                                UI/Sport/Sport/Light/BrightnessView.swift,
                                UI/Sport/Sport/Light/LightSetVC.swift,
                                UI/Sport/Sport/Light/ModeView.swift,
@@ -589,6 +599,18 @@
                                Sdk/JoySdk/VC/ModeVC.swift,
                                UI/Sport/MusicRootView.swift,
                                UI/Sport/RecordRootView.swift,
+                               UI/Sport/Sport/Group/add/AddGroupVC.swift,
+                               UI/Sport/Sport/Group/Create/AddGroupHeader.swift,
+                               UI/Sport/Sport/Group/Create/CreateGroupVC.swift,
+                               UI/Sport/Sport/Group/Create/SportInputItem.swift,
+                               UI/Sport/Sport/Group/Create/SportSelectItem.swift,
+                               UI/Sport/Sport/Group/Create/SportSwitchItem.swift,
+                               UI/Sport/Sport/Group/MyGroup/MyGroupCell.swift,
+                               UI/Sport/Sport/Group/MyGroup/MyGroupModel.swift,
+                               UI/Sport/Sport/Group/MyGroup/MyGroupVC.swift,
+                               UI/Sport/Sport/Group/MyGroup/MyGroupView.swift,
+                               UI/Sport/Sport/Group/Other/GroupRoleVC.swift,
+                               UI/Sport/Sport/Group/Other/GroupTypeVC.swift,
                                UI/Sport/Sport/Light/BrightnessView.swift,
                                UI/Sport/Sport/Light/LightSetVC.swift,
                                UI/Sport/Sport/Light/ModeView.swift,
@@ -1436,7 +1458,6 @@
                                INFOPLIST_KEY_NSBluetoothAlwaysUsageDescription = "扫描附近蓝牙设备需要获得权限";
                                INFOPLIST_KEY_NSCameraUsageDescription = "修改用户头像、提交意见反馈需要访问相册使用摄像头";
                                INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "允许APP使用定位方便查找耳机";
-                               INFOPLIST_KEY_NSMicrophoneUsageDescription = "录音需要使用麦克风";
                                INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "修改用户头像、提交意见反馈需要访问相册";
                                INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
                                INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
@@ -1492,7 +1513,6 @@
                                INFOPLIST_KEY_NSBluetoothAlwaysUsageDescription = "扫描附近蓝牙设备需要获得权限";
                                INFOPLIST_KEY_NSCameraUsageDescription = "修改用户头像、提交意见反馈需要访问相册使用摄像头";
                                INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "允许APP使用定位方便查找耳机";
-                               INFOPLIST_KEY_NSMicrophoneUsageDescription = "录音需要使用麦克风";
                                INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "修改用户头像、提交意见反馈需要访问相册";
                                INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
                                INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;

diff --git a/ShenYin/ShenYin/Info.plist b/ShenYin/ShenYin/Info.plist
index c3d8d11..69dbc59 100644 (file)
--- a/ShenYin/ShenYin/Info.plist
+++ b/ShenYin/ShenYin/Info.plist
@@ -51,5 +51,7 @@
                <string>bluetooth-central</string>
                <string>audio</string>
        </array>
+       <key>NSMicrophoneUsageDescription</key>
+       <string>录音需要使用麦克风</string>
 </dict>
 </plist>

diff --git a/ShenYin/ShenYin/Launch/SceneDelegate.swift b/ShenYin/ShenYin/Launch/SceneDelegate.swift
index fd80973..9532784 100644 (file)
--- a/ShenYin/ShenYin/Launch/SceneDelegate.swift
+++ b/ShenYin/ShenYin/Launch/SceneDelegate.swift
@@ -17,9 +17,9 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         guard let _ = (scene as? UIWindowScene) else { return }
         
         App.shared.window = window
-        AppLaunch.start()
-//        MapManager.shared.setupSdk()
-//        window?.rootViewController = UINavigationController(rootViewController: CreateGroupVC())
+//        AppLaunch.start()
+        MapManager.shared.setupSdk()
+        window?.rootViewController = UINavigationController(rootViewController: CreateGroupVC())
 //        
     }
 

diff --git a/ShenYin/ShenYin/Sdk/DcSdk/tool/DcSdkManager.swift b/ShenYin/ShenYin/Sdk/DcSdk/tool/DcSdkManager.swift
index a9b6ec1..fc27259 100644 (file)
--- a/ShenYin/ShenYin/Sdk/DcSdk/tool/DcSdkManager.swift
+++ b/ShenYin/ShenYin/Sdk/DcSdk/tool/DcSdkManager.swift
@@ -114,7 +114,7 @@ extension DcSdkManager{
                 Logger.debug(advMsd)
                 Logger.debug("mac地址",mac)
                 if mac.count > 20{
-                    return ""
+                    return nil
                 }
                 Logger.debug(text)
                 return text

diff --git a/ShenYin/ShenYin/Sdk/JoySdk/tool/CCDevice.swift b/ShenYin/ShenYin/Sdk/JoySdk/tool/CCDevice.swift
index b126b36..00ae57b 100644 (file)
--- a/ShenYin/ShenYin/Sdk/JoySdk/tool/CCDevice.swift
+++ b/ShenYin/ShenYin/Sdk/JoySdk/tool/CCDevice.swift
@@ -7,7 +7,7 @@
 import JoyGemAI
 class CCDevice{
     static var isJoy = true
-    static var showRaisound = false
+    static var showRaisound = true
     static func initSdk(){
         if CCDevice.isJoy {
             JoySdkManager.shared.setupSdk()

diff --git a/ShenYin/ShenYin/Sdk/LogManager.swift b/ShenYin/ShenYin/Sdk/LogManager.swift
index 8735333..f61e054 100644 (file)
--- a/ShenYin/ShenYin/Sdk/LogManager.swift
+++ b/ShenYin/ShenYin/Sdk/LogManager.swift
@@ -9,7 +9,7 @@ import Foundation
 
 /// 日记管理
 class Logger {
-    static var isDebug: Bool = true
+    static var isDebug: Bool = false
     
     fileprivate static let shared = Logger()
     private var fileHandle:FileHandle?

diff --git a/ShenYin/ShenYin/UI/Raisound/RSChatVC.swift b/ShenYin/ShenYin/UI/Raisound/RSChatVC.swift
index c445d8b..ded8bf3 100644 (file)
--- a/ShenYin/ShenYin/UI/Raisound/RSChatVC.swift
+++ b/ShenYin/ShenYin/UI/Raisound/RSChatVC.swift
@@ -133,9 +133,13 @@ class RSChatVC:BaseVC{
         RSManager.shared.chat.ttsCallBack = { data in
             PcmSound.sharedInstance().feed(data)
         }
+        NotificationCenter.default.addObserver(self, selector: #selector(applicationDidEnterBackground), name: UIApplication.didEnterBackgroundNotification, object: nil)
 
     }
-
+    @objc func applicationDidEnterBackground() {
+        print("应用已进入后台（通过通知）")
+        toolBar.endBtnAction()
+    }
     func refreshData(){
         tableView.reloadData()
         if dataList.count > 0 {