Browse Source

feat:app改名字

kailen 2 weeks ago
parent
commit
029717cdc4
27 changed files with 39 additions and 38 deletions
  1. BIN
      .DS_Store
  2. 3 3
      Podfile.lock
  3. 4 4
      TSLiveWallpaper.xcodeproj/project.pbxproj
  4. 2 2
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/Contents.json
  5. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/app_logo@1x 1.png
  6. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/app_logo@1x.png
  7. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/emusic_logo 1.png
  8. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/emusic_logo.png
  9. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/Cloud_Music.imageset/Cloud_Music@1x.png
  10. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/Cloud_Music.imageset/Cloud_Music@2x.png
  11. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/Cloud_Music.imageset/Cloud_Music@3x.png
  12. 3 3
      TSLiveWallpaper/Assets.xcassets/Vip/Cloud_Music.imageset/Contents.json
  13. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/Cloud_Music_Pro.imageset/Cloud_Music_Pro@1x.png
  14. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/Cloud_Music_Pro.imageset/Cloud_Music_Pro@2x.png
  15. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/Cloud_Music_Pro.imageset/Cloud_Music_Pro@3x.png
  16. 3 3
      TSLiveWallpaper/Assets.xcassets/Vip/Cloud_Music_Pro.imageset/Contents.json
  17. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/emusic_Pro.imageset/emusic_Pro@1x.png
  18. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/emusic_Pro.imageset/emusic_Pro@2x.png
  19. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/emusic_Pro.imageset/emusic_Pro@3x.png
  20. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/splash_emusic.imageset/splash_emusic@1x.png
  21. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/splash_emusic.imageset/splash_emusic@2x.png
  22. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/splash_emusic.imageset/splash_emusic@3x.png
  23. 3 3
      TSLiveWallpaper/Base.lproj/LaunchScreen.storyboard
  24. 17 17
      TSLiveWallpaper/Business/AdMob/ADScene.swift
  25. 1 1
      TSLiveWallpaper/Business/TSMineVC/TSMineVC.swift
  26. 1 1
      TSLiveWallpaper/Business/TSPurchaseMembershipVC/TSPurchaseVC.swift
  27. 2 1
      TSLiveWallpaper/LaunchVC/TSLaunchVC.swift

BIN
.DS_Store


+ 3 - 3
Podfile.lock

@@ -178,7 +178,7 @@ CHECKOUT OPTIONS:
     :git: https://gitee.com/WanlanNeel/tsvideo-kit.git
 
 SPEC CHECKSUMS:
-  ADManager: 82b2c255aadfb314141275088e13287ccc3dcd14
+  ADManager: 69cd1b8805b2e64a72315ed2abfa1f1c02f8f879
   AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
   Alamofire: 7193b3b92c74a07f85569e1a6c4f4237291e7496
   BetterSegmentedControl: 09607b27861d49cbce48b7673b74f9150a3d371a
@@ -198,11 +198,11 @@ SPEC CHECKSUMS:
   SJVideoPlayer: 4f09814f58522e0975cb2dccfda925f6c8643467
   SnapKit: d612e99e678a2d3b95bf60b0705ed0a35c03484a
   SVProgressHUD: 4837c74bdfe2e51e8821c397825996a8d7de6e22
-  TSVideoKit: 922402ea051d72e78224f22d37c10fdb2e378f60
+  TSVideoKit: 16761d4bf8bb9e8af192459ae9eb01a213fc1531
   TYCyclePagerView: 2b051dade0615c70784aa34f40c646feeddb7344
   TZImagePickerController: d084a7b97c82d387e7669dd86dc9a9057500aacf
   YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
 
 PODFILE CHECKSUM: 436b32429cb708cca90f47b70a0a376c1a6e0417
 
-COCOAPODS: 1.16.2
+COCOAPODS: 1.15.2

+ 4 - 4
TSLiveWallpaper.xcodeproj/project.pbxproj

@@ -1622,7 +1622,7 @@
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = TSLiveWallpaper/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = emusic;
+				INFOPLIST_KEY_CFBundleDisplayName = "Cloud Music";
 				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "This app needs to access your location information while you're using it to provide relevant location services and features. We promise to only obtain your location information when you're using the app and to use it solely for providing services and features.";
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Allow us to access Photos in order to save wallpapers to your device.";
 				INFOPLIST_KEY_NSUserTrackingUsageDescription = "It will only be used to measure advertising efficiency without leaking any of your personal information.";
