3.6.17(1)

AIEmoji/Business/TSAILIstVC/TSAIPhotoGeneratorBaseVC/TSAIPhotoGeneratorBaseVM/TSAIListPhotoGeneratorBaseVM.swift

@@ -154,10 +154,7 @@ class TSAIListPhotoGeneratorBaseVM {
         stateDatauPblished = (.progressString(generating(progress: 0.0)),nil)
         
         var urlType:TSNeURLType = .changeAge
-        var postDict:[String:Any] = [
-            "device":getUserInfoJsonString(),
-            "imageUrl":imageUrl
-        ]
+        var postDict:[String:Any] = [:]
         switch generatorModel.generatorStyle {
         case .ageOld:
         postDict = ["targetAge":70
@@ -203,6 +200,8 @@ class TSAIListPhotoGeneratorBaseVM {
                         ]
             postDict.removeValue(forKey: "imageUrl")
         }
+        postDict["device"] = getUserInfoJsonString()
+        postDict["imageUrl"] = imageUrl
         creatRequest = TSNetworkShared.post(urlType: urlType,parameters: postDict) { [weak self] data,error in
             guard let self = self else { return }
             

AIEmoji/Common/View/TSPhotoPickerManager/TSPhotoPickerManager.swift

@@ -65,7 +65,9 @@ class TSPhotoPickerManager: NSObject {
         if #available(iOS 13.0, *) {
             imagePicker.overrideUserInterfaceStyle = .dark
         }
-        viewController?.present(imagePicker, animated: true, completion: nil)
+        viewController?.present(imagePicker, animated: true) {
+            TSToastShared.hideLoading()
+        }
     }
     
     /// 显示权限提示
@@ -92,7 +94,6 @@ class TSPhotoPickerManager: NSObject {
 // MARK: - UIImagePickerControllerDelegate & UINavigationControllerDelegate (iOS 14 以下)
 extension TSPhotoPickerManager: UIImagePickerControllerDelegate, UINavigationControllerDelegate {
     func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
-        TSToastShared.hideLoading()
 //        picker.dismiss(animated: true) {
             if let image = info[.originalImage] as? UIImage {
                 self.completionHandler?(image,info[.phAsset] as? PHAsset )
@@ -108,7 +109,6 @@ extension TSPhotoPickerManager: UIImagePickerControllerDelegate, UINavigationCon
     }
     
     func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {
-        TSToastShared.hideLoading()
 //        self.completionHandler?(nil,nil)
 //        if completionSizeHandler == nil {
             picker.dismiss(animated: true, completion: nil)