Skip to content

I
ios1x
Commit c3f046f7 by houweibin
Options

Merge branch 'master' of https://git.oschina.net/kollway-kollway/newcemarose 

# Conflicts:
#	iCemarose/Class/UI/NewHome/KWMNewHomeVC.m
parents 343bf742 a07e140b
Showing with 208 additions and 53 deletions
iCemarose/Class/AppDelegate+Deeplink.m
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#import "AppDelegate+Deeplink.h" #import "AppDelegate+Deeplink.h"
#import <JLRoutes/JLRoutes.h> #import <JLRoutes/JLRoutes.h>
#import "AppDelegate.h" #import "AppDelegate.h"
#import "KWMProductDetailVC.h" #import "KWMNewProductVC.h"
#import "KWMSelectedGoodsVC.h" #import "KWMSelectedGoodsVC.h"
#import "KWMBlogDetailVC.h" #import "KWMBlogDetailVC.h"
#import "KWMNewProductVC.h" #import "KWMNewProductVC.h"
...@@ -27,13 +27,14 @@ ...@@ -27,13 +27,14 @@
KWMSelectedGoodsVC * selectedGoodsVC = (KWMSelectedGoodsVC *)[KWMBaseVC findControllerBy:[KWMSelectedGoodsVC kwmTag] fromStoryboard:@"New"]; KWMSelectedGoodsVC * selectedGoodsVC = (KWMSelectedGoodsVC *)[KWMBaseVC findControllerBy:[KWMSelectedGoodsVC kwmTag] fromStoryboard:@"New"];
selectedGoodsVC.handle = parameters[@"handle"]; selectedGoodsVC.handle = parameters[@"handle"];
selectedGoodsVC.ctags = tags; selectedGoodsVC.ctags = tags;
selectedGoodsVC.title = parameters[@"title"];
[[AppDelegate mainViewController].selectedViewController pushViewController:selectedGoodsVC animated:YES]; [[AppDelegate mainViewController].selectedViewController pushViewController:selectedGoodsVC animated:YES];
return YES; return YES;
}]; }];
[routes addRoute:@"/products/:id" handler:^BOOL(NSDictionary<NSString *,id> * _Nonnull parameters) { [routes addRoute:@"/products/:id" handler:^BOOL(NSDictionary<NSString *,id> * _Nonnull parameters) {
NSLog(@"product id %@",parameters[@"id"]); NSLog(@"product id %@",parameters[@"id"]);
KWMNewProductVC *vc = [KWMNewProductVC getNewInstance]; KWMNewProductVC *vc = [KWMNewProductVC getNewInstance];
// KWMProductDetailVC *productDetailVC = (KWMProductDetailVC*)[KWMBaseVC findControllerBy:[KWMProductDetailVC kwmTag] fromStoryboard:@"New"]; // KWMNewProductVC *productDetailVC = [KWMNewProductVC getNewInstance];
// productDetailVC.product = brandCell.leftProduct; // productDetailVC.product = brandCell.leftProduct;
vc.handle = parameters[@"id"]; vc.handle = parameters[@"id"];
// NSLog(@"%@",[AppDelegate mainViewController].selectedViewController); // NSLog(@"%@",[AppDelegate mainViewController].selectedViewController);
...@@ -43,7 +44,8 @@ ...@@ -43,7 +44,8 @@
[routes addRoute:@"/blogs/:blog/:handle" handler:^BOOL(NSDictionary<NSString *,id> * _Nonnull parameters) { [routes addRoute:@"/blogs/:blog/:handle" handler:^BOOL(NSDictionary<NSString *,id> * _Nonnull parameters) {
KWMBlogDetailVC *blogDetailVC = (KWMBlogDetailVC *)[KWMBlogDetailVC findControllerBy:@"KWMBlogDetailVC" fromStoryboard:@"Home"]; KWMBlogDetailVC *blogDetailVC = (KWMBlogDetailVC *)[KWMBlogDetailVC findControllerBy:@"KWMBlogDetailVC" fromStoryboard:@"Home"];
blogDetailVC.handle = parameters[@"handle"]; blogDetailVC.handle = parameters[@"handle"];
blogDetailVC.type = KWMContentTypeBlog; blogDetailVC.type = KWMContentTypeBlog;;
blogDetailVC.title = parameters[@"title"];
[[AppDelegate mainViewController].selectedViewController pushViewController:blogDetailVC animated:YES]; [[AppDelegate mainViewController].selectedViewController pushViewController:blogDetailVC animated:YES];
return YES; return YES;
}]; }];
...@@ -51,6 +53,7 @@ ...@@ -51,6 +53,7 @@
KWMBlogDetailVC *blogDetailVC = (KWMBlogDetailVC *)[KWMBlogDetailVC findControllerBy:@"KWMBlogDetailVC" fromStoryboard:@"Home"]; KWMBlogDetailVC *blogDetailVC = (KWMBlogDetailVC *)[KWMBlogDetailVC findControllerBy:@"KWMBlogDetailVC" fromStoryboard:@"Home"];
blogDetailVC.handle = parameters[@"handle"]; blogDetailVC.handle = parameters[@"handle"];
blogDetailVC.type = KWMContentTypePage; blogDetailVC.type = KWMContentTypePage;
blogDetailVC.title = parameters[@"title"];
[[AppDelegate mainViewController].selectedViewController pushViewController:blogDetailVC animated:YES]; [[AppDelegate mainViewController].selectedViewController pushViewController:blogDetailVC animated:YES];
return YES; return YES;
}]; }];
......
iCemarose/Class/Classify/UIViewController+HTTP.m
...@@ -15,8 +15,15 @@ ...@@ -15,8 +15,15 @@
@implementation UIViewController (HTTP) @implementation UIViewController (HTTP)
- (void)openURLWithString:(NSString *)URLString { - (void)openURLWithString:(NSString *)URLString {
UIApplication *application = [UIApplication sharedApplication]; NSString *parten=@"[^%\\da-zA-Z:/.?&=]+";
NSURL *url = [[NSURL alloc] initWithString:[URLString stringByReplacingOccurrencesOfRegex:@"^https?" withString:@"cemarose"]]; NSRegularExpression *reg=[NSRegularExpression regularExpressionWithPattern:parten options:0 error:nil];
NSArray *matchs=[reg matchesInString:URLString options:0 range:NSMakeRange(0, [URLString length])];
NSString *encodeURL=[NSString stringWithString:URLString];
for (long i=matchs.count-1; i>=0; --i) {
NSTextCheckingResult *tcr=matchs[i];
encodeURL=[encodeURL stringByReplacingCharactersInRange:tcr.range withString:[[encodeURL substringWithRange:tcr.range] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
}
NSURL *url = [[NSURL alloc] initWithString:[encodeURL stringByReplacingOccurrencesOfRegex:@"^https?" withString:@"cemarose"]];
if ([JLRoutes canRouteURL:url]) { if ([JLRoutes canRouteURL:url]) {
[JLRoutes routeURL:url]; [JLRoutes routeURL:url];
// }else if ([application respondsToSelector:@selector(openURL:options:completionHandler:)]) { // }else if ([application respondsToSelector:@selector(openURL:options:completionHandler:)]) {
......
iCemarose/Class/UI/Brand/KWMBrandCaramelVC.m
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#import "KWMBrandCaramelVC.h" #import "KWMBrandCaramelVC.h"
#import "KWMBrandCaramelCell.h" #import "KWMBrandCaramelCell.h"
#import "KWMBarandSelectView.h" #import "KWMBarandSelectView.h"
#import "KWMProductDetailVC.h" #import "KWMNewProductVC.h"
#import "KWMShopCartVC.h" #import "KWMShopCartVC.h"
#import "KWMShopCartData.h" #import "KWMShopCartData.h"
#import "UIImageView+WebCache.h" #import "UIImageView+WebCache.h"
...@@ -232,14 +232,14 @@ static NSString *idStr = @"KWMBrandCaramelCell"; ...@@ -232,14 +232,14 @@ static NSString *idStr = @"KWMBrandCaramelCell";
//点击左边商品回调 //点击左边商品回调
- (void)kwm_onClickLeftIamge:(KWMBrandCaramelCell *)brandCell{ - (void)kwm_onClickLeftIamge:(KWMBrandCaramelCell *)brandCell{
KWMProductDetailVC *productDetailVC = (KWMProductDetailVC*)[KWMBaseVC findControllerBy:[KWMProductDetailVC kwmTag] fromStoryboard:@"New"]; KWMNewProductVC *productDetailVC = [KWMNewProductVC getNewInstance];
productDetailVC.product = brandCell.leftProduct; productDetailVC.product = brandCell.leftProduct;
[self.navigationController pushViewController:productDetailVC animated:YES]; [self.navigationController pushViewController:productDetailVC animated:YES];
} }
//点击右边商品回调 //点击右边商品回调
- (void)kwm_onClickRightIamge:(KWMBrandCaramelCell *)brandCell{ - (void)kwm_onClickRightIamge:(KWMBrandCaramelCell *)brandCell{
KWMProductDetailVC *productDetailVC = (KWMProductDetailVC*)[KWMBaseVC findControllerBy:[KWMProductDetailVC kwmTag] fromStoryboard:@"New"]; KWMNewProductVC *productDetailVC = [KWMNewProductVC getNewInstance];
productDetailVC.product = brandCell.rightProduct; productDetailVC.product = brandCell.rightProduct;
[self.navigationController pushViewController:productDetailVC animated:YES]; [self.navigationController pushViewController:productDetailVC animated:YES];
} }
......
iCemarose/Class/UI/Category/KWMCategoryVC.m
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
// //
#import "KWMCategoryVC.h" #import "KWMCategoryVC.h"
#import "KWMProductDetailVC.h" #import "KWMNewProductVC.h"
#import "KWMShopCartVC.h" #import "KWMShopCartVC.h"
#import "KWMNewProductVC.h" #import "KWMNewProductVC.h"
#import "KWMSearchFeedbackVC.h" #import "KWMSearchFeedbackVC.h"
......
iCemarose/Class/UI/Home/KWMBlogDetailVC.m
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
// Do any additional setup after loading the view // Do any additional setup after loading the view
self.title = @"正文"; if(!self.title) self.title = @"正文";
self.automaticallyAdjustsScrollViewInsets = NO; self.automaticallyAdjustsScrollViewInsets = NO;
if (!self.handle) { if (!self.handle) {
[self initData]; [self initData];
......
iCemarose/Class/UI/Mine/KWMOrderVC.m
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#import "KWMOrderVC.h" #import "KWMOrderVC.h"
#import "KWMOrderCell.h" #import "KWMOrderCell.h"
#import "KWMProductDetailVC.h" #import "KWMNewProductVC.h"
#import "KWMImageUtil.h" #import "KWMImageUtil.h"
#import "KWMStringUtil.h" #import "KWMStringUtil.h"
...@@ -141,7 +141,8 @@ ...@@ -141,7 +141,8 @@
} }
- (void)kwm_onClickProduct:(NSNumber *)productId{ - (void)kwm_onClickProduct:(NSNumber *)productId{
KWMProductDetailVC *productDetailVC = (KWMProductDetailVC *)[KWMProductDetailVC findControllerBy:[KWMProductDetailVC kwmTag] fromStoryboard:@"New"]; // KWMProductDetailVC *productDetailVC = (KWMProductDetailVC *)[KWMProductDetailVC findControllerBy:[KWMProductDetailVC kwmTag] fromStoryboard:@"New"];
KWMNewProductVC *productDetailVC = [KWMNewProductVC getNewInstance];
productDetailVC.productId = productId; productDetailVC.productId = productId;
[self.navigationController pushViewController:productDetailVC animated:YES]; [self.navigationController pushViewController:productDetailVC animated:YES];
} }
......
iCemarose/Class/UI/NewHome/KWMNewHomeVC.m
...@@ -156,7 +156,7 @@ typedef enum{ ...@@ -156,7 +156,7 @@ typedef enum{
#pragma mark - KWMMenuDelegate #pragma mark - KWMMenuDelegate
-(void)kwm_onClickHotMenu{ -(void)kwm_onClickHotMenu{
[self openURLWithString:@"https://cemarose.myshopify.com/collections/new"]; [self openURLWithString:@"https://cemarose.myshopify.com/collections/new?title=最新单品"];
} }
-(void)kwm_onClickNewMenu{ -(void)kwm_onClickNewMenu{
...@@ -175,12 +175,12 @@ typedef enum{ ...@@ -175,12 +175,12 @@ typedef enum{
-(void)kwm_onClickDeliveryMenu{ -(void)kwm_onClickDeliveryMenu{
NSLog(@"deliverymenu"); NSLog(@"deliverymenu");
[self openURLWithString:@"https://www.cemarose.com/pages/service-description/"]; [self openURLWithString:@"https://www.cemarose.com/pages/service-description/?title=服务说明"];
} }
#pragma mark - KWMRecommendDelegate #pragma mark - KWMRecommendDelegate
-(void)kwm_gotoRecommendPage{ -(void)kwm_gotoRecommendPage{
[self openURLWithString:@"https://cemarose.myshopify.com/collections/hot-sell-app"]; [self openURLWithString:@"https://cemarose.myshopify.com/collections/hot-sell-app?title=主推单品"];
} }
-(void)kwm_gotoClothingSetsPage{ -(void)kwm_gotoClothingSetsPage{
......
iCemarose/Class/UI/NewProduct/Cell/KWMFirstDetailView.h
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
- (void)kwm_onClickImage:(NSMutableArray *)imageArr currentIndex:(NSInteger)currentIndex; - (void)kwm_onClickImage:(NSMutableArray *)imageArr currentIndex:(NSInteger)currentIndex;
- (void)kwm_onClickSizeBtn; - (void)kwm_onClickSizeBtn;
- (void)kwm_goToBrandVC; - (void)kwm_goToBrandVC;
- (void)kwm_sizeGuide;
@end @end
...@@ -31,6 +32,6 @@ ...@@ -31,6 +32,6 @@
-(void)setData:(BUYProduct *)product; -(void)setData:(BUYProduct *)product;
@property (nonatomic) BOOL sizeGuideHidden;
@end @end
iCemarose/Class/UI/NewProduct/Cell/KWMFirstDetailView.m
...@@ -33,6 +33,9 @@ ...@@ -33,6 +33,9 @@
@property(nonatomic,weak) IBOutlet KWMPageControl *pageControl; @property(nonatomic,weak) IBOutlet KWMPageControl *pageControl;
@property (weak, nonatomic) IBOutlet UIView *sizeGuideView;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *sizeGuideViewHeightConstraint;
@property (nonatomic) BUYProduct *product; @property (nonatomic) BUYProduct *product;
@property (nonatomic) NSMutableArray *imageArr; @property (nonatomic) NSMutableArray *imageArr;
...@@ -254,6 +257,11 @@ ...@@ -254,6 +257,11 @@
} }
} }
- (IBAction)sizeGuideAction:(id)sender {
[self.delegate kwm_sizeGuide];
}
-(void)onClickBlandBtn:(id)sender{ -(void)onClickBlandBtn:(id)sender{
if(self.delegate){ if(self.delegate){
[self.delegate kwm_goToBrandVC]; [self.delegate kwm_goToBrandVC];
...@@ -273,10 +281,9 @@ ...@@ -273,10 +281,9 @@
} }
} }
- (void)setSizeGuideHidden:(BOOL)sizeGuideHidden {
self.sizeGuideView.hidden = sizeGuideHidden;
self.sizeGuideViewHeightConstraint.constant = sizeGuideHidden ? 0 : 50;
}
@end @end
iCemarose/Class/UI/NewProduct/Cell/KWMFirstDetailView.xib
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait"> <device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/> <adaptation id="fullscreen"/>
</device> </device>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/> <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
<outlet property="lbPrice" destination="gpT-Sg-ghu" id="FGd-AA-Yiv"/> <outlet property="lbPrice" destination="gpT-Sg-ghu" id="FGd-AA-Yiv"/>
<outlet property="lbVariant" destination="o3P-oH-Xcb" id="i3M-ae-jhH"/> <outlet property="lbVariant" destination="o3P-oH-Xcb" id="i3M-ae-jhH"/>
<outlet property="pageControl" destination="M6v-TN-2WE" id="QPe-TI-LdG"/> <outlet property="pageControl" destination="M6v-TN-2WE" id="QPe-TI-LdG"/>
<outlet property="sizeGuideView" destination="sRa-JA-uEq" id="D94-al-5dF"/>
<outlet property="sizeGuideViewHeightConstraint" destination="CLu-Pt-dGG" id="yih-xF-sL8"/>
<outlet property="vView" destination="iN0-l3-epB" id="TQD-W9-jEg"/> <outlet property="vView" destination="iN0-l3-epB" id="TQD-W9-jEg"/>
</connections> </connections>
</placeholder> </placeholder>
...@@ -246,16 +248,59 @@ ...@@ -246,16 +248,59 @@
<outletCollection property="gestureRecognizers" destination="Bn3-BY-NZm" appends="YES" id="5YW-Qp-ioO"/> <outletCollection property="gestureRecognizers" destination="Bn3-BY-NZm" appends="YES" id="5YW-Qp-ioO"/>
</connections> </connections>
</view> </view>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sRa-JA-uEq" userLabel="Size Guide" customClass="KWMItemView">
<rect key="frame" x="0.0" y="190" width="375" height="0.0"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="尺码参考" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TKI-ds-uBS">
<rect key="frame" x="21" y="-9" width="48" height="17"/>
<fontDescription key="fontDescription" name="PingFangSC-Light" family="PingFang SC" pointSize="12"/>
<color key="textColor" red="0.1529411765" green="0.14901960780000001" blue="0.21176470589999999" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uPE-YR-dUl" userLabel="line">
<rect key="frame" x="20" y="-1" width="355" height="1"/>
<color key="backgroundColor" red="0.84705882349999995" green="0.85882352939999995" blue="0.87058823529999996" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="aZ5-j8-htj"/>
</constraints>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="button_mine_more" translatesAutoresizingMaskIntoConstraints="NO" id="thi-C2-XsQ">
<rect key="frame" x="348" y="-7" width="7" height="14"/>
<constraints>
<constraint firstAttribute="width" constant="7" id="0AO-H1-1QW"/>
<constraint firstAttribute="height" constant="14" id="eYQ-zU-dNQ"/>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<gestureRecognizers/>
<constraints>
<constraint firstAttribute="height" id="CLu-Pt-dGG"/>
<constraint firstItem="TKI-ds-uBS" firstAttribute="centerY" secondItem="sRa-JA-uEq" secondAttribute="centerY" id="MNr-f8-wK4"/>
<constraint firstItem="uPE-YR-dUl" firstAttribute="leading" secondItem="sRa-JA-uEq" secondAttribute="leading" constant="20" id="OdU-WY-fl8"/>
<constraint firstAttribute="bottom" secondItem="uPE-YR-dUl" secondAttribute="bottom" id="Rs7-5n-j55"/>
<constraint firstItem="TKI-ds-uBS" firstAttribute="leading" secondItem="sRa-JA-uEq" secondAttribute="leading" constant="21" id="fLf-3b-nJK"/>
<constraint firstAttribute="trailing" secondItem="thi-C2-XsQ" secondAttribute="trailing" constant="20" id="imC-XO-I0R"/>
<constraint firstItem="thi-C2-XsQ" firstAttribute="centerY" secondItem="sRa-JA-uEq" secondAttribute="centerY" id="vxn-93-Pge"/>
<constraint firstAttribute="trailing" secondItem="uPE-YR-dUl" secondAttribute="trailing" id="yPN-GE-gtc"/>
</constraints>
<connections>
<outletCollection property="gestureRecognizers" destination="GPA-oO-7UP" appends="YES" id="idl-7c-IV1"/>
</connections>
</view>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints> <constraints>
<constraint firstItem="sRa-JA-uEq" firstAttribute="top" secondItem="wgu-cH-TXa" secondAttribute="bottom" id="0Tr-TT-0nX"/>
<constraint firstAttribute="trailing" secondItem="wgu-cH-TXa" secondAttribute="trailing" id="1BE-r2-etn"/> <constraint firstAttribute="trailing" secondItem="wgu-cH-TXa" secondAttribute="trailing" id="1BE-r2-etn"/>
<constraint firstItem="wgu-cH-TXa" firstAttribute="top" secondItem="iJa-Oj-Sd2" secondAttribute="bottom" constant="10" id="3E1-qY-lsE"/> <constraint firstItem="wgu-cH-TXa" firstAttribute="top" secondItem="iJa-Oj-Sd2" secondAttribute="bottom" constant="10" id="3E1-qY-lsE"/>
<constraint firstItem="sRa-JA-uEq" firstAttribute="leading" secondItem="Ymw-Cg-156" secondAttribute="leading" id="3dS-8p-JTq"/>
<constraint firstAttribute="bottom" secondItem="sRa-JA-uEq" secondAttribute="bottom" id="8LP-Bk-QII"/>
<constraint firstAttribute="trailing" secondItem="iJa-Oj-Sd2" secondAttribute="trailing" id="8a6-sG-pwj"/> <constraint firstAttribute="trailing" secondItem="iJa-Oj-Sd2" secondAttribute="trailing" id="8a6-sG-pwj"/>
<constraint firstItem="iJa-Oj-Sd2" firstAttribute="top" secondItem="Ymw-Cg-156" secondAttribute="top" id="Vl5-q8-AzT"/> <constraint firstItem="iJa-Oj-Sd2" firstAttribute="top" secondItem="Ymw-Cg-156" secondAttribute="top" id="Vl5-q8-AzT"/>
<constraint firstItem="iJa-Oj-Sd2" firstAttribute="leading" secondItem="Ymw-Cg-156" secondAttribute="leading" id="hhQ-sM-yEW"/> <constraint firstItem="iJa-Oj-Sd2" firstAttribute="leading" secondItem="Ymw-Cg-156" secondAttribute="leading" id="hhQ-sM-yEW"/>
<constraint firstAttribute="trailing" secondItem="sRa-JA-uEq" secondAttribute="trailing" id="jq7-29-LTi"/>
<constraint firstItem="wgu-cH-TXa" firstAttribute="leading" secondItem="Ymw-Cg-156" secondAttribute="leading" id="oIc-Ag-UZg"/> <constraint firstItem="wgu-cH-TXa" firstAttribute="leading" secondItem="Ymw-Cg-156" secondAttribute="leading" id="oIc-Ag-UZg"/>
<constraint firstAttribute="bottom" secondItem="wgu-cH-TXa" secondAttribute="bottom" id="uTa-HP-Rfa"/>
</constraints> </constraints>
</view> </view>
</subviews> </subviews>
...@@ -287,6 +332,11 @@ ...@@ -287,6 +332,11 @@
<action selector="onClickSizeBtn:" destination="-1" id="Xre-Rk-3w3"/> <action selector="onClickSizeBtn:" destination="-1" id="Xre-Rk-3w3"/>
</connections> </connections>
</tapGestureRecognizer> </tapGestureRecognizer>
<tapGestureRecognizer id="GPA-oO-7UP" userLabel="sizeGuide">
<connections>
<action selector="sizeGuideAction:" destination="-1" id="M2I-CX-KdI"/>
</connections>
</tapGestureRecognizer>
</objects> </objects>
<resources> <resources>
<image name="button_mine_more" width="7" height="14"/> <image name="button_mine_more" width="7" height="14"/>
......
iCemarose/Class/UI/NewProduct/KWMNewProductVC.m
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
#import "KWMImageUtil.h" #import "KWMImageUtil.h"
#import "KWMStringUtil.h" #import "KWMStringUtil.h"
#import "KWMShopCartVC.h" #import "KWMShopCartVC.h"
#import <TOWebViewController/TOWebViewController.h>
#import <PPNetworkHelper/PPNetworkHelper.h>
#import <TOWebViewController/NJKWebViewProgress.h>
@interface KWMNewProductVC () @interface KWMNewProductVC ()
...@@ -50,6 +53,8 @@ ...@@ -50,6 +53,8 @@
//选中的数量 //选中的数量
@property (nonatomic) NSInteger count; @property (nonatomic) NSInteger count;
@property (nonatomic) NSString *typeTag;
@property (nonatomic) BOOL isLikeVariant; @property (nonatomic) BOOL isLikeVariant;
...@@ -104,8 +109,12 @@ ...@@ -104,8 +109,12 @@
[self initShopCartCount]; [self initShopCartCount];
[self initMidViewHight]; [self initMidViewHight];
[self.btnLike setImage:[UIImage imageNamed:@"ic_like_unable"] forState:UIControlStateNormal]; [self.btnLike setImage:[UIImage imageNamed:@"ic_like_unable"] forState:UIControlStateNormal];
} }
- (void)initShopCartCount{ - (void)initShopCartCount{
NSNumber *count = [[KWMShoppingCart sharedInstance] count]; NSNumber *count = [[KWMShoppingCart sharedInstance] count];
[self.btnShopCart setTitle:count.stringValue forState:UIControlStateNormal]; [self.btnShopCart setTitle:count.stringValue forState:UIControlStateNormal];
...@@ -301,6 +310,68 @@ ...@@ -301,6 +310,68 @@
[self showPresentation:variantsVC size:size tapOutsideClose:YES style:MZFormSheetPresentationTransitionStyleFade]; [self showPresentation:variantsVC size:size tapOutsideClose:YES style:MZFormSheetPresentationTransitionStyleFade];
} }
- (void)kwm_sizeGuide {
NSString *brand = [self.product.vendor stringByReplacingOccurrencesOfRegex:@"\\s*\\W\\s*" withString:@"-"].lowercaseString;
NSString *baseUrl = @"http://www.cemarose.cn/pages/";
NSString *url= [NSString stringWithFormat:@"%@%@-size-guide-%@",baseUrl,brand,self.typeTag];
NSLog(@"size guide url: %@",url);
// TOWebViewController *wv = [[TOWebViewController alloc] initWithURLString:url];
TOWebViewController *wv = [[TOWebViewController alloc] init];
__unused id _ = wv.view;
wv.showPageTitles = NO;
wv.title = @"Size Guide";
wv.navigationButtonsHidden = YES;
// AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
//// manager.responseSerializer = [AFXMLParserResponseSerializer serializer];
// manager.responseSerializer = [AFHTTPResponseSerializer serializer];
// manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"text/html", nil];
// [manager GET:url parameters:nil progress:^(NSProgress * _Nonnull downloadProgress) {
//// NJKWebViewProgress *wvp = [vc valueForKeyPath:@"progressManager"];
//// [wvp.progressDelegate webViewProgress:wvp updateProgress:downloadProgress.fractionCompleted];
// } success:^(NSURLSessionDataTask * _Nonnull task, id _Nullable responseObject) {
// NSString *body = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
// body = [body stringByReplacingOccurrencesOfRegex:@"<meta[\\w\\W]*?/?>" withString:@""];
// body = [body stringByReplacingOccurrencesOfRegex:@"<script[\\w\\W]*?</script>" withString:@""];
// body = [body stringByReplacingOccurrencesOfRegex:@"<header[\\w\\W]*?</header>" withString:@""];
// body = [body stringByReplacingOccurrencesOfRegex:@"<footer[\\w\\W]*?</footer>" withString:@""];
// body = [body stringByReplacingOccurrencesOfRegex:@"<head>" withString:@"<head><meta name=\"viewport\" content=\"width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no\" /><style type='text/css'>"
// @".page-title h1.label{font-size:17px;}"
// @".rte.text-content td{padding-left:10px;}"
// @"</style>"];
// [wv.webView loadHTMLString:body baseURL:[NSURL URLWithString:baseUrl]];
// } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
// }];
void(^success)(id) = ^(id body){
if (!body) {
return;
}
body = [[NSString alloc] initWithData:body encoding:NSUTF8StringEncoding];
body = [body stringByReplacingOccurrencesOfRegex:@"<meta[\\w\\W]*?/?>" withString:@""];
body = [body stringByReplacingOccurrencesOfRegex:@"<script[\\w\\W]*?</script>" withString:@""];
body = [body stringByReplacingOccurrencesOfRegex:@"<header[\\w\\W]*?</header>" withString:@""];
body = [body stringByReplacingOccurrencesOfRegex:@"<footer[\\w\\W]*?</footer>" withString:@""];
body = [body stringByReplacingOccurrencesOfRegex:@"<head>" withString:@"<head><meta name=\"viewport\" content=\"width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no\" /><style type='text/css'>"
@".page-title h1.label{font-size:17px;}"
@".rte.text-content td{padding-left:10px;}"
@"</style>"];
[wv.webView loadHTMLString:body baseURL:[NSURL URLWithString:baseUrl]];
};
__weak typeof(self) this = self;
[PPNetworkHelper setAFHTTPSessionManagerProperty:^(AFHTTPSessionManager *sessionManager) {
sessionManager.responseSerializer = [AFHTTPResponseSerializer serializer];
sessionManager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"text/html", nil];
}];
[PPNetworkHelper GET:url parameters:nil responseCache:success success:success failure:^(NSError *error) {
[this showError:error];
}];
[self.navigationController pushViewController:wv animated:YES];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(200 * NSEC_PER_MSEC)), dispatch_get_main_queue(), ^{
NJKWebViewProgress *wvp = [wv valueForKeyPath:@"progressManager"];
[wvp.progressDelegate webViewProgress:wvp updateProgress:0.1];
});
}
-(void)kwm_goToBrandVC{ -(void)kwm_goToBrandVC{
if(self.product && self.product.vendor){ if(self.product && self.product.vendor){
...@@ -585,6 +656,19 @@ ...@@ -585,6 +656,19 @@
- (void)setProduct:(BUYProduct *)product {
_product = product;
NSArray *types = @[@"baby",@"girls",@"boys",@"shoes",@"newborn"];
for (NSString *tag in self.product.tags) {
if ([types containsObject:tag.lowercaseString]) {
self.typeTag = tag.lowercaseString;
break;
}
}
[self.detailView1 setSizeGuideHidden:!self.typeTag];
}
......
iCemarose/Class/UI/Product/KWMNewVC.m
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#import "KWMSelectedGoodsVC.h" #import "KWMSelectedGoodsVC.h"
#import "KWMBrandCaramelVC.h" #import "KWMBrandCaramelVC.h"
#import "UIColor+SAMAdditions.h" #import "UIColor+SAMAdditions.h"
#import "KWMProductDetailVC.h" #import "KWMNewProductVC.h"
#import "KWMShoppingCart.h" #import "KWMShoppingCart.h"
...@@ -281,7 +281,8 @@ static NSString * idStr = @"KWMNewGoodsCell"; ...@@ -281,7 +281,8 @@ static NSString * idStr = @"KWMNewGoodsCell";
if (product == nil) { if (product == nil) {
return; return;
} }
KWMProductDetailVC *goodsDetailvc = (KWMProductDetailVC *)[KWMBaseVC findControllerBy:[KWMProductDetailVC kwmTag] fromStoryboard:@"New"]; // KWMProductDetailVC *goodsDetailvc = (KWMProductDetailVC *)[KWMBaseVC findControllerBy:[KWMProductDetailVC kwmTag] fromStoryboard:@"New"];
KWMNewProductVC *goodsDetailvc = [KWMNewProductVC getNewInstance];
goodsDetailvc.product = product; goodsDetailvc.product = product;
[self.navigationController pushViewController:goodsDetailvc animated:YES]; [self.navigationController pushViewController:goodsDetailvc animated:YES];
} }
......
iCemarose/Class/UI/Product/KWMProductDetailVC.h
////
//// KWMProductDetailVC.h
//// iCemarose
////
//// Created by HouWeiBin on 2017/1/11.
//// Copyright © 2017年 kollway. All rights reserved.
////
// //
// KWMProductDetailVC.h //#import "KWMBaseVC.h"
// iCemarose
// //
// Created by HouWeiBin on 2017/1/11. //@interface KWMProductDetailVC : KWMBaseVC
// Copyright © 2017年 kollway. All rights reserved.
// //
//@property (nonatomic) BUYProduct *product;
#import "KWMBaseVC.h" //
//@property (nonatomic) NSNumber *productId;
@interface KWMProductDetailVC : KWMBaseVC //
///**
@property (nonatomic) BUYProduct *product; // * SKU 人为定义的SKU
// */
@property (nonatomic) NSNumber *productId; //@property (nonatomic) NSString *handle;
//
/** //@end
* SKU 人为定义的SKU
*/
@property (nonatomic) NSString *handle;
@end
iCemarose/Class/UI/Product/KWMSearchFeedbackVC.m
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#import "KWMSearchFeedbackVC.h" #import "KWMSearchFeedbackVC.h"
#import "KWMBrandCaramelCell.h" #import "KWMBrandCaramelCell.h"
#import "KWMSearchFeedBackView.h" #import "KWMSearchFeedBackView.h"
#import "KWMProductDetailVC.h" #import "KWMNewProductVC.h"
@interface KWMSearchFeedbackVC ()<UITableViewDelegate,UITableViewDataSource,KWMSearchFeedBackViewDelegate,KWMBrandCaramelCellDelegate> @interface KWMSearchFeedbackVC ()<UITableViewDelegate,UITableViewDataSource,KWMSearchFeedBackViewDelegate,KWMBrandCaramelCellDelegate>
@property (nonatomic) KWMSearchFeedBackView *vSearchFB; @property (nonatomic) KWMSearchFeedBackView *vSearchFB;
...@@ -90,14 +90,14 @@ static NSString *idStr = @"KWMBrandCaramelCell"; ...@@ -90,14 +90,14 @@ static NSString *idStr = @"KWMBrandCaramelCell";
#pragma mark -- KWMBrandCaramelCellDelegate #pragma mark -- KWMBrandCaramelCellDelegate
//点击左边商品回调 //点击左边商品回调
- (void)kwm_onClickLeftIamge:(KWMBrandCaramelCell *)brandCell{ - (void)kwm_onClickLeftIamge:(KWMBrandCaramelCell *)brandCell{
KWMProductDetailVC *productDetailVC = (KWMProductDetailVC*)[KWMBaseVC findControllerBy:[KWMProductDetailVC kwmTag] fromStoryboard:@"New"]; KWMNewProductVC *productDetailVC = [KWMNewProductVC getNewInstance];
productDetailVC.productId = brandCell.leftDataProduct.id; productDetailVC.productId = brandCell.leftDataProduct.id;
[self.navigationController pushViewController:productDetailVC animated:YES]; [self.navigationController pushViewController:productDetailVC animated:YES];
} }
//点击右边商品回调 //点击右边商品回调
- (void)kwm_onClickRightIamge:(KWMBrandCaramelCell *)brandCell{ - (void)kwm_onClickRightIamge:(KWMBrandCaramelCell *)brandCell{
KWMProductDetailVC *productDetailVC = (KWMProductDetailVC*)[KWMBaseVC findControllerBy:[KWMProductDetailVC kwmTag] fromStoryboard:@"New"]; KWMNewProductVC *productDetailVC = [KWMNewProductVC getNewInstance];
productDetailVC.productId = brandCell.rightDataProduct.id; productDetailVC.productId = brandCell.rightDataProduct.id;
[self.navigationController pushViewController:productDetailVC animated:YES]; [self.navigationController pushViewController:productDetailVC animated:YES];
} }
......
iCemarose/Class/UI/Product/KWMSelectedGoodsVC.m
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
// //
#import "KWMSelectedGoodsVC.h" #import "KWMSelectedGoodsVC.h"
#import "KWMProductDetailVC.h" #import "KWMNewProductVC.h"
#import "KWMBeforePayVC.h" #import "KWMBeforePayVC.h"
#import "KWMMineTitleView.h" #import "KWMMineTitleView.h"
#import "MJRefresh.h" #import "MJRefresh.h"
...@@ -53,7 +53,7 @@ static NSString *idStr = @"KWMBrandCaramelCell"; ...@@ -53,7 +53,7 @@ static NSString *idStr = @"KWMBrandCaramelCell";
self.hasNextPage = NO; self.hasNextPage = NO;
self.collectionSort = BUYCollectionSortCreatedDescending; self.collectionSort = BUYCollectionSortCreatedDescending;
if (self.handle) { if (self.handle && !self.title) {
self.title = self.handle.capitalizedString; self.title = self.handle.capitalizedString;
}else if(self.productType != nil){ }else if(self.productType != nil){
//初始化双行标题栏 //初始化双行标题栏
...@@ -168,14 +168,14 @@ static NSString *idStr = @"KWMBrandCaramelCell"; ...@@ -168,14 +168,14 @@ static NSString *idStr = @"KWMBrandCaramelCell";
//点击左边商品回调 //点击左边商品回调
- (void)kwm_onClickLeftIamge:(KWMBrandCaramelCell *)brandCell{ - (void)kwm_onClickLeftIamge:(KWMBrandCaramelCell *)brandCell{
KWMProductDetailVC *productDetailVC = (KWMProductDetailVC*)[KWMBaseVC findControllerBy:[KWMProductDetailVC kwmTag] fromStoryboard:@"New"]; KWMNewProductVC *productDetailVC = [KWMNewProductVC getNewInstance];
productDetailVC.product = brandCell.leftProduct; productDetailVC.product = brandCell.leftProduct;
[self.navigationController pushViewController:productDetailVC animated:YES]; [self.navigationController pushViewController:productDetailVC animated:YES];
} }
//点击右边商品回调 //点击右边商品回调
- (void)kwm_onClickRightIamge:(KWMBrandCaramelCell *)brandCell{ - (void)kwm_onClickRightIamge:(KWMBrandCaramelCell *)brandCell{
KWMProductDetailVC *productDetailVC = (KWMProductDetailVC*)[KWMBaseVC findControllerBy:[KWMProductDetailVC kwmTag] fromStoryboard:@"New"]; KWMNewProductVC *productDetailVC = [KWMNewProductVC getNewInstance];
productDetailVC.product = brandCell.rightProduct; productDetailVC.product = brandCell.rightProduct;
[self.navigationController pushViewController:productDetailVC animated:YES]; [self.navigationController pushViewController:productDetailVC animated:YES];
} }
......
iCemarose/Header-Prefix.h
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#import "NSDecimalNumber+Currency.h" #import "NSDecimalNumber+Currency.h"
#import "UIViewController+HTTP.h" #import "UIViewController+HTTP.h"
#import <RXCollections/RXCollection.h> #import <RXCollections/RXCollection.h>
#import <RegexKitLite/RegexKitLite.h>
#ifndef Header_Prefix_h #ifndef Header_Prefix_h
#define Header_Prefix_h #define Header_Prefix_h
......
iCemarose/Info.plist
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.4.0</string> <string>1.5.0</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
......
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