100Years 3 tygodni temu
rodzic
commit
c0c51f90a4

+ 2 - 2
KittensTravelNotes.xcodeproj/project.pbxproj

@@ -942,7 +942,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = KittensTravelNotes/Info.plist;
@@ -978,7 +978,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = KittensTravelNotes/Info.plist;

+ 4 - 1
KittensTravelNotes/Business/Plog/TSAIPhotoGeneratorVC/TSAIPhotoGeneratoBaserVC/TSAIPhotoGeneratoBaserVC+Image.swift

@@ -65,6 +65,9 @@ extension TSAIPhotoGeneratoBaserVC {
     
     @objc func clickNetworkImageView(){
         guard let infoModel = infoModel else { return }
-        kPresentModalVC(target: self, modelVC: TSImageBrowseVC(dataModelArray: [infoModel], currentIndex: 0))
+        kPresentModalVC(target: self, modelVC: TSImageBrowseVC(dataModelArray: [infoModel], currentIndex: 0,saveBlock: { [weak self]  in
+            guard let self = self else { return }
+            isSavePhotoMark = true
+        }))
     }
 }

+ 13 - 4
KittensTravelNotes/Business/Plog/TSPlogBootImageVC/TSImageBrowseVC.swift

@@ -11,11 +11,12 @@ private let videoCellId = "TSAIVideoBrowseCell"
 import RealmSwift
 class TSImageBrowseVC: TSBaseVC {
     var dataModelArray:[TSActionInfoModel]
-    
     init(dataModelArray: [TSActionInfoModel],
-         currentIndex: Int) {
+         currentIndex: Int,
+         saveBlock:(()->Void)? = nil) {
         self.dataModelArray = dataModelArray
         self.currentIndex = currentIndex
+        self.saveBlock = saveBlock
         super.init()
     }
     
@@ -23,6 +24,10 @@ class TSImageBrowseVC: TSBaseVC {
         fatalError("init(coder:) has not been implemented")
     }
     
+    
+    var saveBlock:(()->Void)?
+    
+    
     var currentImage:UIImage?{
         let cell = collectionView.cellForItem(at: IndexPath(item: currentIndex, section: 0)) as? TSPhotoBrowseCell
         var image = cell?.netWorkImageView.image
@@ -185,8 +190,10 @@ class TSImageBrowseVC: TSBaseVC {
 //        }else{
             TSImageStoreTool.downloadImageWithProgress(urlString: urlString) { image in
                 if let image = image{
-                    PhotoManagerShared.saveToAlbum(image) { success, error in
+                    PhotoManagerShared.saveToAlbum(image) { [weak self] success, error in
+                        guard let self = self else { return }
                         if success {
+                            saveBlock?()
                             kSaveSuccesswShared.show(atView: self.view)
                         }else{
                             debugPrint(error)
@@ -194,8 +201,10 @@ class TSImageBrowseVC: TSBaseVC {
                     }
                 }else{//如果服务器取不到,直接保存当前显示的图片
                     if let currentImage = self.currentImage {
-                        PhotoManagerShared.saveToAlbum(currentImage) { success, error in
+                        PhotoManagerShared.saveToAlbum(currentImage) { [weak self] success, error in
+                            guard let self = self else { return }
                             if success {
+                                saveBlock?()
                                 kSaveSuccesswShared.show(atView: self.view)
                             }else{
                                 debugPrint(error)

+ 3 - 3
KittensTravelNotes/Business/Recollection/TSRecollectionVC.swift

@@ -212,9 +212,9 @@ extension TSRecollectionVC: UICollectionViewDataSource ,UICollectionViewDelegate
             kPresentModalVC(target: self, modelVC: browseVC,transitionStyle: .crossDissolve)
             
 //            let gennerateVC = TSAIPhotoGeneratorVC(generatorModel: TSAIListPhotoGeneratorModel(upLoadImage: UIImage(), generatorStyle:.ptp),infoModel: item.getModel()) { model in }
-//             gennerateVC.modalPresentationStyle = .overFullScreen
-//             gennerateVC.modalTransitionStyle = .crossDissolve
-//             self.present(gennerateVC, animated: true)
+//            gennerateVC.modalPresentationStyle = .overFullScreen
+//            gennerateVC.modalTransitionStyle = .crossDissolve
+//            self.present(gennerateVC, animated: true)
         }
            
     }