3.6.10(3)提审

Podfile

@@ -32,6 +32,7 @@ target 'TSLiveWallpaper' do
   
   pod "HXPhotoPicker/Picker" #只有选择器
   pod "HXPhotoPicker/Camera/Lite"#不包含定位功能
+  #pod "HXPhotoPicker/Editor" #只有编辑器
 end
 
 

Podfile.lock

@@ -159,6 +159,6 @@ SPEC CHECKSUMS:
   TYCyclePagerView: 2b051dade0615c70784aa34f40c646feeddb7344
   TZImagePickerController: d084a7b97c82d387e7669dd86dc9a9057500aacf
 
-PODFILE CHECKSUM: 303a47295259c1155536009c1e316f7497504520
+PODFILE CHECKSUM: 2f952644185b0f1e1c61383947fd4d148d034d07
 
 COCOAPODS: 1.16.2

TSLiveWallpaper/Business/TSAIListVC/TSAIListVC/TSAIListVC.swift

@@ -197,9 +197,7 @@ extension TSAIListVC {
                     closeSelectPhotos()
                 }
             }else{
-                let aiUploadPhotoVC = TSAIUploadPhotoVC(titleString: itemModel.name,upLoadImage: images.first!, generatorStyle: itemModel.style,disCoverItemModel: itemModel)
-                kPresentModalVC(target: target, modelVC: aiUploadPhotoVC)
-                target.push(aiUploadPhotoVC,animated: true) {
+                target.push(TSAIUploadPhotoVC(titleString: itemModel.name,upLoadImage: images.first!, generatorStyle: itemModel.style,disCoverItemModel: itemModel),animated: false) {
                     closeSelectPhotos()
                 }
             }
@@ -210,18 +208,17 @@ extension TSAIListVC {
 extension TSAIListVC{
     static var hintBaseVC:TSAIListHintBaseVC?
     static var photoPickerManager:TSPhotoPickerManager?
-    static var aiUploadPhotoVC:TSAIUploadPhotoVC?
     static func enterSelectPhotos(target:UIViewController,style:TSGeneratorImageStyle,complete: @escaping ([UIImage])->Void){
         if style.userDefaultsKey.count == 0 {
             self.pickSinglePhoto(target:target,style:style,complete:complete)
         }else{
-//            TSAIListHintBaseVC.userDefaultsKey = style.userDefaultsKey
-//            if TSAIListHintBaseVC.isShowUploadImageHint{
-//                TSAIListHintBaseVC.isShowUploadImageHint = false
-//                self.presentModalHintVC(target:target,style:style,complete:complete)
-//            }else {
+            TSAIListHintBaseVC.userDefaultsKey = style.userDefaultsKey
+            if TSAIListHintBaseVC.isShowUploadImageHint{
+                TSAIListHintBaseVC.isShowUploadImageHint = false
+                self.presentModalHintVC(target:target,style:style,complete:complete)
+            }else {
                 self.pickSinglePhoto(target:target,style:style,complete:complete)
-//            }
+            }
         }
     }
 

TSLiveWallpaper/Common/ViewTool/TSPhotoPickerManager/TSPhotoPickerManager.swift

@@ -37,8 +37,8 @@ class TSPhotoPickerManager: NSObject {
     var picker: PhotoPickerController?
     lazy var multipleConfig: PickerConfiguration = {
         var config = PickerConfiguration()
-        config.modalPresentationStyle = .automatic
-//        config.modalPresentationStyle = .fullScreen
+//        config.modalPresentationStyle = .automatic
+        config.modalPresentationStyle = .overFullScreen
         config.themeColor = .themeColor
         config.selectOptions = .photo
         config.selectMode = .multiple
@@ -57,15 +57,22 @@ class TSPhotoPickerManager: NSObject {
         
         config.navigationBarStyle = .black
     
-        config.photoSelectionTapAction = .quickSelect
-        config.photoList.bottomView.isHiddenPreviewButton = true
-        config.photoList.bottomView.isShowSelectedView = false
+//        config.photoSelectionTapAction = .quickSelect
+//        config.photoList.bottomView.isHiddenPreviewButton = true
+//        config.photoList.bottomView.isShowSelectedView = false
+        
+        config.photoSelectionTapAction = .preview
+        config.photoList.bottomView.isHiddenPreviewButton = false
+        config.photoList.bottomView.isShowSelectedView = true
+        config.photoList.previewStyle = .push
+        
+//        let cropSize = EditorConfiguration.ToolsView.Options(
+//            imageType: HX.ImageResource.ImageType,
+//            type: .cropSize
+//        )
+//        config.editor.toolsView = .init(toolOptions: [cropSize])
+//        config.editor.toolsView.toolOptions = [EditorConfiguration.ToolsView.Options.cropSize]
         
-//        config.photoSelectionTapAction = .preview
-//        config.photoList.bottomView.isHiddenPreviewButton = false
-//        config.photoList.bottomView.isShowSelectedView = true
-//        config.photoList.previewStyle = .present
-    
         var cameraConfig = SystemCameraConfiguration()
         cameraConfig.allowsEditing = false
         config.appearanceStyle = .dark
@@ -168,6 +175,7 @@ extension TSPhotoPickerManager: PhotoPickerControllerDelegate {
     func pickerController(_ pickerController: PhotoPickerController, didFinishSelection result: PickerResult) {
         result.getImage(compressionScale: 1.0) { images in
             self.completionHandler?(images)
+            pickerController.dismiss(animated: true, completion: nil)
         }
     }