100Years пре 3 недеља
родитељ
комит
9109b46657

+ 2 - 2
AIRingtone.xcodeproj/project.pbxproj

@@ -1323,7 +1323,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AIRingtone/Info.plist;
@@ -1365,7 +1365,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AIRingtone/Info.plist;

+ 2 - 0
AIRingtone/Business/TSAIRintoneVC/TSGeneralRintoneVC/TSGeneralRintoneVC+Event.swift

@@ -42,9 +42,11 @@ extension TSGeneralRintoneVC {
         updateInfoModel(model: model)
         switch state {
             case .failed(let errorStr):
+                audioPlayer.stop()
                 hiddenSelfVC(hidden: false)
                 showError(text: errorStr)
             case .success:
+                audioPlayer.stop()
                 hiddenSelfVC(hidden: false)
                 if let model = model {
                     showSuccess(model: model)

+ 1 - 1
AIRingtone/Business/TSThemeVC/TSThemeBrowseVC/TSThemeBrowseVC.swift

@@ -189,7 +189,7 @@ extension TSThemeBrowseVC {
     
     func setUpRingtone() {
         if let ringtone = currentModel?.ringtone {
-            TSCommonTool.downloadAndCacheFile(from: ringtone) { path, error in
+            TSCommonTool.downloadAndCacheFile(from: ringtone,missingEx: "mp3") { path, error in
                 if let path = path {
                     self.currentRingtone = path
                 }else{

+ 1 - 0
AIRingtone/Business/VIewTool/TSRingToneCellView.swift

@@ -122,6 +122,7 @@ class TSRingToneCellView: TSBaseView {
 extension TSRingToneCellView {
     
     func monitorPlayStateDefaultHandle(){
+        TSBusinessAudioPlayer.shared.stop()
         TSBusinessAudioPlayer.shared.stateChangedHandle = { [weak self] state  in
             guard let self = self else { return }
             DispatchQueue.main.async {

+ 6 - 4
AIRingtone/Common/Tool/TSBandRingTool/TSBandRingTool.swift

@@ -15,6 +15,7 @@ class TSBandRingTool:NSObject {
     
     lazy var ringLoadingView: TSRingLoadingView = {
         let ringLoadingView = TSRingLoadingView(frame: CGRectMake(0, 0, k_ScreenWidth, k_ScreenHeight))
+//        ringLoadingView.backgroundColor = .blue
         return ringLoadingView
     }()
     weak var targetVC:UIViewController?
@@ -58,12 +59,12 @@ class TSBandRingTool:NSObject {
         fileURLString: String,
                    fileName:String?,
                    completion: ((Bool) -> Void)? = nil) {
-        
+        self.targetVC = vc
         if checkGarageBandInstallation() == false {
             completion?(false)
             return
         }
-        self.targetVC = vc
+
         if fileURLString.contains("http") {
             
 //            TSLoadingAnimation.showLoading(in: self.targetVC?.view)
@@ -72,7 +73,7 @@ class TSBandRingTool:NSObject {
                 ringLoadingView.isRotating = true
             }
 
-            TSCommonTool.downloadAndCacheFile(from: fileURLString) { [weak self] path, error in
+            TSCommonTool.downloadAndCacheFile(from: fileURLString,missingEx: "mp3") { [weak self] path, error in
                 guard let self = self else { return }
 //                TSLoadingAnimation.hideLoading()
                 ringLoadingView.removeFromSuperview()
@@ -187,11 +188,12 @@ extension TSBandRingTool : AVPlayerViewControllerDelegate, AVPictureInPictureCon
             tutorialPlayer?.replaceCurrentItem(with: playerItem)
         }
         tutorialPlayer?.allowsExternalPlayback = true
-        
+//        playContentView.backgroundColor = .red
         targetVC?.view.addSubview(playContentView)
         
         let layer = AVPlayerLayer(player: tutorialPlayer)
         layer.frame = CGRect(x: 0, y: 0, width: 1, height: 1)
+//        layer.backgroundColor = UIColor.yellow.cgColor
         playContentView.layer.addSublayer(layer)
 
         let pictureVC = AVPictureInPictureController(playerLayer: layer)