3.6.14(3)提测

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 = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -1522,7 +1522,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

TSLiveWallpaper/Business/BusinessView/TSPageNullView.swift

@@ -13,7 +13,7 @@ class TSPageNullView: TSBaseView {
     }()
     
     lazy var titleLabel: UILabel = {
-        let titleLabel = UILabel.createLabel(text:"No Creation yet. Your creations will be listed here".localized ,font:.font(size: 14.0),textColor: .white.withAlphaComponent(0.6),textAlignment: .center,numberOfLines: 0)
+        let titleLabel = UILabel.createLabel(text:"No creation yet. Your creations will be listed here".localized ,font:.font(size: 14.0),textColor: .white.withAlphaComponent(0.6),textAlignment: .center,numberOfLines: 0)
         return titleLabel
     }()
     

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

@@ -27,10 +27,10 @@ extension TSAIListDataVM {
     var unionTypeDict:[Int:[TSGenerateModel]]{
         return[
             1:[
+                TSGenerateModel(json: ptp_Descratch)!,
                 TSGenerateModel(json: ptp_Colorize)!,
                 TSGenerateModel(json: ptp_Recreate)!,
                 TSGenerateModel(json: ptp_Enhance)!,
-                TSGenerateModel(json: ptp_Descratch)!,
                 TSGenerateModel(json: ptp_AdjustLight)!,
             ]
         ]

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

@@ -43,22 +43,18 @@ class TSAIListDataVM {
     
     lazy var restoreOldPhotoItems: [TSDiscoverItemModel] = {
         return [
-            TSDiscoverItemModel(style: .recreate,
-                                viewModel: TSDiscoverAnimationItemVM(title: "",style: .comparison, imageNameds: ["alistHome_0_Recreate","alistHome_1_Recreate"]),
-                                generateModel: TSGenerateModel(json: ptp_Recreate)),
-            
             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/TSMineVC/TSMineVM.swift

@@ -118,46 +118,46 @@ class TSMineVM {
         sectionModel.addSubItemModel(updateItem)
         
         
-//#if DEBUG
-//        sectionModel.addSubItemModel(
-//            createItemModel(
-//                leftImage: .mineCellPrivacy,
-//                leftTitle: "清除所有计数和钥匙串".localized,
-//                tapBlock: { [weak self] _, _, _ in
-//                    guard let self = self else { return }
-//                    KeychainManager.clearAll()
-//                    UserDefaults.standard.set(nil, forKey: kVipGeneratedNumKey)
-//                    UserDefaults.standard.set(nil, forKey: kDayGeneratedNumKey)
-//                    UserDefaults.standard.set(nil, forKey: kFreeNumKey)
-//                    UserDefaults.standard.synchronize()
-//                    UIAlertView(title: "", message: "清除所有计数和钥匙串", delegate: nil, cancelButtonTitle: "OK").show()
-//                }))
-//        
-//        sectionModel.addSubItemModel(
-//            createItemModel(
-//                leftImage: .mineCellPrivacy,
-//                leftTitle: "查询会员次数".localized,
-//                tapBlock: { [weak self] _, _, _ in
-//                    guard let self = self else { return }
-//                    
-//                    var string = ""
-//                    if var saveDict = UserDefaults.standard.dictionary(forKey: kFreeNumKey) as? [String: Int]{
-//                        string = string + "新用户免费次数" + (saveDict.toJSONString() ?? "")
-//                    }
-//                    string = string + "\n"
-//            
-//                    if var saveDict = UserDefaults.standard.dictionary(forKey: kDayGeneratedNumKey) as? [String: [String: Any]]{
-//                        string = string + "每日的次数" + (saveDict.toJSONString() ?? "")
-//                    }
-//                    string = string + "\n"
-//                    if var saveDict = UserDefaults.standard.dictionary(forKey: kVipGeneratedNumKey) as? [String: [String: Any]]{
-//                        string = string + "会员的总次"  + (saveDict.toJSONString() ?? "")
-//                    }
-//                    string = string + "\n当前会员过期时间戳:\(kPurchaseBusiness.expireTime)"
-//                    UIAlertView(title: "", message: string, delegate: nil, cancelButtonTitle: "OK").show()
-//                    dePrint("所有的会员次数=\(string)")
-//                }))
-//#endif
+#if DEBUG
+        sectionModel.addSubItemModel(
+            createItemModel(
+                leftImage: .mineCellPrivacy,
+                leftTitle: "清除所有计数和钥匙串".localized,
+                tapBlock: { [weak self] _, _, _ in
+                    guard let self = self else { return }
+                    KeychainManager.clearAll()
+                    UserDefaults.standard.set(nil, forKey: kVipGeneratedNumKey)
+                    UserDefaults.standard.set(nil, forKey: kDayGeneratedNumKey)
+                    UserDefaults.standard.set(nil, forKey: kFreeNumKey)
+                    UserDefaults.standard.synchronize()
+                    UIAlertView(title: "", message: "清除所有计数和钥匙串", delegate: nil, cancelButtonTitle: "OK").show()
+                }))
+        
+        sectionModel.addSubItemModel(
+            createItemModel(
+                leftImage: .mineCellPrivacy,
+                leftTitle: "查询会员次数".localized,
+                tapBlock: { [weak self] _, _, _ in
+                    guard let self = self else { return }
+                    
+                    var string = ""
+                    if var saveDict = UserDefaults.standard.dictionary(forKey: kFreeNumKey) as? [String: Int]{
+                        string = string + "新用户免费次数" + (saveDict.toJSONString() ?? "")
+                    }
+                    string = string + "\n"
+            
+                    if var saveDict = UserDefaults.standard.dictionary(forKey: kDayGeneratedNumKey) as? [String: [String: Any]]{
+                        string = string + "每日的次数" + (saveDict.toJSONString() ?? "")
+                    }
+                    string = string + "\n"
+                    if var saveDict = UserDefaults.standard.dictionary(forKey: kVipGeneratedNumKey) as? [String: [String: Any]]{
+                        string = string + "会员的总次"  + (saveDict.toJSONString() ?? "")
+                    }
+                    string = string + "\n当前会员过期时间戳:\(kPurchaseBusiness.expireTime)"
+                    UIAlertView(title: "", message: string, delegate: nil, cancelButtonTitle: "OK").show()
+                    dePrint("所有的会员次数=\(string)")
+                }))
+#endif
         
         
         return dataArray
@@ -204,7 +204,7 @@ extension TSMineVM {
     //首次点击保存弹出系统评分弹窗
     static func kFirstSaveRateAction(){
         if UserDefaults.standard.string(forKey: "iskFirstSaveRateAction") == nil {
-            kDelayOnMainThread(0.5) {
+            kDelayOnMainThread(0.1) {
                 Self.kRateAction()
             }
             UserDefaults.standard.set("1", forKey: "iskFirstSaveRateAction")

TSLiveWallpaper/ar.lproj/Localizable.strings

@@ -218,5 +218,5 @@
 "Faster&Higher Quality" = "أسرع وأعلى جودة";
 "100% Ad-Free" = "خالٍ من الإعلانات بنسبة 100%";
 
-"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." = "لم تستخدم أي صور بعد.";

TSLiveWallpaper/de.lproj/Localizable.strings

@@ -209,5 +209,5 @@
 "Faster&Higher Quality" = "Schneller und höhere Qualität";
 "100% Ad-Free" = "100 % werbefrei";
 
-"No Creation yet. Your creations will be listed here" = "Noch keine Kreation. Deine Kreationen werden hier aufgelistet";
+"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.";

TSLiveWallpaper/en.lproj/Localizable.strings

@@ -218,5 +218,5 @@
 "100% Ad-Free" = "100% Ad-Free";
 
 
-"No Creation yet. Your creations will be listed here" = "No Creation yet. Your creations will be listed here";
+"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.";

TSLiveWallpaper/es.lproj/Localizable.strings

@@ -222,5 +222,5 @@
 "Faster&Higher Quality" = "Más rápido y de mayor calidad";
 "100% Ad-Free" = "100% libre de publicidad";
 
-"No Creation yet. Your creations will be listed here" = "Aún no hay creación. Tus creaciones se listarán aquí.";
+"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";

TSLiveWallpaper/fr.lproj/Localizable.strings

@@ -210,5 +210,5 @@
 "Faster&Higher Quality" = "Plus rapide et de meilleure qualité";
 "100% Ad-Free" = "100% sans publicité";
 
-"No Creation yet. Your creations will be listed here" = "Aucune création pour le moment. Vos créations seront listées ici.";
+"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.";

TSLiveWallpaper/it.lproj/Localizable.strings

@@ -219,5 +219,5 @@
 "Faster&Higher Quality" = "Più veloce e di qualità superiore";
 "100% Ad-Free" = "100% senza pubblicità";
 
-"No Creation yet. Your creations will be listed here" = "Nessuna creazione ancora. Le tue creazioni saranno elencate qui";
+"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.";

TSLiveWallpaper/ja.lproj/Localizable.strings

@@ -216,5 +216,5 @@
 "Faster&Higher Quality" = "より速く、より高品質";
 "100% Ad-Free" = "100%広告なし";
 
-"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." = "まだ写真を使用していません。";

TSLiveWallpaper/ko.lproj/Localizable.strings

@@ -216,5 +216,5 @@
 "Faster&Higher Quality" = "더 빠르고 더 높은 품질";
 "100% Ad-Free" = "100% 광고 없음";
 
-"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." = "아직 사진을 사용하지 않았습니다.";

TSLiveWallpaper/pt-BR.lproj/Localizable.strings

@@ -210,5 +210,5 @@
 "Faster&Higher Quality" = "Mais rápido e com mais qualidade";
 "100% Ad-Free" = "100% sem anúncios";
 
-"No Creation yet. Your creations will be listed here" = "Nenhuma criação ainda. Suas criações serão listadas aqui.";
+"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.";

TSLiveWallpaper/pt-PT.lproj/Localizable.strings

@@ -210,5 +210,5 @@
 "Faster&Higher Quality" = "Mais rápido e com mais qualidade";
 "100% Ad-Free" = "100% sem anúncios";
 
-"No Creation yet. Your creations will be listed here" = "Nenhuma criação ainda. Suas criações serão listadas aqui.";
+"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.";

TSLiveWallpaper/zh-Hant.lproj/Localizable.strings

@@ -216,5 +216,5 @@
 "Faster&Higher Quality" = "更快、更高品質";
 "100% Ad-Free" = "100% 無廣告";
 
-"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." = "您尚未使用任何照片。";