Browse Source

3.6.12(1)
1.修复启动页不显示的问题
2.更换首页图生图的功能顺序

100Years 1 week ago
parent
commit
3e7b21983e

+ 8 - 4
AIEmoji.xcodeproj/project.pbxproj

@@ -148,6 +148,7 @@
 		A885088D2DBCE7BE000FBCEC /* TSPTPHistoryVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A885088C2DBCE7BC000FBCEC /* TSPTPHistoryVC.swift */; };
 		A88508B62DBF142B000FBCEC /* TSGennertatorSelectStyleVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A88508B52DBF142A000FBCEC /* TSGennertatorSelectStyleVC.swift */; };
 		A8990DE92DDF241500DD55FE /* TYCycleImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8990DE82DDF241300DD55FE /* TYCycleImageView.swift */; };
+		A8990E022DE1800100DD55FE /* launch.png in Resources */ = {isa = PBXBuildFile; fileRef = A8990E012DE1800100DD55FE /* launch.png */; };
 		A899D34A2D827A0E00AB9C1C /* TSChatThinkingModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A899D3492D8279FB00AB9C1C /* TSChatThinkingModel.swift */; };
 		A89EA64B2D59A588000EB181 /* MessageKit in Frameworks */ = {isa = PBXBuildFile; productRef = A89EA64A2D59A588000EB181 /* MessageKit */; };
 		A89EA6542D59A9F4000EB181 /* TSTextLayoutSizeCalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A89EA64F2D59A9F4000EB181 /* TSTextLayoutSizeCalculator.swift */; };
@@ -437,6 +438,7 @@
 		A885088C2DBCE7BC000FBCEC /* TSPTPHistoryVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSPTPHistoryVC.swift; sourceTree = "<group>"; };
 		A88508B52DBF142A000FBCEC /* TSGennertatorSelectStyleVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSGennertatorSelectStyleVC.swift; sourceTree = "<group>"; };
 		A8990DE82DDF241300DD55FE /* TYCycleImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TYCycleImageView.swift; sourceTree = "<group>"; };
+		A8990E012DE1800100DD55FE /* launch.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = launch.png; 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>"; };
 		A89EA64E2D59A9F4000EB181 /* TSLayoutSizeCalculator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSLayoutSizeCalculator.swift; sourceTree = "<group>"; };
@@ -1653,6 +1655,7 @@
 				A8F774922D38EA8C00AA6E93 /* Business */,
 				A8F774D82D38EA8C00AA6E93 /* Common */,
 				A8F774812D38E8B700AA6E93 /* AppDelegate.swift */,
+				A8990E012DE1800100DD55FE /* launch.png */,
 				A8F774822D38E8B700AA6E93 /* Assets.xcassets */,
 				A8F774832D38E8B700AA6E93 /* Info.plist */,
 				A83405012DA35CB700C140E4 /* InfoPlist.strings */,
@@ -2149,6 +2152,7 @@
 				A83404D92D9D34ED00C140E4 /* Kelsi-Regular.otf in Resources */,
 				A80E72482D3F4F0A00C64288 /* templates.json in Resources */,
 				A83404CC2D9BEED800C140E4 /* Poppins-BlackItalic.ttf in Resources */,
+				A8990E022DE1800100DD55FE /* launch.png in Resources */,
 				A87587162D81734300286A66 /* text_to_photo_style.json in Resources */,
 				A8FDB1812DCC8C5600E9919B /* catPaw_left.gif in Resources */,
 				A8FDB1822DCC8C5600E9919B /* catPaw_right.gif in Resources */,
@@ -2516,7 +2520,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2532,7 +2536,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.11;
+				MARKETING_VERSION = 3.6.12;
 				PRODUCT_BUNDLE_IDENTIFIER = com.girl.music.wallpaper;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -2555,7 +2559,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2571,7 +2575,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.11;
+				MARKETING_VERSION = 3.6.12;
 				PRODUCT_BUNDLE_IDENTIFIER = com.girl.music.wallpaper;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

+ 0 - 22
AIEmoji/Assets.xcassets/Launch/launch.imageset/Contents.json

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

BIN
AIEmoji/Assets.xcassets/Launch/launch.imageset/launch@3x.png


+ 6 - 6
AIEmoji/Base.lproj/LaunchScreen.storyboard

@@ -16,17 +16,17 @@
                         <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" translatesAutoresizingMaskIntoConstraints="NO" id="CSy-NA-31p">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch.png" translatesAutoresizingMaskIntoConstraints="NO" id="xfk-nW-LaM">
                                 <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                         <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
