2.6(3)打包

AIEmoji.xcodeproj/project.pbxproj

@@ -1940,12 +1940,12 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AIEmoji/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = ArtVibe;
+				INFOPLIST_KEY_CFBundleDisplayName = GhibliX;
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Allow us to access Photos in order to save emoji to your device.";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
@@ -1979,12 +1979,12 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AIEmoji/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = ArtVibe;
+				INFOPLIST_KEY_CFBundleDisplayName = GhibliX;
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Allow us to access Photos in order to save emoji to your device.";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;

AIEmoji/Business/TSGenmojiVC/TSGenmojiVC/View/TSGenmojiColSectionView.swift

@@ -22,18 +22,19 @@ class TSGenmojiColSectionView: TSBaseCollectionnReusableView {
     }()
     
     override func creatUI() {
+        let centerYOffset = 8.0
         bgContentView.addSubview(leftLab)
         bgContentView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(dismissKeyboard)))
         leftLab.snp.makeConstraints { make in
             make.leading.equalTo(16)
-            make.centerY.equalToSuperview()
+            make.centerY.equalToSuperview().offset(centerYOffset)
         }
         
         bgContentView.addSubview(delBtn)
         delBtn.snp.makeConstraints { make in
             make.trailing.equalTo(-6)
             make.width.height.equalTo(40)
-            make.centerY.equalToSuperview()
+            make.centerY.equalToSuperview().offset(centerYOffset)
         }
     }
     

AIEmoji/Business/TSPTPGeneratorVC/TSAIPhotoGeneratorBaseVC/TSAIPhotoBrowseVC.swift

@@ -57,21 +57,21 @@ class TSAIPhotoBrowseVC: TSBaseVC {
     }()
     
     
-    lazy var leftBtn: UIButton = {
-        let leftBtn = UIButton.createButton(image: UIImage(named: "page_left")){ [weak self]  in
-            guard let self = self else { return }
-            self.collectionView.scrollToItem(at:  IndexPath(item: self.currentIndex-1, section: 0), at: .left, animated: true)
-        }
-        return leftBtn
-    }()
-    
-    lazy var rightBtn: UIButton = {
-        let rightBtn = UIButton.createButton(image: UIImage(named: "page_right")){ [weak self]  in
-            guard let self = self else { return }
-            self.collectionView.scrollToItem(at: IndexPath(item: self.currentIndex+1, section: 0), at: .left, animated: true)
-        }
-        return rightBtn
-    }()
+//    lazy var leftBtn: UIButton = {
+//        let leftBtn = UIButton.createButton(image: UIImage(named: "page_left")){ [weak self]  in
+//            guard let self = self else { return }
+//            self.collectionView.scrollToItem(at:  IndexPath(item: self.currentIndex-1, section: 0), at: .left, animated: true)
+//        }
+//        return leftBtn
+//    }()
+//    
+//    lazy var rightBtn: UIButton = {
+//        let rightBtn = UIButton.createButton(image: UIImage(named: "page_right")){ [weak self]  in
+//            guard let self = self else { return }
+//            self.collectionView.scrollToItem(at: IndexPath(item: self.currentIndex+1, section: 0), at: .left, animated: true)
+//        }
+//        return rightBtn
+//    }()
         
 
     //保存按钮
@@ -103,19 +103,19 @@ class TSAIPhotoBrowseVC: TSBaseVC {
             make.edges.equalTo(0)
         }
         
-        contentView.addSubview(leftBtn)
-        leftBtn.snp.makeConstraints { make in
-            make.leading.equalTo(17)
-            make.centerY.equalToSuperview()
-            make.width.height.equalTo(40)
-        }
-        
-        contentView.addSubview(rightBtn)
-        rightBtn.snp.makeConstraints { make in
-            make.trailing.equalTo(-18)
-            make.centerY.equalToSuperview()
-            make.width.height.equalTo(40)
-        }
+//        contentView.addSubview(leftBtn)
+//        leftBtn.snp.makeConstraints { make in
+//            make.leading.equalTo(17)
+//            make.centerY.equalToSuperview()
+//            make.width.height.equalTo(40)
+//        }
+//        
+//        contentView.addSubview(rightBtn)
+//        rightBtn.snp.makeConstraints { make in
+//            make.trailing.equalTo(-18)
+//            make.centerY.equalToSuperview()
+//            make.width.height.equalTo(40)
+//        }
         
         DispatchQueue.main.async {
 //        kDelayMainShort {
@@ -180,20 +180,20 @@ class TSAIPhotoBrowseVC: TSBaseVC {
 extension TSAIPhotoBrowseVC {
     
     func reloadUI() {
-        //判断前后是否还有,以此来确定左右翻页按钮
-        var isHiddenLeft = false
-        var isHiddenRight = false
-        if dataModelArray.count == 1{
-            isHiddenLeft = true
-            isHiddenRight = true
-        }else if currentIndex == 0 {
-            isHiddenLeft = true
-        }else if currentIndex+1 >= dataModelArray.count {
-            isHiddenRight = true
-        }
-        
-        leftBtn.isHidden = isHiddenLeft
-        rightBtn.isHidden = isHiddenRight
+//        //判断前后是否还有,以此来确定左右翻页按钮
+//        var isHiddenLeft = false
+//        var isHiddenRight = false
+//        if dataModelArray.count == 1{
+//            isHiddenLeft = true
+//            isHiddenRight = true
+//        }else if currentIndex == 0 {
+//            isHiddenLeft = true
+//        }else if currentIndex+1 >= dataModelArray.count {
+//            isHiddenRight = true
+//        }
+//        
+//        leftBtn.isHidden = isHiddenLeft
+//        rightBtn.isHidden = isHiddenRight
     }
 }
 
@@ -225,6 +225,14 @@ extension TSAIPhotoBrowseVC:UICollectionViewDataSource,UICollectionViewDelegate
         return cell
     }
     
+    func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
+        guard let cell = cell as? TSAIPhotoBrowseCell else { return }
+        
+        if let model = dataModelArray.safeObj(At: indexPath.item){
+            cell.model = model
+        }
+    }
+    
 }
 
 
