3.6.1(3)提审

TSLiveWallpaper.xcodeproj/project.pbxproj

@@ -210,7 +210,7 @@
 		A8FD8F3F2DFC10CF008CAACF /* SwiftUIX in Frameworks */ = {isa = PBXBuildFile; productRef = A8FD8F3E2DFC10CF008CAACF /* SwiftUIX */; };
 		A8FD8F412DFC138A008CAACF /* TYCycleImageComparisonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8FD8F402DFC138A008CAACF /* TYCycleImageComparisonView.swift */; };
 		A8FD8F432DFC1656008CAACF /* TSImageComparisonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8FD8F422DFC1656008CAACF /* TSImageComparisonView.swift */; };
-		A8FD8F452DFC219B008CAACF /* launch1.png in Resources */ = {isa = PBXBuildFile; fileRef = A8FD8F442DFC219B008CAACF /* launch1.png */; };
+		A8FD8F472DFC3092008CAACF /* launch2.png in Resources */ = {isa = PBXBuildFile; fileRef = A8FD8F462DFC3092008CAACF /* launch2.png */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -432,7 +432,7 @@
 		A8FD8F3B2DFC0A71008CAACF /* HighlightedText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightedText.swift; sourceTree = "<group>"; };
 		A8FD8F402DFC138A008CAACF /* TYCycleImageComparisonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TYCycleImageComparisonView.swift; sourceTree = "<group>"; };
 		A8FD8F422DFC1656008CAACF /* TSImageComparisonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TSImageComparisonView.swift; sourceTree = "<group>"; };
-		A8FD8F442DFC219B008CAACF /* launch1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = launch1.png; sourceTree = "<group>"; };
+		A8FD8F462DFC3092008CAACF /* launch2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = launch2.png; sourceTree = "<group>"; };
 		CA36AE9B313600F95F04D9CA /* Pods-TSLiveWallpaper.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TSLiveWallpaper.debug.xcconfig"; path = "Target Support Files/Pods-TSLiveWallpaper/Pods-TSLiveWallpaper.debug.xcconfig"; sourceTree = "<group>"; };
 		E33A770AEFA5810AED7219D3 /* Pods_TSLiveWallpaper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TSLiveWallpaper.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -1273,7 +1273,7 @@
 				A81CA45F2D1567CD00A3AAC8 /* LaunchVC */,
 				A8E56BEC2D1520EC003C54AF /* AppDelegate.swift */,
 				A8E56BED2D1520EC003C54AF /* Assets.xcassets */,
-				A8FD8F442DFC219B008CAACF /* launch1.png */,
+				A8FD8F462DFC3092008CAACF /* launch2.png */,
 				A8E56BEE2D1520EC003C54AF /* Info.plist */,
 				A8E56BF02D1520EC003C54AF /* LaunchScreen.storyboard */,
 				609B6EA32D6F1221007942D4 /* Localizable.strings */,
@@ -1402,12 +1402,12 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A8FD8F452DFC219B008CAACF /* launch1.png in Resources */,
 				603901222DF9770A0096551E /* Flash-old-Time.png in Resources */,
 				606372D82D545E6C005C82CF /* Example Music.mp3 in Resources */,
 				A8C4C0A42D24218A003C46FC /* metadata.mov in Resources */,
 				A86857D72DF983620089D222 /* generat_loading.gif in Resources */,
 				A86857C62DF92BE70089D222 /* ZillaSlab-Bold.ttf in Resources */,
+				A8FD8F472DFC3092008CAACF /* launch2.png in Resources */,
 				60553FC42D3B528A00BAAD7F /* IJKPlayer.md in Resources */,
 				609B6EA52D6F1221007942D4 /* Localizable.strings in Resources */,
 				A8FD8F332DFBCB85008CAACF /* ZillaSlab-Regular.ttf in Resources */,
@@ -1697,7 +1697,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -1737,7 +1737,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

TSLiveWallpaper/Assets.xcassets/Purchase/purchase_icon_ad.imageset/Contents.json

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

TSLiveWallpaper/Assets.xcassets/Purchase/purchase_icon_hd.imageset/Contents.json

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

TSLiveWallpaper/Assets.xcassets/Purchase/purchase_icon_unlimited.imageset/Contents.json

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

TSLiveWallpaper/Assets.xcassets/Purchase/setting_purchase_vip.imageset/Contents.json

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

TSLiveWallpaper/Base.lproj/LaunchScreen.storyboard

@@ -16,7 +16,7 @@
                         <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="launch1.png" translatesAutoresizingMaskIntoConstraints="NO" id="JeO-0Z-rkP">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch2.png" adjustsImageSizeForAccessibilityContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JeO-0Z-rkP">
                                 <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                             </imageView>
                         </subviews>
@@ -36,6 +36,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="launch1.png" width="750" height="1624"/>
+        <image name="launch2.png" width="750" height="1624"/>
     </resources>
 </document>

TSLiveWallpaper/Business/BusinessView/TSImageIPanComparisonView.swift

@@ -67,11 +67,11 @@ class TSImageIPanComparisonView: UIView {
         // 获取手指在视图中的移动距离（相对起点）
         let translation = gesture.translation(in: self)
         if translation.x > 0 {
-            print("向右移动: \(translation.x) 像素")
+//            print("向右移动: \(translation.x) 像素")
             lineX = min(lineX + translation.x, self.width-1)
         } else if translation.x < 0 {
             lineX = max(lineX + translation.x, 0)
-            print("向左移动: \(translation.x) 像素")
+//            print("向左移动: \(translation.x) 像素")
         }
         gesture.setTranslation(.zero, in: self) // 重置位移
     }

TSLiveWallpaper/Business/TSAIListVC/TSAIAgeImageHintVC/TSAIListHintBaseVC.swift

@@ -83,7 +83,7 @@ class TSAIListHintBaseVC: TSBaseVC {
             return Config(imageMaxBitSize: kUploadImageMaxBit10Size,
                           goodImageNamed: "hint_Enlighten_good",
                           badImageNamed: "hint_Enlighten_bad",
-                          titleText: "Descratch Tips".localized,
+                          titleText: "Enlighten Tips".localized,
                           titleSubText: "",
                           goodText: "Suitable".localized,
                           goodInfoText: "Over-dark or over-light, overexposed, or underexposed photos".localized,
@@ -95,7 +95,7 @@ class TSAIListHintBaseVC: TSBaseVC {
             return Config(imageMaxBitSize: kUploadImageMaxBit10Size,
                           goodImageNamed: "hint_Descratch_good",
                           badImageNamed: "hint_Enhance_bad",
-                          titleText: "Descratch Tips".localized,
+                          titleText: "Recreate Tips".localized,
                           titleSubText: "",
                           goodText: "Suitable".localized,
                           goodInfoText: "Portraits, Low-resolution and photos, faces should be visible".localized,

TSLiveWallpaper/Business/TSAIListVC/TSAIListVC/TSAILIstCell.swift

@@ -28,7 +28,7 @@ class TSAILIstCell: TSBaseCollectionCell {
     
     
     lazy var titleLab: UILabel = {
-        let titleLab = UILabel.createLabel(font: .font(name: .ZillaSlab,size: 18,weight: .bold),textColor:.fromHex("FFFFFF"),numberOfLines: 0)
+        let titleLab = UILabel.createLabel(font: .font(name: .ZillaSlab,size: 20,weight: .bold),textColor:.fromHex("FFFFFF"),numberOfLines: 0)
         return titleLab
     }()
     

TSLiveWallpaper/Business/TSAIListVC/TSAIListVC/TSAIListVC.swift

@@ -13,35 +13,7 @@ class TSAIListVC: TSBaseVC {
         let sectionModel = TSBasicSectionModel()
         dataArray.append(sectionModel)
         
-        //调整光线
-        sectionModel.addSubItemModel(
-            createItemModel(
-                leftImageName:"aiList_Enlighten",
-                leftTitle: "Enlighten".localized,
-                leftSubTitle: "Remove scratches and dirt".localized,
-                rightViewStyle: 0,
-                tapBlock: { [weak self] model, _, _ in
-                   guard let self = self else { return }
-                    enterSelectPhotos(style: .enlighten) { image in
-                    let baseVc = TSAIUploadPhotoVC(titleString: model.leftTitle ?? "",upLoadImage: image, generatorStyle: .enlighten)
-                        kPushVC(target: self, modelVC: baseVc)
-                    }
-        }))
-        
-        //修复和上色老照片
-        sectionModel.addSubItemModel(
-            createItemModel(
-                leftImageName:"aiList_Recreate",
-                leftTitle: "Recreate".localized,
-                leftSubTitle: "Remove scratches and dirt".localized,
-                rightViewStyle: 0,
-                tapBlock: { [weak self] model, _, _ in
-                   guard let self = self else { return }
-                    enterSelectPhotos(style: .recreate) { image in
-                    let baseVc = TSAIUploadPhotoVC(titleString: model.leftTitle ?? "",upLoadImage: image, generatorStyle: .recreate)
-                        kPushVC(target: self, modelVC: baseVc)
-                    }
-        }))
+
         
         //照片高清修复
         sectionModel.addSubItemModel(
@@ -87,6 +59,38 @@ class TSAIListVC: TSBaseVC {
                         kPushVC(target: self, modelVC: baseVc)
                     }
         }))
+        
+        //修复和上色老照片
+        sectionModel.addSubItemModel(
+            createItemModel(
+                leftImageName:"aiList_Recreate",
+                leftTitle: "Recreate".localized,
+                leftSubTitle: "Bring new life to old photos".localized,
+                rightViewStyle: 0,
+                tapBlock: { [weak self] model, _, _ in
+                   guard let self = self else { return }
+                    enterSelectPhotos(style: .recreate) { image in
+                    let baseVc = TSAIUploadPhotoVC(titleString: model.leftTitle ?? "",upLoadImage: image, generatorStyle: .recreate)
+                        kPushVC(target: self, modelVC: baseVc)
+                    }
+        }))
+        
+        //调整光线
+        sectionModel.addSubItemModel(
+            createItemModel(
+                leftImageName:"aiList_Enlighten",
+                leftTitle: "Enlighten".localized,
+                leftSubTitle: "Easily fix lighting issues on photos".localized,
+                rightViewStyle: 0,
+                tapBlock: { [weak self] model, _, _ in
+                   guard let self = self else { return }
+                    enterSelectPhotos(style: .enlighten) { image in
+                    let baseVc = TSAIUploadPhotoVC(titleString: model.leftTitle ?? "",upLoadImage: image, generatorStyle: .enlighten)
+                        kPushVC(target: self, modelVC: baseVc)
+                    }
+        }))
+        
+
 
         return dataArray
 
@@ -167,6 +171,8 @@ class TSAIListVC: TSBaseVC {
         collectionView.snp.makeConstraints { make in
             make.edges.equalToSuperview()
         }
+        
+        PlayerManager.shared.miniBar.isHidden = true
     }
     
     override func dealThings() {
@@ -241,17 +247,17 @@ extension TSAIListVC: UICollectionViewDataSource ,UICollectionViewDelegate {
 extension TSAIListVC{
     
     func enterSelectPhotos(style:TSGeneratorImageStyle,complete: @escaping (UIImage)->Void){
-//        if style.userDefaultsKey.isEmpty{
-//            self.pickSinglePhoto(maxBitSize:style.imageMaxBitSize,complete:complete)
-//        }else{
-//            TSAIListHintBaseVC.userDefaultsKey = style.userDefaultsKey
-//            if TSAIListHintBaseVC.isShowUploadImageHint{
-//                TSAIListHintBaseVC.isShowUploadImageHint = false
+        if style.userDefaultsKey.isEmpty{
+            self.pickSinglePhoto(maxBitSize:style.imageMaxBitSize,complete:complete)
+        }else{
+            TSAIListHintBaseVC.userDefaultsKey = style.userDefaultsKey
+            if TSAIListHintBaseVC.isShowUploadImageHint{
+                TSAIListHintBaseVC.isShowUploadImageHint = false
                 self.presentModalHintVC(config:style.config,complete:complete)
-//            }else {
-//                self.pickSinglePhoto(maxBitSize:style.imageMaxBitSize,complete:complete)
-//            }
-//        }
+            }else {
+                self.pickSinglePhoto(maxBitSize:style.imageMaxBitSize,complete:complete)
+            }
+        }
     }
     
     

TSLiveWallpaper/Business/TSAIListVC/TSAIPhotoGeneratorVC/TSAIListPhotoGeneratorVC.swift

@@ -60,7 +60,7 @@ class TSAIListPhotoGeneratorVC: TSAIPhotoDetailsVC {
     lazy var generateInView : TSGeneratorView = {
         let generateInView = TSGeneratorView()
         generateInView.isUploadImage = false
-        generateInView.animationView.setText(time: String(format: "～ %d min".localized, 2), info: "Lots of people are processing images right now, so this might take a bit.".localized)
+        generateInView.animationView.setText(time: String(format: "～ %d mins".localized, 2), info: "Lots of people are processing images right now, so this might take a bit.".localized)
         generateInView.clickErrorBlock = { [weak self] style in
             guard let self = self else { return }
             
@@ -125,7 +125,7 @@ class TSAIListPhotoGeneratorVC: TSAIPhotoDetailsVC {
             }
         }else{
             TSCustomAlertController.show(in: self, config: TSCustomAlertController.AlertConfig(
-                message: "As you leave, your generation will be interrupted and no result.".localized,
+                message: "As you leave, your task will be interrupted and no result.".localized,
                 messageColor: .white,
                 messageFont: .systemFont(ofSize: 16),
                 
@@ -200,7 +200,7 @@ extension TSAIListPhotoGeneratorVC {
     }
     
     func showLoading(){
-        generateInView.updateShowLoading(text: "Generating".localized + " ...".localized)
+        generateInView.updateShowLoading(text: "Processing".localized + " ...".localized)
 
     }
     

TSLiveWallpaper/Business/TSAIListVC/TSAIPhotoGeneratorVC/TSAIListPhotoGeneratorVM.swift

@@ -306,7 +306,7 @@ class TSAIListPhotoGeneratorBaseVM {
     
     func generating(progress:Float) -> String {
         let progress = progress*(0.9) // 预留 10% 进度给图片下载
-        //Generating 0%-100%
+        //Processing 0%-100%
         var progressInt = Int(progress*100)
 
         if progressInt > 99 {
@@ -318,6 +318,6 @@ class TSAIListPhotoGeneratorBaseVM {
     
     
     var generatingText:String{
-        return "Generating".localized
+        return "Processing".localized
     }
 }

TSLiveWallpaper/Business/TSMineVC/TSMineCell.swift

@@ -16,7 +16,7 @@ class TSMineCell: TSSimpleTableViewCell {
     }()
     
     lazy var rightLab: UILabel = {
-        return UILabel.createLabel(font: .font(name:.ZillaSlab,size: 16),textColor: .white)
+        return UILabel.createLabel(font: .font(name:.PingFangSC,size: 16),textColor: .white)
     }()
     
     lazy var rightImageView: UIImageView = {

TSLiveWallpaper/Business/TSMineVC/TSMineVC.swift

@@ -12,6 +12,8 @@ class TSMineVC: TSBaseVC {
         headerView.frame = CGRect(x: 0, y: 0, width: k_ScreenWidth - 32, height: 134)
         headerView.clickUpgrade = { [weak self]  in
             guard let self = self else { return }
+            if PurchaseManager.default.isVip { return }
+            
             TSPurchaseVC.show(target: self)
         }
         return headerView

TSLiveWallpaper/Business/TSMineVC/View/TSMineTopView.swift

@@ -28,7 +28,7 @@ class TSMineTopView: TSBaseView {
     lazy var upgradeBtn: UIButton = {
         let upgradeBtn = kCreateNormalSubmitBtn(title: "Upgrade".localized,font: .font(size: 18,weight: .medium)){ [weak self] in
             guard let self = self else { return }
-            clickUpgrade?()
+            clickView()
         }
         return upgradeBtn
     }()
@@ -80,7 +80,7 @@ class TSMineTopView: TSBaseView {
 
     
     lazy var vipTitleLabel: UILabel = {
-        let titleLabel = UILabel.createLabel(text: kAppName, font: .font(name: .ZillaSlabBoldItalic,size: 36,weight: .bold), textColor: .mainText)
+        let titleLabel = UILabel.createLabel(text: kAppName + " PRO", font: .font(name: .ZillaSlabBoldItalic,size: 32,weight: .bold), textColor: .mainText)
         kMainAsync {
             titleLabel.applyGradient(colors: ["#F1D3AB".uiColor,"#E4A858".uiColor])
         }
@@ -95,7 +95,7 @@ class TSMineTopView: TSBaseView {
     
     lazy var vipView: UIView = {
         let contentView = UIView()
-        
+
         let vipBgImageView = UIImageView.createImageView(image: .settingPurchaseVipBg, contentMode: .scaleToFill)
         contentView.addSubview(vipBgImageView)
         vipBgImageView.snp.makeConstraints { make in
@@ -105,22 +105,33 @@ class TSMineTopView: TSBaseView {
         
         contentView.addSubview(vipTitleLabel)
         vipTitleLabel.snp.makeConstraints { make in
-            make.top.equalTo(24)
-            make.centerX.equalToSuperview()
+            make.top.equalTo(28)
+            make.leading.equalTo(20)
         }
 
         contentView.addSubview(vipTimeLabel)
         vipTimeLabel.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.top.equalTo(vipTitleLabel.snp.bottom).offset(20)
+            make.leading.equalTo(20)
+            make.top.equalTo(vipTitleLabel.snp.bottom).offset(13)
         }
+        
+//        let vipIcon = UIImageView.createImageView(image: .settingPurchaseVip, contentMode: .scaleToFill)
+//        contentView.addSubview(vipIcon)
+//        vipIcon.snp.makeConstraints { make in
+//            make.centerY.equalToSuperview()
+//            make.trailing.equalTo(18)
+//            make.width.height.equalTo(196)
+//        }
+        
         contentView.isHidden = true
         return contentView
     }()
     
-
+    @objc func clickView(){
+        clickUpgrade?()
+    }
     override func creatUI() {
-
+        contentView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(clickView)))
         contentView.snp.updateConstraints { make in
             make.bottom.equalTo(-16)
         }

TSLiveWallpaper/Business/TSPurchaseMembershipVC/TSPurchaseVC.swift

@@ -229,20 +229,45 @@ struct PurchaseView :View {
                 
 //                let text = vipType == .none ? "Get PRO Access".localized : "Super Offer for Yearly Pro".localized
                 // 自定义颜色
-                HighlightedText("Get PRO Access",
-                              highlighted: "PRO",
-                              baseColor: .gray,
-                              highlightColor: .yellow)
+//                HighlightedText("Get PRO Access",
+//                              highlighted: "PRO",
+//                                baseColor: .white,
+//                                highlightColor: UIColor.themeColor.color)
+                Text("Get PRO Access")
+                    .foregroundStyle(.white)
                     .multilineTextAlignment(.center)
                     .font(.font(name: .ZillaSlabBoldItalic,size: 36))
-//                    .foregroundColor(UIColor.white.color)
                     .frame(width: k_ScreenWidth - 32, alignment: .center)
                 
-                
+                Spacer().frame(height: 16)
+                ZStack {
+                    VStack(alignment: .leading,spacing: 8) {
+                        HStack(spacing: 8) {
+                            Spacer().frame(width: 34)
+                            Image(.purchaseIconUnlimited).resizable().frame(width: 24, height: 24)
+                            Text("Unlimited Restore Photos".localized())
+                            Spacer()
+                        }
+                        HStack(spacing: 8) {
+                            Spacer().frame(width: 34)
+                            Image(.purchaseIconHd).resizable().frame(width: 24, height: 24)
+                            Text("Enhance & Colorize at High Quality".localized())
+                            Spacer()
+                        }
+                        
+                        HStack(spacing: 8) {
+                            Spacer().frame(width: 34)
+                            Image(.purchaseIconAd).resizable().frame(width: 24, height: 24)
+                            Text("100% No Ads".localized()).multilineTextAlignment(.leading)
+                            Spacer()
+                        }
+                    }.font(.font(size: 16)).foregroundColor(.white)
+                }
+
 
             }
             
-            Spacer().frame(height: 30)
+            Spacer().frame(height: 20)
  
             VStack(spacing: 12) {
                 
@@ -251,15 +276,15 @@ struct PurchaseView :View {
 //                    //增加月付费
 //                        PurchaseItemView(title: "One Month".localized, type: .month, selectedType: $viewModel.selectedType).onTapGesture {
 //                            viewModel.selectedType = .month
-                        PurchaseItemView(title: "YEARLY ACCESS".localized, type: .year, selectedType: $viewModel.selectedType).onTapGesture {
-//                        viewModel.selectedType = .year
-//                        viewModel.buyPublisher.send(true)
+                        PurchaseItemView(title: "YEARLY".localized, type: .year, selectedType: $viewModel.selectedType).onTapGesture {
+                            viewModel.selectedType = .year
+                            viewModel.buyPublisher.send(true)
                         }
                         TSVipRecView(save: vipType.saveString)
                             .offset(x:-30,y:-14)
                     }
                     
-                PurchaseItemView(title: "MONTH ACCESS".localized, type: .month, selectedType: $viewModel.selectedType).onTapGesture {
+                PurchaseItemView(title: "MONTH".localized, type: .month, selectedType: $viewModel.selectedType).onTapGesture {
                         viewModel.selectedType = .month
                         viewModel.buyPublisher.send(true)
                     }
@@ -334,7 +359,15 @@ struct PurchaseItemView: View {
                 //左边加个
                 VStack(alignment: .leading, spacing: 14) {
                     Text(title).font(.font(size: 16,weight: .medium)).foregroundColor(type == selectedType ? UIColor.themeColor.color : textColor)
-                    Text(priceString()).font(.font(size: 14))
+                    
+                    HStack{
+                        Text("Just".localized)
+                        Text(PurchaseManager.default.price(for: type) ?? "--").font(.font(size: 18))
+                        Text(perString())
+                    }.font(.font(size: 14))
+                    .foregroundColor(type == selectedType ? .white : textColor)
+                    
+                    
                 }
 
                 Spacer()
@@ -356,16 +389,26 @@ struct PurchaseItemView: View {
         )
     }
     
-    func priceString()->String{
+//    func priceString()->String{
+//        switch type {
+//        case .year:
+//            return "Just \(PurchaseManager.default.price(for: type) ?? "--") Per Year"
+//        case .month:
+//            return "Just \(PurchaseManager.default.price(for: type) ?? "--") Per Week"
+//        default:
+//            return "--"
+//        }
+//    }
+    
+    func perString()->String{
         switch type {
         case .year:
-            return "Just \(PurchaseManager.default.price(for: type) ?? "--") Per Year"
+            return "Per Year".localized
         case .month:
-            return "Just \(PurchaseManager.default.price(for: type) ?? "--") Per Week"
+            return "Per Month".localized
         default:
-            return "--"
+            return ""
         }
-        
     }
 }
 
@@ -375,7 +418,7 @@ struct TSVipRecView: View {
     var body: some View {
         HStack(spacing: 4) {
 //            Image("upvote_black").resizable().frame(width: 16, height: 16)
-            Text(save + " " + "OFF".localized).font(.font(size: 12,weight: .medium)).foregroundColor(.hex("#111111"))
+            Text("Save".localized  + " " + save ).font(.font(size: 12,weight: .medium)).foregroundColor(.hex("#111111"))
         }
         .padding(EdgeInsets(top: 6, leading: 6, bottom: 6, trailing: 6))
 //        .background(Color.hex("#FECB34"))

TSLiveWallpaper/Business/TSTabBarController/TSTabBarController.swift

@@ -45,38 +45,22 @@ class TSTabBarController: UITabBarController {
     }
 
     @objc private func setUpData() {
-//        viewControllerArray = ["MusicHomeContainerViewController",
-//                               "MusicPlaylistContainerViewController",
-//                               "TSHomeVC",
-//                              "TSMineVC"]
-//        selectedImageArray = [
-//            "tabbar_select_music",
-//            "tabbar_select_playlist",
-//            "tabbar_select_random",
-//            "tabbar_select_mine",
-//        ]
-//        unselectedImageArray = [
-//            "tabbar_unSelect_music",
-//            "tabbar_unSelect_playlist",
-//            "tabbar_unSelect_random",
-//            "tabbar_unSelect_mine",
-//        ]
-//
-        viewControllerArray = ["MusicHomeContainerViewController",
-                               "MusicPlaylistContainerViewController",
-                               "TSAIListVC",
-                               "TSMineVC"]
+        viewControllerArray = [
+            "TSAIListVC",
+            "MusicHomeContainerViewController",
+            "MusicPlaylistContainerViewController",
+            "TSMineVC"]
         
         selectedImageArray = [
+            "tabbar_select_ailist",
             "tabbar_select_music",
             "tabbar_select_playlist",
-            "tabbar_select_ailist",
             "tabbar_select_mine",
         ]
         unselectedImageArray = [
+            "tabbar_unSelect_allist",
             "tabbar_unSelect_music",
             "tabbar_unSelect_playlist",
-            "tabbar_unSelect_allist",
             "tabbar_unSelect_mine",
         ]
 
@@ -122,6 +106,10 @@ class TSTabBarController: UITabBarController {
         }
 
         addMusicAndMiniBar()
+        kMainShort {
+            self.updateMiniBarHidden()
+        }
+        
     }
 
     func updateMarkViewFrame() {
@@ -170,10 +158,13 @@ class TSTabBarController: UITabBarController {
 
 extension TSTabBarController: UITabBarControllerDelegate {
     func tabBarController(_ tabBarController: UITabBarController, didSelect viewController: UIViewController) {
-        
-        PlayerManager.shared.miniBar.isHidden = selectedIndex >= 2
+        updateMiniBarHidden()
         updateMarkViewFrame()
     }
+    
+    func updateMiniBarHidden(){
+        PlayerManager.shared.miniBar.isHidden = (selectedIndex == 0 || selectedIndex == 3)
+    }
 }
 
 // MARK: 音乐布局相关

TSLiveWallpaper/Common/Purchase/TSPurchaseBusiness.swift

@@ -120,8 +120,8 @@ extension TSPurchaseBusiness{
         PurchaseManager.default.password = "155c8104e2b041c0abae43ace199124c"
         PurchaseManager.default.purchaseProducts = [
             PurchaseProduct(productId: "1001", period:.month),
-            PurchaseProduct(productId: "1002", period: .year),
-            PurchaseProduct(productId: "003", period: .lifetime)
+            PurchaseProduct(productId: "1002", period:.year),
+            PurchaseProduct(productId: "003", period:.lifetime)
         ]
         
         PurchaseManager.default.requestProducts()

TSLiveWallpaper/Common/Purchase/TSPurchaseEnum.swift

@@ -32,9 +32,9 @@ public enum PremiumPeriod: String, CaseIterable {
     var saveString: String {
         switch self {
         case .none:
-            return "80%"//"40%" 增加月付费
+            return "60%"
         default:
-            return "80%"
+            return "60%"
         }
     }
     

TSLiveWallpaper/DataManger/Config/TSConfig.swift

@@ -7,7 +7,7 @@
 
 extension UIColor {
     /// 背景色
-    static let mainBg = "#121212".uiColor
+    static let mainBg = "#010101".uiColor
     
     /// 主色调
     static let themeColor = "#E4A858".uiColor

TSLiveWallpaper/LaunchVC/TSLaunchVC.swift

@@ -104,7 +104,7 @@ class TSLaunchVC: UIViewController {
 //        launchView.frame = UIScreen.main.bounds
         
         let launchView = UIImageView(frame: UIScreen.main.bounds)
-        launchView.image = UIImage(named: "launch1")
+        launchView.image = UIImage(named: "launch2")
         launchView.contentMode = .scaleAspectFit
         view.addSubview(launchView)
     }