100Years 3 долоо хоног өмнө
parent
commit
5f14cfd0bd

BIN
.DS_Store


+ 4 - 4
AIEmoji.xcodeproj/project.pbxproj

@@ -2480,12 +2480,12 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				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;
@@ -2519,12 +2519,12 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				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;

+ 3 - 3
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>

+ 1 - 1
AIEmoji/Business/TSAILIstVC/TSAILIstVC/TSAILIstCell.swift

@@ -129,7 +129,7 @@ class TSAILIstCell: TSBaseCollectionCell {
             make.bottom.equalTo(infoLab.snp.top).offset(-8)
             make.height.greaterThanOrEqualTo(18)
         }
-        
+
         bgContentView.addSubview(catPawAnimatedImageView)
         catPawAnimatedImageView.snp.makeConstraints { make in
             make.leading.equalTo(leading)

+ 11 - 1
AIEmoji/Business/TSPTPGeneratorVC/TSGennertatorSelectStyleVC/TSGennertatorSelectStyleVC.swift

@@ -182,6 +182,11 @@ class TSGennertatorSelectStyleCell: TSBaseCollectionCell {
                     make.top.equalTo(4)
                     make.width.height.equalTo(w-8)
                 }
+                imageView.cornerRadius = 12
+                
+                hotImageView.snp.updateConstraints { make in
+                    make.width.height.equalTo(36)
+                }
             case .ttp:
                 boardImageView.cornerRadius = 34.0
                 let w = 68.0
@@ -192,6 +197,11 @@ class TSGennertatorSelectStyleCell: TSBaseCollectionCell {
                     make.top.equalTo(4)
                     make.width.height.equalTo(w-8)
                 }
+                imageView.cornerRadius = (w-8)/2
+                
+                hotImageView.snp.updateConstraints { make in
+                    make.width.height.equalTo(34)
+                }
             }
         }
     }
@@ -275,7 +285,7 @@ class TSGennertatorSelectStyleCell: TSBaseCollectionCell {
         
         imageView.addSubview(hotImageView)
         hotImageView.snp.makeConstraints { make in
-            make.leading.equalTo(0)
+            make.leading.equalTo(0.0)
             make.top.equalTo(0.0)
             make.width.height.equalTo(36)
         }

+ 1 - 1
AIEmoji/Business/TSPTPGeneratorVC/TSPTPInputVC/View/TSPTPSelectStyleView.swift

@@ -58,7 +58,7 @@ class TSPTPSelectStyleView: TSBaseView {
 
     func selectStyle(styleId: String) {
         let index = dataArray.firstIndex {
-            $0.style == styleId
+            $0.styleId == styleId
         } ?? 0
 
         let indexPath = IndexPath(item: index, section: 0)

+ 4 - 3
AIEmoji/Business/TSPTPGeneratorVC/TSPhotoToPhotoVC/M/TSPTPStyleModel.swift

@@ -15,8 +15,8 @@ class TSGenerateStyleModel: TSBaseModel {
     var isVip:Bool = false
     var specialStyle:Int = 0 //0 普通类型,1 热门类型,2 新类型,3 max,
     var clickType:Int = 0 //0 无响应, 1空类型 2.换图
-    var style:String = ""   //风格类型
-    
+    var style:String = ""   //风格类型(本地用)
+    var styleId:String = ""   //风格类型(网络用)
     var input:Bool = false   //是否输入框
     var advance:Bool = false    //走新的通道
     
@@ -27,7 +27,8 @@ class TSGenerateStyleModel: TSBaseModel {
         isVip                   <- map["isVip"]
         specialStyle            <- map["specialStyle"]
         clickType               <- map["clickType"]
-        style                   <- map["styleId"]
+        style                   <- map["style"]
+        styleId                 <- map["styleId"]
         input                   <- map["input"]
         advance                 <- map["advance"]
     }

+ 1 - 1
AIEmoji/Common/Tool/TSCommonTool/TSCommonTool.swift

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

+ 1 - 1
AIEmoji/Res/photo_to_photo_style.json

@@ -19,7 +19,7 @@
     {
         "imageName": "ptp_style_ActionFigure",
         "imageText": "Action Figure",
-        "prompt":"Turn the uploaded photo into a chibi sticker set of 4 pictures,every sticker should not cover the other stickers. Stickers reserved chibi Aesthetic style: exaggerated big eyes, soft facial lines, lively and playful hairstyles, dress up as much as possible to reproduce the photos I provided you with, the background using vibrant colors, and with some small elements for decoration, the appropriate perimeter of the white space!",
+        "prompt":"将上传的照片转化为一款3D可爱玩偶风格形象,整体造型卡通立体,主角位于画面正中,清哳可见,风格融合插画与 3D 质感。背景为玩具包装盒展示样式:包括透明塑料外壳、纸卡底板,纸卡上印有 「Limited  Edition」字样。包装设计包含玩具插卡元素,如顶部挂孔、边缘裁切线等,呈现真实的商用玩具包装感。包装内右侧竖排另外放置 4 件 “配件” 道具,要根据上传的照片中人物的造型和身份推理出匹配的道具,摆放自然协调,增强整体故事感。色调以照片配色为主,饱和度高,颜色明亮清澈,光线自然温暖,画面风格现代、专业,同时保持可爱、俏皮的趣味性。背景简洁,突出主体,整体视觉呈现应具备真实商品的质感与陈列吸引力。",
         "input":true,
         "specialStyle":1,
         "isVip": true,