@@ -278,24 +286,24 @@ class TSAIPhotoBrowseCell : TSBaseCollectionCell{
             make.trailing.equalTo(5)
         }
         
-        contentView.addSubview(exampleView)
-        exampleView.snp.makeConstraints { make in
-            make.bottom.equalTo(-(44+8+k_Height_safeAreaInsetsBottom()+20))
-            make.centerX.equalToSuperview()
-            make.height.equalTo(20)
-        }
+//        contentView.addSubview(exampleView)
+//        exampleView.snp.makeConstraints { make in
+//            make.bottom.equalTo(-(44+8+k_Height_safeAreaInsetsBottom()+20))
+//            make.centerX.equalToSuperview()
+//            make.height.equalTo(20)
+//        }
         
     }
     
     var model:TSGenmojiModel = TSGenmojiModel(){
         didSet{
-            
+            dePrint("TSAIPhotoBrowseCell didSet model")
             if model.modelType == .example {
-                exampleView.isHidden = false
+//                exampleView.isHidden = false
                 netWorkImageView.image = UIImage(named:model.response.resultUrl)
                 netWorkImageView.adaptiveScale()
             }else{
-                exampleView.isHidden = true
+//                exampleView.isHidden = true
                 netWorkImageView.setAsyncImage(urlString: model.response.resultUrl,placeholder: kPlaceholderImage,contentMode: .scaleAspectFit, completion: { [weak self] image in
                     guard let self = self else { return }
                     netWorkImageView.adaptiveScale()

AIEmoji/Business/TSPTPGeneratorVC/TSPhotoToPhotoVC/Cell/TSPTPSelectStyleCell.swift

@@ -56,7 +56,7 @@ class TSPTPSelectStyleCell : TSBaseCollectionCell{
         if let itemModel = object as? TSGenmojiCoLItemModel{
             dataArray = itemModel.ptpStyleModels
             if self.dataArray.count > 0 {
-                kDelayMainShort{
+                DispatchQueue.main.async {
                     self.styleCollectionView.selectItem(at: self.currentIndexPath, animated: true, scrollPosition: .centeredHorizontally)
                 }
             }

AIEmoji/Business/TSPTPGeneratorVC/TSPhotoToPhotoVC/TSPhotoToPhotoVC.swift

@@ -101,18 +101,23 @@ class TSPhotoToPhotoVC: TSBaseVC {
                             guard let self = self else { return }
                             if let image = image {
                                 viewModel.upLoadImage = image
-                                cp.collectionView.reloadSections(IndexSet(integer: 0))
-//                                viewModel.uploadImage()
+                                UIView.performWithoutAnimation {
+                                    cp.collectionView.reloadSections(IndexSet(integer: 0))
+                                    //                                viewModel.uploadImage()
+                                }
                             }
                         }
                     }else if text == "delete"{//删除图片
                         viewModel.upLoadImage = nil
-                        cp.collectionView.reloadSections(IndexSet(integer: 0))
+                        UIView.performWithoutAnimation {
+                            cp.collectionView.reloadSections(IndexSet(integer: 0))
+                        }
                     }
                 }
             }else if let model = cellCp as? TSPTPStyleModel ,indexPath == IndexPath(item: 0, section: 1) {
                 //选择了某个样式
                 viewModel.selectedPTPStyleModel = model
+                kSetBtnVipIcon(btn: self.submitBtn, show: model.isVip)
             }
         }
         
@@ -214,6 +219,7 @@ class TSPhotoToPhotoVC: TSBaseVC {
     override func dealThings() {
         NotificationCenter.default.addObserver(self, selector: #selector(vipInfoChanged), name: .kPurchaseDidChanged, object: nil)
         updateVipView()
+        kSetBtnVipIcon(btn: self.submitBtn, show: self.viewModel.selectedPTPStyleModel?.isVip ?? false)
     }
     
     @objc func vipInfoChanged() {

AIEmoji/Business/TSTextGeneralPictureVC/TSTTPInputVC/TSTTPInputVC.swift

@@ -50,6 +50,7 @@ class TSTTPInputVC: TSBaseVC {
         promptStyleView.selectedValueBlock = { [weak self] model in
             guard let self = self else { return }
             viewModel.selectPromptModel = model
+            kSetBtnVipIcon(btn: self.creatBtnView.creatBtn, show: model.isVip)
         }
         return promptStyleView
     }()
@@ -102,6 +103,7 @@ class TSTTPInputVC: TSBaseVC {
     override func dealThings() {
         updateVipView()
         NotificationCenter.default.addObserver(self, selector: #selector(vipInfoChanged), name: .kPurchaseDidChanged, object: nil)
+        kSetBtnVipIcon(btn: self.creatBtnView.creatBtn, show: self.viewModel.selectPromptModel?.isVip ?? false)
     }
     
     @objc func vipInfoChanged() {

AIEmoji/Business/TSTextGeneralPictureVC/TSTTPInputVC/View/TSTTPStyleView.swift

@@ -13,7 +13,7 @@ class TSTTPStyleView:TSBaseView {
         didSet{
             styleCollectionView.reloadData()
             if dataArray.count > 0 {
-                self.styleCollectionView.selectItem(at: self.currentIndexPath, animated: true, scrollPosition: .centeredHorizontally)
+                self.styleCollectionView.selectItem(at: self.currentIndexPath, animated: false, scrollPosition: .centeredHorizontally)
             }
         }
     }