3.6.15(1)修改 bug

TSLiveWallpaper.xcodeproj/project.pbxproj

@@ -1481,7 +1481,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -1499,7 +1499,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.14;
+				MARKETING_VERSION = 3.6.15;
 				PRODUCT_BUNDLE_IDENTIFIER = musicplayer.offline.com;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1522,7 +1522,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -1540,7 +1540,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.14;
+				MARKETING_VERSION = 3.6.15;
 				PRODUCT_BUNDLE_IDENTIFIER = musicplayer.offline.com;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

TSLiveWallpaper/Assets.xcassets/AIList/home/alistHome_0_Restore.imageset/Contents.json

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

TSLiveWallpaper/Assets.xcassets/AIList/home/alistHome_1_Restore.imageset/Contents.json

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

TSLiveWallpaper/Business/TSAIListVC/TSAIListVC/VM/TSAIListDataVM+Dic.swift

@@ -27,10 +27,10 @@ extension TSAIListDataVM {
     var unionTypeDict:[Int:[TSGenerateModel]]{
         return[
             1:[
+                TSGenerateModel(json: ptp_Enhance)!,
                 TSGenerateModel(json: ptp_Descratch)!,
                 TSGenerateModel(json: ptp_Colorize)!,
                 TSGenerateModel(json: ptp_Recreate)!,
-                TSGenerateModel(json: ptp_Enhance)!,
                 TSGenerateModel(json: ptp_AdjustLight)!,
             ]
         ]
@@ -344,7 +344,7 @@ extension TSAIListDataVM {
     var ptp_Recreate:[String:Any]{
         [
             imageName: "ptp_style_Recreate",
-            imageText: "Recreate",
+            imageText: "Restore",
             prompt:"Recreate damaged portraits and added suitable color for photo",
             isVip: false,
             unionType: 1,

TSLiveWallpaper/Business/TSAIListVC/TSAIListVC/VM/TSAIListDataVM.swift

@@ -17,12 +17,15 @@ class TSAIListDataVM {
     
     lazy var bannerItems: [TSDiscoverItemModel] = {
         return [
-            TSDiscoverItemModel(style: .enhance,
-                                viewModel: TSDiscoverAnimationItemVM(title: "Photo Enhance",style: .comparison, imageNameds: ["alistHome_0_PhotoEnhance","alistHome_1_PhotoEnhance"]),
-                                generateModel: TSGenerateModel(json: ptp_Enhance)),
+            TSDiscoverItemModel(style: .recreate,
+                                viewModel: TSDiscoverAnimationItemVM(title: "",style: .comparison, imageNameds: ["alistHome_0_Restore","alistHome_1_Restore"]),
+                                generateModel: TSGenerateModel(json: ptp_Recreate)),
+            
 //            TSDiscoverItemModel(style: .creatVideo,
 //                                viewModel: TSDiscoverAnimationItemVM(style: .video,imageNameds: ["aiList SendRose Banner.mp4"]),
 //                                generateModel: TSGenerateModel(json: video_SendRose)),
+            
+            
             TSDiscoverItemModel(style: .removeWatermark,
                                 viewModel: TSDiscoverAnimationItemVM(style: .comparison, imageNameds: ["alistHome_0_banner_RemoveWatermark","alistHome_1_banner_RemoveWatermark"]),
                                 generateModel: TSGenerateModel(json: ptp_RemoveWatermark)),
@@ -43,18 +46,22 @@ class TSAIListDataVM {
     
     lazy var restoreOldPhotoItems: [TSDiscoverItemModel] = {
         return [
+            TSDiscoverItemModel(style: .enhance,
+                                viewModel: TSDiscoverAnimationItemVM(title: "",style: .comparison, imageNameds: ["alistHome_0_Enhance","alistHome_1_Enhance"]),
+                                generateModel: TSGenerateModel(json: ptp_Enhance)),
+            
+            
             TSDiscoverItemModel(style: .descratch,
                                 viewModel: TSDiscoverAnimationItemVM(title: "",style: .comparison, imageNameds: ["alistHome_0_Descratch","alistHome_1_Descratch"]),
                                 generateModel: TSGenerateModel(json: ptp_Descratch)),
             TSDiscoverItemModel(style: .colorize,
                                 viewModel: TSDiscoverAnimationItemVM(title: "",style: .comparison, imageNameds: ["alistHome_0_Colorize","alistHome_1_Colorize"]),
                                 generateModel: TSGenerateModel(json: ptp_Colorize)),
+            
             TSDiscoverItemModel(style: .recreate,
                                 viewModel: TSDiscoverAnimationItemVM(title: "",style: .comparison, imageNameds: ["alistHome_0_Recreate","alistHome_1_Recreate"]),
                                 generateModel: TSGenerateModel(json: ptp_Recreate)),
-            TSDiscoverItemModel(style: .enhance,
-                                viewModel: TSDiscoverAnimationItemVM(title: "",style: .comparison, imageNameds: ["alistHome_0_Enhance","alistHome_1_Enhance"]),
-                                generateModel: TSGenerateModel(json: ptp_Enhance)),
+
             TSDiscoverItemModel(style: .enlighten,
                                 viewModel: TSDiscoverAnimationItemVM(title: "",style: .comparison, imageNameds: ["alistHome_0_AdjustLight","alistHome_1_AdjustLight"]),
                                 generateModel: TSGenerateModel(json: ptp_AdjustLight)),

TSLiveWallpaper/Business/TSAIListVC/TSAIPhotoDetailsVC/TSAIPhotoDetailsBrowserPageVC.swift

@@ -269,4 +269,13 @@ class TSAIPhotoDetailsBrowserVideoVC: TSAIPhotoDetailsBrowserBaseVC {
         self.videoPlayerVC?.runloppPlay()
     }
     
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        self.videoPlayerVC?.runloppPlay()
+    }
+    
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        self.videoPlayerVC?.playPause()
+    }
 }

TSLiveWallpaper/Business/TSAIListVC/TSAIUploadPhotoVC/TSAIPhotoRemoveVC/TSAIPhotoRemoveVC.swift

@@ -65,10 +65,10 @@ class TSAIRemovePhotoBgVC: TSBaseVC {
     lazy var removeView: TSAIPhotoRemoveBgView = {
         let removeView = TSAIPhotoRemoveBgView(targetVC: self)
         removeView.setFrontImage(image: originalImage)
-        removeView.clickImageViewBlock = { [weak self]  in
-            guard let self = self else { return }
-            clickNavRight()
-        }
+//        removeView.clickImageViewBlock = { [weak self]  in
+//            guard let self = self else { return }
+//            clickNavRight()
+//        }
         return removeView
     }()
     
@@ -175,7 +175,7 @@ class TSAIRemovePhotoBgVC: TSBaseVC {
     override func createView() {
         setPageTitle("Remove Background".localized)
 
-        _ = setNavigationItem("", imageName: "replace_photo", direction: .right, action: #selector(clickNavRight))
+//        _ = setNavigationItem("", imageName: "replace_photo", direction: .right, action: #selector(clickNavRight))
         contentView.addSubview(removeView)
         removeView.snp.makeConstraints { make in
             make.edges.equalToSuperview()
@@ -232,17 +232,17 @@ extension TSAIRemovePhotoBgVC {
         }
     }
     
-    @objc func clickNavRight() {
-        if kPurchaseBusiness.kJudgeVipFreeType(vipFreeNumType: .generalRemoveBg){ return }//判断 vip
-        photoPickerManager.pickPhoto(maxSelected: 1) { [weak self] images in
-            guard let self = self else { return }
-            if let image = images.first {
-                originalImage = image
-                removeView.setFrontImage(image: originalImage)
-            }
-            self.photoPickerManager.dismissPageVC()
-        }
-    }
+//    @objc func clickNavRight() {
+//        if kPurchaseBusiness.kJudgeVipFreeType(vipFreeNumType: .generalRemoveBg){ return }//判断 vip
+//        photoPickerManager.pickPhoto(maxSelected: 1) { [weak self] images in
+//            guard let self = self else { return }
+//            if let image = images.first {
+//                originalImage = image
+//                removeView.setFrontImage(image: originalImage)
+//            }
+//            self.photoPickerManager.dismissPageVC()
+//        }
+//    }
     
     //保存功能
     @objc func clickSaveBtn(){

TSLiveWallpaper/Business/TSPurchaseMembershipVC/TSPurchaseVC.swift

@@ -255,7 +255,6 @@ struct PurchaseView :View {
                     //                            viewModel.selectedType = .month
                     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)
@@ -263,13 +262,11 @@ struct PurchaseView :View {
                 
                 PurchaseItemView(title: "Weekly".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)
                 //                    }
                 //                }
             }.padding(.horizontal)

TSLiveWallpaper/Common/Purchase/TSPurchaseManager.swift

@@ -90,9 +90,9 @@ public class PurchaseManager: NSObject {
     }
 
     @objc public var isVip: Bool {
-//        #if DEBUG
-//        return true
-//        #endif
+        #if DEBUG
+        return true
+        #endif
         guard let expiresDate = expiredDate else {
             return false
         }

TSLiveWallpaper/Common/ViewTool/TSPhotoPickerManager/TSPhotoPickerManager.swift

@@ -193,7 +193,7 @@ class TSPhotoPickerManager: NSObject{
         config.maximumSelectedCount = maxSelected
         config.languageType = LanguageManager.shared.currentLanguage.languageType
         config.customLanguages = [CustomLanguage(language: "it", bundle: Bundle(path: Bundle.main.path(forResource: "it", ofType: "lproj")!)!)]
-        config.selectOptions = []
+//        config.selectOptions = []
         config.photoList.allowAddCamera = false
         
         config.textManager.picker.albumCameraRollTitle = .custom("Used Photo".localized)

TSLiveWallpaper/ar.lproj/Localizable.strings

@@ -220,3 +220,4 @@
 
 "No creation yet. Your creations will be listed here" = "لا يوجد أي إبداع بعد. سيتم إدراج إبداعاتك هنا.";
 "You haven’t used any photos yet." = "لم تستخدم أي صور بعد.";
+"Restore" = "يعيد";

TSLiveWallpaper/de.lproj/Localizable.strings

@@ -211,3 +211,4 @@
 
 "No creation yet. Your creations will be listed here" = "Noch keine Kreation. Deine Kreationen werden hier aufgelistet";
 "You haven’t used any photos yet." = "Sie haben noch keine Fotos verwendet.";
+"Restore" = "Wiederherstellen";

TSLiveWallpaper/en.lproj/Localizable.strings

@@ -220,3 +220,4 @@
 
 "No creation yet. Your creations will be listed here" = "No creation yet. Your creations will be listed here";
 "You haven’t used any photos yet." = "You haven’t used any photos yet.";
+"Restore" = "Restore";

TSLiveWallpaper/es.lproj/Localizable.strings

@@ -224,3 +224,4 @@
 
 "No creation yet. Your creations will be listed here" = "Aún no hay creación. Tus creaciones se listarán aquí.";
 "You haven’t used any photos yet." = "Aún no has utilizado ninguna fotografía";
+"Restore" = "Restaurar";

TSLiveWallpaper/fr.lproj/Localizable.strings

@@ -212,3 +212,4 @@
 
 "No creation yet. Your creations will be listed here" = "Aucune création pour le moment. Vos créations seront listées ici.";
 "You haven’t used any photos yet." = "Vous n’avez pas encore utilisé de photos.";
+"Restore" = "Restaurer";

TSLiveWallpaper/it.lproj/Localizable.strings

@@ -221,3 +221,4 @@
 
 "No creation yet. Your creations will be listed here" = "Nessuna creazione ancora. Le tue creazioni saranno elencate qui";
 "You haven’t used any photos yet." = "Non hai ancora utilizzato alcuna foto.";
+"Restore" = "Ripristinare";

TSLiveWallpaper/ja.lproj/Localizable.strings

@@ -218,3 +218,4 @@
 
 "No creation yet. Your creations will be listed here" = "まだ作品はありません。あなたの作品はここに表示されます";
 "You haven’t used any photos yet." = "まだ写真を使用していません。";
+"Restore" = "復元する";

TSLiveWallpaper/ko.lproj/Localizable.strings

@@ -218,3 +218,4 @@
 
 "No creation yet. Your creations will be listed here" = "아직 만든 것이 없습니다. 만든 것이 여기에 나열됩니다.";
 "You haven’t used any photos yet." = "아직 사진을 사용하지 않았습니다.";
+"Restore" = "복원하다";

TSLiveWallpaper/pt-BR.lproj/Localizable.strings

@@ -212,3 +212,4 @@
 
 "No creation yet. Your creations will be listed here" = "Nenhuma criação ainda. Suas criações serão listadas aqui.";
 "You haven’t used any photos yet." = "Você ainda não usou nenhuma foto.";
+"Restore" = "Restaurar";

TSLiveWallpaper/pt-PT.lproj/Localizable.strings

@@ -212,3 +212,4 @@
 
 "No creation yet. Your creations will be listed here" = "Nenhuma criação ainda. Suas criações serão listadas aqui.";
 "You haven’t used any photos yet." = "Você ainda não usou nenhuma foto.";
+"Restore" = "Restaurar";

TSLiveWallpaper/zh-Hant.lproj/Localizable.strings

@@ -218,3 +218,4 @@
 
 "No creation yet. Your creations will be listed here" = "尚未創作。您的作品將在此列出";
 "You haven’t used any photos yet." = "您尚未使用任何照片。";
+"Restore" = "恢復";