feat(all): add Cartile && update 0.2.0

internetWei · internetWei · commit cd4e84dffe2f · 2021-01-24T10:05:01.000+08:00
diff --git a/Framework/LLDynamicLaunchScreen.xcodeproj/project.pbxproj b/Framework/LLDynamicLaunchScreen.xcodeproj/project.pbxproj
@@ -183,9 +183,9 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.1.9;
+				CURRENT_PROJECT_VERSION = 0.2.0;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DYLIB_CURRENT_VERSION = 0.1.9;
+				DYLIB_CURRENT_VERSION = 0.2.0;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -246,9 +246,9 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.1.9;
+				CURRENT_PROJECT_VERSION = 0.2.0;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DYLIB_CURRENT_VERSION = 0.1.9;
+				DYLIB_CURRENT_VERSION = 0.2.0;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -273,7 +273,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0.1.9;
+				CURRENT_PROJECT_VERSION = 0.2.0;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -286,7 +286,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.1.9;
+				MARKETING_VERSION = 0.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.internetwei.launchScreen;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -298,7 +298,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0.1.9;
+				CURRENT_PROJECT_VERSION = 0.2.0;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -311,7 +311,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.1.9;
+				MARKETING_VERSION = 0.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.internetwei.launchScreen;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
diff --git a/LLDynamicLaunchScreen.podspec b/LLDynamicLaunchScreen.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'LLDynamicLaunchScreen'
-  s.version          = '0.1.6'
+  s.version          = '0.2.0'
   s.summary          = 'Dynamically modify the iOS Launch Image'
   s.homepage         = 'https://github.com/internetWei/LLDynamicLaunchScreen'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
diff --git a/LLDynamicLaunchScreen/LLDynamicLaunchScreen.m b/LLDynamicLaunchScreen/LLDynamicLaunchScreen.m
@@ -292,16 +292,16 @@ + (void)backupSystemLaunchImage {
         }
         
         // 3.将启动图保存到备份文件夹
