Skip to content

I
ios1x
Commit ada3f1c7 by lee
Options

Merge branch 'cart_recode'

parents 5c5c8b12 fdfa3996
Showing with 957 additions and 156 deletions
Podfile
......@@ -2,11 +2,15 @@
platform :ios, '8.0'
# Uncomment this line if you're using Swift
# use_frameworks!
inhibit_all_warnings!
target 'iCemarose' do
# CordovaLib Dependency Pod
#pod 'Cordova'
pod 'JRSwizzle'
pod 'RegexKitLite'
pod 'SAMKeychain'
pod 'AFNetworking','~> 2.6'
pod 'JSONModel','~> 1.2.0'
......
iCemarose.xcodeproj/project.pbxproj
......@@ -83,6 +83,11 @@
80F82E611D704E34008B470B /* KWMBrandCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 80F82E5F1D704E34008B470B /* KWMBrandCell.m */; };
80F82E621D704E34008B470B /* KWMBrandCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 80F82E601D704E34008B470B /* KWMBrandCell.xib */; };
80FBF7E18C063DB9E8DC7502 /* libPods-iCemarose.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 450DA8BB947651E9A9B38BEB /* libPods-iCemarose.a */; };
9B0F56B81ECD3424009FC5FE /* UIViewController+AppearLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0F56B71ECD3424009FC5FE /* UIViewController+AppearLog.m */; };
9B166F511ED6DBCF003E9F03 /* KWMHttpUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B166F501ED6DBCF003E9F03 /* KWMHttpUtil.m */; };
9BE61CFB1ECD56E70031D21E /* KWMDictioaryResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE61CFA1ECD56E70031D21E /* KWMDictioaryResult.m */; };
9BE61CFE1ECD66BC0031D21E /* KWMShoppingCart.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE61CFD1ECD66BC0031D21E /* KWMShoppingCart.m */; };
9BE61D011ECD71610031D21E /* KWMCartResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BE61D001ECD71610031D21E /* KWMCartResult.m */; };
C001BA5C1EB2ED5500B366A8 /* KWMImageBlurUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = C001BA5B1EB2ED5500B366A8 /* KWMImageBlurUtil.m */; };
C0219A951DF53EB200711099 /* KWMExchangeRateResult.m in Sources */ = {isa = PBXBuildFile; fileRef = C0219A941DF53EB200711099 /* KWMExchangeRateResult.m */; };
C02C7D801E640D82008DC29C /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C02C7D7B1E640D82008DC29C /* libWeChatSDK.a */; };
......@@ -415,7 +420,17 @@
80F82E5E1D704E34008B470B /* KWMBrandCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMBrandCell.h; sourceTree = "<group>"; };
80F82E5F1D704E34008B470B /* KWMBrandCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMBrandCell.m; sourceTree = "<group>"; };
80F82E601D704E34008B470B /* KWMBrandCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KWMBrandCell.xib; sourceTree = "<group>"; };
9B0F56B61ECD3424009FC5FE /* UIViewController+AppearLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+AppearLog.h"; sourceTree = "<group>"; };
9B0F56B71ECD3424009FC5FE /* UIViewController+AppearLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+AppearLog.m"; sourceTree = "<group>"; };
9B166F4F1ED6DBCF003E9F03 /* KWMHttpUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMHttpUtil.h; sourceTree = "<group>"; };
9B166F501ED6DBCF003E9F03 /* KWMHttpUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMHttpUtil.m; sourceTree = "<group>"; };
9B58353B797587723B0E7515 /* Pods-iCemarose.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iCemarose.debug.xcconfig"; path = "Pods/Target Support Files/Pods-iCemarose/Pods-iCemarose.debug.xcconfig"; sourceTree = "<group>"; };
9BE61CF91ECD56E70031D21E /* KWMDictionaryResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMDictionaryResult.h; sourceTree = "<group>"; };
9BE61CFA1ECD56E70031D21E /* KWMDictioaryResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMDictioaryResult.m; sourceTree = "<group>"; };
9BE61CFC1ECD66BC0031D21E /* KWMShoppingCart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMShoppingCart.h; sourceTree = "<group>"; };
9BE61CFD1ECD66BC0031D21E /* KWMShoppingCart.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMShoppingCart.m; sourceTree = "<group>"; };
9BE61CFF1ECD71610031D21E /* KWMCartResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMCartResult.h; sourceTree = "<group>"; };
9BE61D001ECD71610031D21E /* KWMCartResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMCartResult.m; sourceTree = "<group>"; };
B5C3F0326028FE5E2F51B4C1 /* Pods-iCemarose.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iCemarose.release.xcconfig"; path = "Pods/Target Support Files/Pods-iCemarose/Pods-iCemarose.release.xcconfig"; sourceTree = "<group>"; };
C001BA5A1EB2ED5500B366A8 /* KWMImageBlurUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMImageBlurUtil.h; sourceTree = "<group>"; };
C001BA5B1EB2ED5500B366A8 /* KWMImageBlurUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMImageBlurUtil.m; sourceTree = "<group>"; };
......@@ -1022,6 +1037,8 @@
807806841D75666400FD2841 /* Classify */,
C034E6C51D6AECF9006EE129 /* View */,
80ED0A3D1D93B4CF00B28DF2 /* CoreData */,
9B0F56B61ECD3424009FC5FE /* UIViewController+AppearLog.h */,
9B0F56B71ECD3424009FC5FE /* UIViewController+AppearLog.m */,
);
path = Class;
sourceTree = "<group>";
......@@ -1078,6 +1095,8 @@
C0F4AF4A1DF1149500BDA719 /* KWMProduct.m */,
C0D7CA9F1EA843AD005AE3A3 /* KWMOrder.h */,
C0D7CAA01EA843AD005AE3A3 /* KWMOrder.m */,
9BE61CFC1ECD66BC0031D21E /* KWMShoppingCart.h */,
9BE61CFD1ECD66BC0031D21E /* KWMShoppingCart.m */,
);
path = Model;
sourceTree = "<group>";
......@@ -1119,6 +1138,8 @@
C034E6D51D6AEF1B006EE129 /* KWMTextFieldUtil.m */,
C001BA5A1EB2ED5500B366A8 /* KWMImageBlurUtil.h */,
C001BA5B1EB2ED5500B366A8 /* KWMImageBlurUtil.m */,
9B166F4F1ED6DBCF003E9F03 /* KWMHttpUtil.h */,
9B166F501ED6DBCF003E9F03 /* KWMHttpUtil.m */,
);
path = Util;
sourceTree = "<group>";
......@@ -1613,6 +1634,10 @@
C0219A941DF53EB200711099 /* KWMExchangeRateResult.m */,
C0D7CAA21EA846AA005AE3A3 /* KWMOrdersResult.h */,
C0D7CAA31EA846AA005AE3A3 /* KWMOrdersResult.m */,
9BE61CF91ECD56E70031D21E /* KWMDictionaryResult.h */,
9BE61CFA1ECD56E70031D21E /* KWMDictioaryResult.m */,
9BE61CFF1ECD71610031D21E /* KWMCartResult.h */,
9BE61D001ECD71610031D21E /* KWMCartResult.m */,
);
path = Cemarose;
sourceTree = "<group>";
......@@ -2011,7 +2036,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
F84386F9A53E1205C21D5570 /* [CP] Copy Pods Resources */ = {
......@@ -2049,6 +2074,7 @@
C034E7001D6AF205006EE129 /* KWMButton.m in Sources */,
C0F5867A1E24F820001248E2 /* KWMDoubleTitleView.m in Sources */,
8091DFBB1D6EC1DD0020519C /* KWMThreeView.m in Sources */,
9BE61CFB1ECD56E70031D21E /* KWMDictioaryResult.m in Sources */,
C034E6D81D6AEF1B006EE129 /* KWMImageUtil.m in Sources */,
C03846941DB89EEB008C3BAB /* KWMCemaroseResult.m in Sources */,
C0F586951E25C17A001248E2 /* KWMProductDetailVC.m in Sources */,
......@@ -2086,6 +2112,7 @@
C034E85C1D6B10A0006EE129 /* UIView+PBExtend.m in Sources */,
C0F5867E1E24F820001248E2 /* KWMNewGoodsCell.m in Sources */,
C032D3071DD87E5F008D3155 /* KWMImage.m in Sources */,
9BE61CFE1ECD66BC0031D21E /* KWMShoppingCart.m in Sources */,
C0F586761E24F820001248E2 /* KWMCollectionCell.m in Sources */,
C034E8421D6B10A0006EE129 /* NSArray+Extend.m in Sources */,
C034E85B1D6B10A0006EE129 /* LFRoundProgressView.m in Sources */,
......@@ -2132,6 +2159,7 @@
C034E8401D6B10A0006EE129 /* CALayer+Anim.m in Sources */,
C0FC278E1D9B73B000C5CFFE /* KWMGiftCardCell.m in Sources */,
8077F79A1D73E39000A2E2E2 /* KWMBrandCaramelCell.m in Sources */,
9BE61D011ECD71610031D21E /* KWMCartResult.m in Sources */,
C084F4571D6D975400A0625D /* KWMSearchBar.m in Sources */,
C0F586841E24F820001248E2 /* KWMWatchView.m in Sources */,
C0E8AE091D7D030B00C193DC /* KWMEditAddressVC.m in Sources */,
......@@ -2177,6 +2205,7 @@
C034E8441D6B10A0006EE129 /* NSObject+Extend.m in Sources */,
8079FF701D797DDC0037A71F /* KWMPointView.m in Sources */,
80A611B21D6DB0EC00709E09 /* KWMShopCartVC.m in Sources */,
9B0F56B81ECD3424009FC5FE /* UIViewController+AppearLog.m in Sources */,
C034E8451D6B10A0006EE129 /* NSString+Extend.m in Sources */,
805C04381DD1FA7100ACC071 /* KWMBrandsTypeResult.m in Sources */,
C034E6DA1D6AEF1B006EE129 /* KWMTextFieldUtil.m in Sources */,
......@@ -2189,6 +2218,7 @@
80E81E691D87F96E00FCC0B1 /* KWMMineTitleView.m in Sources */,
C0F5868A1E24F820001248E2 /* KWMSelectedGoodsVC.m in Sources */,
C034E8661D6B10A0006EE129 /* PhotoItemView.m in Sources */,
9B166F511ED6DBCF003E9F03 /* KWMHttpUtil.m in Sources */,
C034E6D91D6AEF1B006EE129 /* KWMStringUtil.m in Sources */,
C02C7D9B1E642DED008DC29C /* KWMWeChatUtil.m in Sources */,
C034E6F11D6AF13A006EE129 /* KWMBasePageVC.m in Sources */,
......
iCemarose/Class/Api/Cemarose/KWMCartResult.h 0 → 100644
//
// KWMCartResult.h
// iCemarose
//
// Created by lee on 2017/5/18.
// Copyright © 2017年 kollway. All rights reserved.
//
#import "KWMCemaroseResult.h"
#import "KWMShopCartModel.h"
@interface KWMCartResult : KWMCemaroseResult
@property (nonatomic, strong) NSNumber *original_total_price;
@property (nonatomic, strong) NSNumber *total_price;
@property (nonatomic, strong) NSNumber *total_discount;
@property (nonatomic, strong) NSNumber *item_count;
@property (nonatomic, assign) BOOL requires_shipping;
@property (nonatomic, strong) NSArray<KWMShopCartModel *> *items;
@end
iCemarose/Class/Api/Cemarose/KWMCartResult.m 0 → 100644
//
// KWMCartResult.m
// iCemarose
//
// Created by lee on 2017/5/18.
// Copyright © 2017年 kollway. All rights reserved.
//
#import "KWMCartResult.h"
#import "KWMImageUtil.h"
@implementation KWMCartResult
- (instancetype)initWithDictionary:(NSDictionary *)dict error:(NSError **)err {
self = [super initWithDictionary:dict error:err];
if (self) {
NSArray *dataArray = dict[@"items"];
if(dataArray){
self.items = [self buildListData:[KWMShopCartModel class] jsonDictionary:dataArray];
}
}
return self;
}
- (instancetype)initWithDictionary:(NSDictionary *)dict modelClass:(Class)modelClass error:(NSError *__autoreleasing *)err {
if (self = [super initWithDictionary:dict error:err]) {
NSArray *dataArray = dict[@"items"];
if(dataArray){
self.items = [self buildListData:[KWMShopCartModel class] jsonDictionary:dataArray];
}
}
return self;
}
- (NSArray *)buildListData:(Class)modelClass jsonDictionary:(NSArray *)dataArray {
NSMutableArray *datas = [NSMutableArray arrayWithCapacity:dataArray.count];
for (id item in dataArray) {
KWMShopCartModel *shopCartModel = [[KWMShopCartModel alloc] init];
shopCartModel.name = item[@"title"];
shopCartModel.brand = item[@"vendor"];
shopCartModel.identifier = [item[@"id"] stringValue];
shopCartModel.size = item[@"variant_title"];
shopCartModel.product_id = item[@"product_id"];
shopCartModel.quantity = [item[@"quantity"] integerValue];
shopCartModel.price = [item[@"discounted_price"] floatValue] / 100;
shopCartModel.imageStr = [KWMImageUtil getProductImageUrl:item[@"product_id"] ImageSize:NormalImage];
shopCartModel.shopCartDict = item;
[datas addObject:shopCartModel];
}
return datas;
}
@end
iCemarose/Class/Api/Cemarose/KWMDictioaryResult.m 0 → 100644
//
// KWMDictiomaryResult.m
// iCemarose
//
// Created by lee on 2017/5/18.
// Copyright © 2017年 kollway. All rights reserved.
//
#import "KWMDictionaryResult.h"
@implementation KWMDictionaryResult
- (instancetype)initWithDictionary:(NSDictionary *)dict
modelClass:(Class)modelClass
error:(NSError **)err {
if (self = [super init]) {
self.data = dict;
}
return self;
}
@end
iCemarose/Class/Api/Cemarose/KWMDictionaryResult.h 0 → 100644
//
// KWMDictiomaryResult.h
// iCemarose
//
// Created by lee on 2017/5/18.
// Copyright © 2017年 kollway. All rights reserved.
//
#import "KWMCemaroseResult.h"
@interface KWMDictionaryResult : KWMCemaroseResult
@property (nonatomic, strong) NSDictionary *data;
@end
iCemarose/Class/Api/KWMAPIManager.h
......@@ -28,7 +28,7 @@
#import "KWMOrdersResult.h"
#import "KWMOrder.h"
#import "KWMExchangeRateResult.h"
#import "KWMCartResult.h"
......@@ -62,6 +62,61 @@
success:(void(^)(NSURLSessionDataTask *task,KWMCemaroseResult *result))success
failure:(void(^)(NSURLSessionDataTask *task,NSError *error))failure;
/**
* 登陆网站接口
*
* @param success <#success description#>
* @param failure <#failure description#>
*/
- (void) loginWebSuccess:(void(^)()) success failure:(void(^)(NSError *error)) failure;
/**
* 添加商品到购物车
*
* @param variantId <#variantId description#>
* @param quantity <#quantity description#>
* @param success <#success description#>
* @param failure <#failure description#>
*
* @return <#return value description#>
*/
- (NSURLSessionDataTask *) addProductWithVariantId:(NSNumber *) variantId quantity:(NSInteger) quantity success:(void(^)(NSURLSessionDataTask *task,KWMRequestResult *result)) success failure:(void(^)(NSURLSessionDataTask *task,NSError *error)) failure;
/**
* 立即购买使用
*
* @param variantId <#variantId description#>
* @param quantity <#quantity description#>
* @param success <#success description#>
* @param failure <#failure description#>
*
* @return <#return value description#>
*/
- (NSURLSessionDataTask *) tmpCartWithVariantId:(NSNumber *) variantId quantity:(NSInteger) quantity success:(void(^)(NSURLSessionDataTask *task,NSString *cartCookie)) success failure:(void(^)(NSURLSessionDataTask *task,NSError *error)) failure;
/**
*
*
* @param variantId <#variantId description#>
* @param success <#success description#>
* @param failure <#failure description#>
*
* @return <#return value description#>
*/
- (NSURLSessionDataTask *) changeProductWithVariantId:(NSNumber *) variantId quantity:(NSInteger) quantity success:(void(^)(NSURLSessionDataTask *task,KWMCartResult *result)) success failure:(void(^)(NSURLSessionDataTask *task,NSError *error)) failure;
-(NSURLSessionDataTask *) updateProductWithVariantIds:(NSArray<NSNumber *> *) variantIds quantities:(NSArray<NSNumber *> *) quantities success:(void(^)(NSURLSessionDataTask *task,KWMCartResult *result)) success failure:(void(^)(NSURLSessionDataTask *task,NSError *error)) failure;
/**
* 获取系统购物车
*
* @param success <#success description#>
* @param failure <#failure description#>
*
* @return <#return value description#>
*/
- (NSURLSessionDataTask *) getCartSuccess:(void(^)(NSURLSessionDataTask *task,KWMCartResult *result)) success failure:(void(^)(NSURLSessionDataTask *task,NSError *error)) failure;
/**
* 手机登录API
* @param parameters {mobile=?手机号,code=?收到的短信验证码}
......
iCemarose/Class/Api/KWMAPIManager.m
......@@ -19,6 +19,11 @@
#import "KWMCustomerResult.h"
#import "KWMBrandsTypeResult.h"
#import "KWMBrandsTypeModel.h"
#import "KWMDictionaryResult.h"
#import <RegexKitLite/RegexKitLite.h>
#import <SAMKeychain/SAMKeychain.h>
#import "KWMUserModel.h"
#import "KWMHttpUtil.h"
......@@ -74,9 +79,9 @@ typedef NS_ENUM(NSInteger, KWMHTTPMethod) {
id result = nil;
@try {
//#ifdef DEBUG
NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsonDict options:NSJSONWritingPrettyPrinted error:&error];
NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
NSLog(@"%@", jsonString);
// NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsonDict options:NSJSONWritingPrettyPrinted error:&error];
// NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
// NSLog(@"%@", jsonString);
//#endif
result = [[requestResultClass alloc] initWithDictionary:jsonDict modelClass:modelClass error:&error];
}
......@@ -170,7 +175,8 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
sessionManager.requestSerializer = [AFJSONRequestSerializer serializerWithWritingOptions:0];
}
[[KWMUserDao shareDao] checkSession];
// 使用系统cookie管理 2017年5月18日 因为改动cart需要使用cookie
// [[KWMUserDao shareDao] checkSession];
sessionManager.requestSerializer.HTTPShouldHandleCookies = YES;
sessionManager.responseSerializer = [AFJSONResponseSerializer serializerWithReadingOptions:NSJSONReadingAllowFragments];
......@@ -186,6 +192,7 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
}
- (NSURLSessionDataTask *)startSessionTask:(KWMHTTPMethod)httpMethod
apiPath:(NSString *)apiPath
parameters:(NSDictionary *)parameters
......@@ -210,13 +217,13 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
failure:failure];
AFHTTPSessionManager *sessionManager = [self buildSessionManager:isJsonParameter];
//app version code
static NSString *KEY_VERSION_CODE = @"version_code";
NSString *build = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
// static NSString *KEY_VERSION_CODE = @"version_code";
// NSString *build = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
NSMutableDictionary *mutableParameters = [[NSMutableDictionary alloc] initWithDictionary:parameters];
// mutableParameters[KEY_VERSION_CODE] = build;
//os_version统一添加
static NSString *KEY_OS_VERSION = @"os_version";
// static NSString *KEY_OS_VERSION = @"os_version";
// mutableParameters[KEY_OS_VERSION] = [NSString stringWithFormat:@"ios%@", [UIDevice currentDevice].systemVersion];
// NSLog(@"os_version:%@=====", mutableParameters[KEY_OS_VERSION]);
......@@ -298,6 +305,7 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
}
- (NSURLSessionDataTask *)startSessionTask:(KWMHTTPMethod)httpMethod
apiPath:(NSString *)apiPath
parameters:(NSDictionary *)parameters
......@@ -351,7 +359,43 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
}
}
- (void)loginWebSuccess:(void (^)())success failure:(void (^)(NSError *))failure {
KWMUserModel *user= [KWMUserModel shareUser];
NSString *account = user.email;
NSString *password = user.password;
if (!password) {
password = [SAMKeychain passwordForService:@"cemarose.account" account:account];
}
// 没登陆过不做处理
if (!password) {
return;
}
AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
manager.responseSerializer = [AFHTTPResponseSerializer serializer];
[manager.responseSerializer setAcceptableContentTypes:[NSSet setWithObject:@"text/html"]];
[manager setTaskWillPerformHTTPRedirectionBlock:^NSURLRequest * _Nonnull(NSURLSession * _Nonnull session, NSURLSessionTask * _Nonnull task, NSURLResponse * _Nonnull response, NSURLRequest * _Nonnull request) {
NSString *url = request.URL.absoluteString;
if ([url isEqualToString:[NSString stringWithFormat:@"https://%@/account",Shopify_SHOP_DOMAIN]]) {
if(success) success();
}else{
NSError *error = [[NSError alloc] initWithDomain:url code:401 userInfo:@{NSLocalizedDescriptionKey:@"email & password is invalid !"}];
if(failure) failure(error);
}
return nil;
}];
NSString *loginUrl = [NSString stringWithFormat:@"https://%@/account/login",Shopify_SHOP_DOMAIN];
id param = @{
@"from_type":@"customer_login",
@"utf8":@"✓",
@"customer[email]":account,
@"customer[password]":password,
};
[manager POST:loginUrl parameters:param success:^(NSURLSessionDataTask * _Nonnull task, id _Nonnull responseObject) {
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
if(failure) failure(error);
}];
}
/**
* 手机登录API
......@@ -375,6 +419,51 @@ static NSString *const passwordTest = @"9e84aae218c57cdf0762763c4cf5a651";
failure:failure];
}
- (NSURLSessionDataTask *)changeProductWithVariantId:(NSNumber *)variantId quantity:(NSInteger) quantity success:(void (^)(NSURLSessionDataTask *, KWMCartResult *))success failure:(void (^)(NSURLSessionDataTask *, NSError *))failure {
NSString *apiPath = [NSString stringWithFormat:@"https://%@/cart/change/%@.js",Shopify_SHOP_DOMAIN,variantId];
id params = @{ @"quantity": @(quantity) };
return [self startSessionTask:KWMHTTPMethodGET apiPath:apiPath parameters:params result:[KWMCartResult class] model:nil success:success failure:failure];
}
- (NSURLSessionDataTask *)updateProductWithVariantIds:(NSArray<NSNumber *> *)variantIds quantities:(NSArray<NSNumber *> *)quantities success:(void (^)(NSURLSessionDataTask *, KWMCartResult *))success failure:(void (^)(NSURLSessionDataTask *, NSError *))failure {
NSString *apiPath = [NSString stringWithFormat:@"https://%@/cart/update.js",Shopify_SHOP_DOMAIN];
NSMutableDictionary *params = [NSMutableDictionary new];
for (int i=0; i<quantities.count; i++) {
[params setObject:quantities[i] forKey:[NSString stringWithFormat:@"updates[%@]",variantIds[i]]];
}
return [self startSessionTask:KWMHTTPMethodPOST apiPath:apiPath parameters:params result:[KWMCartResult class] model:nil success:success failure:failure];
}
- (NSURLSessionDataTask *)addProductWithVariantId:(NSNumber *)variantId quantity:(NSInteger)quantity success:(void (^)(NSURLSessionDataTask *, KWMRequestResult *))success failure:(void (^)(NSURLSessionDataTask *, NSError *))failure {
NSString *apiPath = [NSString stringWithFormat:@"https://%@/cart/add.js",Shopify_SHOP_DOMAIN];
id params = @{
@"id":variantId,
@"quantity":@(quantity),
};
return [self startSessionTask:KWMHTTPMethodPOST apiPath:apiPath parameters:params result:[KWMDictionaryResult class] model:nil success:success failure:failure];
}
- (NSURLSessionDataTask *)tmpCartWithVariantId:(NSNumber *)variantId quantity:(NSInteger)quantity success:(void (^)(NSURLSessionDataTask *, NSString *))success failure:(void (^)(NSURLSessionDataTask *, NSError *))failure {
NSString *apiPath = [NSString stringWithFormat:@"https://%@/cart/add.js",Shopify_SHOP_DOMAIN];
id params = @{
@"id":variantId,
@"quantity":@(quantity),
};
AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
[manager.requestSerializer setHTTPShouldHandleCookies:NO];
NSString *cookie = [[KWMHttpUtil buildRequestCookieString] stringByReplacingOccurrencesOfRegex:@"cart=.*?; ?" withString:@""];
[manager.requestSerializer setValue:cookie forHTTPHeaderField:@"Cookie"];
return [manager POST:apiPath parameters:params success:^(NSURLSessionDataTask * _Nonnull task, id _Nonnull responseObject) {
NSHTTPURLResponse *response = (NSHTTPURLResponse *)task.response;
NSString *cartCookie = [response.allHeaderFields[@"Set-Cookie"] stringByMatching:@"cart=(.*?);" capture:1];
success(task,cartCookie);
} failure:failure];
}
-(NSURLSessionDataTask *)getCartSuccess:(void (^)(NSURLSessionDataTask *, KWMCartResult *))success failure:(void (^)(NSURLSessionDataTask *, NSError *))failure {
NSString *apiPath = [NSString stringWithFormat:@"https://%@/cart.js",Shopify_SHOP_DOMAIN];
return [self startSessionTask:KWMHTTPMethodGET apiPath:apiPath parameters:nil result:[KWMCartResult class] model:nil success:success failure:failure];
}
/**
* 手机登录-获取短信API
......
iCemarose/Class/Api/KWMRequestResult.m
......@@ -15,7 +15,7 @@
- (instancetype)initWithDictionary:(NSDictionary *)dict
modelClass:(Class)modelClass
error:(NSError **)err {
self = [super initWithDictionary:dict error:err];
self = [super initWithDictionary:@{@"message":@"",@"code":@"",@"data":dict} error:err];
if (self) {
NSDictionary *dataDictionary = dict[@"data"];
if(dataDictionary){
......
iCemarose/Class/CoreData/KWMShopCartData.h
......@@ -13,6 +13,13 @@
@interface KWMShopCartData : NSObject
/**
* 商品同步 会清除已有的然后重新保存
*
* @param items <#items description#>
*/
- (void)syncCartProducts:(NSArray *) items;
//添加购物商品
- (void) inocreaseItem:(KWMShopCartModel *)shopCartModel;
......
iCemarose/Class/CoreData/KWMShopCartData.m
......@@ -10,6 +10,13 @@
#define KWM_MAX_PRODUCT_COUNT 9999
@implementation KWMShopCartData
-(void)syncCartProducts:(NSArray *)items {
[self removeAllItems];
for (KWMShopCartModel *item in items) {
[self inocreaseItem:item];
}
}
//添加购物商品
- (void) inocreaseItem:(KWMShopCartModel *)shopCartModel{
KWMShopCartItem *shopCartItem = [self toShopCartProduct:shopCartModel];
......@@ -115,6 +122,7 @@
result.size = shopCartModel.size;
result.quantity = shopCartModel.quantity;
result.price = shopCartModel.price;
result.product_id = shopCartModel.product_id.stringValue;
result.shopCartDict = shopCartModel.shopCartDict;
}
return result;
......@@ -132,6 +140,7 @@
result.size = shopCartItem.size;
result.quantity = shopCartItem.quantity;
result.shopCartDict = shopCartItem.shopCartDict;
result.product_id = @(shopCartItem.product_id.integerValue);
return result;
}
......
iCemarose/Class/CoreData/KWMShopCartItem+CoreDataProperties.h
......@@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nullable, nonatomic, copy) NSString *brand;
@property (nullable, nonatomic, copy) NSString *name;
@property (nullable, nonatomic, copy) NSString *size;
@property (nullable, nonatomic, copy) NSString *product_id;
@property (nonatomic) NSInteger quantity;
@property (nonatomic) float price;
@property (nullable, nonatomic, retain) NSDictionary *shopCartDict;
......
iCemarose/Class/CoreData/KWMShopCartItem+CoreDataProperties.m
......@@ -18,6 +18,7 @@
@dynamic imageStr;
@dynamic brand;
@dynamic name;
@dynamic product_id;
@dynamic size;
@dynamic quantity;
@dynamic price;
......
iCemarose/Class/CoreData/KWMShopCartModel.h
......@@ -14,6 +14,7 @@
@property (nullable, nonatomic, copy) NSString *brand;
@property (nullable, nonatomic, copy) NSString *name;
@property (nullable, nonatomic, copy) NSString *size;
@property (nullable, nonatomic, strong) NSNumber *product_id;
@property (nonatomic) NSInteger quantity;
@property (nonatomic) float price;
@property (nullable, nonatomic, retain) NSDictionary *shopCartDict;
......
iCemarose/Class/DB_shopCart.xcdatamodeld/DB_shopCart.xcdatamodel/contents
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11232" systemVersion="15G1004" minimumToolsVersion="Automatic" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="12141" systemVersion="16E195" minimumToolsVersion="Automatic" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
<entity name="KWMShopCartItem" representedClassName="KWMShopCartItem" syncable="YES">
<attribute name="brand" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="identifier" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="imageStr" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="price" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="YES" syncable="YES"/>
<attribute name="product_id" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="quantity" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES" syncable="YES"/>
<attribute name="shopCartDict" optional="YES" attributeType="Transformable" syncable="YES"/>
<attribute name="size" optional="YES" attributeType="String" syncable="YES"/>
</entity>
<elements>
<element name="KWMShopCartItem" positionX="-63" positionY="-18" width="128" height="165"/>
<element name="KWMShopCartItem" positionX="-63" positionY="-18" width="128" height="180"/>
</elements>
</model>
\ No newline at end of file
iCemarose/Class/Model/KWMShoppingCart.h 0 → 100644
//
// KWMShoppingCart.h
// iCemarose
//
// Created by lee on 2017/5/18.
// Copyright © 2017年 kollway. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "KWMShopCartModel.h"
#import "KWMCartResult.h"
typedef void(^ShoppingCartCallBack) (NSError *error,KWMCartResult *cart);
@interface KWMShoppingCart : NSObject
@property (nonatomic, strong) NSMutableArray<KWMShopCartModel *> * items;
@property (nonatomic, strong) NSNumber *count;
+ (instancetype)sharedInstance;
- (void)allItemsWithCallback:(ShoppingCartCallBack) callback;
- (void)increaseProductWithVariantId:(NSNumber *) variantId quantity:(NSInteger) quantity callback:(ShoppingCartCallBack) callback;
- (void)changeProductWithVariantId:(NSNumber *) variantId quantity:(NSInteger) quantity callback:(ShoppingCartCallBack) callback;
- (void)updateProductWithVariantIds:(NSArray<NSNumber *> *) variantIds quantitties:(NSArray<NSNumber *> *) quantites callback:(ShoppingCartCallBack) callback;
- (void)deleteProductWithVariantId:(NSNumber *) variantId callback:(ShoppingCartCallBack) callback;
@end
iCemarose/Class/Model/KWMShoppingCart.m 0 → 100644
//
// KWMShoppingCart.m
// iCemarose
//
// Created by lee on 2017/5/18.
// Copyright © 2017年 kollway. All rights reserved.
//
#import "KWMShoppingCart.h"
#import "KWMCartResult.h"
#import "KWMShopCartData.h"
@interface KWMShoppingCart ()
@property (nonatomic, strong) KWMCartResult *result;
@end
@implementation KWMShoppingCart
- (NSMutableArray<KWMShopCartModel *> *)items {
return (NSMutableArray *)_result.items;
}
- (NSNumber *)count {
return _result.item_count;
}
- (void)setResult:(KWMCartResult *)result {
_result = result;
[[KWMShopCartData alloc] syncCartProducts:result.items];
}
- (void)setResultNoSync:(KWMCartResult *)result {
_result = result;
}
+ (instancetype)sharedInstance {
static KWMShoppingCart *instance;
static dispatch_once_t onceToken;
dispatch_once(&onceToken,^{
instance = [[super allocWithZone:NULL] init];
});
if (!instance.result) {
[instance setResultNoSync:[KWMCartResult new]];
instance.result.items = [[[KWMShopCartData alloc] getALLItems] mutableCopy];
NSInteger count = 0;
for (KWMShopCartModel *item in instance.items) {
count += item.quantity;
}
instance.result.item_count = @(count);
}
return instance;
}
- (void)allItemsWithCallback:(ShoppingCartCallBack)callback {
[[KWMAPIManager sharedManager] getCartSuccess:^(NSURLSessionDataTask *task, KWMCartResult *result) {
[[KWMShoppingCart sharedInstance] setResult:result];
callback(nil,result);
} failure:^(NSURLSessionDataTask *task, NSError *error) {
callback(error,nil);
}];
}
- (void)increaseProductWithVariantId:(NSNumber *)variantId quantity:(NSInteger)quantity callback:(ShoppingCartCallBack)callback {
[[KWMAPIManager sharedManager] addProductWithVariantId:variantId quantity:quantity success:^(NSURLSessionDataTask *task, KWMRequestResult *result) {
[[KWMShoppingCart sharedInstance] allItemsWithCallback:^(NSError *error, KWMCartResult *cart) {
callback(error,cart);
}];
} failure:^(NSURLSessionDataTask *task, NSError *error) {
// callback(error,nil);
}];
callback(nil,[self changeLocalCartWithVariantId:variantId quantity:quantity flag:1]);
}
- (void)changeProductWithVariantId:(NSNumber *)variantId quantity:(NSInteger)quantity callback:(ShoppingCartCallBack)callback {
[[KWMAPIManager sharedManager] changeProductWithVariantId:variantId quantity:quantity success:^(NSURLSessionDataTask *task, KWMCartResult *result) {
[[KWMShoppingCart sharedInstance] setResult:result];
callback(nil,result);
} failure:^(NSURLSessionDataTask *task, NSError *error) {
// callback(error,nil);
}];
callback(nil,[self changeLocalCartWithVariantId:variantId quantity:quantity flag:quantity ? 2 : 0]);
}
-(void)updateProductWithVariantIds:(NSArray<NSNumber *> *)variantIds quantitties:(NSArray<NSNumber *> *)quantites callback:(ShoppingCartCallBack)callback {
[[KWMAPIManager sharedManager] updateProductWithVariantIds:variantIds quantities:quantites success:^(NSURLSessionDataTask *task, KWMCartResult *result) {
[[KWMShoppingCart sharedInstance] setResult:result];
callback(nil,result);
} failure:^(NSURLSessionDataTask *task, NSError *error) {
// callback(error,nil);
}];
for (int i=0; i<quantites.count; i++) {
[self changeLocalCartWithVariantId:variantIds[i] quantity:quantites[i].integerValue flag:quantites[i].integerValue ? 2 : 0];
}
callback(nil,self.result);
}
- (void)deleteProductWithVariantId:(NSNumber *)variantId callback:(ShoppingCartCallBack)callback {
[self changeProductWithVariantId:variantId quantity:0 callback:callback];
}
- (KWMCartResult *) changeLocalCartWithVariantId:(NSNumber *) variantId quantity:(NSInteger) quantity flag:(NSInteger) flag {
NSMutableArray<KWMShopCartModel *> *items= self.items;
NSInteger count = self.result.item_count.integerValue;
BOOL processed = NO;
NSUInteger size = items.count;
for (int i=0;i < size; i++) {
KWMShopCartModel *item = items[i];
if (item.identifier.integerValue == variantId.integerValue) {
switch (flag) {
case 0:
count -= item.quantity;
[self.items removeObjectAtIndex:i];
break;
case 1:
count += quantity;
item.quantity += quantity;
break;
default:
count -= item.quantity - quantity;
item.quantity = quantity;
}
processed = YES;
break;
}
}
if (!processed) {
KWMShopCartModel *model = [[KWMShopCartModel alloc] init];
model.identifier = variantId.stringValue;
model.quantity = quantity;
count += quantity;
// [items addObject:model];
[items insertObject:model atIndex:0];
}
self.result.item_count = @(count);
return self.result;
}
+ (id)allocWithZone:(struct _NSZone *)zone {
return [KWMShoppingCart sharedInstance];
}
- (id)copy {
return self;
}
- (id)mutableCopy {
return self;
}
@end
iCemarose/Class/Model/KWMUserModel.h
......@@ -17,6 +17,7 @@
@property (nonatomic) NSDictionary *tokenJSON;
+ (instancetype)shareUser;
+ (void) saveAccountByCredentials:(BUYAccountCredentials *) credentials;
- (void)login;
- (void)logout;
@end
iCemarose/Class/Model/KWMUserModel.m
......@@ -7,6 +7,7 @@
//
#import "KWMUserModel.h"
#import <SAMKeychain/SAMKeychain.h>
@implementation KWMUserModel
......@@ -64,6 +65,18 @@ static KWMUserModel *_shareUser;
[self deleteUser];
}
+ (void) saveAccountByCredentials:(BUYAccountCredentials *) credentials {
NSString *account = nil,*password = nil;
for (BUYAccountCredentialItem *item in credentials.items) {
if ([item.key isEqualToString:BUYAccountEmailKey]) {
account = item.value.lowercaseString;
} else if ([item.key isEqualToString:BUYAccountPasswordKey]) {
password = item.value;
}
}
[SAMKeychain setPassword:password forService:@"cemarose.account" account:account];
}
- (void)deleteUser{
[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"KeyUser"];
[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"customer"];
......
iCemarose/Class/UI/Brand/KWMBrandCaramelVC.m
......@@ -18,6 +18,7 @@
#import "UIColor+SAMAdditions.h"
#import "KWMFilterVC.h"
#import "KWMImageBlurUtil.h"
#import "KWMShoppingCart.h"
@interface KWMBrandCaramelVC ()<UITableViewDelegate,UITableViewDataSource,KWMBrandCaramelCellDelegate>
@property (nonatomic) KWMBarandSelectView *barandSelectView;
......@@ -135,8 +136,7 @@
- (void)initHeaderView{
_barandSelectView = [[KWMBarandSelectView alloc] initWithFrame:CGRectMake(0, 0, UI_SCREEN_WIDTH, 64)];
NSArray *arr = [[KWMShopCartData alloc] getALLItems];
_barandSelectView.count = arr.count;
_barandSelectView.count = [[KWMShoppingCart sharedInstance] count].integerValue;
_barandSelectView.lbBrand.text = [_brand uppercaseString];
......
iCemarose/Class/UI/Brand/KWMBrandVC.m
......@@ -18,6 +18,7 @@
#import <SDWebImage/UIImageView+WebCache.h>
#import "KWMBrandsTypeModel.h"
#import "UIColor+SAMAdditions.h"
#import "KWMShoppingCart.h"
@interface KWMBrandVC ()<KWMCarCountViewDelegate>
......@@ -79,8 +80,7 @@ static NSString *cellId = @"KWMBrandCell";
- (void) initHeardView{
_vCartCount = [[KWMCarCountView alloc] initWithFrame:CGRectMake(0, 0, UI_SCREEN_WIDTH, 64)];
NSArray *arr = [[KWMShopCartData alloc] getALLItems];
_vCartCount.count = arr.count;
_vCartCount.count = [[KWMShoppingCart sharedInstance] count].integerValue;
_vCartCount.delegate = self;
[self.view addSubview:_vCartCount];
}
......
iCemarose/Class/UI/Home/KWMHomeVC.m
......@@ -16,6 +16,7 @@
#import "KWMBlogDetailVC.h"
#import "KWMUserModel.h"
#import "KWMLoginVC.h"
#import "KWMShoppingCart.h"
@interface KWMHomeVC ()
@property (nonatomic)KWMSearchBar *searchBar;
......@@ -25,7 +26,7 @@
@implementation KWMHomeVC
+(NSString *)kwmTag{
+ (NSString *)kwmTag{
return @"KWMHomeVC";
}
......@@ -42,6 +43,7 @@
[super viewDidLoad];
_dataArr = [NSArray array];
[self requestBlogAPI];
[self.api loginWebSuccess:nil failure:nil];
}
- (UITableView *)targetTableView{
......@@ -71,8 +73,8 @@
[self.navigationController setNavigationBarHidden:YES];
[self initHeaderView];
if (_searchBar) {
NSArray *arr = [[KWMShopCartData alloc] getALLItems];
_searchBar.count = arr.count;
NSInteger count = [[KWMShoppingCart sharedInstance] count].integerValue;
_searchBar.count = count;
}
[_searchBar resumeView];
}
......
iCemarose/Class/UI/Login/KWMEmailVC.m
......@@ -167,9 +167,10 @@
//请求登录aip
- (void)requestLoginAPI{
BUYAccountCredentials *bac = credentials;
[self.client loginCustomerWithCredentials:credentials callback:^(BUYCustomer * _Nullable customer, BUYCustomerToken * _Nullable token, NSError * _Nullable error) {
if (customer && token && !error) {
[KWMUserModel saveAccountByCredentials:bac];
_customer = customer;
_token = token;
_userModel.customerJSON = customer.JSONDictionary;
......@@ -191,6 +192,7 @@
//异步保存数据
dispatch_async(dispatch_get_global_queue(0, 0), ^{
[self.api loginWebSuccess:nil failure:nil];
[self saveData];
});
// NSString *path = NSHomeDirectory();
......
iCemarose/Class/UI/Login/KWMValidationVC.m
......@@ -431,6 +431,7 @@
[self.client loginCustomerWithCredentials:credentials callback:^(BUYCustomer * _Nullable customer, BUYCustomerToken * _Nullable token, NSError * _Nullable error) {
[self hideLoading];
if (customer && token && !error) {
[KWMUserModel saveAccountByCredentials:credentials];
_customer = customer;
_token = token;
_userModel.customerJSON = customer.JSONDictionary;
......@@ -440,6 +441,7 @@
NSLog(@"登录成功");
//异步保存数据
dispatch_async(dispatch_get_global_queue(0, 0), ^{
[self.api loginWebSuccess:nil failure:nil];
[self saveData];
});
[self dismissViewControllerAnimated:YES completion:nil];
......
iCemarose/Class/UI/Product/KWMNewVC.m
......@@ -18,6 +18,7 @@
#import "KWMBrandCaramelVC.h"
#import "UIColor+SAMAdditions.h"
#import "KWMProductDetailVC.h"
#import "KWMShoppingCart.h"
@interface KWMNewVC ()
......@@ -60,6 +61,7 @@ static NSString * idStr = @"KWMNewGoodsCell";
isNew = YES;
[self initView];
[self requestNewProductsCollection];
}
- (void)initNotification{
......@@ -92,8 +94,8 @@ static NSString * idStr = @"KWMNewGoodsCell";
[self.navigationController setNavigationBarHidden:YES];
[self.tabBarController setHidesBottomBarWhenPushed:NO];
if (_searchBar) {
NSArray *arr = [[KWMShopCartData alloc] getALLItems];
_searchBar.count = arr.count;
NSInteger count = [[KWMShoppingCart sharedInstance] count].integerValue;
_searchBar.count = count;
}
[_searchBar resumeView];
_vBackground.hidden = YES;
......
iCemarose/Class/UI/Product/KWMProductDetailVC.m
......@@ -23,6 +23,7 @@
#import "MZFormSheetPresentationViewController.h"
#import "KWMShareVC.h"
#import "KWMImageUtil.h"
#import "KWMShoppingCart.h"
......@@ -56,7 +57,7 @@
[super viewDidLoad];
[self initScrollView];
[self initRecommendProduct];
[self initShopCartCount];
// [self initShopCartCount];
//刷新product，如果是缓存的product，因为没有字典，所以会发生错误，需要重新请求一个有字典的product
if(self.product && self.product.identifier && !self.product.JSONDictionary){
[self getProductBy:nil product:self.product];
......@@ -70,6 +71,7 @@
- (void)viewWillAppear:(BOOL)animated{
[super viewWillAppear:animated];
[self.navigationController setNavigationBarHidden:YES animated:YES];
[self initShopCartCount];
}
- (void)viewWillDisappear:(BOOL)animated{
......@@ -125,9 +127,8 @@
}
- (void)initShopCartCount{
NSArray *shopCarArray = [[KWMShopCartData alloc] getALLItems];
NSInteger count = shopCarArray == 0?0:shopCarArray.count;
[self.btnShopCart setTitle:@(count).stringValue forState:UIControlStateNormal];
NSNumber *count = [[KWMShoppingCart sharedInstance] count];
[self.btnShopCart setTitle:count.stringValue forState:UIControlStateNormal];
}
- (void)setProductId:(NSNumber *)productId{
......@@ -168,7 +169,8 @@
KWMSelectSizeVC *editVC = (KWMSelectSizeVC *)[KWMBaseVC findControllerBy:[KWMSelectSizeVC kwmTag] fromStoryboard:@"ShopCart"];
editVC.delegate = self;
editVC.product = self.product;
NSDictionary *shopCartDict = self.product.JSONDictionary;
// NSDictionary *shopCartDict = self.product.JSONDictionary;
editVC.view.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0];
editVC.modalPresentationStyle = UIModalPresentationOverCurrentContext;
editVC.providesPresentationContextTransitionStyle = YES;
......@@ -210,28 +212,75 @@
[self initRecommendProduct];
}
//KWMSelectSizeVCDelegate
-(void)kwm_addShopCartItem:(KWMShopCartModel *)shopCartModel{
[self initShopCartCount];
}
-(void)kwm_fastBuy:(BUYCart *)fastBuyCart{
if(fastBuyCart == nil){
#pragma mark - KWMSelectSizeVCDelegate
- (void)kwm_addShopWithVariantId:(NSNumber *)identifier quantity:(NSInteger)quantity variant:(BUYProductVariant *) variant buyNow:(BOOL)buyNow callback:(void (^)(BOOL))callback {
__weak KWMProductDetailVC *this = self;
if (!buyNow) {
[[KWMShoppingCart sharedInstance] increaseProductWithVariantId:identifier quantity:quantity callback:^(NSError *error, KWMCartResult *cart) {
if (cart.items.firstObject && !cart.items.firstObject.product_id) {
KWMShopCartModel *model = cart.items.firstObject;
model.imageStr = [KWMImageUtil getProductImageUrl:this.product.identifier ImageSize:NormalImage];
model.name = this.product.title;
model.size = variant.title;
model.price = variant.price.floatValue;
}
if (!error) {
[this showToast:@"添加成功"];
[this.btnShopCart setTitle:cart.item_count.stringValue forState:UIControlStateNormal];
callback(YES);
}else{
[this showError:error];
callback(NO);
}
}];
return;
}
callback(YES);
KWMUserModel *useModel = [KWMUserModel shareUser];
if (useModel.status) {
KWMBeforePayVC *beforePayVC = (KWMBeforePayVC *)[KWMBaseVC findControllerBy:[KWMBeforePayVC kwmTag] fromStoryboard:@"ShopCart"];
beforePayVC.fastPayCart = fastBuyCart;
[self.navigationController pushViewController:beforePayVC animated:YES];}
//用户未登录
else{
if (!useModel.status) {
//登录
KWMLoginVC *loginVc = (KWMLoginVC *)[KWMBaseVC findControllerBy:[KWMLoginVC kwmTag] fromStoryboard:@"Login"];
UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:loginVc];
[self presentViewController:nav animated:YES completion:nil];
return;
}
[self showLoading];
[self.api tmpCartWithVariantId:identifier quantity:quantity success:^(NSURLSessionDataTask *task, NSString *cartCookie) {
[this hideLoading];
KWMBeforePayVC *beforePayVC = (KWMBeforePayVC *)[KWMBaseVC findControllerBy:[KWMBeforePayVC kwmTag] fromStoryboard:@"ShopCart"];
beforePayVC.cartCookie = cartCookie;
[this.navigationController pushViewController:beforePayVC animated:YES];
} failure:^(NSURLSessionDataTask *task, NSError *error) {
[this showError:error];
}];
}
////KWMSelectSizeVCDelegate
//-(void)kwm_addShopCartItem:(KWMShopCartModel *)shopCartModel{
// [self initShopCartCount];
//}
//
//-(void)kwm_fastBuy:(BUYCart *)fastBuyCart{
// if(fastBuyCart == nil){
// return;
// }
// KWMUserModel *useModel = [KWMUserModel shareUser];
// if (useModel.status) {
// KWMBeforePayVC *beforePayVC = (KWMBeforePayVC *)[KWMBaseVC findControllerBy:[KWMBeforePayVC kwmTag] fromStoryboard:@"ShopCart"];
// beforePayVC.fastPayCart = fastBuyCart;
// [self.navigationController pushViewController:beforePayVC animated:YES];}
// //用户未登录
// else{
// KWMLoginVC *loginVc = (KWMLoginVC *)[KWMBaseVC findControllerBy:[KWMLoginVC kwmTag] fromStoryboard:@"Login"];
// UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:loginVc];
// [self presentViewController:nav animated:YES completion:nil];
// }
//}
#pragma mark - KWMSelectSizeVCDelegate End
-(void)initRecommendProduct{
if(self.product == nil){
return;
......
iCemarose/Class/UI/ShopCart/KWMBeforePayVC.h
......@@ -56,6 +56,8 @@
//快速购买购物车
@property (nonatomic) BUYCart *fastPayCart;
@property (strong, nonatomic) NSString *cartCookie;
- (IBAction)onClickPayType:(id)sender;
- (IBAction)onClickAddress:(id)sender;
......
iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m
......@@ -17,7 +17,8 @@
#import "KWMPaySuccessVC.h"
#import "KWMStringUtil.h"
#import "UIColor+SAMAdditions.h"
#import <RegexKitLite/RegexKitLite.h>
#import "KWMHttpUtil.h"
@interface KWMBeforePayVC ()
......@@ -213,18 +214,28 @@
//初始化订单
-(void)initCheckOut{
[self initBuyCart];
// 直接使用session cart所以不需要init了之后可以做代码清除
// [self initBuyCart];
//如果已登录
if(self.cart && self.customer){
BUYCheckout *checkout = nil;
//如果self.checkout1=nil，则为缓存订单，反正则为新建订单
// if(self.cart && self.customer){
if(self.customer){
// BUYCheckout *checkout = nil;
// //如果self.checkout1=nil，则为缓存订单，反正则为新建订单
// NSDictionary *checkoutCache = [self.userDao checkOutCache];
// // 这个if可能不需要了 下面下直接对session进行修改就可以
// if(checkoutCache){
// // update server
// checkout = [[BUYCheckout alloc] initWithModelManager:self.client.modelManager JSONDictionary:checkoutCache];
// [checkout updateWithCart:self.cart];
// }else{
// // init checkout 这里应该也没用了 因为self.cart不存在
// checkout = [[BUYCheckout alloc] initWithModelManager:self.client.modelManager cart:self.cart];
// }
NSDictionary *checkoutCache = [self.userDao checkOutCache];
if(checkoutCache){
checkout = [[BUYCheckout alloc] initWithModelManager:self.client.modelManager JSONDictionary:checkoutCache];
[checkout updateWithCart:self.cart];
}else{
checkout = [[BUYCheckout alloc] initWithModelManager:self.client.modelManager cart:self.cart];
BUYCheckout *checkout = nil;
if (!checkoutCache || self.cartCookie) {
checkout = [[BUYCheckout alloc] initWithModelManager:self.client.modelManager JSONDictionary:nil];
}
if(self.address){
if([self checkAddress:self.address]){
......@@ -245,11 +256,15 @@
}
checkout.email = self.customer.email;
// self.client.urlScheme = @"CemaroseApp://";
if(checkoutCache){
[self requestUpdateCheckout:checkout isCacheCheckout:YES];
}else{
// 走session的情况下应该不存在update 只是update cart自动会update到checkout
// if(checkoutCache){
// 更新订单
// [self requestUpdateCheckout:checkout isCacheCheckout:YES];
// }else{
// 申请将session cart转成checkout
[self requestCreateCheckout:checkout];
}
//
// }
}
}
......@@ -384,24 +399,67 @@
-(void)requestCreateCheckout:(BUYCheckout *)checkout{
[self showLoading];
//[self showToast:@"创建订单中"];
__weak KWMBeforePayVC *weakSelf = self;
self.checkoutCreationOperation = [self.client createCheckout:checkout completion:^(NSDictionary *dictionary,BUYCheckout *checkout, NSError *error) {
[self hideLoading];
[[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
if (error == nil && checkout) {
weakSelf.checkout = checkout;
//[self showToast:@"创建订单成功"];
[weakSelf initData];
NSLog(@"saveDict: %@",dictionary);
[weakSelf.userDao saveCheckoutCache:dictionary];
if(weakSelf.checkout.shippingAddress!=nil){
[weakSelf requestShippingData];
}}
else {
[self hideLoading];
[weakSelf showError:error];
NSLog(@"Error creating checkout: %@", error);
}
// __weak KWMBeforePayVC *weakSelf = self;
// self.checkoutCreationOperation = [self.client createCheckout:checkout completion:^(NSDictionary *dictionary,BUYCheckout *checkout, NSError *error) {
// [self hideLoading];
// [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
// if (error == nil && checkout) {
// weakSelf.checkout = checkout;
// //[self showToast:@"创建订单成功"];
// [weakSelf initData];
// NSLog(@"saveDict: %@",dictionary);
// [weakSelf.userDao saveCheckoutCache:dictionary];
// if(weakSelf.checkout.shippingAddress!=nil){
// [weakSelf requestShippingData];
// }}
// else {
// [self hideLoading];
// [weakSelf showError:error];
// NSLog(@"Error creating checkout: %@", error);
// }
// }];
__weak KWMBeforePayVC *this = self;
AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
if (self.cartCookie) {
[manager.requestSerializer setHTTPShouldHandleCookies:NO];
NSString *cookie = [[KWMHttpUtil buildRequestCookieString] stringByReplacingOccurrencesOfRegex:@"cart=.*?;" withString:[NSString stringWithFormat:@"cart=%@;",self.cartCookie]];
[manager.requestSerializer setValue:cookie forHTTPHeaderField:@"Cookie"];
}
[manager setTaskWillPerformHTTPRedirectionBlock:^NSURLRequest * _Nonnull(NSURLSession * _Nonnull session, NSURLSessionTask * _Nonnull task, NSURLResponse * _Nonnull response, NSURLRequest * _Nonnull request) {
if (!response) {
return request;
}
NSString *checkoutId = [request.URL.absoluteString stringByMatching:@"checkouts/(.*?)\\?" capture:1];
checkoutId = checkoutId ? checkoutId : [request.URL.absoluteString stringByMatching:@"checkouts/(.*)$" capture:1];
NSString *URLString = [NSString stringWithFormat:@"https://%@/api/checkouts/%@.json",Shopify_SHOP_DOMAIN,checkoutId];
NSMutableURLRequest *newReq = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:URLString]];
[newReq setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
[newReq setValue:@"application/json" forHTTPHeaderField:@"Accept"];
NSString *token = [NSString stringWithFormat:@"Basic %@",[[this.client.apiKey dataUsingEncoding:NSUTF8StringEncoding] base64EncodedStringWithOptions:0]];
[newReq setValue:token forHTTPHeaderField:@"Authorization"];
if(this.client.customerToken) {
[newReq setValue:this.client.customerToken.accessToken forHTTPHeaderField:@"X-Shopify-Customer-Access-Token"];
}
// 如果有checkout说明是新订单 直接更新订单地址就好 如果没有checkout说明是旧订单已经有地址所以无需更新
if (checkout || this.cartCookie) {
newReq.HTTPMethod = @"PATCH";
[newReq setHTTPBody:[NSJSONSerialization dataWithJSONObject:[checkout jsonDictionaryForCheckout] options:0 error:nil]];
}
return newReq;
}];
[manager GET:[NSString stringWithFormat:@"https://%@/checkout",Shopify_SHOP_DOMAIN] parameters:nil success:^(NSURLSessionDataTask * _Nonnull task, id _Nonnull responseObject) {
[this hideLoading];
BUYCheckout *checkout = [this.client.modelManager insertCheckoutWithJSONDictionary:responseObject[@"checkout"]];
this.checkout = checkout;
[this initData];
[this.userDao saveCheckoutCache:responseObject[@"checkout"]];
if(!this.checkout.shippingAddress) {
[this requestShippingData];
}
} failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
[this showError:error];
}];
}
......
iCemarose/Class/UI/ShopCart/KWMSelectSizeVC.h
......@@ -15,9 +15,11 @@
@protocol KWMSelectSizeVCDelegate <NSObject>
- (void)kwm_addShopCartItem:(KWMShopCartModel *)shopCartModel;
//- (void)kwm_addShopCartItem:(KWMShopCartModel *)shopCartModel;
//
//- (void)kwm_fastBuy:(BUYCart *)fastBuyCart;
- (void)kwm_fastBuy:(BUYCart *)fastBuyCart;
- (void)kwm_addShopWithVariantId:(NSNumber *) identifier quantity:(NSInteger) quantity variant:(BUYProductVariant *) variant buyNow:(BOOL) buyNow callback:(void(^)(BOOL)) callback;
@end
@interface KWMSelectSizeVC : KWMBaseVC<UICollectionViewDataSource,UICollectionViewDelegate,UICollectionViewDelegateFlowLayout,KWMSizeDelegate>
......@@ -90,6 +92,6 @@
- (IBAction)onClickRemind:(id)sender;
- (IBAction)onClickFastBuy:(id)sender;
//- (IBAction)onClickFastBuy:(id)sender;
@end
iCemarose/Class/UI/ShopCart/KWMSelectSizeVC.m
......@@ -181,8 +181,12 @@
_shopCartModel.identifier = [NSString stringWithFormat:@"%@",_selectSize.identifier];
_shopCartModel.quantity = _count;
}
-(void)onClickComplete:(id)sender{
/**
* 点击加入购物车
*
* @param sender <#sender description#>
*/
-(void)onClickComplete:(UIButton *)sender{
if (self.selectSize == nil || self.count==0) {
[self showToast:@"请选择您想要的规格"];
return;
......@@ -191,58 +195,70 @@
[self showToast:@"该商品信息缺失"];
return;
}
KWMShopCartData *shopCartData = [[KWMShopCartData alloc] init];
if (_shopCartModel == nil) {
[self initModelByPrudct];
[self initBySelectSize];
[shopCartData inocreaseItem:_shopCartModel];
}else{
NSString *seletStr = [NSString stringWithFormat:@"%@",_selectSize.identifier];
_shopCartModel.quantity = _count;
//判断规格是否相同
if ([_shopCartModel.identifier isEqualToString:seletStr]) {
[self initBySelectSize];
[shopCartData changeNumberShopcart:_shopCartModel];
}else{
[shopCartData removeItem:_shopCartModel];
[self initBySelectSize];
//变为选择的规格
[shopCartData inocreaseItem:_shopCartModel];
}
}
self.btnComplete.userInteractionEnabled =NO;
if (_isShopcart) {
[self showToast:@"修改成功"];
}else{
[self showToast:@"加入成功"];
}
if (self.delegate != nil) {
[self.delegate kwm_addShopCartItem:_shopCartModel];
}
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self dismissViewControllerAnimated:YES completion:nil];
});
}
//点击了快速购买按钮
-(void)onClickFastBuy:(id)sender{
if (self.selectSize == nil || self.count == 0) {
[self showToast:@"请选择您想要的规格"];
return;
BOOL buyNow = sender.tag == 1;
__weak id this = self;
[self showLoading];
if (self.delegate) {
[self.delegate kwm_addShopWithVariantId:_selectSize.identifier quantity:_count variant:_selectSize buyNow:buyNow callback:^(BOOL success) {
[self hideLoading];
if(success) {
[this dismissViewControllerAnimated:YES completion:nil];
}
if (self.product && !self.product.JSONDictionary){
[self showToast:@"该商品信息缺失"];
return;
}
BUYCart *cart = [self.client.modelManager insertCartWithJSONDictionary:nil];
[cart setVariant:self.selectSize withTotalQuantity:self.count];
[self dismissViewControllerAnimated:YES completion:nil];
if(self.delegate != nil){
[self.delegate kwm_fastBuy:cart];
}];
}
// KWMShopCartData *shopCartData = [[KWMShopCartData alloc] init];
// if (_shopCartModel == nil) {
// [self initModelByPrudct];
// [self initBySelectSize];
// [shopCartData inocreaseItem:_shopCartModel];
// }else{
// NSString *seletStr = [NSString stringWithFormat:@"%@",_selectSize.identifier];
// _shopCartModel.quantity = _count;
// //判断规格是否相同
// if ([_shopCartModel.identifier isEqualToString:seletStr]) {
// [self initBySelectSize];
// [shopCartData changeNumberShopcart:_shopCartModel];
// }else{
// [shopCartData removeItem:_shopCartModel];
// [self initBySelectSize];
// //变为选择的规格
// [shopCartData inocreaseItem:_shopCartModel];
// }
// }
// self.btnComplete.userInteractionEnabled =NO;
// if (_isShopcart) {
// [self showToast:@"修改成功"];
// }else{
// [self showToast:@"加入成功"];
// }
// if (self.delegate != nil) {
// [self.delegate kwm_addShopCartItem:_shopCartModel];
// }
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
// [self dismissViewControllerAnimated:YES completion:nil];
// });
}
////点击了快速购买按钮
//-(void)onClickFastBuy:(id)sender{
//
// if (self.selectSize == nil || self.count == 0) {
// [self showToast:@"请选择您想要的规格"];
// return;
// }
// if (self.product && !self.product.JSONDictionary){
// [self showToast:@"该商品信息缺失"];
// return;
// }
// BUYCart *cart = [self.client.modelManager insertCartWithJSONDictionary:nil];
// [cart setVariant:self.selectSize withTotalQuantity:self.count];
// [self dismissViewControllerAnimated:YES completion:nil];
// if(self.delegate != nil){
// [self.delegate kwm_fastBuy:cart];
// }
//}
-(void)initData{
if(self.product == nil){
return;
......
iCemarose/Class/UI/ShopCart/KWMShopCartVC.m
......@@ -15,6 +15,7 @@
#import "KWMShopCartData.h"
#import "KWMNewVC.h"
#import "KWMStringUtil.h"
#import "KWMShoppingCart.h"
@interface KWMShopCartVC ()<KWMSelectSizeVCDelegate>
@property (nonatomic) NSMutableArray *shopCartList;
......@@ -22,6 +23,7 @@
@implementation KWMShopCartVC{
KWMShopCartModel *_removeModel;
KWMShopCartModel *_changeModel;
}
+(NSString *)kwmTag{
......@@ -37,7 +39,7 @@
// Do any additional setup after loading the view.
self.title = @"购物车";
// self.vBackground.hidden = NO;
_shopCartList = [NSMutableArray arrayWithArray:[[KWMShopCartData alloc] getALLItems]];
_shopCartList = (NSMutableArray *)[[KWMShoppingCart sharedInstance] items];
if (_shopCartList.count == 0) {
self.vBackground.hidden = NO;
}else{
......@@ -47,6 +49,10 @@
self.btnRandom.layer.borderColor = [UIColor colorWithRed:78.0/255 green:78.0/255 blue:78.0/255 alpha:1.0].CGColor;
[self setTotalPrice];
__weak typeof(self) this = self;
[[KWMShoppingCart sharedInstance] allItemsWithCallback:^(NSError *error, KWMCartResult *cart) {
[this refresh];
}];
}
-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
......@@ -108,23 +114,36 @@
}
- (void)kwm_onClickEdit:(KWMShopCartModel *)shopCartModel{
self.definesPresentationContext = YES;
__block KWMShopCartVC *this = self;
_changeModel = shopCartModel;
[self showLoading];
[self.client getProductById:shopCartModel.product_id completion:^(BUYProduct * _Nullable product, NSError * _Nullable error) {
[this hideLoading];
this.definesPresentationContext = YES;
KWMSelectSizeVC *editVC = (KWMSelectSizeVC *)[KWMBaseVC findControllerBy:[KWMSelectSizeVC kwmTag] fromStoryboard:@"ShopCart"];
editVC.delegate = self;
BUYProduct * product = [[BUYProduct alloc] initWithModelManager:self.client.modelManager JSONDictionary:shopCartModel.shopCartDict];
editVC.delegate = this;
// BUYProduct * product = [[BUYProduct alloc] initWithModelManager:self.client.modelManager JSONDictionary:shopCartModel.shopCartDict];
editVC.isShopcart = YES;
editVC.product = product;
editVC.shopCartModel = shopCartModel;
//設置背景為透明
// if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0) {
editVC.view.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0];
editVC.modalPresentationStyle = UIModalPresentationOverCurrentContext;
editVC.providesPresentationContextTransitionStyle = YES;
editVC.definesPresentationContext = YES;
[self presentViewController:editVC animated:YES completion:nil];
[this presentViewController:editVC animated:YES completion:nil];
}];
//設置背景為透明
// if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0) {
// editVC.view.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0];
// editVC.modalPresentationStyle = UIModalPresentationOverCurrentContext;
// editVC.providesPresentationContextTransitionStyle = YES;
// editVC.definesPresentationContext = YES;
// [self presentViewController:editVC animated:YES completion:nil];
//下面這個方法在9.0的模擬器上嘗試發現失敗，8.0以下沒試過，不過官方模擬器都沒有8.0以下的可以下載了，也沒有支持的必要。
// }else{
......@@ -136,37 +155,99 @@
}
#pragma mark -- KWMSelectSizeVCDelegate
- (void)kwm_addShopCartItem:(KWMShopCartModel *)shopCartModel{
[_shopCartList removeAllObjects];
[_shopCartList addObjectsFromArray:[[KWMShopCartData alloc] getALLItems]];
[self.tbvCart reloadData];
[self setTotalPrice];
- (void)kwm_addShopWithVariantId:(NSNumber *)identifier quantity:(NSInteger)quantity variant:(BUYProductVariant *) variant buyNow:(BOOL)buyNow callback:(void (^)(BOOL))callback {
__weak KWMShopCartVC *this = self;
void(^success)(NSError*,KWMCartResult*) = ^(NSError *error,KWMCartResult *cart){
if (!error) {
[this refresh];
callback(YES);
}else{
[this showError:error];
callback(NO);
}
};
if (_changeModel.identifier.integerValue == identifier.integerValue) {
[[KWMShoppingCart sharedInstance] changeProductWithVariantId:identifier quantity:quantity callback:success];
}else{
NSNumber *oldId = @(_changeModel.identifier.integerValue);
KWMShopCartModel *model = _changeModel;
_changeModel = nil;
NSArray<NSNumber *> *variantIds = @[oldId,identifier];
NSArray<NSNumber *> *quantities = @[@0,@(quantity)];
[[KWMShoppingCart sharedInstance] updateProductWithVariantIds:variantIds quantitties:quantities callback:^(NSError *error, KWMCartResult *cart) {
if (!cart.items.firstObject.product_id) {
KWMShopCartModel *tmp = cart.items.firstObject;
tmp.imageStr = model.imageStr;
tmp.size = variant.title;
tmp.brand = model.brand;
tmp.name = model.name;
tmp.price = variant.price.floatValue;
tmp.product_id = model.product_id;
}
success(error,cart);
}];
// [[KWMShoppingCart sharedInstance] deleteProductWithVariantId:oldId callback:^(NSError *error, KWMCartResult *cart) {
// [[KWMShoppingCart sharedInstance] increaseProductWithVariantId:identifier quantity:quantity callback:^(NSError *error, KWMCartResult *cart) {
// if (!cart.items.lastObject.product_id) {
// KWMShopCartModel *tmp = cart.items.lastObject;
// tmp.imageStr = model.imageStr;
// tmp.size = variant.title;
// tmp.brand = model.brand;
// tmp.name = model.name;
// tmp.price = variant.price.floatValue;
// tmp.product_id = model.product_id;
// }
// success(error,cart);
// }];
// }];
}
}
-(void)kwm_fastBuy:(BUYCart *)fastBuyCart{
//- (void)kwm_addShopCartItem:(KWMShopCartModel *)shopCartModel{
//
// [_shopCartList removeAllObjects];
// [_shopCartList addObjectsFromArray:[[KWMShopCartData alloc] getALLItems]];
// [self.tbvCart reloadData];
// [self setTotalPrice];
//}
//
//-(void)kwm_fastBuy:(BUYCart *)fastBuyCart{
//
//}
-(void)kwm_deleteProduct{
// BOOL isHas = NO;
// for (KWMShopCartModel *item in _shopCartList) {
// if ([item isEqual:_removeModel]) {
// isHas = YES;
// break;
// }
// }
// if (isHas) {
// [_shopCartList removeObjectIdenticalTo:_removeModel];
// }
// [self.tbvCart reloadData];
// [self setTotalPrice];
// [[KWMShopCartData alloc] removeItem:_removeModel];
NSNumber *identifier = @(_removeModel.identifier.integerValue);
__weak KWMShopCartVC *this = self;
[self showLoading];
[[KWMShoppingCart sharedInstance] deleteProductWithVariantId:identifier callback:^(NSError *error, KWMCartResult *cart) {
[this hideLoading];
[this refresh];
}];
}
-(void)kwm_deleteProduct{
BOOL isHas = NO;
for (KWMShopCartModel *item in _shopCartList) {
if ([item isEqual:_removeModel]) {
isHas = YES;
break;
}
}
if (isHas) {
[_shopCartList removeObjectIdenticalTo:_removeModel];
}
- (void)refresh {
self.shopCartList = [[KWMShoppingCart sharedInstance] items];
[self.tbvCart reloadData];
[self setTotalPrice];
[[KWMShopCartData alloc] removeItem:_removeModel];
}
//计算总价格
- (void) setTotalPrice{
float price = 0;
NSInteger price = 0;
for (KWMShopCartModel *model in _shopCartList) {
price += model.price * model.quantity;
}
......
iCemarose/Class/UI/ShopCart/ShopCart.storyboard
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -395,13 +395,13 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="P10-ub-Wj1">
<rect key="frame" x="40" y="53" width="295" height="50"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hBv-LJ-GxK">
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hBv-LJ-GxK">
<rect key="frame" x="0.0" y="0.0" width="118" height="50"/>
<state key="normal" title="快速购买">
<color key="titleColor" red="0.22352941176470587" green="0.22352941176470587" blue="0.22352941176470587" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="onClickFastBuy:" destination="22Z-pQ-E4P" eventType="touchUpInside" id="dH3-yW-rc8"/>
<action selector="onClickComplete:" destination="22Z-pQ-E4P" eventType="touchUpInside" id="hWG-fr-Qex"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5wv-Z6-ZsU">
......
iCemarose/Class/UIViewController+AppearLog.h 0 → 100644
//
// UIViewController+AppearLog.h
// iCemarose
//
// Created by lee on 2017/5/18.
// Copyright © 2017年 kollway. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface UIViewController (AppearLog)
@end
iCemarose/Class/UIViewController+AppearLog.m 0 → 100644
//
// UIViewController+AppearLog.m
// iCemarose
//
// Created by lee on 2017/5/18.
// Copyright © 2017年 kollway. All rights reserved.
//
#import "UIViewController+AppearLog.h"
#import <JRSwizzle/JRSwizzle.h>
@implementation UIViewController (AppearLog)
+ (void)load
{
[self jr_swizzleMethod:@selector(viewWillAppear:) withMethod:@selector(logViewWillAppear:) error:nil];
}
- (void)logViewWillAppear:(BOOL) animated
{
NSLog(@"logViewWillAppear: %@",NSStringFromClass([self class]));
[self logViewWillAppear:animated];
}
@end
iCemarose/Class/Util/KWMHttpUtil.h 0 → 100644
//
// KWMHttpUtil.h
// iCemarose
//
// Created by lee on 2017/5/25.
// Copyright © 2017年 kollway. All rights reserved.
//
#import <Foundation/Foundation.h>
@interface KWMHttpUtil : NSObject
+ (NSString *) buildRequestCookieString;
@end
iCemarose/Class/Util/KWMHttpUtil.m 0 → 100644
//
// KWMHttpUtil.m
// iCemarose
//
// Created by lee on 2017/5/25.
// Copyright © 2017年 kollway. All rights reserved.
//
#import "KWMHttpUtil.h"
@implementation KWMHttpUtil
+ (NSString *)buildRequestCookieString {
NSArray *cookies = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookies];
NSMutableString *cookieString = [[NSMutableString alloc] init];
for (NSHTTPCookie *cookie in cookies) {
[cookieString appendFormat:@"%@=%@; ",cookie.name,cookie.value];
}
return cookieString;
}
@end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment