Forráskód Böngészése

1. APP 名字改成 Chibi
2. 默认选中 Anime Pro 风格
3.tabbar增加小猫动画

100Years 3 hete
szülő
commit
863d5eabce

+ 14 - 6
AIEmoji.xcodeproj/project.pbxproj

@@ -253,6 +253,8 @@
 		A8FDB1712DCC4B1100E9919B /* TSLoadState.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8FDB16F2DCC4B1100E9919B /* TSLoadState.swift */; };
 		A8FDB17C2DCC5A1000E9919B /* TSTTPInputVC+Col.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8FDB17B2DCC5A0000E9919B /* TSTTPInputVC+Col.swift */; };
 		A8FDB17E2DCC5D8500E9919B /* TSTTPInputVC+Style.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8FDB17D2DCC5D8000E9919B /* TSTTPInputVC+Style.swift */; };
+		A8FDB1812DCC8C5600E9919B /* catPaw_left.gif in Resources */ = {isa = PBXBuildFile; fileRef = A8FDB17F2DCC8C5600E9919B /* catPaw_left.gif */; };
+		A8FDB1822DCC8C5600E9919B /* catPaw_right.gif in Resources */ = {isa = PBXBuildFile; fileRef = A8FDB1802DCC8C5600E9919B /* catPaw_right.gif */; };
 		D34BB2B8FE0DBF83E06A3FC4 /* Pods_AIEmoji.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 86FB4D6AEFDDA7A2017F307C /* Pods_AIEmoji.framework */; };
 /* End PBXBuildFile section */
 
@@ -533,6 +535,8 @@
 		A8FDB16F2DCC4B1100E9919B /* TSLoadState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSLoadState.swift; sourceTree = "<group>"; };
 		A8FDB17B2DCC5A0000E9919B /* TSTTPInputVC+Col.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TSTTPInputVC+Col.swift"; sourceTree = "<group>"; };
 		A8FDB17D2DCC5D8000E9919B /* TSTTPInputVC+Style.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TSTTPInputVC+Style.swift"; sourceTree = "<group>"; };
+		A8FDB17F2DCC8C5600E9919B /* catPaw_left.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = catPaw_left.gif; sourceTree = "<group>"; };
+		A8FDB1802DCC8C5600E9919B /* catPaw_right.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = catPaw_right.gif; sourceTree = "<group>"; };
 		CA9B99CBEC45A6004629E790 /* Pods-AIEmoji.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AIEmoji.debug.xcconfig"; path = "Target Support Files/Pods-AIEmoji/Pods-AIEmoji.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -1969,6 +1973,8 @@
 				A83404D72D9D34ED00C140E4 /* Kelsi-Regular.otf */,
 				A83404CB2D9BEED800C140E4 /* Poppins-BlackItalic.ttf */,
 				A83404DA2D9D382200C140E4 /* AccentURW-Reg.ttf */,
+				A8FDB17F2DCC8C5600E9919B /* catPaw_left.gif */,
+				A8FDB1802DCC8C5600E9919B /* catPaw_right.gif */,
 				A82D60802DB7A1E600596190 /* activePhoto.gif */,
 				A80EDE072D700395003CD332 /* rotatingAnimation.gif */,
 				A89EA6972D5B19F0000EB181 /* Butterfly🦋.json */,
@@ -2098,6 +2104,8 @@
 				A80E72482D3F4F0A00C64288 /* templates.json in Resources */,
 				A83404CC2D9BEED800C140E4 /* Poppins-BlackItalic.ttf in Resources */,
 				A87587162D81734300286A66 /* text_to_photo_style.json in Resources */,
+				A8FDB1812DCC8C5600E9919B /* catPaw_left.gif in Resources */,
+				A8FDB1822DCC8C5600E9919B /* catPaw_right.gif in Resources */,
 				A8EEADD42D3E6C660032C5A0 /* Flower💐.json in Resources */,
 				A82D60812DB7A1E600596190 /* activePhoto.gif in Resources */,
 				A8EEADE92D3E76D90032C5A0 /* Beauty👸.json in Resources */,