-        if (verticalLightImage) {
+        if (verticalLightImage && verticalLightPath) {
             [UIImageJPEGRepresentation(verticalLightImage, 0.8) writeToFile:verticalLightPath atomically:YES];
         }
-        if (verticalDarkImage) {
+        if (verticalDarkImage && verticalDarkPath) {
             [UIImageJPEGRepresentation(verticalDarkImage, 0.8) writeToFile:verticalDarkPath atomically:YES];
         }
-        if (horizontalLightImage) {
+        if (horizontalLightImage && horizontalLightPath) {
             [UIImageJPEGRepresentation(horizontalLightImage, 0.8) writeToFile:horizontalLightPath atomically:YES];
         }
-        if (horizontalDarkImage) {
+        if (horizontalDarkImage && horizontalDarkPath) {
             [UIImageJPEGRepresentation(horizontalDarkImage, 0.8) writeToFile:horizontalDarkPath atomically:YES];
         }
         
@@ -342,6 +342,8 @@ + (BOOL)launchImageCustomBlock:(void (^) (NSString *tmpDirectory))complete {
     // 还原系统启动图信息
     moveResult = [fileManager moveItemAtPath:tmpDirectory toPath:systemDirectory error:nil];
     
+    if (!moveResult) return NO;
+    
     // 清理工作目录
     if ([fileManager fileExistsAtPath:tmpDirectory]) {
         [fileManager removeItemAtPath:tmpDirectory error:nil];
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 LLDynamicLaunchScreen
 ==============
-[![License MIT](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/internetWei/llDark/blob/master/LICENSE)&nbsp; [![CocoaPods](https://img.shields.io/badge/pod-0.1.6-blue)](http://cocoapods.org/pods/LLDark)&nbsp; [![Platform](https://img.shields.io/badge/platform-ios-lightgrey)](https://www.apple.com/nl/ios)&nbsp; [![Support](https://img.shields.io/badge/support-iOS%209%2B-blue)](https://www.apple.com/nl/ios)
+[![License MIT](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/internetWei/llDark/blob/master/LICENSE)&nbsp; [![Carthage](https://img.shields.io/badge/Carthage-compatible-blue)](https://github.com/Carthage/Carthage)&nbsp; [![CocoaPods](https://img.shields.io/badge/pod-0.2.0-blue)](http://cocoapods.org/pods/LLDark)&nbsp; [![Platform](https://img.shields.io/badge/platform-ios-lightgrey)](https://www.apple.com/nl/ios)&nbsp; [![Support](https://img.shields.io/badge/support-iOS%209%2B-blue)](https://www.apple.com/nl/ios)
 
 Solve the problem of abnormal display of iOS startup map, and support dynamic replacement of startup map.<br>
 Chinese mainland users can access[This link](https://gitee.com/internetWei/lldynamic-launch-screen)<br>
@@ -47,7 +47,13 @@ Installation
 ### CocoaPods
 1. Add pod 'LLDynamicLaunchScreen' to your Podfile.
 2. Run pod install --repo-update.
-3. Import <LLDynamicLaunchScreen/LLDynamicLaunchScreen.h>.
+3. Import \<LLDynamicLaunchScreen/LLDynamicLaunchScreen.h\>.
+
+### Carthage
+
+1. Add `github "internetWei/LLDynamicLaunchScreen"` to your Cartfile.
+2. Run `carthage update --platform ios` and add the framework to your project.
+3. Import \<LLDynamicLaunchScreen/LLDynamicLaunchScreen.h\>.
 
 ### Manually
 1. Download all the files in the LLDynamicLaunchScreen subdirectory.
diff --git a/README_CN.md b/README_CN.md
@@ -1,6 +1,6 @@
 LLDynamicLaunchScreen
 ==============
-[![License MIT](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/internetWei/llDark/blob/master/LICENSE)&nbsp; [![CocoaPods](https://img.shields.io/badge/pod-0.1.6-blue)](http://cocoapods.org/pods/LLDark)&nbsp; [![Platform](https://img.shields.io/badge/platform-ios-lightgrey)](https://www.apple.com/nl/ios)&nbsp; [![Support](https://img.shields.io/badge/support-iOS%209%2B-blue)](https://www.apple.com/nl/ios)
+[![License MIT](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/internetWei/llDark/blob/master/LICENSE)&nbsp; [![Carthage](https://img.shields.io/badge/Carthage-compatible-blue)](https://github.com/Carthage/Carthage)&nbsp; [![CocoaPods](https://img.shields.io/badge/pod-0.2.0-blue)](http://cocoapods.org/pods/LLDark)&nbsp; [![Platform](https://img.shields.io/badge/platform-ios-lightgrey)](https://www.apple.com/nl/ios)&nbsp; [![Support](https://img.shields.io/badge/support-iOS%209%2B-blue)](https://www.apple.com/nl/ios)
 
 解决iOS启动图显示异常的问题，并且支持动态更换启动图。<br>
 中国大陆用户可以访问[这个链接](https://gitee.com/internetWei/lldynamic-launch-screen)
@@ -46,7 +46,13 @@ LLDynamicLaunchScreen.hasDarkImageBlock = ^BOOL(UIImage * _Nonnull image) {
 ### CocoaPods
 1. 在 Podfile 中添加 pod 'LLDynamicLaunchScreen'。
 2. 执行 pod install --repo-update。
-3. 导入 <LLDynamicLaunchScreen/LLDynamicLaunchScreen.h>。
+3. 导入 \<LLDynamicLaunchScreen/LLDynamicLaunchScreen.h\>。
+
+### Carthage
+1. 在 Cartfile 中添加 `github "internetWei/LLDynamicLaunchScreen"`。
+2. 执行 `carthage update --platform ios` 并将生成的 framework 添加到你的工程。
+3. 导入 \<LLDynamicLaunchScreen/LLDynamicLaunchScreen.h\>。
+4. [Xcode12生成Cartifle失败参考文章](https://www.liangzl.com/get-article-detail-210255.html)
 
 ### 手动安装
 1. 下载 LLDynamicLaunchScreen 文件夹内的所有内容。

Original file line number	Diff line number	Diff line change
`@@ -292,16 +292,16 @@ + (void)backupSystemLaunchImage {`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`// 3.将启动图保存到备份文件夹`
`295`		`- if (verticalLightImage) {`
	`295`	`+ if (verticalLightImage && verticalLightPath) {`
`296`	`296`	`[UIImageJPEGRepresentation(verticalLightImage, 0.8) writeToFile:verticalLightPath atomically:YES];`
`297`	`297`	`}`
`298`		`- if (verticalDarkImage) {`
	`298`	`+ if (verticalDarkImage && verticalDarkPath) {`
`299`	`299`	`[UIImageJPEGRepresentation(verticalDarkImage, 0.8) writeToFile:verticalDarkPath atomically:YES];`
`300`	`300`	`}`
`301`		`- if (horizontalLightImage) {`
	`301`	`+ if (horizontalLightImage && horizontalLightPath) {`
`302`	`302`	`[UIImageJPEGRepresentation(horizontalLightImage, 0.8) writeToFile:horizontalLightPath atomically:YES];`
`303`	`303`	`}`
`304`		`- if (horizontalDarkImage) {`
	`304`	`+ if (horizontalDarkImage && horizontalDarkPath) {`
`305`	`305`	`[UIImageJPEGRepresentation(horizontalDarkImage, 0.8) writeToFile:horizontalDarkPath atomically:YES];`
`306`	`306`	`}`
`307`	`307`
`@@ -342,6 +342,8 @@ + (BOOL)launchImageCustomBlock:(void (^) (NSString *tmpDirectory))complete {`
`342`	`342`	`// 还原系统启动图信息`
`343`	`343`	`moveResult = [fileManager moveItemAtPath:tmpDirectory toPath:systemDirectory error:nil];`
`344`	`344`
	`345`	`+ if (!moveResult) return NO;`
	`346`	`+`
`345`	`347`	`// 清理工作目录`
`346`	`348`	`if ([fileManager fileExistsAtPath:tmpDirectory]) {`
`347`	`349`	`[fileManager removeItemAtPath:tmpDirectory error:nil];`