load cache

wushangkun · wushangkun · commit 767616be45bf · 2020-05-10T23:28:56.000+08:00
diff --git a/README.md b/README.md
@@ -1,2 +1,18 @@
 # SKGenerateModelTool
-Automatically generate model files, support JSON and URL requests.  JSON转model工具
+
+- 支持通过URL链接或json字符串一键生成model文件
+- 支持自定义model父类、自定义model前缀、自定义文件名、自定义作者名
+- 支持OC / Swift
+- 支持自定义输出文件夹路径
+- 兼容YYModel / MJExtension / HandyJSON解析
+- 兼容服务端返回“id”字段
+
+- Supports one-click generation of model files through URL links or json strings
+- Support custom model parent class, custom model prefix, custom file name, custom author name
+- Support OC / Swift
+- Support custom output folder path
+- Compatible with YYModel / MJExtension / HandyJSON analysis
+- Compatible server returns "id" field
+
+![photo1.png](https://upload-images.jianshu.io/upload_images/1129777-cf955d251053c767.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240)
+
diff --git a/SKGenerateModelTool.xcodeproj/project.pbxproj b/SKGenerateModelTool.xcodeproj/project.pbxproj
@@ -281,6 +281,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Xcoder1011.SKGenerateModelTool;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -299,6 +300,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Xcoder1011.SKGenerateModelTool;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
diff --git a/SKGenerateModelTool/ViewController.swift b/SKGenerateModelTool/ViewController.swift
@@ -24,7 +24,7 @@ class ViewController: NSViewController {
     @IBOutlet weak var jsonTypeBtn: NSPopUpButton!
     @IBOutlet weak var generateFileBtn: NSButton!
 
-    var outputFilePath: String?
+    /// cache key
 
     let LastInputURLCacheKey = "LastInputURLCacheKey"
     let SuperClassNameCacheKey = "SuperClassNameCacheKey"
@@ -35,6 +35,11 @@ class ViewController: NSViewController {
     let SupportJSONModelTypeCacheKey = "SupportJSONModelTypeCacheKey"
     let ShouldGenerateFileCacheKey = "ShouldGenerateFileCacheKey"
     let GenerateFilePathCacheKey = "GenerateFilePathCacheKey"
+    
+    /// cache key
+    var outputFilePath: String?
+
+    var builder = SKCodeBuilder()
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -57,7 +62,9 @@ class ViewController: NSViewController {
         loadUserLastInputContent()
     }
     
+    /// load cache
     func loadUserLastInputContent() {
+        
         if let lastUrl = UserDefaults.standard.string(forKey: LastInputURLCacheKey)  {
             urlTF.stringValue = lastUrl
         }
@@ -77,6 +84,19 @@ class ViewController: NSViewController {
             outputFilePath = outFilePath
         }
         
+        builder.config.codeType = SKCodeBuilderCodeType(rawValue: UserDefaults.standard.integer(forKey: BuildCodeTypeCacheKey)) ?? .OC
+        codeTypeBtn.selectItem(at: builder.config.codeType.rawValue - 1)
+        
+        builder.config.jsonType = SKCodeBuilderJSONModelType(rawValue: UserDefaults.standard.integer(forKey: SupportJSONModelTypeCacheKey)) ?? .None
+        jsonTypeBtn.selectItem(at: builder.config.jsonType.rawValue)
+                    
+        generateFileBtn.state = UserDefaults.standard.bool(forKey: SupportJSONModelTypeCacheKey) ? .on : .off
+    }
+    
+    /// save cache
+    func saveUserInputContent() {
+        let superClassName = superClassNameTF.stringValue.isBlank ? "NSObject" : superClassNameTF.stringValue
+        UserDefaults.standard.setValue(superClassName, forKey: SuperClassNameCacheKey)
     }
     
     
