浏览代码

3.6.15(2)

100Years 1 周之前
父节点
当前提交
0f0c216e12
共有 23 个文件被更改,包括 76 次插入32 次删除
  1. 2 2
      AIEmoji.xcodeproj/project.pbxproj
  2. 二进制
      AIEmoji/Assets.xcassets/PTP/style/ptp_style_1.imageset/ptp_style_1@2x.png
  3. 二进制
      AIEmoji/Assets.xcassets/PTP/style/ptp_style_1.imageset/ptp_style_1@3x.png
  4. 1 1
      AIEmoji/Assets.xcassets/PTP/style/ptp_style_7.imageset/Contents.json
  5. 二进制
      AIEmoji/Assets.xcassets/PTP/style/ptp_style_7.imageset/ptp_style_7@2x 1.png
  6. 二进制
      AIEmoji/Assets.xcassets/PTP/style/ptp_style_7.imageset/ptp_style_7@2x.png
  7. 二进制
      AIEmoji/Assets.xcassets/PTP/style/ptp_style_7.imageset/ptp_style_7@3x.png
  8. 二进制
      AIEmoji/Assets.xcassets/PTP/style/ptp_style_ApocalypticWorld.imageset/ptp_style_ApocalypticWorld@2x.png
  9. 二进制
      AIEmoji/Assets.xcassets/PTP/style/ptp_style_ApocalypticWorld.imageset/ptp_style_ApocalypticWorld@3x.png
  10. 二进制
      AIEmoji/Assets.xcassets/PTP/style/ptp_style_Watercolor.imageset/ptp_style_Watercolor@2x.png
  11. 二进制
      AIEmoji/Assets.xcassets/PTP/style/ptp_style_Watercolor.imageset/ptp_style_Watercolor@3x.png
  12. 二进制
      AIEmoji/Assets.xcassets/PTP/style/ptp_style_WongKarwaiIsfilms.imageset/ptp_style_WongKarwaiIsfilms@2x.png
  13. 二进制
      AIEmoji/Assets.xcassets/PTP/style/ptp_style_WongKarwaiIsfilms.imageset/ptp_style_WongKarwaiIsfilms@3x.png
  14. 二进制
      AIEmoji/Assets.xcassets/PTP/style/ptp_style_disney.imageset/ptp_style_disney@2x.png
  15. 二进制
      AIEmoji/Assets.xcassets/PTP/style/ptp_style_disney.imageset/ptp_style_disney@3x.png
  16. 22 0
      AIEmoji/Assets.xcassets/PTP/style/ptp_style_gameYS.imageset/Contents.json
  17. 二进制
      AIEmoji/Assets.xcassets/PTP/style/ptp_style_gameYS.imageset/ptp_style_gameYS@2x.png
  18. 二进制
      AIEmoji/Assets.xcassets/PTP/style/ptp_style_gameYS.imageset/ptp_style_gameYS@3x.png
  19. 3 0
      AIEmoji/Business/TSPurchaseMembershipVC/TSPurchaseVC.swift
  20. 22 11
      AIEmoji/Business/TSTextGeneralPictureVC/TSTTPInputVC/View/TSTitleView.swift
  21. 20 17
      AIEmoji/Res/photo_to_photo_style.json
  22. 1 0
      Podfile
  23. 5 1
      Podfile.lock

+ 2 - 2
AIEmoji.xcodeproj/project.pbxproj

@@ -2544,7 +2544,7 @@
 				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;
@@ -2583,7 +2583,7 @@
 				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;

二进制
AIEmoji/Assets.xcassets/PTP/style/ptp_style_1.imageset/ptp_style_1@2x.png


二进制
AIEmoji/Assets.xcassets/PTP/style/ptp_style_1.imageset/ptp_style_1@3x.png


+ 1 - 1
AIEmoji/Assets.xcassets/PTP/style/ptp_style_7.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "ptp_style_7@2x 1.png",
+      "filename" : "ptp_style_7@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

二进制
AIEmoji/Assets.xcassets/PTP/style/ptp_style_7.imageset/ptp_style_7@2x 1.png


二进制
AIEmoji/Assets.xcassets/PTP/style/ptp_style_7.imageset/ptp_style_7@2x.png


二进制
AIEmoji/Assets.xcassets/PTP/style/ptp_style_7.imageset/ptp_style_7@3x.png


二进制
AIEmoji/Assets.xcassets/PTP/style/ptp_style_ApocalypticWorld.imageset/ptp_style_ApocalypticWorld@2x.png


二进制
AIEmoji/Assets.xcassets/PTP/style/ptp_style_ApocalypticWorld.imageset/ptp_style_ApocalypticWorld@3x.png


二进制
AIEmoji/Assets.xcassets/PTP/style/ptp_style_Watercolor.imageset/ptp_style_Watercolor@2x.png


二进制
AIEmoji/Assets.xcassets/PTP/style/ptp_style_Watercolor.imageset/ptp_style_Watercolor@3x.png


