From 26a667a27e3ca413f08f6b9849fd247a135fac43 Mon Sep 17 00:00:00 2001 From: Mccc <> Date: Mon, 14 Oct 2024 18:56:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96key=E7=9A=84=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=98=A0=E5=B0=84=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SmartCodable/Test2ViewController.swift | 63 +++++++++------- .../SmartCodable/Test3ViewController.swift | 74 +++++-------------- Example/SmartCodable/TestViewController.swift | 47 ++++++++---- SmartCodable.podspec | 2 +- .../JSONDecoder/Decoder/KeysMapper.swift | 6 +- 5 files changed, 92 insertions(+), 100 deletions(-) diff --git a/Example/SmartCodable/Test2ViewController.swift b/Example/SmartCodable/Test2ViewController.swift index e32d479..7ea090b 100644 --- a/Example/SmartCodable/Test2ViewController.swift +++ b/Example/SmartCodable/Test2ViewController.swift @@ -17,42 +17,49 @@ class Test2ViewController: BaseViewController { super.viewDidLoad() let dict: [String: Any] = [ - "name": "mccc", - "subModel": "mccc111", +// "name": "mccc", + "age": 30, + "info": [ + "name": "mccc111" + ], + "sub": [ + "subname": "qilin", + "subage": 3, + "info": [ + "name": "qilin111" + ], + ] ] let model = Model.deserialize(from: dict) - print(model?.subModel?.rawValue) - - let dict1 = model?.toDictionary() - print(dict1) + BTPrint.print(model) - } - - struct Model: SmartCodable { - var name: String = "" - @SmartPublished - var subModel: TestEnum? + print("\n") - - static func mappingForValue() -> [SmartValueTransformer]? { - [ - CodingKeys.name <--- FastTransformer(fromJSON: { json in - "abc" - }), - CodingKeys.subModel <--- FastTransformer(fromJSON: { json in - TestEnum.man - }), - ] - } + let tranDict = model?.toDictionary() ?? [:] + BTPrint.print(tranDict) } +} + +struct Model: SmartCodable { + var name: String = "" + var age: Int = 0 + var sub: SubModel = SubModel() - enum TestEnum: String, SmartCaseDefaultable { - case man + static func mappingForKey() -> [SmartKeyTransformer]? { + [ + CodingKeys.name <--- "info.name" + ] } +} + +struct SubModel: SmartCodable { + var subname: String = "" + var subage: Int = 0 - struct SubModel: SmartCodable { - var name: String = "" - + static func mappingForKey() -> [SmartKeyTransformer]? { + [ + CodingKeys.subname <--- "info.name" + ] } } diff --git a/Example/SmartCodable/Test3ViewController.swift b/Example/SmartCodable/Test3ViewController.swift index 2891d8b..079afc6 100644 --- a/Example/SmartCodable/Test3ViewController.swift +++ b/Example/SmartCodable/Test3ViewController.swift @@ -15,7 +15,7 @@ import CleanJSON /** 测试内容项 1. 默认值的使用是否正常 2. mappingForValue是否正常。 - 3. + 3. */ @@ -25,67 +25,33 @@ class Test3ViewController: BaseViewController { override func viewDidLoad() { super.viewDidLoad() - - let dict1: [String: Any] = [ - "age": 10, - "name": "Mccc", - "location": [ - "province": "Jiang zhou", - "city": "Su zhou", + "code": "10000", + "msg": "成功", + "data": [ + "guideSvga": "guideSvga", + "guideOnevga": "guideOnevga", + "loadingSvga": "loadingSvga", + "loadingSvgaBackgroundColor": "loadingSvgaBackgroundColor", ] - ] - if let jsonData = try? JSONSerialization.data(withJSONObject: dict1, options: []) { - // Successfully converted Dictionary to Data - print("JSON Data:", jsonData) - - do { - let obj = try JSONDecoder().decode(Model.self, from: jsonData) - print("obj = ", obj) - - } catch { - print("error = ", error) - } - - // If you want to convert it back to a String for debugging purposes - if let jsonString = String(data: jsonData, encoding: .utf8) { - print("JSON String:", jsonString) - } - } - - if let model = Model.deserialize(from: dict1) { - smartPrint(value: model) - print("\n") - let dict = model.toDictionary() ?? [:] - print(dict) - } + guard let model = ResponseData.deserialize(from: dict1) else { return } + print(model) } -} - - - - -extension Test3ViewController { - struct Model: SmartCodable { - var name: String = "" - @IgnoredKey - var ignore: String = "" - @IgnoredKey - var ignore2 = "" - var age: Int = 0 - var location: Location? + + struct HomeListModel: SmartCodable { + var guideSvga = "" + var guideOnevga = "" + var loadingSvga = "" + var loadingSvgaBackgroundColor = "" } - struct Location: SmartCodable { - var province: String = "" - - // 忽略解析 - @IgnoredKey - var city: String = "area123" + struct ResponseData: SmartCodable where T: SmartCodable { + var code = "" + var msg = "" + var data: T? } } - diff --git a/Example/SmartCodable/TestViewController.swift b/Example/SmartCodable/TestViewController.swift index 9b49447..a6a6000 100644 --- a/Example/SmartCodable/TestViewController.swift +++ b/Example/SmartCodable/TestViewController.swift @@ -35,37 +35,52 @@ class TestViewController: BaseViewController { override func viewDidLoad() { super.viewDidLoad() let jsonString = """ +[ { - - "enjoyCount": 462, - "talkCount": null, + "enjoyCount": 1, + "commentCount": 1, +}, +{ + "enjoyCount": 2, + "commentCount": 2, +}, +{ + "enjoyCount": 2, + "commentCount": 2, } +] """ - - guard let model = RecommendModel.deserialize(from: jsonString) else { + guard let models = [RecommendModel].deserialize(from: jsonString) else { return } + print(models) + print("\n") - print(model) + let uniqueRecommends = Array(Set(models)) + print(uniqueRecommends) } - - struct RecommendModel: SmartCodable { + struct RecommendModel: SmartCodable, Equatable, Hashable { /// 点赞数 var enjoyCount: Int = 0 /// 评论数 var commentCount: Int = 0 - - - static func mappingForKey() -> [SmartKeyTransformer]? { - [ - CodingKeys.commentCount <--- ["commentCount","talkCount","postCommentCount","topicCommentCount","topicTalkCount", "articleCommentCount"], - CodingKeys.enjoyCount <--- ["articleEnjoyCount","enjoyCount","topicEnjoyCount","postEnjoyCount"], - ] + @IgnoredKey + var priceText: NSAttributedString? // 价格富文本 + + + static func == (lhs: RecommendModel, rhs: RecommendModel) -> Bool { + return true + } + + // 手动实现 Hashable 协议 + func hash(into hasher: inout Hasher) { + hasher.combine(enjoyCount) + hasher.combine(commentCount) } } - + } diff --git a/SmartCodable.podspec b/SmartCodable.podspec index 44e9ba5..21ddc37 100644 --- a/SmartCodable.podspec +++ b/SmartCodable.podspec @@ -12,7 +12,7 @@ Pod::Spec.new do |s| s.name = 'SmartCodable' - s.version = '4.2.3' + s.version = '4.2.4' s.summary = '数据解析库' s.homepage = 'https://github.com/intsig171' diff --git a/SmartCodable/Classes/JSONDecoder/Decoder/KeysMapper.swift b/SmartCodable/Classes/JSONDecoder/Decoder/KeysMapper.swift index af59319..09f4369 100644 --- a/SmartCodable/Classes/JSONDecoder/Decoder/KeysMapper.swift +++ b/SmartCodable/Classes/JSONDecoder/Decoder/KeysMapper.swift @@ -44,11 +44,15 @@ struct KeysMapper { type.mappingForKey()?.forEach { mapping in for oldKey in mapping.from { let newKey = mapping.to.stringValue + + // 先移除数据中原本的字段 + newDict.removeValue(forKey: newKey) + if let value = newDict[oldKey] as? JSONValue, value != .null { newDict[newKey] = newDict[oldKey] break } else { // Handles the case of a custom parsing path. - if newDict[newKey] == nil, let pathValue = newDict.getValue(forKeyPath: oldKey) { + if let pathValue = newDict.getValue(forKeyPath: oldKey) { newDict.updateValue(pathValue, forKey: newKey) } }