-                            <constraint firstItem="CSy-NA-31p" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="4kF-2v-u3b"/>
-                            <constraint firstAttribute="bottom" secondItem="CSy-NA-31p" secondAttribute="bottom" id="6Td-cS-Fax"/>
-                            <constraint firstItem="CSy-NA-31p" firstAttribute="trailing" secondItem="6Tk-OE-BBY" secondAttribute="trailing" id="X2c-K3-Zsb"/>
-                            <constraint firstItem="CSy-NA-31p" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="Z9Z-2A-5Iu"/>
+                            <constraint firstItem="xfk-nW-LaM" firstAttribute="trailing" secondItem="6Tk-OE-BBY" secondAttribute="trailing" id="4HI-Xw-Nr5"/>
+                            <constraint firstItem="xfk-nW-LaM" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="Xmg-Lm-MFj"/>
+                            <constraint firstAttribute="bottom" secondItem="xfk-nW-LaM" secondAttribute="bottom" id="Zgm-Ml-X83"/>
+                            <constraint firstItem="xfk-nW-LaM" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="kVc-FX-QYw"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -36,6 +36,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="launch" width="375" height="812"/>
+        <image name="launch.png" width="750" height="1624"/>
     </resources>
 </document>

+ 2 - 2
AIEmoji/Business/LaunchVC/TSLaunchVC.swift

@@ -36,8 +36,8 @@ class TSLaunchVC: UIViewController {
         }
 
         
-        startTimer()
-        addNotifiy()
+//        startTimer()
+//        addNotifiy()
     }
 
     func addNotifiy() {

+ 32 - 44
AIEmoji/Res/photo_to_photo_style.json

@@ -18,6 +18,14 @@
         "styleId": "ImageToImage-04",
         "advance":true
     },
+    {
+        "imageName": "ptp_style_disney",
+        "imageText": "Disney",
+        "prompt":"把图片变成disney风格",
+        "specialStyle":0,
+        "styleId": "ImageToImage-21",
+        "isVip": true
+    },
     {
         "imageName": "ptp_style_7",
         "imageText": "Fantasy Illustration",
@@ -25,16 +33,6 @@
         "styleId": "ImageToImage-05",
         "isVip": false
     },
-    {
-        "imageName": "ptp_style_Irasutoya",
-        "imageText": "Irasutoya",
-        "prompt":"用 irasutoya 风格绘制上传的照片,保留关键内容和构图,色彩丰富明亮",
-        "specialStyle":0,
-        "isVip": true,
-        "styleId": "ImageToImage-09",
-        "advance":true
-    },
-    
     {
         "imageName": "ptp_style_1",
         "imageText": "Cyberpunk",
@@ -42,6 +40,15 @@
         "styleId": "ImageToImage-17",
         "isVip": false
     },
+    {
+        "imageName": "ptp_style_EarphoneCase",
+        "imageText": "Earphone Case",
+        "prompt":"请根据上传的照片生成AirPods充电盒手办,照片的人物探出AirPods充电盒,一只手扶着盒子边缘,一只手拿着咖啡杯(或者打招呼),营造可爱且俏皮的感觉。充电盒细节 :Apple AirPods充电盒设计,摆放角度为45度角摆放,让内部结构更清楚。内部摆放顺序: 照片中的人物,AirPods 耳机(只保留一个耳机,摆放于盒内)。整体风格要可爱3D盲盒风格,人物相似度高",
+        "specialStyle":2,
+        "isVip": true,
+        "styleId": "ImageToImage-13",
+        "advance":true
+    },
     {
         "imageName": "ptp_style_chibi",
         "imageText": "Chibi Sticker",
@@ -52,12 +59,13 @@
         "advance":true
     },
     {
-        "imageName": "ptp_style_disney",
-        "imageText": "Disney",
-        "prompt":"把图片变成disney风格",
+        "imageName": "ptp_style_MusicBox",
+        "imageText": "Music Box",
+        "prompt":"根据照片上的内容打造一款细致精美、萌趣可爱的3D渲染收藏摆件,装置在柔和粉彩色调、温馨浪漫的展示盒中。展示盒为浅奶油色搭配柔和的金色装饰,形似精致的便携珠宝盒。打开盒盖,呈现出一幕温暖浪漫的场景:两位Q版角色正甜蜜相望。盒顶雕刻着“FOREVER/Users/100years/Downloads/download/ptp_style_CibiMarukoChan@3x.png TOGETHER”(永远在一起)的字样,周围点缀着小巧精致的星星与爱心图案。两人都拥有充满表现力的眼睛,以及柔和、温暖的微笑,传递出浓浓的爱意和迷人的气质。他们身后有一扇圆形窗户,透过窗户能看到阳光明媚的中国古典小镇天际线和轻柔飘浮的云朵。盒内以温暖的柔和光线进行照明,背景中漂浮着花瓣点缀气氛。整个展示盒和角色的色调优雅和谐,营造出一个奢华而梦幻的迷你纪念品场景。",
         "specialStyle":0,
-        "styleId": "ImageToImage-21",
-        "isVip": true
+        "isVip": true,
+        "styleId": "ImageToImage-10",
+        "advance":true
     },
     {
         "imageName": "ptp_style_PolaroidClay",
@@ -75,8 +83,6 @@
         "styleId": "ImageToImage-08",
         "isVip": false
     },