@@ -2452,12 +2460,12 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AIEmoji/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "AI Image";
+				INFOPLIST_KEY_CFBundleDisplayName = Chibi;
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Allow us to access photos to upload your photos to generate new styles.";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
@@ -2468,7 +2476,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.3;
+				MARKETING_VERSION = 3.6.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.girl.music.wallpaper;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -2491,12 +2499,12 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = AIEmoji/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "AI Image";
+				INFOPLIST_KEY_CFBundleDisplayName = Chibi;
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Allow us to access photos to upload your photos to generate new styles.";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
@@ -2507,7 +2515,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.3;
+				MARKETING_VERSION = 3.6.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.girl.music.wallpaper;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

BIN
AIEmoji/Assets.xcassets/Tabbar/tabbar_select_ailist.imageset/tabbar_select_ailist@2x.png


BIN
AIEmoji/Assets.xcassets/Tabbar/tabbar_select_ailist.imageset/tabbar_select_ailist@3x.png


+ 22 - 0
AIEmoji/Assets.xcassets/Tabbar/tabbar_select_text.imageset/Contents.json

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

BIN
AIEmoji/Assets.xcassets/Tabbar/tabbar_select_text.imageset/tabbar_select_text@2x.png


BIN
AIEmoji/Assets.xcassets/Tabbar/tabbar_select_text.imageset/tabbar_select_text@3x.png


BIN
AIEmoji/Assets.xcassets/Tabbar/tabbar_unSelect_ailist.imageset/tabbar_unSelect_ailist@2x.png


BIN
AIEmoji/Assets.xcassets/Tabbar/tabbar_unSelect_ailist.imageset/tabbar_unSelect_ailist@3x.png


+ 22 - 0
AIEmoji/Assets.xcassets/Tabbar/tabbar_unSelect_text.imageset/Contents.json

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

BIN
AIEmoji/Assets.xcassets/Tabbar/tabbar_unSelect_text.imageset/tabbar_unSelect_text@2x.png


BIN
AIEmoji/Assets.xcassets/Tabbar/tabbar_unSelect_text.imageset/tabbar_unSelect_text@3x.png


+ 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_AI_Image" highlighted="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FfL-7D-71P">
-                                <rect key="frame" x="86.666666666666671" y="325" width="219.66666666666663" height="45.333333333333314"/>
+                            <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>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
@@ -34,6 +34,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="launch_AI_Image" width="219.66667175292969" height="45.333332061767578"/>
+        <image name="launch_Chibi" width="128" height="45.333332061767578"/>
     </resources>
 </document>

+ 1 - 1
AIEmoji/Business/TSPTPGeneratorVC/TSPTPInputVC/VM/TSPTPInputVM.swift

@@ -17,7 +17,7 @@ class TSPTPInputVM {
         }
     }
     
