From b3cf2872f0f21723fc9214759defa731f5e52fac Mon Sep 17 00:00:00 2001 From: masakih Date: Thu, 12 Jan 2017 22:02:08 +0900 Subject: [PATCH] =?utf8?q?HMMemberRequireInfoCommand=E3=82=92Swift?= =?utf8?q?=E3=81=AB=E5=A4=89=E6=8F=9B=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KCD.xcodeproj/project.pbxproj | 10 ++++----- KCD/HMMemberRequireInfoCommand.h | 13 ------------ KCD/HMMemberRequireInfoCommand.m | 39 ------------------------------------ KCD/HMMemberRequireInfoCommand.swift | 24 ++++++++++++++++++++++ KCD/KCD-Bridging-Header.h | 1 - 5 files changed, 28 insertions(+), 59 deletions(-) delete mode 100644 KCD/HMMemberRequireInfoCommand.h delete mode 100644 KCD/HMMemberRequireInfoCommand.m create mode 100644 KCD/HMMemberRequireInfoCommand.swift diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj index ce89fbc8..2137e7e5 100644 --- a/KCD.xcodeproj/project.pbxproj +++ b/KCD.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - F403893E1CAEA711002A264B /* HMMemberRequireInfoCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F403893D1CAEA711002A264B /* HMMemberRequireInfoCommand.m */; }; F4048A9D1E18D75E008ACFD6 /* HMDamageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4048A9C1E18D75E008ACFD6 /* HMDamageView.swift */; }; F4048A9F1E19308A008ACFD6 /* HMStrokeTextFieldCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4048A9E1E19308A008ACFD6 /* HMStrokeTextFieldCell.swift */; }; F4048AA11E1951BB008ACFD6 /* HMSuppliesCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4048AA01E1951BB008ACFD6 /* HMSuppliesCell.swift */; }; @@ -73,6 +72,7 @@ F44BC7051E2660E4004644E3 /* HMStoreCreateSlotItemHistoryCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC7041E2660E4004644E3 /* HMStoreCreateSlotItemHistoryCommand.swift */; }; F44BC7071E2670BB004644E3 /* HMCreateShipCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC7061E2670BB004644E3 /* HMCreateShipCommand.swift */; }; F44BC7091E279C41004644E3 /* HMKenzoMarkCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC7081E279C41004644E3 /* HMKenzoMarkCommand.swift */; }; + F44BC70B1E27B456004644E3 /* HMMemberRequireInfoCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F44BC70A1E27B456004644E3 /* HMMemberRequireInfoCommand.swift */; }; F4513EDD18B619B600073552 /* HMCoreDataManager.m in Sources */ = {isa = PBXBuildFile; fileRef = F4513EDC18B619B600073552 /* HMCoreDataManager.m */; }; F4513EE818B77A5300073552 /* HMMemberKDockCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4513EE718B77A5300073552 /* HMMemberKDockCommand.m */; }; F4513EEB18B7900A00073552 /* HMMemberDeckCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4513EEA18B7900A00073552 /* HMMemberDeckCommand.m */; }; @@ -325,8 +325,6 @@ /* Begin PBXFileReference section */ F402D5381BEF14EA008D5881 /* Bookmark 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Bookmark 2.xcdatamodel"; sourceTree = ""; }; - F403893C1CAEA711002A264B /* HMMemberRequireInfoCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMemberRequireInfoCommand.h; sourceTree = ""; }; - F403893D1CAEA711002A264B /* HMMemberRequireInfoCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMemberRequireInfoCommand.m; sourceTree = ""; }; F4048A9C1E18D75E008ACFD6 /* HMDamageView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMDamageView.swift; sourceTree = ""; }; F4048A9E1E19308A008ACFD6 /* HMStrokeTextFieldCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMStrokeTextFieldCell.swift; sourceTree = ""; }; F4048AA01E1951BB008ACFD6 /* HMSuppliesCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMSuppliesCell.swift; sourceTree = ""; }; @@ -410,6 +408,7 @@ F44BC7041E2660E4004644E3 /* HMStoreCreateSlotItemHistoryCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMStoreCreateSlotItemHistoryCommand.swift; sourceTree = ""; }; F44BC7061E2670BB004644E3 /* HMCreateShipCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMCreateShipCommand.swift; sourceTree = ""; }; F44BC7081E279C41004644E3 /* HMKenzoMarkCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMKenzoMarkCommand.swift; sourceTree = ""; }; + F44BC70A1E27B456004644E3 /* HMMemberRequireInfoCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMMemberRequireInfoCommand.swift; sourceTree = ""; }; F4513EDB18B619B600073552 /* HMCoreDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMCoreDataManager.h; sourceTree = ""; }; F4513EDC18B619B600073552 /* HMCoreDataManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMCoreDataManager.m; sourceTree = ""; }; F4513EE618B77A5300073552 /* HMMemberKDockCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMMemberKDockCommand.h; sourceTree = ""; }; @@ -858,8 +857,7 @@ F426802A194D0F4800B2C27F /* HMMemberShip2Command.m */, F426802C194D0FFD00B2C27F /* HMMemberShip3Command.h */, F426802D194D0FFD00B2C27F /* HMMemberShip3Command.m */, - F403893C1CAEA711002A264B /* HMMemberRequireInfoCommand.h */, - F403893D1CAEA711002A264B /* HMMemberRequireInfoCommand.m */, + F44BC70A1E27B456004644E3 /* HMMemberRequireInfoCommand.swift */, ); name = MemberUpdateCommand; sourceTree = ""; @@ -1627,6 +1625,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + F44BC70B1E27B456004644E3 /* HMMemberRequireInfoCommand.swift in Sources */, F4D05BD91E0F748900688D66 /* HMQuestListViewController.swift in Sources */, F4AA59381E1DC4C3001667AF /* HMMapAreaTransformaer.swift in Sources */, F47215A21E1F38280083D3BC /* HMQueue.swift in Sources */, @@ -1759,7 +1758,6 @@ F4AA593A1E1E02D9001667AF /* HMUpgradeShipExcludeColorTransformer.swift in Sources */, F4D2CBCB18B05E58000EBC59 /* HMMaserShipCommand.m in Sources */, F42680121943E92D00B2C27F /* HMKCShipObject+Extensions.m in Sources */, - F403893E1CAEA711002A264B /* HMMemberRequireInfoCommand.m in Sources */, F431E9761DF3AC1C00FB56AE /* HMSetActionCommand.m in Sources */, F44BC6C71E222675004644E3 /* HMFailedCommand.swift in Sources */, F47215A01E1E90C10083D3BC /* HMJSONNode.swift in Sources */, diff --git a/KCD/HMMemberRequireInfoCommand.h b/KCD/HMMemberRequireInfoCommand.h deleted file mode 100644 index 2124230d..00000000 --- a/KCD/HMMemberRequireInfoCommand.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// HMMemberRequireInfoCommand.h -// KCD -// -// Created by Hori,Masaki on 2016/04/01. -// Copyright © 2016年 Hori,Masaki. All rights reserved. -// - -#import "HMCompositCommand.h" - -@interface HMMemberRequireInfoCommand : HMCompositCommand - -@end diff --git a/KCD/HMMemberRequireInfoCommand.m b/KCD/HMMemberRequireInfoCommand.m deleted file mode 100644 index 04eedcd4..00000000 --- a/KCD/HMMemberRequireInfoCommand.m +++ /dev/null @@ -1,39 +0,0 @@ -// -// HMMemberRequireInfoCommand.m -// KCD -// -// Created by Hori,Masaki on 2016/04/01. -// Copyright © 2016年 Hori,Masaki. All rights reserved. -// - -#import "HMMemberRequireInfoCommand.h" - -#import "HMMemberSlotItemCommand.h" -#import "HMMemberKDockCommand.h" - - -@implementation HMMemberRequireInfoCommand -//+ (void)load -//{ -// static dispatch_once_t onceToken; -// dispatch_once(&onceToken, ^{ -// [HMJSONCommand registerClass:self]; -// }); -//} - -+ (BOOL)canExcuteAPI:(NSString *)api -{ - return [api isEqualToString:@"/kcsapi/api_get_member/require_info"]; -} - -- (instancetype)initWithAPIResponse:(HMAPIResponse *)apiResponse -{ - self = [super initWithAPIResponse:apiResponse - commandList: - @[ - [HMMemberSlotItemCommand commandWithAPIResponse:apiResponse], - [HMMemberKDockCommand commandWithAPIResponse:apiResponse], - ]]; - return self; -} -@end diff --git a/KCD/HMMemberRequireInfoCommand.swift b/KCD/HMMemberRequireInfoCommand.swift new file mode 100644 index 00000000..df21a10d --- /dev/null +++ b/KCD/HMMemberRequireInfoCommand.swift @@ -0,0 +1,24 @@ +// +// HMMemberRequireInfoCommand.swift +// KCD +// +// Created by Hori,Masaki on 2017/01/12. +// Copyright © 2017年 Hori,Masaki. All rights reserved. +// + +import Cocoa + +class HMMemberRequireInfoCommand: HMCompositCommand { + override init(apiResponse: HMAPIResponse) { + super.init(apiResponse: apiResponse, commandList: + [ + HMMemberSlotItemCommand(apiResponse: apiResponse), + HMMemberKDockCommand(apiResponse: apiResponse), + ] + ) + } + override class func canExcuteAPI(_ api: String) -> Bool { + if api == "/kcsapi/api_get_member/require_info" { return true } + return false + } +} diff --git a/KCD/KCD-Bridging-Header.h b/KCD/KCD-Bridging-Header.h index ee323008..539b4529 100644 --- a/KCD/KCD-Bridging-Header.h +++ b/KCD/KCD-Bridging-Header.h @@ -37,7 +37,6 @@ #import "HMMemberSlotItemCommand.h" #import "HMMemberShip2Command.h" #import "HMMemberShip3Command.h" -#import "HMMemberRequireInfoCommand.h" #import "HMMapStartCommand.h" #import "HMBattleCommand.h" #import "HMMidnightBattleCommand.h" -- 2.11.0