浏览代码

修改3.6.14(2)bug

100Years 2 周之前
父节点
当前提交
cd5ecae407

+ 2 - 6
AIEmoji.xcodeproj/project.pbxproj

@@ -151,7 +151,6 @@
 		A8990E022DE1800100DD55FE /* launch.png in Resources */ = {isa = PBXBuildFile; fileRef = A8990E012DE1800100DD55FE /* launch.png */; };
 		A8990EE52DEE8C2300DD55FE /* TSAISmallUploadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8990EE42DEE8C2200DD55FE /* TSAISmallUploadView.swift */; };
 		A8990EE82DEE8CC200DD55FE /* TSFutureBabyVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8990EE72DEE8CBF00DD55FE /* TSFutureBabyVC.swift */; };
-		A8990EEA2DEE8CDC00DD55FE /* TSFutureBabyVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8990EE92DEE8CD900DD55FE /* TSFutureBabyVM.swift */; };
 		A8990EEC2DEE8EED00DD55FE /* TSPredictBabyStyleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8990EEB2DEE8EE200DD55FE /* TSPredictBabyStyleView.swift */; };
 		A899D34A2D827A0E00AB9C1C /* TSChatThinkingModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A899D3492D8279FB00AB9C1C /* TSChatThinkingModel.swift */; };
 		A89EA64B2D59A588000EB181 /* MessageKit in Frameworks */ = {isa = PBXBuildFile; productRef = A89EA64A2D59A588000EB181 /* MessageKit */; };
@@ -445,7 +444,6 @@
 		A8990E012DE1800100DD55FE /* launch.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = launch.png; sourceTree = "<group>"; };
 		A8990EE42DEE8C2200DD55FE /* TSAISmallUploadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSAISmallUploadView.swift; sourceTree = "<group>"; };
 		A8990EE72DEE8CBF00DD55FE /* TSFutureBabyVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSFutureBabyVC.swift; sourceTree = "<group>"; };
-		A8990EE92DEE8CD900DD55FE /* TSFutureBabyVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSFutureBabyVM.swift; sourceTree = "<group>"; };
 		A8990EEB2DEE8EE200DD55FE /* TSPredictBabyStyleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSPredictBabyStyleView.swift; sourceTree = "<group>"; };
 		A899D3492D8279FB00AB9C1C /* TSChatThinkingModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSChatThinkingModel.swift; sourceTree = "<group>"; };
 		A89EA64C2D59A9F4000EB181 /* CustomMessageFlowLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomMessageFlowLayout.swift; sourceTree = "<group>"; };
@@ -1372,7 +1370,6 @@
 			isa = PBXGroup;
 			children = (
 				A8990EEB2DEE8EE200DD55FE /* TSPredictBabyStyleView.swift */,
-				A8990EE92DEE8CD900DD55FE /* TSFutureBabyVM.swift */,
 				A8990EE72DEE8CBF00DD55FE /* TSFutureBabyVC.swift */,
 			);
 			path = TSPredictBabyVC;
@@ -2418,7 +2415,6 @@
 				A87587182D81814500286A66 /* TSAIThinkingView.swift in Sources */,
 				A85E47962D672ADA0018D62D /* TSTextPicGennerateVC.swift in Sources */,
 				A82D60A02DBA1B0500596190 /* TSImageGenerateView.swift in Sources */,
-				A8990EEA2DEE8CDC00DD55FE /* TSFutureBabyVM.swift in Sources */,
 				A80E72562D3F98D700C64288 /* TSDiyKeyboardViewVC.swift in Sources */,
 				A8F775032D38EA8C00AA6E93 /* GlobalImports.swift in Sources */,
 				A89EA67A2D59D25F000EB181 /* TSAIChatVM.swift in Sources */,
@@ -2544,7 +2540,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2583,7 +2579,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;

+ 12 - 18
AIEmoji/Business/TSAILIstVC/TSAILIstVC/TSAILIstVC.swift

