3.6.22(1)打包

AIEmoji.xcodeproj/project.pbxproj

@@ -106,7 +106,6 @@
 		A82D607B2DB7724700596190 /* TSAIExpandStyleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A82D607A2DB7724600596190 /* TSAIExpandStyleView.swift */; };
 		A82D607D2DB7748800596190 /* ai_expand_image_style.json in Resources */ = {isa = PBXBuildFile; fileRef = A82D607C2DB7748200596190 /* ai_expand_image_style.json */; };
 		A82D607F2DB7772200596190 /* TSAIExpandImageVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = A82D607E2DB7771B00596190 /* TSAIExpandImageVM.swift */; };
-		A82D60812DB7A1E600596190 /* activePhoto.gif in Resources */ = {isa = PBXBuildFile; fileRef = A82D60802DB7A1E600596190 /* activePhoto.gif */; };
 		A82D60832DB87D1A00596190 /* TSAIExpandChangeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A82D60822DB87D1900596190 /* TSAIExpandChangeView.swift */; };
 		A82D608B2DB9CE7E00596190 /* MXParallaxHeader+Ex.swift in Sources */ = {isa = PBXBuildFile; fileRef = A82D608A2DB9CE7A00596190 /* MXParallaxHeader+Ex.swift */; };
 		A82D60952DB9D45900596190 /* TSGeneratePosterOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = A82D608D2DB9D45900596190 /* TSGeneratePosterOperation.swift */; };
@@ -129,7 +128,6 @@
 		A83405032DA35CB700C140E4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A83405012DA35CB700C140E4 /* InfoPlist.strings */; };
 		A83405202DA3ADA900C140E4 /* TSPhotoSizeHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = A834051F2DA3ADA600C140E4 /* TSPhotoSizeHelper.swift */; };
 		A83A6A822E1F619A0084197A /* launch1.png in Resources */ = {isa = PBXBuildFile; fileRef = A83A6A812E1F619A0084197A /* launch1.png */; };
-		A83F28B22E17892B009A4975 /* animated_aiBaby.apng in Resources */ = {isa = PBXBuildFile; fileRef = A83F28B12E17892B009A4975 /* animated_aiBaby.apng */; };
 		A85E478F2D67115A0018D62D /* TSTextGeneralPictureVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A85E478E2D6711590018D62D /* TSTextGeneralPictureVC.swift */; };
 		A85E47922D6728A00018D62D /* TSTextGeneralPictureVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = A85E47912D67289F0018D62D /* TSTextGeneralPictureVM.swift */; };
 		A85E47962D672ADA0018D62D /* TSTextPicGennerateVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A85E47952D672AD90018D62D /* TSTextPicGennerateVC.swift */; };
@@ -423,7 +421,6 @@
 		A82D607A2DB7724600596190 /* TSAIExpandStyleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSAIExpandStyleView.swift; sourceTree = "<group>"; };
 		A82D607C2DB7748200596190 /* ai_expand_image_style.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = ai_expand_image_style.json; sourceTree = "<group>"; };
 		A82D607E2DB7771B00596190 /* TSAIExpandImageVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSAIExpandImageVM.swift; sourceTree = "<group>"; };
-		A82D60802DB7A1E600596190 /* activePhoto.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = activePhoto.gif; sourceTree = "<group>"; };
 		A82D60822DB87D1900596190 /* TSAIExpandChangeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSAIExpandChangeView.swift; sourceTree = "<group>"; };
 		A82D608A2DB9CE7A00596190 /* MXParallaxHeader+Ex.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MXParallaxHeader+Ex.swift"; sourceTree = "<group>"; };
 		A82D608D2DB9D45900596190 /* TSGeneratePosterOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSGeneratePosterOperation.swift; sourceTree = "<group>"; };
@@ -467,7 +464,6 @@
 		A834051A2DA3828E00C140E4 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		A834051F2DA3ADA600C140E4 /* TSPhotoSizeHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSPhotoSizeHelper.swift; sourceTree = "<group>"; };
 		A83A6A812E1F619A0084197A /* launch1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = launch1.png; sourceTree = "<group>"; };
-		A83F28B12E17892B009A4975 /* animated_aiBaby.apng */ = {isa = PBXFileReference; lastKnownFileType = file; path = animated_aiBaby.apng; sourceTree = "<group>"; };
 		A85E478E2D6711590018D62D /* TSTextGeneralPictureVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSTextGeneralPictureVC.swift; sourceTree = "<group>"; };
 		A85E47912D67289F0018D62D /* TSTextGeneralPictureVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSTextGeneralPictureVM.swift; sourceTree = "<group>"; };
 		A85E47952D672AD90018D62D /* TSTextPicGennerateVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSTextPicGennerateVC.swift; sourceTree = "<group>"; };
@@ -2322,7 +2318,6 @@
 			isa = PBXGroup;
 			children = (
 				A8EB38422E13FEF3002F90E9 /* Gift.apng */,
