diff --git a/WallpaperHD_Live.xcodeproj/project.pbxproj b/WallpaperHD_Live.xcodeproj/project.pbxproj index 1fec698..3b250c0 100644 --- a/WallpaperHD_Live.xcodeproj/project.pbxproj +++ b/WallpaperHD_Live.xcodeproj/project.pbxproj @@ -656,14 +656,19 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "Apple Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 6HWQW9JC74; + DEVELOPMENT_TEAM = S7MWK7J6D7; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = S7MWK7J6D7; ENABLE_USER_SCRIPT_SANDBOXING = NO; GCC_PREFIX_HEADER = "$(SRCROOT)/WallpaperHD_Live/Header/waperLivePCH.pch"; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = WallpaperHD_Live/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Lock Wallpaper"; + INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "Lock Wallpaper needs to access your photo album so that when you click My Album on the homepage, you can store photos in your private album and save wallpapers to your album."; + INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Lock Wallpaper needs access to your photo album so that you can upload photos to your private photo album and save wallpapers to your photo album."; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; @@ -675,8 +680,10 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.520.cn.WallpaperHD-Live"; + PRODUCT_BUNDLE_IDENTIFIER = com.free.lock.wallpaper; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = lockwallpaper; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; @@ -694,14 +701,19 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_IDENTITY = "Apple Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 6HWQW9JC74; + DEVELOPMENT_TEAM = S7MWK7J6D7; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = S7MWK7J6D7; ENABLE_USER_SCRIPT_SANDBOXING = NO; GCC_PREFIX_HEADER = "$(SRCROOT)/WallpaperHD_Live/Header/waperLivePCH.pch"; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = WallpaperHD_Live/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Lock Wallpaper"; + INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "Lock Wallpaper needs to access your photo album so that when you click My Album on the homepage, you can store photos in your private album and save wallpapers to your album."; + INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Lock Wallpaper needs access to your photo album so that you can upload photos to your private photo album and save wallpapers to your photo album."; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; @@ -713,8 +725,10 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.520.cn.WallpaperHD-Live"; + PRODUCT_BUNDLE_IDENTIFIER = com.free.lock.wallpaper; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = lockwallpaper; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; diff --git a/WallpaperHD_Live/AppDelegate.swift b/WallpaperHD_Live/AppDelegate.swift index fb15fe3..1123193 100644 --- a/WallpaperHD_Live/AppDelegate.swift +++ b/WallpaperHD_Live/AppDelegate.swift @@ -16,7 +16,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate { IQKeyboardManager.shared.enable = true window = UIWindow(frame: UIScreen.main.bounds) // WP_TabbarCommon.TabBarController() - + // 强制设置浅色模式 + if #available(iOS 13.0, *) { + window?.overrideUserInterfaceStyle = .light + + } let userDefaults = UserDefaults.standard @@ -38,5 +42,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate { self.window?.makeKeyAndVisible() return true } + } diff --git a/WallpaperHD_Live/Assets.xcassets/album.imageset/Contents.json b/WallpaperHD_Live/Assets.xcassets/album.imageset/Contents.json new file mode 100644 index 0000000..f951b0a --- /dev/null +++ b/WallpaperHD_Live/Assets.xcassets/album.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Group 1597880767.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Group 1597880767@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Group 1597880767@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WallpaperHD_Live/Assets.xcassets/album.imageset/Group 1597880767.png b/WallpaperHD_Live/Assets.xcassets/album.imageset/Group 1597880767.png new file mode 100644 index 0000000..f17add0 Binary files /dev/null and b/WallpaperHD_Live/Assets.xcassets/album.imageset/Group 1597880767.png differ diff --git a/WallpaperHD_Live/Assets.xcassets/album.imageset/Group 1597880767@2x.png b/WallpaperHD_Live/Assets.xcassets/album.imageset/Group 1597880767@2x.png new file mode 100644 index 0000000..faee850 Binary files /dev/null and b/WallpaperHD_Live/Assets.xcassets/album.imageset/Group 1597880767@2x.png differ diff --git a/WallpaperHD_Live/Assets.xcassets/album.imageset/Group 1597880767@3x.png b/WallpaperHD_Live/Assets.xcassets/album.imageset/Group 1597880767@3x.png new file mode 100644 index 0000000..dac3d91 Binary files /dev/null and b/WallpaperHD_Live/Assets.xcassets/album.imageset/Group 1597880767@3x.png differ diff --git a/WallpaperHD_Live/Assets.xcassets/banner.imageset/Contents.json b/WallpaperHD_Live/Assets.xcassets/banner.imageset/Contents.json new file mode 100644 index 0000000..05ebc0e --- /dev/null +++ b/WallpaperHD_Live/Assets.xcassets/banner.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Group 1597880770.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Group 1597880770@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Group 1597880770@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WallpaperHD_Live/Assets.xcassets/banner.imageset/Group 1597880770.png b/WallpaperHD_Live/Assets.xcassets/banner.imageset/Group 1597880770.png new file mode 100644 index 0000000..ca77c88 Binary files /dev/null and b/WallpaperHD_Live/Assets.xcassets/banner.imageset/Group 1597880770.png differ diff --git a/WallpaperHD_Live/Assets.xcassets/banner.imageset/Group 1597880770@2x.png b/WallpaperHD_Live/Assets.xcassets/banner.imageset/Group 1597880770@2x.png new file mode 100644 index 0000000..07ecdde Binary files /dev/null and b/WallpaperHD_Live/Assets.xcassets/banner.imageset/Group 1597880770@2x.png differ diff --git a/WallpaperHD_Live/Assets.xcassets/banner.imageset/Group 1597880770@3x.png b/WallpaperHD_Live/Assets.xcassets/banner.imageset/Group 1597880770@3x.png new file mode 100644 index 0000000..95bd89e Binary files /dev/null and b/WallpaperHD_Live/Assets.xcassets/banner.imageset/Group 1597880770@3x.png differ diff --git a/WallpaperHD_Live/Assets.xcassets/lock.imageset/Contents.json b/WallpaperHD_Live/Assets.xcassets/lock.imageset/Contents.json new file mode 100644 index 0000000..5891809 --- /dev/null +++ b/WallpaperHD_Live/Assets.xcassets/lock.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Group 1597880768.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Group 1597880768@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Group 1597880768@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WallpaperHD_Live/Assets.xcassets/lock.imageset/Group 1597880768.png b/WallpaperHD_Live/Assets.xcassets/lock.imageset/Group 1597880768.png new file mode 100644 index 0000000..3c0cc6b Binary files /dev/null and b/WallpaperHD_Live/Assets.xcassets/lock.imageset/Group 1597880768.png differ diff --git a/WallpaperHD_Live/Assets.xcassets/lock.imageset/Group 1597880768@2x.png b/WallpaperHD_Live/Assets.xcassets/lock.imageset/Group 1597880768@2x.png new file mode 100644 index 0000000..a0c25ea Binary files /dev/null and b/WallpaperHD_Live/Assets.xcassets/lock.imageset/Group 1597880768@2x.png differ diff --git a/WallpaperHD_Live/Assets.xcassets/lock.imageset/Group 1597880768@3x.png b/WallpaperHD_Live/Assets.xcassets/lock.imageset/Group 1597880768@3x.png new file mode 100644 index 0000000..a415ca0 Binary files /dev/null and b/WallpaperHD_Live/Assets.xcassets/lock.imageset/Group 1597880768@3x.png differ diff --git a/WallpaperHD_Live/Assets.xcassets/logo.imageset/Contents.json b/WallpaperHD_Live/Assets.xcassets/logo.imageset/Contents.json new file mode 100644 index 0000000..17f6fd9 --- /dev/null +++ b/WallpaperHD_Live/Assets.xcassets/logo.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "Image.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WallpaperHD_Live/Assets.xcassets/logo.imageset/Image.png b/WallpaperHD_Live/Assets.xcassets/logo.imageset/Image.png new file mode 100644 index 0000000..b036810 Binary files /dev/null and b/WallpaperHD_Live/Assets.xcassets/logo.imageset/Image.png differ diff --git a/WallpaperHD_Live/Base.lproj/LaunchScreen.storyboard b/WallpaperHD_Live/Base.lproj/LaunchScreen.storyboard index 865e932..41dc178 100644 --- a/WallpaperHD_Live/Base.lproj/LaunchScreen.storyboard +++ b/WallpaperHD_Live/Base.lproj/LaunchScreen.storyboard @@ -1,8 +1,11 @@ - - + + + - + + + @@ -11,10 +14,31 @@ - + - + + + + + + + + + + + + + + + + + @@ -22,4 +46,10 @@ + + + + + + diff --git a/WallpaperHD_Live/Home/C/WP_HomeVC.swift b/WallpaperHD_Live/Home/C/WP_HomeVC.swift index 8732d4d..dd3e84c 100644 --- a/WallpaperHD_Live/Home/C/WP_HomeVC.swift +++ b/WallpaperHD_Live/Home/C/WP_HomeVC.swift @@ -11,6 +11,10 @@ import JXSegmentedView import SnapKit class WP_HomeVC: WP_RootVC { + + @IBOutlet weak var openlabel: UILabel! + + @IBOutlet weak var segmentedView: JXSegmentedView! var segmentedDataSource = JXSegmentedTitleDataSource() var listContainerView: JXSegmentedListContainerView! @@ -23,8 +27,12 @@ class WP_HomeVC: WP_RootVC { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) self.navigationController?.navigationBar.isHidden = true - - + let userDefaults = UserDefaults.standard + if userDefaults.bool(forKey: "islock"){ + self.openlabel.text = "open" + }else{ + self.openlabel.text = "closed" + } } func setSegmentedViewUI(){ segmentedView.delegate = self @@ -60,12 +68,29 @@ class WP_HomeVC: WP_RootVC { } } + @IBAction func lockBtn(_ sender: Any) { + + let vc = WP_LockVC() + vc.modalPresentationStyle = .fullScreen + vc.type = 1 + self.present(vc, animated: true) + + } + + @IBAction func album(_ sender: Any) { + + let vc = WP_PhotoAlbumVC() + navigationController?.pushViewController(vc, animated: true) + + } + } extension WP_HomeVC:JXSegmentedListContainerViewDataSource,JXSegmentedViewDelegate { //返回列表的数量 func numberOfLists(in listContainerView: JXSegmentedListContainerView) -> Int { return 4 } + //返回遵从`JXSegmentedListContainerViewListDelegate`协议的实例 func listContainerView(_ listContainerView: JXSegmentedListContainerView, initListAt index: Int) -> JXSegmentedListContainerViewListDelegate { diff --git a/WallpaperHD_Live/Home/C/WP_HomeVC.xib b/WallpaperHD_Live/Home/C/WP_HomeVC.xib index 7e20d9b..c443519 100644 --- a/WallpaperHD_Live/Home/C/WP_HomeVC.xib +++ b/WallpaperHD_Live/Home/C/WP_HomeVC.xib @@ -11,6 +11,7 @@ + @@ -21,24 +22,120 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + - + + + + diff --git a/WallpaperHD_Live/Home/V/WA_PreView.xib b/WallpaperHD_Live/Home/V/WA_PreView.xib index e2e5587..31a7422 100644 --- a/WallpaperHD_Live/Home/V/WA_PreView.xib +++ b/WallpaperHD_Live/Home/V/WA_PreView.xib @@ -1,21 +1,22 @@ - + - + + - + - - + @@ -50,7 +51,7 @@ - + @@ -58,8 +59,8 @@ - diff --git a/WallpaperHD_Live/Info.plist b/WallpaperHD_Live/Info.plist index 3c3ebe3..6a6654d 100644 --- a/WallpaperHD_Live/Info.plist +++ b/WallpaperHD_Live/Info.plist @@ -2,10 +2,6 @@ - NSPhotoLibraryUsageDescription - Wallpaper Home needs access to your photo album to update your profile picture, save wallpapers to your album, and share updates within the community. - NSPhotoLibraryAddUsageDescription - Wallpaper Home needs access to your photo album to update your profile picture, save wallpapers to your album, and share updates within the community. NSAppTransportSecurity NSAllowsArbitraryLoads diff --git a/WallpaperHD_Live/Mine/C/WP_AboutVC.xib b/WallpaperHD_Live/Mine/C/WP_AboutVC.xib index 3dbfb8e..56a8250 100644 --- a/WallpaperHD_Live/Mine/C/WP_AboutVC.xib +++ b/WallpaperHD_Live/Mine/C/WP_AboutVC.xib @@ -19,15 +19,15 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -339,15 +249,12 @@ - - - diff --git a/WallpaperHD_Live/Mine/C/WP_PrivacyVC.swift b/WallpaperHD_Live/Mine/C/WP_PrivacyVC.swift index 910515d..e353b3c 100644 --- a/WallpaperHD_Live/Mine/C/WP_PrivacyVC.swift +++ b/WallpaperHD_Live/Mine/C/WP_PrivacyVC.swift @@ -17,13 +17,13 @@ class WP_PrivacyVC: WP_RootVC { view = webView if type == 0 { - if let url = URL(string: "https://wallpaperhomewail.bitbucket.io/privacy.html") { + if let url = URL(string: "https://lockwallpaper.mystrikingly.com/privacy") { let request = URLRequest(url: url) webView.load(request) } }else{ - if let url = URL(string: "https://wallpaperhomewail.bitbucket.io/terms.html") { + if let url = URL(string: "https://lockwallpaper.mystrikingly.com/terms") { let request = URLRequest(url: url) webView.load(request) }