Quellcode durchsuchen

Merge branch '更换-icon'

kailen vor 2 Monaten
Ursprung
Commit
33a78415e9
31 geänderte Dateien mit 10 neuen und 32 gelöschten Zeilen
  1. 4 4
      TSLiveWallpaper.xcodeproj/project.pbxproj
  2. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-1024.png
  3. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png
  4. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
  5. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png
  6. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
  7. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-38@2x.png
  8. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-38@3x.png
  9. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
  10. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
  11. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
  12. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
  13. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-64@2x.png
  14. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-64@3x.png
  15. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-68@2x.png
  16. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
  17. BIN
      TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
  18. BIN
      TSLiveWallpaper/Assets.xcassets/Common/App-Icon.imageset/App-Icon 1.png
  19. BIN
      TSLiveWallpaper/Assets.xcassets/Common/App-Icon.imageset/App-Icon.png
  20. 1 1
      TSLiveWallpaper/Assets.xcassets/Common/App-Icon.imageset/Contents.json
  21. 2 2
      TSLiveWallpaper/Assets.xcassets/Vip/dmanagepro.imageset/Contents.json
  22. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/dmanagepro.imageset/Dmanagepro@2x.png
  23. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/dmanagepro.imageset/Dmanagepro@3x.png
  24. 0 22
      TSLiveWallpaper/Assets.xcassets/Vip/lIvelivepro.imageset/Contents.json
  25. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/lIvelivepro.imageset/lIvelivepro@2x.png
  26. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/lIvelivepro.imageset/lIvelivepro@3x.png
  27. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/livelive.imageset/livelive@2x.png
  28. BIN
      TSLiveWallpaper/Assets.xcassets/Vip/livelive.imageset/livelive@3x.png
  29. 1 1
      TSLiveWallpaper/Business/TSMineVC/TSMineVC.swift
  30. 1 1
      TSLiveWallpaper/Business/TSPurchaseMembershipVC/TSPurchaseMembershipVC.swift
  31. 1 1
      TSLiveWallpaper/Business/TSPurchaseMembershipVC/TSPurchaseVC.swift

+ 4 - 4
TSLiveWallpaper.xcodeproj/project.pbxproj

@@ -1542,7 +1542,7 @@
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = TSLiveWallpaper/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = LiveLive;
+				INFOPLIST_KEY_CFBundleDisplayName = Dmanage;
 				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.";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -1553,7 +1553,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.8;
 				PRODUCT_BUNDLE_IDENTIFIER = musicplayer.offline.com;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1582,7 +1582,7 @@
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = TSLiveWallpaper/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = LiveLive;
+				INFOPLIST_KEY_CFBundleDisplayName = Dmanage;
 				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.";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -1593,7 +1593,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.7;
+				MARKETING_VERSION = 1.8;
 				PRODUCT_BUNDLE_IDENTIFIER = musicplayer.offline.com;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-1024.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-38@2x.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-38@3x.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-64@2x.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-64@3x.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-68@2x.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png


BIN
TSLiveWallpaper/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png


BIN
TSLiveWallpaper/Assets.xcassets/Common/App-Icon.imageset/App-Icon 1.png


BIN
TSLiveWallpaper/Assets.xcassets/Common/App-Icon.imageset/App-Icon.png


+ 1 - 1
TSLiveWallpaper/Assets.xcassets/Common/App-Icon.imageset/Contents.json

@@ -1,11 +1,11 @@
 {
   "images" : [
     {
-      "filename" : "App-Icon.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "App-Icon 1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

+ 2 - 2
TSLiveWallpaper/Assets.xcassets/Vip/livelive.imageset/Contents.json → TSLiveWallpaper/Assets.xcassets/Vip/dmanagepro.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "livelive@2x.png",
+      "filename" : "Dmanagepro@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "livelive@3x.png",
+      "filename" : "Dmanagepro@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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


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


+ 0 - 22
TSLiveWallpaper/Assets.xcassets/Vip/lIvelivepro.imageset/Contents.json

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

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


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


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


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


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

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

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

@@ -221,7 +221,7 @@ extension TSPurchaseMembership111VC {
         let vipImageView = UIImageView.createImageView(imageName: "vip_big_icon")
         topView.addSubview(vipImageView)
         
-        let liveImageView = UIImageView.createImageView(imageName: "livelive")
+        let liveImageView = UIImageView.createImageView(imageName: "dmanagepro")
         topView.addSubview(liveImageView)
         
         let cell0 = creatCell(text: "All Premium Wallpapers")

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

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