-				A83F28B12E17892B009A4975 /* animated_aiBaby.apng */,
 				A8708A522E0D4FA000601686 /* discover_0_AnimatePhoto1.gif */,
 				A83404D62D9D34ED00C140E4 /* Kelsi-fill.otf */,
 				A83404D72D9D34ED00C140E4 /* Kelsi-Regular.otf */,
@@ -2333,7 +2328,6 @@
 				A8F7D33D2DF18A1800DDBECE /* arrow.gif */,
 				A8FDB17F2DCC8C5600E9919B /* catPaw_left.gif */,
 				A8FDB1802DCC8C5600E9919B /* catPaw_right.gif */,
-				A82D60802DB7A1E600596190 /* activePhoto.gif */,
 				A80EDE072D700395003CD332 /* rotatingAnimation_1.gif */,
 				A89EA6972D5B19F0000EB181 /* Butterfly🦋.json */,
 				A80E723E2D3F4D3000C64288 /* Universe🌍.json */,
@@ -2461,7 +2455,6 @@
 				A83404D92D9D34ED00C140E4 /* Kelsi-Regular.otf in Resources */,
 				A80E72482D3F4F0A00C64288 /* templates.json in Resources */,
 				A83404CC2D9BEED800C140E4 /* Poppins-BlackItalic.ttf in Resources */,
-				A83F28B22E17892B009A4975 /* animated_aiBaby.apng in Resources */,
 				A87587162D81734300286A66 /* text_to_photo_style.json in Resources */,
 				A8FDB1812DCC8C5600E9919B /* catPaw_left.gif in Resources */,
 				A8F7D33E2DF18A1800DDBECE /* arrow.gif in Resources */,
@@ -2470,7 +2463,6 @@
 				A83A6A822E1F619A0084197A /* launch1.png in Resources */,
 				A8FDB1822DCC8C5600E9919B /* catPaw_right.gif in Resources */,
 				A8EEADD42D3E6C660032C5A0 /* Flower💐.json in Resources */,
-				A82D60812DB7A1E600596190 /* activePhoto.gif in Resources */,
 				A8EEADE92D3E76D90032C5A0 /* Beauty👸.json in Resources */,
 				A89EA6982D5B1A01000EB181 /* Butterfly🦋.json in Resources */,
 				A8EEADE02D3E75900032C5A0 /* Crystal🔮.json in Resources */,
@@ -2876,7 +2868,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2892,7 +2884,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.21;
+				MARKETING_VERSION = 3.6.22;
 				PRODUCT_BUNDLE_IDENTIFIER = com.girl.music.wallpaper;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -2915,7 +2907,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2931,7 +2923,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.21;
+				MARKETING_VERSION = 3.6.22;
 				PRODUCT_BUNDLE_IDENTIFIER = com.girl.music.wallpaper;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

AIEmoji/Assets.xcassets/Discover/discover_aiBaby.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "discover_aiBaby@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "discover_aiBaby@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