二进制
AIEmoji/Assets.xcassets/PTP/style/ptp_style_WongKarwaiIsfilms.imageset/ptp_style_WongKarwaiIsfilms@2x.png


二进制
AIEmoji/Assets.xcassets/PTP/style/ptp_style_WongKarwaiIsfilms.imageset/ptp_style_WongKarwaiIsfilms@3x.png


二进制
AIEmoji/Assets.xcassets/PTP/style/ptp_style_disney.imageset/ptp_style_disney@2x.png


二进制
AIEmoji/Assets.xcassets/PTP/style/ptp_style_disney.imageset/ptp_style_disney@3x.png


+ 22 - 0
AIEmoji/Assets.xcassets/PTP/style/ptp_style_gameYS.imageset/Contents.json

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

二进制
AIEmoji/Assets.xcassets/PTP/style/ptp_style_gameYS.imageset/ptp_style_gameYS@2x.png


二进制
AIEmoji/Assets.xcassets/PTP/style/ptp_style_gameYS.imageset/ptp_style_gameYS@3x.png


+ 3 - 0
AIEmoji/Business/TSPurchaseMembershipVC/TSPurchaseVC.swift

@@ -351,6 +351,7 @@ struct PurchaseView :View {
                     ZStack(alignment: .topTrailing) {
                         PurchaseItemView(title: "One Month".localized, type: .month, selectedType: $viewModel.selectedType).onTapGesture {
                             viewModel.selectedType = .month
+                            viewModel.buyPublisher.send(true)
                         }
                         TSVipRecView(save: vipType.saveString)
                             .offset(x:-30,y:-14)
@@ -358,10 +359,12 @@ struct PurchaseView :View {
                     
                     PurchaseItemView(title: "One Week".localized, type: .week, selectedType: $viewModel.selectedType).onTapGesture {
                         viewModel.selectedType = .week
+                        viewModel.buyPublisher.send(true)
                     }
                 }else{
                     PurchaseItemTypeOneView(title: "One Year".localized, type: .year, selectedType: $viewModel.selectedType).onTapGesture {
                         viewModel.selectedType = .year
+                        viewModel.buyPublisher.send(true)
                     }
                 }
                 

+ 22 - 11
AIEmoji/Business/TSTextGeneralPictureVC/TSTTPInputVC/View/TSTitleView.swift

@@ -49,6 +49,8 @@ extension TSTitleView {
     }
 }
 
+
+import Shimmer
 class TSTitleMoreView: TSTitleView {
     
     var isAnimationArrow:Bool = false
@@ -64,21 +66,21 @@ class TSTitleMoreView: TSTitleView {
     }
     
     lazy var imageView:UIImageView = {
-        let imageView = UIImageView.createImageView(imageName: "gray_right_arrow")
-        
-        if isAnimationArrow {
-            imageView.animationImages = [.rightArrow0,.rightArrow1,.rightArrow2,.rightArrow3]
-            imageView.animationDuration = 1.0
-            imageView.startAnimating()
-        }
-        
+//        let imageView = UIImageView.createImageView(imageName: "gray_right_arrow")
+        let imageView = UIImageView.createImageView(image:.whiteRightArrow.withRenderingMode(.alwaysTemplate))
+//        if isAnimationArrow {
+//            imageView.animationImages = [.rightArrow0,.rightArrow1,.rightArrow2,.rightArrow3]
+//            imageView.animationDuration = 1.0
+//            imageView.startAnimating()
+//        }
+        imageView.tintColor = .themeColor
         return imageView
     }()
     
     
     lazy var rightLabel: UILabel = {
         let label = UILabel.createLabel(text: "See all".localized,font: .font(size: 12),textColor: .white.withAlphaComponent(isAnimationArrow ? 0.8 : 0.4))
-
+        label.textColor = .themeColor
         return label
     }()
     
@@ -102,11 +104,20 @@ class TSTitleMoreView: TSTitleView {
     override func creatUI() {
         super.creatUI()
 
-        contentView.addSubview(moreView)
-        moreView.snp.makeConstraints { make in
+        let shimmerView = FBShimmeringView()
+        shimmerView.contentView = moreView // 可以是 UILabel、UIView 等
+        shimmerView.shimmeringSpeed = 150
+        contentView.addSubview(shimmerView)
+        shimmerView.snp.makeConstraints { make in
             make.trailing.equalTo(-6)//16
             make.centerY.equalTo(titleLab)
         }
+        
+        moreView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        
+        shimmerView.isShimmering = isAnimationArrow // 开启扫光效果
     }
     
     @objc private func clickMoreView() {

+ 20 - 17
AIEmoji/Res/photo_to_photo_style.json

@@ -18,6 +18,14 @@
         "styleId": "ImageToImage-04",
         "advance":true
     },
+
+    {
+        "imageName": "ptp_style_7",
+        "imageText": "Fantasy Illustration",
+        "prompt":"将图片转化成精美插画手绘风格,保留人物主体和背景",
+        "styleId": "ImageToImage-05",
+        "isVip": false
+    },
     {
         "imageName": "ptp_style_disney",
         "imageText": "Disney",
@@ -26,19 +34,14 @@
         "styleId": "ImageToImage-21",
         "isVip": false
     },
-    {
-        "imageName": "ptp_style_7",
-        "imageText": "Fantasy Illustration",
-        "prompt":"将图片转化成精美插画手绘风格,保留人物主体和背景",
-        "styleId": "ImageToImage-05",
-        "isVip": false
-    },
+    
     {
         "imageName": "ptp_style_1",
         "imageText": "Cyberpunk",
         "prompt":"保留上传的图片人物表情和动作,不改变主体形状,添加霓虹灯光(蓝紫色)、机械义体细节、全息投影,背景改为雨夜未来都市,高饱和度强对比,发光边缘,轻微故障艺术,--保持构图与原图一致",
         "styleId": "ImageToImage-17",
-        "isVip": false
+        "isVip": true,
+        "advance":true
     },
     {
         "imageName": "ptp_style_Gothic",
@@ -58,6 +61,15 @@
         "isVip": true,
         "advance":true
     },
+    {
+        "imageName": "ptp_style_gameYS",
+        "imageText": "Game",
+        "prompt":"Please create image in Genshin Impact style",
+        "specialStyle":2,
+        "isVip": true,
+        "styleId": "",
+        "advance":true
+    },
     {
         "imageName": "ptp_style_MusicBox",
         "imageText": "Music Box",
@@ -236,15 +248,6 @@
         "styleId": "",
         "advance":true
     },
-    {
-        "imageName": "ptp_style_ZhangYimouIsfilms",
-        "imageText": "Zhang Yimou films",
-        "prompt":"Turn uploaded photo into a cinematic portrait with striking visual contrasts, do not change the person face—vivid colors against dark shadows, reminiscent of classic Chinese aesthetic films. The composition is dramatic, with bold reds, deep blacks, and golden accents, creating a sense of tension and grandeur. The lighting is soft yet directional, casting intricate patterns of light and shade, as if illuminated by lanterns or filtered through traditional textiles. The atmosphere is poetic and emotionally charged, blending realism with a painterly touch. The subject’s expression is intense, framed by rich textures like silk, smoke, or weathered wood, evoking a timeless, storytelling quality.",
-        "specialStyle":0,
-        "isVip": true,
-        "styleId": "",
-        "advance":true
-    },
     {
         "imageName": "ptp_style_Simpson",
         "imageText": "Simpson",

+ 1 - 0
Podfile

@@ -26,6 +26,7 @@ target 'AIEmoji' do
   pod "DynamicBlurView"
   pod 'BetterSegmentedControl', '~> 2.0'
   pod 'TYCyclePagerView'
+  pod 'Shimmer'
 end
 
 

+ 5 - 1
Podfile.lock

@@ -58,6 +58,7 @@ PODS:
   - Realm/Headers (10.54.2)
   - RealmSwift (10.54.2):
     - Realm (= 10.54.2)
+  - Shimmer (1.0.2)
   - SnapKit (5.7.1)
   - SVProgressHUD (2.3.1):
     - SVProgressHUD/Core (= 2.3.1)
@@ -84,6 +85,7 @@ DEPENDENCIES:
   - MXParallaxHeader
   - ObjectMapper
   - RealmSwift (~> 10)
+  - Shimmer
   - SnapKit
   - SwipeCellKit
   - TSSmalCoacopods (from `../TSSmalCoacopods`)
@@ -111,6 +113,7 @@ SPEC REPOS:
     - ObjectMapper
     - Realm
     - RealmSwift
+    - Shimmer
     - SnapKit
     - SVProgressHUD
     - SwipeCellKit
@@ -141,12 +144,13 @@ SPEC CHECKSUMS:
   ObjectMapper: e6e4d91ff7f2861df7aecc536c92d8363f4c9677
   Realm: 16852517a207e98cc6acba9336b56c30d06d84ad
   RealmSwift: bca777b3904ee58a9b16036e1840012f03348060
+  Shimmer: c5374be1c2b0c9e292fb05b339a513cf291cac86
   SnapKit: d612e99e678a2d3b95bf60b0705ed0a35c03484a
   SVProgressHUD: 4837c74bdfe2e51e8821c397825996a8d7de6e22
   SwipeCellKit: 3972254a826da74609926daf59b08d6c72e619ea
   TSSmalCoacopods: 6aa97167f0c76b16fc7d1fd1eb198bb6aece4f68
   TYCyclePagerView: 2b051dade0615c70784aa34f40c646feeddb7344
 
-PODFILE CHECKSUM: 74bba6d07088682a850112386af03f348dc0e7ef
+PODFILE CHECKSUM: 96ce9226d2d7d5271b0e285aaad4af1514dbdd82
 
 COCOAPODS: 1.16.2