1.7(4)

AIRingtone/Business/TSAIRintoneVC/TSGeneralRintoneVC/TSGeneralRintoneVC+Event.swift

@@ -6,16 +6,16 @@
 //
 
 extension UIViewController {
-    func findFirstTransitionView() -> UIView? {
-        var currentView = self.view
-        while currentView != nil {// 判断当前视图是否是 UITransitionView
-            if String(describing: type(of: currentView!)) == "UITransitionView" {
-                return currentView
-            }
-            currentView = currentView?.superview
-        }
-        return nil // 如果没有找到，返回 nil
-    }
+//    func findFirstTransitionView() -> UIView? {
+//        var currentView = self.view
+//        while currentView != nil {// 判断当前视图是否是 UITransitionView
+//            if String(describing: type(of: currentView!)) == "UITransitionView" {
+//                return currentView
+//            }
+//            currentView = currentView?.superview
+//        }
+//        return nil // 如果没有找到，返回 nil
+//    }
 }
 extension TSGeneralRintoneVC {
     
@@ -31,10 +31,10 @@ extension TSGeneralRintoneVC {
         }
     }
     
-    func hiddenSelfVC(hidden:Bool){
-        self.view.isHidden = hidden
-        findFirstTransitionView()?.isHidden = hidden
-    }
+//    func hiddenSelfVC(hidden:Bool){
+//        self.view.isHidden = hidden
+//        findFirstTransitionView()?.isHidden = hidden
+//    }
 
 }
 extension TSGeneralRintoneVC {
@@ -43,11 +43,11 @@ extension TSGeneralRintoneVC {
         switch state {
             case .failed(let errorStr):
                 audioPlayer.stop()
-                hiddenSelfVC(hidden: false)
+//                hiddenSelfVC(hidden: false)
                 showError(text: errorStr)
             case .success:
                 audioPlayer.stop()
-                hiddenSelfVC(hidden: false)
+//                hiddenSelfVC(hidden: false)
                 if let model = model {
                     showSuccess(model: model)
                 }else{

AIRingtone/Business/TSAIRintoneVC/TSGeneralRintoneVC/TSGeneralRintoneVC.swift

@@ -12,9 +12,11 @@ class TSGeneralRintoneVC: TSBottomAlertVC {
     
     var prompt:String
     var promptSort:String
-    init(prompt: String,promptSort: String,complete:@escaping ((TSActionInfoModel)->Void)) {
+    var showInfoModel:TSActionInfoModel?
+    init(prompt: String,promptSort: String,showInfoModel:TSActionInfoModel? = nil,complete:@escaping ((TSActionInfoModel)->Void)) {
         self.prompt = prompt
         self.promptSort = promptSort
+        self.showInfoModel = showInfoModel
         self.complete = complete
         super.init()
     }
@@ -85,8 +87,8 @@ class TSGeneralRintoneVC: TSBottomAlertVC {
     
     @objc func clickBackstageBtn() {
 //        viewModel.cancelAllRequest()
-//        self.dismiss(animated: true, completion: nil)
-        hiddenSelfVC(hidden: true)
+        self.dismiss(animated: true, completion: nil)
+//        hiddenSelfVC(hidden: true)
 
     }
     
@@ -131,7 +133,13 @@ class TSGeneralRintoneVC: TSBottomAlertVC {
 //            guard let self = self else { return }
 //            self.upDateView(state: state, model: model)
 //        }.store(in: &cancellable)
-        creatRintone()
+        
+        if let showInfoModel = showInfoModel {
+            showSuccess(model: showInfoModel)
+            updateInfoModel(model: showInfoModel)
+        }else {
+            creatRintone()
+        }
         ringView.monitorPlayStateDefaultHandle()
     }
     
@@ -143,8 +151,8 @@ class TSGeneralRintoneVC: TSBottomAlertVC {
             guard let self = self else { return }
             self.upDateView(state: state, model: model)
         }.store(in: &cancellable)
-        operation.creatRintone(oldModel: self.infoModel, prompt: prompt, promptSort: promptSort)
-
+        operation.creatRintone(oldModel: nil, prompt: prompt, promptSort: promptSort)
+//        operation.creatRintone(oldModel: self.infoModel, prompt: prompt, promptSort: promptSort)
     }
 }
 

AIRingtone/Business/TSAIRintoneVC/TSTextGeneralRintoneVC/TSTextGeneralRintoneVC.swift

@@ -121,12 +121,15 @@ extension TSTextGeneralRintoneVC {
             reloadUIBlock?()
         }
         
-        //        kPresentModalVC(target: self, modelVC: gennerateVC,transitionStyle: .crossDissolve)
-        if let rootVC = WindowHelper.getRootViewController() {
-            gennerateVC.modalPresentationStyle = .overFullScreen
-            gennerateVC.modalTransitionStyle = .crossDissolve
-            rootVC.present(gennerateVC, animated: true)
-        }
+        kPresentModalVC(target: self, modelVC: gennerateVC,transitionStyle: .crossDissolve)
+        
+//        if let rootVC = WindowHelper.getRootViewController() {
+//            gennerateVC.modalPresentationStyle = .overFullScreen
+//            gennerateVC.modalTransitionStyle = .crossDissolve
+//            rootVC.present(gennerateVC, animated: true)
+////            gennerateVC.hidesBottomBarWhenPushed = true
+////            rootVC.navigationController?.pushViewController(gennerateVC, animated: true)
+//        }
     }
 
     func setCreatBtnEnabled() {

AIRingtone/Common/Tool/OperationQueue/TSGenerateBaseOperation/TSGenerateRintoneOperation.swift

@@ -55,6 +55,12 @@ class TSGenerateRintoneOperation: TSGenerateBaseOperation , @unchecked Sendable{
     
     override func handleGenerateSuccess() {
         kPurchaseToolShared.useOnceForFree(type: .ringtones)
+        let gennerateVC = TSGeneralRintoneVC(prompt:"",promptSort: "",showInfoModel: currentActionInfoModel){ model in }
+        if let rootVC = WindowHelper.getCurrentViewController() {
+            gennerateVC.modalPresentationStyle = .overFullScreen
+            gennerateVC.modalTransitionStyle = .crossDissolve
+            rootVC.present(gennerateVC, animated: true)
+        }
     }
     
 

AIRingtone/Common/Tool/TSBandRingTool/TSBandRingTool.swift

@@ -122,7 +122,7 @@ class TSBandRingTool:NSObject {
     
     func shareRing(fileUrl: URL) {
         DispatchQueue.main.async {
-            self.showTutorialVideo()
+//            self.showTutorialVideo()
             
             let vc = UIActivityViewController(activityItems: [fileUrl], applicationActivities: nil)
             // 排除不需要的活动类型
@@ -144,6 +144,7 @@ class TSBandRingTool:NSObject {
 //                .openInIBooks
 //            ]
             self.targetVC?.present(vc, animated: true, completion: {
+                self.showTutorialVideo()
                 self.tryStartPictureInPicture()
             })