@@ -43,24 +43,18 @@ class TSAILIstVC: TSBaseVC {
         catTohumanItemModel.isWhether = true
         sectionModel.addSubItemModel(catTohumanItemModel)
         
-        //母亲节
-        sectionModel.addSubItemModel(
-            createItemModel(
-                leftImageName:"aiList_MotherDay",
-                leftTitle: "Happy Mother's Day".localized,
-                leftSubTitle: "Create sweet memories with Mom".localized,
-                rightViewStyle: 0,
-                tapBlock: { [weak self] model, _, _ in
-                   guard let self = self else { return }
-//                    enterSelectPhotos(
-//                        userDefaultsKey: "isFirstAIMotherDay",
-//                        maxBitSize: kUploadImageMaxBit10Size,
-//                         config:.getDefaultConfig(imageMaxBitSize: kUploadImageMaxBit10Size)
-//                    ) { image in
-                    let baseVc = TSAIUploadPhotoBaseVC(titleString: model.leftTitle ?? "",upLoadImage: nil,imageMaxBitSize: kUploadImageMaxBit10Size, generatorStyle: .motherDay)
-                        kPushVC(target: self, modelVC: baseVc)
-//                    }
-        }))
+//        //母亲节
+//        sectionModel.addSubItemModel(
+//            createItemModel(
+//                leftImageName:"aiList_MotherDay",
+//                leftTitle: "Happy Mother's Day".localized,
+//                leftSubTitle: "Create sweet memories with Mom".localized,
+//                rightViewStyle: 0,
+//                tapBlock: { [weak self] model, _, _ in
+//                   guard let self = self else { return }
+//                    let baseVc = TSAIUploadPhotoBaseVC(titleString: model.leftTitle ?? "",upLoadImage: nil,imageMaxBitSize: kUploadImageMaxBit10Size, generatorStyle: .motherDay)
+//                        kPushVC(target: self, modelVC: baseVc)
+//        }))
 
 
         //改头发型

+ 7 - 6
AIEmoji/Business/TSAILIstVC/TSPredictBabyVC/TSFutureBabyVC.swift

@@ -8,10 +8,6 @@
 import Combine
 class TSFutureBabyVC: TSBaseVC{
 
-    lazy var viewModel: TSFutureBabyVM = {
-        let viewModel = TSFutureBabyVM()
-        return viewModel
-    }()
     @Published private(set) var isCanGennerate: Bool = false
     lazy var customStackView: TSCustomStackView = {
         let customStackView = TSCustomStackView(axis: .vertical)
@@ -28,6 +24,8 @@ class TSFutureBabyVC: TSBaseVC{
         let personUploadView = TSAISmallUploadView()
         personUploadView.targetVC = self
         personUploadView.titleLab.text = "Parent1".localized
+        personUploadView.config = .futureBabyConfig
+        personUploadView.hintKey = "isFirstAIFutureBaby"
         return personUploadView
     }()
     
@@ -35,6 +33,8 @@ class TSFutureBabyVC: TSBaseVC{
         let garmentUploadView = TSAISmallUploadView()
         garmentUploadView.targetVC = self
         garmentUploadView.titleLab.text = "Parent2".localized
+        garmentUploadView.config = .futureBabyConfig
+        garmentUploadView.hintKey = "isFirstAIFutureBaby"
         return garmentUploadView
     }()
     //##############################选性别##############################
@@ -55,6 +55,7 @@ class TSFutureBabyVC: TSBaseVC{
             generateImage()
         }
         submitBtn.cornerRadius = 24.0
+        kSetBtnVipIcon(btn: submitBtn, show: true)
         return submitBtn
     }()
     override func createView() {
@@ -65,8 +66,8 @@ class TSFutureBabyVC: TSBaseVC{
         
         contentView.addSubview(submitBtn)
         submitBtn.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.width.equalTo(250*kDesignScale)
+            make.leading.equalTo(16.0)
+            make.trailing.equalTo(-16.0)
             make.height.equalTo(48)
             make.bottom.equalTo(-10-k_Height_safeAreaInsetsBottom())
         }

+ 0 - 19
AIEmoji/Business/TSAILIstVC/TSPredictBabyVC/TSFutureBabyVM.swift

@@ -1,19 +0,0 @@
-//
-//  TSPredictBabyVM.swift
-//  AIEmoji
-//
-//  Created by 100Years on 2025/6/2.
-//
-
-import ObjectMapper
-
-
-class TSFutureBabyVM {
-    
-    lazy var sectionDataArray: [TSSimpleSectionData] = {
-        let sectionModel = TSSimpleSectionData()
-        sectionModel.title = "Garment Library".localized
-//        sectionModel.items = selectStyleModels
-        return [sectionModel]
-    }()
-}

+ 2 - 3
AIEmoji/Business/VIewTool/TSAISmallUploadView/TSAISmallUploadView.swift

@@ -9,7 +9,7 @@ import Combine
 
 class TSAISmallUploadView: TSBaseView {
     
-    var viewH: CGFloat = 220.0+44.0
+    var viewH: CGFloat = 220.0*kDesignScale+44.0
     @Published var upLoadImage:UIImage? = nil {
         didSet{
             if let image = upLoadImage {
@@ -59,7 +59,6 @@ class TSAISmallUploadView: TSBaseView {
     lazy var uploadImageView: UIImageView = {
         let uploadImageView = UIImageView()
         uploadImageView.contentMode = .scaleAspectFit
-        uploadImageView.cornerRadius = 12
         upLoadView.isHidden = false
         return uploadImageView
     }()
@@ -108,6 +107,7 @@ class TSAISmallUploadView: TSBaseView {
         titleLab.snp.makeConstraints { make in
             make.leading.equalTo(0)
             make.top.equalTo(16)
+            make.height.equalTo(16)
         }
    
         contentView.addSubview(bgView)
@@ -115,7 +115,6 @@ class TSAISmallUploadView: TSBaseView {
             make.leading.equalTo(0)
             make.trailing.equalTo(0)
             make.bottom.equalTo(0)
-            make.height.equalTo(220.0)
             make.top.equalTo(titleLab.snp.bottom).offset(12)
         }
         

+ 1 - 1
AIEmoji/pt-BR.lproj/Localizable.strings

@@ -405,6 +405,6 @@
 "Gender" = "Gênero";
 "Age" = "Idade";
 "Future Baby" = "Futuro bebê";
-"Parent1" = "Pai 1";
+"Parent1" = "Pai1";
 "Parent2" = "Pai2";
 "To see what will your future baby look like" = "Para ver como será seu futuro bebê";

+ 1 - 1
AIEmoji/pt-PT.lproj/Localizable.strings

@@ -405,6 +405,6 @@
 "Gender" = "Gênero";
 "Age" = "Idade";
 "Future Baby" = "Futuro bebê";
-"Parent1" = "Pai 1";
+"Parent1" = "Pai1";
 "Parent2" = "Pai2";
 "To see what will your future baby look like" = "Para ver como será seu futuro bebê";