AIEmoji/Business/TSAILIstVC/TSPredictBabyVC/TSFutureBabyVC.swift

@@ -153,10 +153,10 @@ extension TSFutureBabyVC {
         let getSex = getSex(genderStr: genderStr)
         var additionalPrompt = ""
         if !getSex.isEmpty {
-            additionalPrompt = additionalPrompt + getSex
+            additionalPrompt = additionalPrompt + " " + getSex
         }
         if !ageStr.isEmpty {
-            additionalPrompt = additionalPrompt + ","+ageStr
+            additionalPrompt = additionalPrompt + ", " + ageStr + " years old."
         }
         if let promptModel = TSGenerateModel(json: kTSDiscoverVM.futureBaby){
             aiGeneratorModel.prompt = promptModel.prompt + additionalPrompt

AIEmoji/Business/TSPurchaseMembershipVC/TSPurchasePromotionalVC/TSPurchasePromotionalCountDownTime.swift

@@ -91,11 +91,23 @@ class TSPurchasePromotionalCountDownTime {
     }
     
     var isTodayAvailable:Bool{
+//        return true
+        //每天限制只弹出一次
         guard let timeModel = timeModel else { return true }
         return timeModel.startDayString != dateFormatter.string(from: Date())
     }
     
+
+    //付费页面返回出折扣时机：30分钟倒计时内每次返回都出折扣
+    var isRepeatShowGift:Bool{
+        return isHaveTime == true
+    }
+    
     var isShowGift:Bool{
+        if isRepeatShowGift {
+            return true
+        }
+        
         if isTodayAvailable == true , isHaveTime == false {
             return true
         }

AIEmoji/Business/TSPurchaseMembershipVC/TSPurchaseVC.swift

@@ -52,7 +52,7 @@ class TSPurchaseVC: TSBaseVC {
         let imageComparisonView = TYCycleImageComparisonView()
         imageComparisonView.frame = CGRect(x: 0, y: 0, width: k_ScreenWidth, height: 532*kDesignScale)
         imageComparisonView.itemModelArray = [
-//            TSImageComparisonModel(oldImage: UIImage(named: "image_comparison_old_0")!, newImage: UIImage(named: "image_comparison_new_0")!),
+            TSImageComparisonModel(oldImage: UIImage(named: "image_comparison_old_0")!, newImage: UIImage(named: "image_comparison_new_0")!),
             TSImageComparisonModel(oldImage: UIImage(named: "image_comparison_old_1")!, newImage: UIImage(named: "image_comparison_new_1")!),
             TSImageComparisonModel(oldImage: UIImage(named: "image_comparison_old_2")!, newImage: UIImage(named: "image_comparison_new_2")!),
             TSImageComparisonModel(oldImage: UIImage(named: "image_comparison_old_3")!, newImage: UIImage(named: "image_comparison_new_3")!),

AIEmoji/Business/TSTabBarController/TSTabBarController.swift

@@ -150,7 +150,7 @@ extension TSTabBarController {
 extension TSTabBarController {
     @objc func refreshPurchasePromotional() {
         if TSPurchasePromotionalVC.showGift,kPurchaseCountDownTime.isNeedCheck == true{
-            kMainAfter(1.0) {
+            kMainAfter(0.3) {
                 let updateAlertVC = TSPurchasePromotionalVC(isAnimation: true)
                 updateAlertVC.modalPresentationStyle = .overFullScreen
                 updateAlertVC.modalTransitionStyle = .crossDissolve

AIEmoji/Business2/DisCover/Data/TSDiscoverViewModel+Dic.swift

@@ -248,7 +248,7 @@ extension TSDiscoverViewModel {
     var futureBaby:[String:Any]{
         [
             imageText: "AI Baby",
-            prompt:"AI-generated a child, blending the uploaded photo's parents' facial features, balanced genetic traits, realistic portrait, age-progression, gender-appropriate stylish clothing, playful yet natural expression, family resemblance, high-detail rendering, soft lighting.",
+            prompt:"Generate a highly realistic portrait of a future child, created by accurately analyzing and blending the facial features of the two uploaded parent photos. The child’s face should clearly reflect a thoughtful combination of both parents’ distinctive traits—such as eye shape, nose structure, lips, facial contours, skin tone, and hair texture. This is not a generic child: the image must visibly preserve and merge identifiable characteristics from both parents. Use age-progression techniques to depict a natural-looking child with a believable family resemblance. Style the child in age-appropriate, modern clothing, with a natural, playful expression and soft, flattering lighting. The final result should appear as a photorealistic portrait of a child that could truly be born from the two individuals in the provided photos.",
             isVip: true,
             model:kie
         ]

AIEmoji/Business2/DisCover/Data/TSDiscoverViewModel.swift

@@ -261,25 +261,38 @@ class TSDiscoverViewModel {
         return section
     }()
     
+//    lazy var babyCardSection: TSDiscoverSectionModel = {
+//        let section = TSDiscoverSectionModel()
+//        section.style = .fullCard
+//        section.items = [
+//            TSDiscoverItemModel(style: .futureBaby,
+//                                viewModel: TSDiscoverAnimationItemVM(
+//                                    title: "Future Baby".localized,
+//                                    info: "To see what will your future baby look like".localized,
+//                                    style: .apng,
+//                                    imageNameds: ["animated_aiBaby.apng"]
+//                                ),
+//                                generateModel: TSGenerateModel(json: futureBaby)),
+//        ]
+//        
+//        return section
+//    }()
+    
     lazy var babyCardSection: TSDiscoverSectionModel = {
         let section = TSDiscoverSectionModel()
         section.style = .fullCard
         section.items = [
             TSDiscoverItemModel(style: .futureBaby,
-                                viewModel: TSDiscoverAnimationItemVM(
-                                    title: "AI Baby Generator".localized,
-                                    info: "To see what will your future baby look like".localized,
-                                    style: .apng,
-                                    imageNameds: ["animated_aiBaby.apng"]
+                                viewModel: TSDiscoverBaseItemVM(
+                                    title: "Future Baby".localized,
+                                    imageNamed: "discover_aiBaby",
+                                    info: "To see what will your future baby look like".localized
                                 ),
                                 generateModel: TSGenerateModel(json: futureBaby)),
         ]
-        
         return section
     }()
     
-    
-    
 
     lazy var coolPersonalitySection: TSDiscoverSectionModel = {
         let section = TSDiscoverSectionModel()
@@ -566,7 +579,7 @@ class TSDiscoverViewModel {
             popularStylesSection,
             processPhotoSection,
             figuresToysSection,
-//            babyCardSection,
+            babyCardSection,
             animeCartoonSection,
             coolPersonalitySection,
             ttpCardSection,

AIEmoji/Business2/DisCover/TSPTPUploadImageVC/TSGennertatorStyleVC/TSGennertatorStyleVC.swift

@@ -25,7 +25,7 @@ class TSGennertatorStyleVC: TSBaseVC {
 //    }()
     
     var selectedValueBlock:((IndexPath,TSGenerateModel)->Void)?
-    
+    var scrollHandle:((Bool)->Void)?
     var dataArray: [TSGenerateModel] = [TSGenerateModel](){
         didSet{
             styleCollectionView.reloadData()
@@ -160,6 +160,40 @@ extension TSGennertatorStyleVC: UICollectionViewDataSource ,UICollectionViewDele
     }
 }
 
+
+extension TSGennertatorStyleVC: UIScrollViewDelegate {
+    // 开始拖拽（用户开始滚动）
+    func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
+        print("滚动开始")
+        scrollHandle?(true)
+    }
+    
+    // 正在滚动（滚动中）
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+//        print("滚动中，偏移量: \(scrollView.contentOffset)")
+    }
+    
+    // 结束拖拽（用户手指离开屏幕）
+    func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {
+        if !decelerate {
+            print("滚动完全停止（无减速动画）")
+        }
+        scrollHandle?(false)
+    }
+    
+    // 结束减速（滚动完全停止）
+    func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
+        print("滚动完全停止")
+//        scrollHandle?(false)
+    }
+    
+    // 以下方法组合可以准确判断滚动是否真正结束
+    func scrollViewDidEndScrollingAnimation(_ scrollView: UIScrollView) {
+        print("编程触发的滚动动画结束")
+//        scrollHandle?(false)
+    }
+}
+
 class TSGennertatorStyleCell: TSBaseCollectionCell {
     
     static let cellID = "TSGennertatorStyleCell"

AIEmoji/Business2/DisCover/TSPTPUploadImageVC/TSPTPUploadImageVC+View.swift

@@ -28,6 +28,11 @@ extension TSPTPUploadImageVC {
             
             setTitleText(model.imageText.localized)
         }
+        selectStyleVC.scrollHandle = { [weak self] scroll in
+            guard let self = self else { return }
+            
+            creatBtnView.isHidden = scroll
+        }
         return selectStyleVC
     }
     

AIEmoji/Business2/DisCover/TSPTPUploadImageVC/TSPTPUploadImageVC.swift

@@ -41,7 +41,7 @@ class TSPTPUploadImageVC: TSBaseVC {
         uploadView.snp.makeConstraints { make in
             make.leading.trailing.equalToSuperview()
             make.top.equalTo(8)
-            make.height.equalTo(313*kDesignScale)
+            make.height.equalTo(280*kDesignScale)
         }
         
         
@@ -55,7 +55,7 @@ class TSPTPUploadImageVC: TSBaseVC {
         
         contentView.addSubview(creatBtnView)
         creatBtnView.snp.makeConstraints { make in
-            make.bottom.equalTo(-20-k_Height_safeAreaInsetsBottom())
+            make.bottom.equalTo(-k_Height_safeAreaInsetsBottom())
             make.leading.equalTo(16)
             make.trailing.equalTo(-16)
             make.height.equalTo(48)

AIEmoji/Business2/DisCover/TSPTPUploadImageVC/View/TSUploadImageView.swift

@@ -85,7 +85,7 @@ class TSUploadImageView: TSBaseView {
         bgView.addSubview(upLoadView)
         upLoadView.snp.makeConstraints { make in
             make.center.equalToSuperview()
-            make.width.lessThanOrEqualTo(k_ScreenWidth - 80)
+            make.width.lessThanOrEqualTo(k_ScreenWidth - 96)
         }
 
         bgView.addSubview(uploadImageView)
@@ -114,8 +114,8 @@ class TSUploadImageView: TSBaseView {
         
         contentView.addSubview(uploadImageBgView)
         uploadImageBgView.snp.makeConstraints { make in
-            make.width.equalTo(313*kDesignScale)
-            make.height.equalTo(313*kDesignScale)
+            make.width.equalTo(280*kDesignScale)
+            make.height.equalTo(280*kDesignScale)
             make.centerX.equalToSuperview()
         }
         

AIEmoji/Common/Purchase/TSPurchaseManager.swift

@@ -265,9 +265,9 @@ public class PurchaseManager: NSObject {
     }
 
     @objc public var isVip: Bool {
-//#if DEBUG
-//        return vipType != .none
-//#endif
+#if DEBUG
+        return vipType != .none
+#endif
         guard let expiresDate = expiredDate else {
             return false
         }
@@ -279,9 +279,9 @@ public class PurchaseManager: NSObject {
     }
 
     public var vipType: PremiumPeriod {
-//#if DEBUG
-//        return PremiumPeriod.none
-//#endif
+#if DEBUG
+        return PremiumPeriod.none
+#endif
         guard isVip, let type = vipInformation["type"] as? String else {
             return .none
         }