瀏覽代碼

3.1(3)打包

100Years 6 天之前
父節點
當前提交
072f8fc353

+ 2 - 2
AIEmoji.xcodeproj/project.pbxproj

@@ -2202,7 +2202,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2241,7 +2241,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				GENERATE_INFOPLIST_FILE = YES;

二進制
AIEmoji/Assets.xcassets/AIList/aiList_ttp.imageset/aiList_ttp@2x.png


二進制
AIEmoji/Assets.xcassets/AIList/aiList_ttp.imageset/aiList_ttp@3x.png


二進制
AIEmoji/Assets.xcassets/Common/failed_big.imageset/failed_big@2x.png


二進制
AIEmoji/Assets.xcassets/Common/failed_big.imageset/failed_big@3x.png


+ 2 - 2
AIEmoji/Business/TSAILIstVC/TSAIAgeImageHintVC/TSAIListHintBaseVC.swift

@@ -81,7 +81,7 @@ class TSAIListHintBaseVC: TSBaseVC {
             make.trailing.equalTo(-32)
             make.trailing.equalTo(-32)
         }
         }
         
         
-        let goodInfoLabel = UILabel.createLabel(text: "Fully clear and visible face, in good lighting".localized,font: .font(size: 14,weight: .medium),textColor: .white.withAlphaComponent(0.6),numberOfLines: 0)
+        let goodInfoLabel = UILabel.createLabel(text: "Fully clear and visible face, in good lighting".localized,font: .font(size: 14),textColor: .white.withAlphaComponent(0.6),numberOfLines: 0)
         popupContentView.addSubview(goodInfoLabel)
         popupContentView.addSubview(goodInfoLabel)
         goodInfoLabel.snp.makeConstraints { make in
         goodInfoLabel.snp.makeConstraints { make in
             make.top.equalTo(goodLabel.snp.bottom).offset(8)
             make.top.equalTo(goodLabel.snp.bottom).offset(8)
@@ -108,7 +108,7 @@ class TSAIListHintBaseVC: TSBaseVC {
             make.trailing.equalTo(-32)
             make.trailing.equalTo(-32)
         }
         }
         
         
-        let badInfoLabel = UILabel.createLabel(text: "Group photos, covered faces, nudes".localized,font: .font(size: 14,weight: .medium),textColor: .white.withAlphaComponent(0.6),numberOfLines: 0)
+        let badInfoLabel = UILabel.createLabel(text: "Group photos, covered faces, nudes".localized,font: .font(size: 14),textColor: .white.withAlphaComponent(0.6),numberOfLines: 0)
         popupContentView.addSubview(badInfoLabel)
         popupContentView.addSubview(badInfoLabel)
         badInfoLabel.snp.makeConstraints { make in
         badInfoLabel.snp.makeConstraints { make in
             make.top.equalTo(badLabel.snp.bottom).offset(8)
             make.top.equalTo(badLabel.snp.bottom).offset(8)

+ 10 - 1
AIEmoji/Business/TSAILIstVC/TSAIUploadPhotoBaseVC/TSAIUploadPhotoBaseVC.swift

@@ -190,7 +190,7 @@ class TSAIUploadPhotoBaseVC: TSBaseVC {
 //        NotificationCenter.default.addObserver(self, selector: #selector(updateVipView), name: .kPurchaseDidChanged, object: nil)
 //        NotificationCenter.default.addObserver(self, selector: #selector(updateVipView), name: .kPurchaseDidChanged, object: nil)
 //        updateVipView()
 //        updateVipView()
         
         
-        TSAIAgeImageHintVC.userDefaultsKey = "isFirstAIList" + titleString
+        TSAIAgeImageHintVC.userDefaultsKey = userDefaultsKey
         kDelayMainShort {
         kDelayMainShort {
             if TSAIAgeImageHintVC.isShowUploadImageHint{
             if TSAIAgeImageHintVC.isShowUploadImageHint{
                 TSAIAgeImageHintVC.isShowUploadImageHint = false
                 TSAIAgeImageHintVC.isShowUploadImageHint = false
@@ -198,6 +198,15 @@ class TSAIUploadPhotoBaseVC: TSBaseVC {
             }
             }
         }
         }
     }
     }
+    
+    var userDefaultsKey:String {
+        switch generatorStyle {
+        case .ageOld:
+            return "isFirstAIListAgeOldHintVC"
+        case .ageChild:
+            return "isFirstAIListAgeChildHintVC"
+        }
+    }
 }
 }
 
 
 extension TSAIUploadPhotoBaseVC {
 extension TSAIUploadPhotoBaseVC {

+ 8 - 2
AIEmoji/Business/TSPTPGeneratorVC/TSPhotoToPhotoVC/Cell/TSPTPSelectStyleCell.swift

@@ -104,9 +104,14 @@ class TSPTPSelectStyleCCell: TSBaseCollectionCell {
     var itemModel:TSPTPStyleModel = TSPTPStyleModel(){
     var itemModel:TSPTPStyleModel = TSPTPStyleModel(){
         didSet{
         didSet{
             imageView.image = UIImage(named: itemModel.imageName)
             imageView.image = UIImage(named: itemModel.imageName)
+            
             let hotImageNamed = getHotImageNamed(specialStyle: itemModel.specialStyle)
             let hotImageNamed = getHotImageNamed(specialStyle: itemModel.specialStyle)
-            hotImageView.image = UIImage(named: hotImageNamed)
-            hotImageView.isHidden = hotImageNamed.count < 0
+            if hotImageNamed.count > 0 {
+                hotImageView.image = UIImage(named: hotImageNamed)
+                hotImageView.isHidden = false
+            }else{
+                hotImageView.isHidden = true
+            }
             
             
             var strokeColor = UIColor.white
             var strokeColor = UIColor.white
             var font = UIFont.font(size: 14)
             var font = UIFont.font(size: 14)
@@ -156,6 +161,7 @@ class TSPTPSelectStyleCCell: TSBaseCollectionCell {
 
 
     lazy var textLabel: UILabel = {
     lazy var textLabel: UILabel = {
         let textLabel = UILabel.createLabel(font: .font(size: 14),textColor: .white,textAlignment: .center,numberOfLines: 0)
         let textLabel = UILabel.createLabel(font: .font(size: 14),textColor: .white,textAlignment: .center,numberOfLines: 0)
+        textLabel.addShadow(shadowColor: UIColor.black.cgColor, shadowOffset: CGSize(width: 0, height: 2), shadowRadius: 2, shadowOpacity: 0.5)
         return textLabel
         return textLabel
     }()
     }()
     
     

+ 2 - 2
AIEmoji/Business/TSSetingVC/SetingVC/TSSetingModel.swift

@@ -19,12 +19,12 @@
 
 
 enum SettingType: String, CaseIterable {
 enum SettingType: String, CaseIterable {
     case update = "Update Version"
     case update = "Update Version"
-    case howToUse = "How to add emojis to iMessages?"
+//    case howToUse = "How to add emojis to iMessages?"
     case rateus = "Rate us"
     case rateus = "Rate us"
     case shareus = "Share us"
     case shareus = "Share us"
     case AboutData = "About Data"
     case AboutData = "About Data"
     case removeCloudData = "Remove Cloud Data"
     case removeCloudData = "Remove Cloud Data"
     case privacy = "Privacy Policy"
     case privacy = "Privacy Policy"
     case agreement = "Terms of Service"
     case agreement = "Terms of Service"
-    case about = "About us"
+//    case about = "About us"
 }
 }

+ 4 - 4
AIEmoji/Business/TSSetingVC/SetingVC/TSSetingVC.swift

@@ -53,8 +53,8 @@ class TSSetingVC: TSBaseVC {
             }
             }
             
             
             switch type {
             switch type {
-            case .howToUse:
-                viewModel.pushTutorials(parent: self)
+//            case .howToUse:
+//                viewModel.pushTutorials(parent: self)
             case .shareus:
             case .shareus:
                 viewModel.shareApp(parent: self)
                 viewModel.shareApp(parent: self)
             case .agreement:
             case .agreement:
@@ -70,8 +70,8 @@ class TSSetingVC: TSBaseVC {
             case .AboutData:
             case .AboutData:
                 viewModel.AboutData(parent: self)
                 viewModel.AboutData(parent: self)
                 break
                 break
-            case .about:
-                break
+//            case .about:
+//                break
             case .rateus:
             case .rateus:
                 viewModel.rateAction()
                 viewModel.rateAction()
             }
             }

+ 1 - 1
AIEmoji/Business/VIewTool/TSGeneratorloadingView.swift

@@ -60,7 +60,7 @@ class TSGeneratorloadingView: TSBaseView {
   
   
         contentView.addSubview(textLabel)
         contentView.addSubview(textLabel)
         textLabel.snp.makeConstraints { make in
         textLabel.snp.makeConstraints { make in
-            make.top.equalTo(imageView.snp.bottom).offset(0)
+            make.top.equalTo(imageView.snp.bottom).offset(-20)
             make.leading.equalTo(16)
             make.leading.equalTo(16)
             make.trailing.equalTo(-16)
             make.trailing.equalTo(-16)
         }
         }

+ 1 - 1
AIEmoji/Common/Purchase/TSPurchaseManager.swift

@@ -416,7 +416,7 @@ extension PurchaseManager {
             guard let self = self else { return }
             guard let self = self else { return }
             if let data = data,
             if let data = data,
                let jsonResponse = try? JSONSerialization.jsonObject(with: data) as? [String: Any] {
                let jsonResponse = try? JSONSerialization.jsonObject(with: data) as? [String: Any] {
-//                debugPrint("PurchaseManager verifyPayResult = \(jsonResponse)")
+                debugPrint("PurchaseManager verifyPayResult = \(jsonResponse)")
                 let status = jsonResponse["status"]
                 let status = jsonResponse["status"]
                 if let status = status as? String, status == "21007" {
                 if let status = status as? String, status == "21007" {
                     self.verifyPayResult(transaction: transaction, useSandBox: true)
                     self.verifyPayResult(transaction: transaction, useSandBox: true)

+ 1 - 1
AIEmoji/Res/photo_to_photo_style.json

@@ -30,7 +30,7 @@
         "imageName": "ptp_style_chibi",
         "imageName": "ptp_style_chibi",
         "imageText": "Chibi",
         "imageText": "Chibi",
         "prompt":"把图片变成 Chibi 风格",
         "prompt":"把图片变成 Chibi 风格",
-        "specialStyle":2,
+        "specialStyle":0,
         "isVip": true
         "isVip": true
     },
     },
     {
     {

+ 1 - 0
AIEmoji/de.lproj/Localizable.strings

@@ -150,3 +150,4 @@
 "Ukiyoe" = "Ukiyo-e";
 "Ukiyoe" = "Ukiyo-e";
 "Turn words into visually stunning artwork" = "Verwandeln Sie Wörter in visuell beeindruckende Kunstwerke";
 "Turn words into visually stunning artwork" = "Verwandeln Sie Wörter in visuell beeindruckende Kunstwerke";
 "Turn your inspiration into brilliant emojis" = "Verwandeln Sie Ihre Inspiration in brillante Emojis";
 "Turn your inspiration into brilliant emojis" = "Verwandeln Sie Ihre Inspiration in brillante Emojis";
+"Size ≤ 10MB" = "Größe ≤10MB";

+ 1 - 0
AIEmoji/en.lproj/Localizable.strings

@@ -150,3 +150,4 @@
 "Ukiyoe" = "Ukiyoe";
 "Ukiyoe" = "Ukiyoe";
 "Turn words into visually stunning artwork" = "Turn words into visually stunning artwork";
 "Turn words into visually stunning artwork" = "Turn words into visually stunning artwork";
 "Turn your inspiration into brilliant emojis" = "Turn your inspiration into brilliant emojis";
 "Turn your inspiration into brilliant emojis" = "Turn your inspiration into brilliant emojis";
+"Size ≤ 10MB" = "Size ≤ 10MB";

+ 1 - 0
AIEmoji/es.lproj/Localizable.strings

@@ -150,3 +150,4 @@
 "Ukiyoe" = "Ukiyo-e";
 "Ukiyoe" = "Ukiyo-e";
 "Turn words into visually stunning artwork" = "Convierte palabras en obras de arte visualmente impresionantes";
 "Turn words into visually stunning artwork" = "Convierte palabras en obras de arte visualmente impresionantes";
 "Turn your inspiration into brilliant emojis" = "Convierte tu inspiración en emojis brillantes";
 "Turn your inspiration into brilliant emojis" = "Convierte tu inspiración en emojis brillantes";
+"Size ≤ 10MB" = "Tamaño ≤10MB";

+ 1 - 0
AIEmoji/ja.lproj/Localizable.strings

@@ -150,3 +150,4 @@
 "Ukiyoe" = "浮世絵";
 "Ukiyoe" = "浮世絵";
 "Turn words into visually stunning artwork" = "言葉を素晴らしいアートに変える";
 "Turn words into visually stunning artwork" = "言葉を素晴らしいアートに変える";
 "Turn your inspiration into brilliant emojis" = "あなたのインスピレーションを素晴らしい表現に変えます";
 "Turn your inspiration into brilliant emojis" = "あなたのインスピレーションを素晴らしい表現に変えます";
+"Size ≤ 10MB" = "サイズ≤10MB";

+ 1 - 0
AIEmoji/ko.lproj/Localizable.strings

@@ -150,3 +150,4 @@
 "Ukiyoe" = "우키요에";
 "Ukiyoe" = "우키요에";
 "Turn words into visually stunning artwork" = "단어를 시각적으로 놀라운 예술 작품으로 바꿔 보세요.";
 "Turn words into visually stunning artwork" = "단어를 시각적으로 놀라운 예술 작품으로 바꿔 보세요.";
 "Turn your inspiration into brilliant emojis" = "영감을 화려한 이모티콘으로 바꿔보세요";
 "Turn your inspiration into brilliant emojis" = "영감을 화려한 이모티콘으로 바꿔보세요";
+"Size ≤ 10MB" = "크기≤10MB)";

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

@@ -150,3 +150,4 @@
 "Ukiyoe" = "Ukiyo-e";
 "Ukiyoe" = "Ukiyo-e";
 "Turn words into visually stunning artwork" = "Transforme palavras em obras de arte visualmente deslumbrantes";
 "Turn words into visually stunning artwork" = "Transforme palavras em obras de arte visualmente deslumbrantes";
 "Turn your inspiration into brilliant emojis" = "Transforme sua inspiração em emojis brilhantes";
 "Turn your inspiration into brilliant emojis" = "Transforme sua inspiração em emojis brilhantes";
+"Size ≤ 10MB" = "Tamanho ≤10MB";

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

@@ -150,3 +150,4 @@
 "Ukiyoe" = "Ukiyo-e";
 "Ukiyoe" = "Ukiyo-e";
 "Turn words into visually stunning artwork" = "Transforme palavras em obras de arte visualmente deslumbrantes";
 "Turn words into visually stunning artwork" = "Transforme palavras em obras de arte visualmente deslumbrantes";
 "Turn your inspiration into brilliant emojis" = "Transforme sua inspiração em emojis brilhantes";
 "Turn your inspiration into brilliant emojis" = "Transforme sua inspiração em emojis brilhantes";
+"Size ≤ 10MB" = "Tamanho ≤10MB";

+ 1 - 0
AIEmoji/zh-Hans.lproj/Localizable.strings

@@ -150,3 +150,4 @@
 "Ukiyoe" = "浮世绘";
 "Ukiyoe" = "浮世绘";
 "Turn words into visually stunning artwork" = "将文字变成令人惊叹的艺术";
 "Turn words into visually stunning artwork" = "将文字变成令人惊叹的艺术";
 "Turn your inspiration into brilliant emojis" = "将您的灵感转化为精彩的表情";
 "Turn your inspiration into brilliant emojis" = "将您的灵感转化为精彩的表情";
+"Size ≤ 10MB" = "大小≤10MB";

+ 1 - 0
AIEmoji/zh-Hant.lproj/Localizable.strings

@@ -146,3 +146,4 @@
 "Ukiyoe" = "浮世繪";
 "Ukiyoe" = "浮世繪";
 "Turn words into visually stunning artwork" = "將文字變成令人驚嘆的藝術";
 "Turn words into visually stunning artwork" = "將文字變成令人驚嘆的藝術";
 "Turn your inspiration into brilliant emojis" = "將您的靈感轉化為精彩的表情";
 "Turn your inspiration into brilliant emojis" = "將您的靈感轉化為精彩的表情";
+"Size ≤ 10MB" = "大小≤10MB";