-    
-    
     {
         "imageName": "ptp_style_Doodle",
         "imageText": "Picture Book",
@@ -123,12 +129,12 @@
         "advance":true
     },
     {
-        "imageName": "ptp_style_MusicBox",
-        "imageText": "Music Box",
-        "prompt":"根据照片上的内容打造一款细致精美、萌趣可爱的3D渲染收藏摆件,装置在柔和粉彩色调、温馨浪漫的展示盒中。展示盒为浅奶油色搭配柔和的金色装饰,形似精致的便携珠宝盒。打开盒盖,呈现出一幕温暖浪漫的场景:两位Q版角色正甜蜜相望。盒顶雕刻着“FOREVER/Users/100years/Downloads/download/ptp_style_CibiMarukoChan@3x.png TOGETHER”(永远在一起)的字样,周围点缀着小巧精致的星星与爱心图案。两人都拥有充满表现力的眼睛,以及柔和、温暖的微笑,传递出浓浓的爱意和迷人的气质。他们身后有一扇圆形窗户,透过窗户能看到阳光明媚的中国古典小镇天际线和轻柔飘浮的云朵。盒内以温暖的柔和光线进行照明,背景中漂浮着花瓣点缀气氛。整个展示盒和角色的色调优雅和谐,营造出一个奢华而梦幻的迷你纪念品场景。",
+        "imageName": "ptp_style_Irasutoya",
+        "imageText": "Irasutoya",
+        "prompt":"用 irasutoya 风格绘制上传的照片,保留关键内容和构图,色彩丰富明亮",
         "specialStyle":0,
         "isVip": true,
-        "styleId": "ImageToImage-10",
+        "styleId": "ImageToImage-09",
         "advance":true
     },
     {
@@ -141,12 +147,12 @@
         "advance":true
     },
     {
-        "imageName": "ptp_style_EarphoneCase",
-        "imageText": "Earphone Case",
-        "prompt":"请根据上传的照片生成AirPods充电盒手办,照片的人物探出AirPods充电盒,一只手扶着盒子边缘,一只手拿着咖啡杯(或者打招呼),营造可爱且俏皮的感觉。充电盒细节 :Apple AirPods充电盒设计,摆放角度为45度角摆放,让内部结构更清楚。内部摆放顺序: 照片中的人物,AirPods 耳机(只保留一个耳机,摆放于盒内)。整体风格要可爱3D盲盒风格,人物相似度高",
-        "specialStyle":2,
+        "imageName": "ptp_style_Minecraft",
+        "imageText": "3D Box",
+        "prompt":"turn photo into MINECRAFT style",
+        "specialStyle":0,
         "isVip": true,
-        "styleId": "ImageToImage-13",
+        "styleId": "",
         "advance":true
     },
     {
@@ -176,7 +182,6 @@
         "styleId": "ImageToImage-15",
         "advance":true
     },
-    
     {
         "imageName": "ptp_style_Dopamine",
         "imageText": "Dopamine",
@@ -185,7 +190,6 @@
         "isVip": true,
         "advance":true
     },
-    
     {
         "imageName": "ptp_style_Y2KMillennium",
         "imageText": "Y2K Millennium",
@@ -195,15 +199,6 @@
         "styleId": "ImageToImage-24",
         "advance":true
     },
-    {
-        "imageName": "ptp_style_Minecraft",
-        "imageText": "3D Box",
-        "prompt":"turn photo into MINECRAFT style",
-        "specialStyle":0,
-        "isVip": true,
-        "styleId": "",
-        "advance":true
-    },
     {
         "imageName": "ptp_style_SoloLeveling",
         "imageText": "Solo Leveling",
@@ -303,7 +298,6 @@
         "styleId": "ImageToImage-29",
         "advance":true
     },
-    
     {
         "imageName": "ptp_style_Neon",
         "imageText": "Neon",
@@ -313,7 +307,6 @@
         "styleId": "ImageToImage-32",
         "advance":true
     },
-    
     {
         "imageName": "ptp_style_BlackWhiteAnime",
         "imageText": "Black & White Anime",
@@ -341,7 +334,6 @@
         "styleId": "ImageToImage-31",
         "advance":true
     },
-    
     {
         "imageName": "ptp_style_HandmadePapercraft",
         "imageText": "Handmade Papercraft",
@@ -351,7 +343,6 @@
         "styleId": "ImageToImage-34",
         "advance":true
     },
-    
     {
         "imageName": "ptp_style_Print",
         "imageText": "Print",
@@ -361,7 +352,6 @@
         "styleId": "ImageToImage-36",
         "advance":true
     },
-    
     {
         "imageName": "ptp_style_MonochromeDoodle",
         "imageText": "Monochrome Doodle",
@@ -488,8 +478,6 @@
         "styleId": "",
         "advance":true
     },
-    
-    
     {
         "imageName": "ptp_style_none",
         "imageText": "No Style",

+ 0 - 0
AIEmoji/Assets.xcassets/Launch/launch.imageset/launch@2x.png → AIEmoji/launch.png