Merge branch '3.1' into 3.2

# Conflicts:
#	AIEmoji/Common/Tool/TSCommonTool/TSCommonTool.swift
#	AIEmoji/de.lproj/Localizable.strings
#	AIEmoji/en.lproj/Localizable.strings
#	AIEmoji/es.lproj/Localizable.strings
#	AIEmoji/ja.lproj/Localizable.strings
#	AIEmoji/ko.lproj/Localizable.strings
#	AIEmoji/pt-BR.lproj/Localizable.strings
#	AIEmoji/pt-PT.lproj/Localizable.strings
#	AIEmoji/zh-Hans.lproj/Localizable.strings
#	AIEmoji/zh-Hant.lproj/Localizable.strings

AIEmoji.xcodeproj/project.pbxproj

@@ -2251,7 +2251,7 @@
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AIEmoji/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = Chibi;
+				INFOPLIST_KEY_CFBundleDisplayName = Chibii;
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Allow us to access photos to upload your photos to generate new styles.";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
@@ -2290,7 +2290,7 @@
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AIEmoji/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = Chibi;
+				INFOPLIST_KEY_CFBundleDisplayName = Chibii;
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Allow us to access photos to upload your photos to generate new styles.";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;

AIEmoji/AppDelegate.swift

@@ -45,14 +45,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func JudgmentSkipPage() {
         if AppDelegate.isFirstInstallApp() {
-            let bootPageVC  = TSBootPageVC { [weak self]  in
-                guard let self = self else { return }
+//            let bootPageVC  = TSBootPageVC { [weak self]  in
+//                guard let self = self else { return }
                 UserDefaults.standard.set("1", forKey: "isFirstInstallApp")
                 UserDefaults.standard.synchronize()
                 goToTab()
-            }
-            let navi = TSBaseNavigationC(rootViewController: bootPageVC)
-            window?.rootViewController = navi
+//            }
+//            let navi = TSBaseNavigationC(rootViewController: bootPageVC)
+//            window?.rootViewController = navi
         }else{
             goToTab()
         }

AIEmoji/Assets.xcassets/Common/launch_Chibii.imageset/Contents.json

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

AIEmoji/Base.lproj/LaunchScreen.storyboard

@@ -16,8 +16,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch_Chibi" highlighted="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FfL-7D-71P">
-                                <rect key="frame" x="132.66666666666666" y="325" width="127.99999999999997" height="45.333333333333314"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch_Chibii" highlighted="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FfL-7D-71P">
+                                <rect key="frame" x="123" y="325" width="147" height="45.333333333333314"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
@@ -34,6 +34,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="launch_Chibi" width="128" height="45.333332061767578"/>
+        <image name="launch_Chibii" width="147" height="45.333332061767578"/>
     </resources>
 </document>

AIEmoji/Common/Purchase/TSPurchaseManager.swift

@@ -143,9 +143,9 @@ public class PurchaseManager: NSObject {
     }
 
     @objc public var isVip: Bool {
-        #if DEBUG
-            return true
-        #endif
+//        #if DEBUG
+//            return true
+//        #endif
         guard let expiresDate = expiredDate else {
             return false
         }

AIEmoji/Common/Tool/TSCommonTool/TSCommonTool.swift

@@ -221,5 +221,5 @@ func kExecuteOnMainThread(_ block: @escaping () -> Void) {
     }
 }
 
-let kAppName:String = "Chibi" //Chibi Ghiblii
+let kAppName:String = "Chibii" //Chibi Ghiblii
 let kUploadImageMaxBitSize:Int = 10 * 1024 * 1024 //10M

AIEmoji/Res/photo_to_photo_style.json

@@ -1,7 +1,7 @@
 [
     {
         "imageName": "ptp_style_10",
-        "imageText": "Ghibli",
+        "imageText": "Anime",
         "prompt":"Studio Ghibli-inspired anime aesthetic, Hayao Miyazaki style, vibrant yet soft color palette, detailed hand-painted textures, whimsical dreamlike atmosphere, soft cel-shading, watercolor wash effect, subtle grain texture, preserving original composition. Style strength: 85%",
         "specialStyle":1,
         "specialStyle":1,

AIEmoji/de.lproj/Localizable.strings

@@ -160,7 +160,6 @@
 "Please enable photo permission in settings to select photos" = "請在設定中啟用照片權限以選擇照片";
 "Go to Settings" = "去“設定”";
 "Cute" = "Niedlich";
-
 "Claymation" = "Claymation";
 "Pixel" = "Pixel";
 "3D" = "3D";
@@ -177,3 +176,4 @@
 "Change" = "Ändern";
 "Change Emotion" = "Ausdruck ändern";
 "Change your facial emotion in one click" = "Ändern Sie Ihre Gesichtsemotion mit einem Klick";
+"Anime" = "Anime";

AIEmoji/en.lproj/Localizable.strings

@@ -157,7 +157,6 @@
 "Please enable photo permission in settings to select photos" = "Please enable photo permission in settings to select photos";
 "Go to Settings" = "Go to Settings";
 "Cute" = "Cute";
-
 "Claymation" = "Claymation";
 "Pixel" = "Pixel";
 "3D" = "3D";
@@ -174,3 +173,4 @@
 "Change" = "Change";
 "Change Emotion" = "Change Emotion";
 "Change your facial emotion in one click" = "Change your facial emotion in one click";
+"Anime" = "Anime";

AIEmoji/es.lproj/Localizable.strings

@@ -156,7 +156,6 @@
 "Please enable photo permission in settings to select photos" = "Habilite el permiso de fotos en la configuración para seleccionar fotos.";
 "Go to Settings" = "Ir a configuración";
 "Cute" = "lindo";
-
 "Claymation" = "plastilina";
 "Pixel" = "Píxel";
 "3D" = "3D";
@@ -173,3 +172,4 @@
 "Change" = "Cambiar";
 "Change Emotion" = "cambiar de expresión";
 "Change your facial emotion in one click" = "Cambia tu emoción facial en un clic";
+"Anime" = "Animado";

AIEmoji/ja.lproj/Localizable.strings

@@ -156,7 +156,6 @@
 "Please enable photo permission in settings to select photos" = "写真を選択するには、設定で写真の許可を有効にしてください";
 "Go to Settings" = "設定に移動";
 "Cute" = "かわいい";
-
 "Claymation" = "クレイメーション";
 "Pixel" = "ピクセル";
 "3D" = "3D";
@@ -173,3 +172,4 @@
 "Change" = "変化";
 "Change Emotion" = "表情を変える";
 "Change your facial emotion in one click" = "ワンクリックで顔の感情を変更します";
+"Anime" = "アニメ";

AIEmoji/ko.lproj/Localizable.strings

@@ -156,7 +156,6 @@
 "Please enable photo permission in settings to select photos" = "사진을 선택하려면 설정에서 사진 권한을 활성화하세요.";
 "Go to Settings" = "설정으로 이동";
 "Cute" = "귀여운";
-
 "Claymation" = "점토화";
 "Pixel" = "픽셀";
 "3D" = "3D";
@@ -173,3 +172,4 @@
 "Change" = "변화";
 "Change Emotion" = "표현 변경";
 "Change your facial emotion in one click" = "클릭 한 번으로 얼굴 감정을 바꿔보세요";
+"Anime" = "만화";

AIEmoji/pt-BR.lproj/Localizable.strings

@@ -156,7 +156,6 @@
 "Please enable photo permission in settings to select photos" = "Ative a permissão de fotos nas configurações para selecionar fotos";
 "Go to Settings" = "Vá para Configurações";
 "Cute" = "bonitinho";
-
 "Claymation" = "Argila";
 "Pixel" = "Pixel";
 "3D" = "3D";
@@ -173,3 +172,4 @@
 "Change" = "Mudar";
 "Change Emotion" = "mudar expressão";
 "Change your facial emotion in one click" = "Mude sua emoção facial com um clique";
+"Anime" = "Anime";

AIEmoji/pt-PT.lproj/Localizable.strings

@@ -156,7 +156,6 @@
 "Please enable photo permission in settings to select photos" = "Ative a permissão de fotos nas configurações para selecionar fotos";
 "Go to Settings" = "Vá para Configurações";
 "Cute" = "bonitinho";
-
 "Claymation" = "Argila";
 "Pixel" = "Pixel";
 "3D" = "3D";
@@ -173,3 +172,4 @@
 "Change" = "Mudar";
 "Change Emotion" = "mudar expressão";
 "Change your facial emotion in one click" = "Mude sua emoção facial com um clique";
+"Anime" = "Anime";

AIEmoji/zh-Hans.lproj/Localizable.strings

@@ -156,7 +156,6 @@
 "Please enable photo permission in settings to select photos" = "请在设置中启用照片权限以选择照片";
 "Go to Settings" = "去“设置”";
 "Cute" = "可爱";
-
 "Claymation" = "粘土动画";
 "Pixel" = "像素";
 "3D" = "3D";
@@ -173,3 +172,4 @@
 "Change" = "改变";
 "Change Emotion" = "改变表情";
 "Change your facial emotion in one click" = "一键改变你的面部表情";
+"Anime" = "动漫";

AIEmoji/zh-Hant.lproj/Localizable.strings

@@ -148,7 +148,6 @@
 "Turn your inspiration into brilliant emojis" = "將您的靈感轉化為精彩的表情";
 "Size ≤ 10MB" = "大小≤10MB";
 "Cute" = "可愛";
-
 "Claymation" = "黏土動畫";
 "Pixel" = "像素";
 "3D" = "3D";
@@ -165,3 +164,4 @@
 "Change" = "改變";
 "Change Emotion" = "改變表情";
 "Change your facial emotion in one click" = "一鍵改變你的臉部表情";
+"Anime" = "動漫";