-    var selectedStyleIndex:Int = 1
+    var selectedStyleIndex:Int = 0
     
     var upLoadImage:UIImage?{
         didSet{

+ 57 - 8
AIEmoji/Business/TSTabBarController/TSTabBarController.swift

@@ -7,8 +7,24 @@
 
 
 import UIKit
-
+import Kingfisher
 class TSTabBarController: UITabBarController {
+  
+    lazy var animatedImageView: AnimatedImageView = {
+        let animatedImageView = AnimatedImageView()
+        animatedImageView.autoPlayAnimatedImage = false
+        if let gifURL = Bundle.main.url(forResource: "catPaw_left", withExtension: "gif") {
+            animatedImageView.kf.setImage(with: gifURL, options: [.cacheOriginalImage]) { result in
+                switch result {
+                case .success(let value):
+                    print("GIF 加载成功: \(value.source.url?.absoluteString ?? "")")
+                case .failure(let error):
+                    print("GIF 加载失败: \(error.localizedDescription)")
+                }
+            }
+        }
+        return animatedImageView
+    }()
     
     private var viewControllerArray: [String] = []
     private var titleArray: [String] = []
@@ -21,6 +37,8 @@ class TSTabBarController: UITabBarController {
         super.viewDidLoad()
         createUI()
         setUpData()
+        
+        addAnimatedImageView()
     }
 
     @objc private func setUpData() {
@@ -33,14 +51,14 @@ class TSTabBarController: UITabBarController {
         titleArray = ["Photo","Text","AI Store","Setting"]
         selectedImageArray = [
             "tabbar_select_pic",
+            "tabbar_select_text",
             "tabbar_select_ailist",
-            "tabbar_select_aichat",
             "tabbar_select_setting"
         ]
         unselectedImageArray = [
             "tabbar_unSelect_pic",
+            "tabbar_unSelect_text",
             "tabbar_unSelect_ailist",
-            "tabbar_unSelect_aichat",
             "tabbar_unSelect_setting"
         ]
 
@@ -48,10 +66,11 @@ class TSTabBarController: UITabBarController {
 
         for i in 0..<viewControllerArray.count {
             if let rootViewController = viewControllerArray[i].toInstance(of: UIViewController.self) {
+                let title = titleArray[i]
                 let nav = TSBaseNavigationC(rootViewController: rootViewController)
                 nav.view.backgroundColor = UIColor.black
                 nav.tabBarItem = tabBarItem(
-                    title: titleArray[i].localized,
+                    title: title.localized,
                     image: UIImage(named: unselectedImageArray[i]),
                     selectedImage: UIImage(named: selectedImageArray[i]),
                     tag: i
@@ -74,7 +93,8 @@ class TSTabBarController: UITabBarController {
         UITabBar.appearance().unselectedItemTintColor = .white.withAlphaComponent(0.4)// 未选中颜色
         UITabBar.appearance().tintColor = UIColor.themeColor // 选中颜色
         
-//        delegate = self
+        delegate = self
+        
     }
 
     private func tabBarItem(title: String, image: UIImage?, selectedImage: UIImage?, tag: Int) -> UITabBarItem {
@@ -93,9 +113,29 @@ class TSTabBarController: UITabBarController {
     
 
 }
+extension TSTabBarController {
+    func addAnimatedImageView(){
+        if let tabBarItems = tabBar.items,tabBarItems.count > 2 {
+            let tabBarButtons = tabBar.subviews.filter({ $0.isKind(of: NSClassFromString("UITabBarButton")!) })
+            if tabBarButtons.count > 2 {
+                let thirdTabButton = tabBarButtons[2]
+                thirdTabButton.addSubview(animatedImageView)
+                animatedImageView.snp.makeConstraints { make in
+                    make.width.equalTo(13.0)
+                    make.height.equalTo(22.0)
+                    make.centerX.equalToSuperview().offset(11)
+                    make.top.equalTo(6)
+                }
+                kDelayMainShort {
+                    self.animatedImageView.startAnimating()
+                }
+                
+            }
+        }
+    }
+}
 
-
-//extension TSTabBarController:UITabBarControllerDelegate {
+extension TSTabBarController:UITabBarControllerDelegate {
 //    func tabBarController(_ tabBarController: UITabBarController, shouldSelect viewController: UIViewController) -> Bool{
 //        if interceptVC == viewController{
 //            kPresentModalVC(target: self, modelVC: TSWallpaperVC())
@@ -103,4 +143,13 @@ class TSTabBarController: UITabBarController {
 //        }
 //        return true
 //    }
-//}
+    
+    // UITabBarControllerDelegate 方法
+    func tabBarController(_ tabBarController: UITabBarController, didSelect viewController: UIViewController) {
+        if tabBarController.selectedIndex == 2 {
+            self.animatedImageView.isHidden = true
+        }else{
+            self.animatedImageView.isHidden = false
+        }
+    }
+}

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

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

BIN
AIEmoji/Res/catPaw_left.gif


BIN
AIEmoji/Res/catPaw_right.gif