@@ -1634,7 +1634,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.1;
+				MARKETING_VERSION = 3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = musicplayer.offline.com;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1663,7 +1663,7 @@
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = TSLiveWallpaper/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = emusic;
+				INFOPLIST_KEY_CFBundleDisplayName = "Cloud Music";
 				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "This app needs to access your location information while you're using it to provide relevant location services and features. We promise to only obtain your location information when you're using the app and to use it solely for providing services and features.";
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Allow us to access Photos in order to save wallpapers to your device.";
 				INFOPLIST_KEY_NSUserTrackingUsageDescription = "It will only be used to measure advertising efficiency without leaking any of your personal information.";
@@ -1675,7 +1675,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.1;
+				MARKETING_VERSION = 3.2;
 				PRODUCT_BUNDLE_IDENTIFIER = musicplayer.offline.com;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

+ 2 - 2
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,13 +1,13 @@
 {
   "images" : [
     {
-      "filename" : "emusic_logo.png",
+      "filename" : "app_logo@1x.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
     },
     {
-      "filename" : "emusic_logo 1.png",
+      "filename" : "app_logo@1x 1.png",
       "idiom" : "universal",
       "platform" : "ios",
       "scale" : "1x",

BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/app_logo@1x 1.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/app_logo@1x.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/emusic_logo 1.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/emusic_logo.png


BIN
TSLiveWallpaper/Assets.xcassets/Vip/Cloud_Music.imageset/Cloud_Music@1x.png


BIN
TSLiveWallpaper/Assets.xcassets/Vip/Cloud_Music.imageset/Cloud_Music@2x.png


BIN
TSLiveWallpaper/Assets.xcassets/Vip/Cloud_Music.imageset/Cloud_Music@3x.png


+ 3 - 3
TSLiveWallpaper/Assets.xcassets/Vip/emusic_Pro.imageset/Contents.json → TSLiveWallpaper/Assets.xcassets/Vip/Cloud_Music.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "emusic_Pro@1x.png",
+      "filename" : "Cloud_Music@1x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "emusic_Pro@2x.png",
+      "filename" : "Cloud_Music@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "emusic_Pro@3x.png",
+      "filename" : "Cloud_Music@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

BIN
TSLiveWallpaper/Assets.xcassets/Vip/Cloud_Music_Pro.imageset/Cloud_Music_Pro@1x.png


BIN
TSLiveWallpaper/Assets.xcassets/Vip/Cloud_Music_Pro.imageset/Cloud_Music_Pro@2x.png


BIN
TSLiveWallpaper/Assets.xcassets/Vip/Cloud_Music_Pro.imageset/Cloud_Music_Pro@3x.png


+ 3 - 3
TSLiveWallpaper/Assets.xcassets/Vip/splash_emusic.imageset/Contents.json → TSLiveWallpaper/Assets.xcassets/Vip/Cloud_Music_Pro.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "splash_emusic@1x.png",
+      "filename" : "Cloud_Music_Pro@1x.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "splash_emusic@2x.png",
+      "filename" : "Cloud_Music_Pro@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "splash_emusic@3x.png",
+      "filename" : "Cloud_Music_Pro@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

BIN
TSLiveWallpaper/Assets.xcassets/Vip/emusic_Pro.imageset/emusic_Pro@1x.png


BIN
TSLiveWallpaper/Assets.xcassets/Vip/emusic_Pro.imageset/emusic_Pro@2x.png


BIN
TSLiveWallpaper/Assets.xcassets/Vip/emusic_Pro.imageset/emusic_Pro@3x.png


BIN
TSLiveWallpaper/Assets.xcassets/Vip/splash_emusic.imageset/splash_emusic@1x.png


BIN
TSLiveWallpaper/Assets.xcassets/Vip/splash_emusic.imageset/splash_emusic@2x.png


BIN
TSLiveWallpaper/Assets.xcassets/Vip/splash_emusic.imageset/splash_emusic@3x.png


+ 3 - 3
TSLiveWallpaper/Base.lproj/LaunchScreen.storyboard

@@ -20,8 +20,8 @@
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="view_main_bg" translatesAutoresizingMaskIntoConstraints="NO" id="k6m-Z3-ud5">
                                 <rect key="frame" x="-10" y="-10" width="413" height="872"/>
                             </imageView>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="splash_emusic" translatesAutoresizingMaskIntoConstraints="NO" id="hat-TL-4Cc">
-                                <rect key="frame" x="128" y="410.33333333333331" width="137.33333333333337" height="31.666666666666686"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Cloud_Music" translatesAutoresizingMaskIntoConstraints="NO" id="hat-TL-4Cc">
+                                <rect key="frame" x="77.666666666666686" y="410" width="238" height="32"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
@@ -42,7 +42,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="splash_emusic" width="137.33332824707031" height="31.666666030883789"/>
+        <image name="Cloud_Music" width="238" height="32"/>
         <image name="view_main_bg" width="375" height="812"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

+ 17 - 17
TSLiveWallpaper/Business/AdMob/ADScene.swift

@@ -16,27 +16,27 @@ import Foundation
 // TODO: !!!
 
 // #if DEBUG
-// private let GAD_ID_Launch                   = "ca-app-pub-3940256099942544/5575463023"
-// private let GAD_ID_Search_Insert            = "ca-app-pub-3940256099942544/4411468910"
-// private let GAD_ID_Play_Insert              = "ca-app-pub-3940256099942544/4411468910"
-// private let GAD_ID_Download_Reward          = "ca-app-pub-3940256099942544/1712485313"
-// private let GAD_ID_Playlist                 = "ca-app-pub-3940256099942544/4411468910"
-// private let GAD_ID_Pause                    = "ca-app-pub-3940256099942544/4411468910"
+ private let GAD_ID_Launch                   = "ca-app-pub-3940256099942544/5575463023"
+ private let GAD_ID_Search_Insert            = "ca-app-pub-3940256099942544/4411468910"
+ private let GAD_ID_Play_Insert              = "ca-app-pub-3940256099942544/4411468910"
+ private let GAD_ID_Download_Reward          = "ca-app-pub-3940256099942544/1712485313"
+ private let GAD_ID_Playlist                 = "ca-app-pub-3940256099942544/4411468910"
+ private let GAD_ID_Pause                    = "ca-app-pub-3940256099942544/4411468910"
 
 // #else
 
 // 开屏广告
-private let GAD_ID_Launch = "ca-app-pub-4941656534177879/5488145330"
-// 点击搜索时弹出的插屏广告
-private let GAD_ID_Search_Insert = "ca-app-pub-4941656534177879/9397376852"
-// 播放视频时弹出的插屏广告
-private let GAD_ID_Play_Insert = "ca-app-pub-4941656534177879/2201413111"
-// 下载视频弹出的激励广告
-private let GAD_ID_Download_Reward = "ca-app-pub-4941656534177879/9888331446"
-// 歌单
-private let GAD_ID_Playlist = "ca-app-pub-4941656534177879/3683573641"
-// 暂停
-private let GAD_ID_Pause = "ca-app-pub-4941656534177879/7350252261"
+//private let GAD_ID_Launch = "ca-app-pub-4941656534177879/5488145330"
+//// 点击搜索时弹出的插屏广告
+//private let GAD_ID_Search_Insert = "ca-app-pub-4941656534177879/9397376852"
+//// 播放视频时弹出的插屏广告
+//private let GAD_ID_Play_Insert = "ca-app-pub-4941656534177879/2201413111"
+//// 下载视频弹出的激励广告
+//private let GAD_ID_Download_Reward = "ca-app-pub-4941656534177879/9888331446"
+//// 歌单
+//private let GAD_ID_Playlist = "ca-app-pub-4941656534177879/3683573641"
+//// 暂停
+//private let GAD_ID_Pause = "ca-app-pub-4941656534177879/7350252261"
 
 // #endif
 

+ 1 - 1
TSLiveWallpaper/Business/TSMineVC/TSMineVC.swift

@@ -51,7 +51,7 @@ class TSMineVC: TSBaseVC {
             make.leading.trailing.bottom.equalTo(0)
         }
 
-        let liveImageView = UIImageView.createImageView(imageName: "emusic_Pro")
+        let liveImageView = UIImageView.createImageView(imageName: "Cloud_Music_Pro")
         vipBgImageView.addSubview(liveImageView)
         liveImageView.snp.makeConstraints { make in
             make.leading.equalTo(16)

+ 1 - 1
TSLiveWallpaper/Business/TSPurchaseMembershipVC/TSPurchaseVC.swift

@@ -212,7 +212,7 @@ struct PurchaseView :View {
             VStack {
                 Image("vip_big_icon").resizable().frame(width: 124, height: 102)
                 Spacer().frame(height: 12)
-                Image("emusic_Pro")
+                Image("Cloud_Music_Pro")
                 
                 Spacer().frame(height: 40)
                 

+ 2 - 1
TSLiveWallpaper/LaunchVC/TSLaunchVC.swift

@@ -10,6 +10,7 @@ import Alamofire
 import GoogleMobileAds
 import TSVideoKit
 import UIKit
+import AppTrackingTransparency
 
 class TSLaunchVC: UIViewController {
     var dismissHandler: (() -> Void)?
@@ -56,7 +57,7 @@ class TSLaunchVC: UIViewController {
 
     /// 欧盟
     func initUmpProtocal() {
-        if AppConfig.isEURegion {
+        if AppConfig.isEURegion && ATTrackingManager.trackingAuthorizationStatus == .authorized {
             /// 请求弹窗
             pauseTimer()
             GoogleMobileAdsConsentManager.shared.gatherConsent(from: self) { _ in