Skip to content

I
ios1x
Commit 0714da2a by lee
Options

u home

parent a6794736
Showing with 117 additions and 27 deletions
iCemarose.xcodeproj/project.pbxproj
......@@ -346,6 +346,7 @@
C0FBD88E1F049D510009E375 /* KWMOrderPaid.m in Sources */ = {isa = PBXBuildFile; fileRef = C0FBD88D1F049D510009E375 /* KWMOrderPaid.m */; };
C0FC278E1D9B73B000C5CFFE /* KWMGiftCardCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C0FC278D1D9B73B000C5CFFE /* KWMGiftCardCell.m */; };
DA4E36921F1613C70007E4D0 /* KWMHomeDataResult.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4E36911F1613C70007E4D0 /* KWMHomeDataResult.m */; };
DA4E36951F1726B80007E4D0 /* UIViewController+HTTP.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4E36941F1726B80007E4D0 /* UIViewController+HTTP.m */; };
DAB6431A1F04CFE5002CD7FE /* AppDelegate+Deeplink.m in Sources */ = {isa = PBXBuildFile; fileRef = DAB643191F04CFE5002CD7FE /* AppDelegate+Deeplink.m */; };
/* End PBXBuildFile section */
......@@ -962,6 +963,8 @@
C0FC278D1D9B73B000C5CFFE /* KWMGiftCardCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMGiftCardCell.m; sourceTree = "<group>"; };
DA4E36901F1613C70007E4D0 /* KWMHomeDataResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KWMHomeDataResult.h; sourceTree = "<group>"; };
DA4E36911F1613C70007E4D0 /* KWMHomeDataResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KWMHomeDataResult.m; sourceTree = "<group>"; };
DA4E36931F1726B80007E4D0 /* UIViewController+HTTP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+HTTP.h"; sourceTree = "<group>"; };
DA4E36941F1726B80007E4D0 /* UIViewController+HTTP.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+HTTP.m"; sourceTree = "<group>"; };
DAB643181F04CFE5002CD7FE /* AppDelegate+Deeplink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "AppDelegate+Deeplink.h"; sourceTree = "<group>"; };
DAB643191F04CFE5002CD7FE /* AppDelegate+Deeplink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "AppDelegate+Deeplink.m"; sourceTree = "<group>"; };
/* End PBXFileReference section */
......@@ -1056,6 +1059,8 @@
807806861D7566DD00FD2841 /* NSString+PinYin.m */,
9B8298E41EF237FC00743438 /* NSDecimalNumber+Currency.h */,
9B8298E51EF237FC00743438 /* NSDecimalNumber+Currency.m */,
DA4E36931F1726B80007E4D0 /* UIViewController+HTTP.h */,
DA4E36941F1726B80007E4D0 /* UIViewController+HTTP.m */,
);
path = Classify;
sourceTree = "<group>";
......@@ -2694,6 +2699,7 @@
C034E8411D6B10A0006EE129 /* CALayer+Transition.m in Sources */,
C077966F1EEAA2BE00CD6859 /* KWMFilterUtil.m in Sources */,
C034E8631D6B10A0006EE129 /* PBSaveBtn.m in Sources */,
DA4E36951F1726B80007E4D0 /* UIViewController+HTTP.m in Sources */,
807AF4A71DC984950000A326 /* KWMProducts.m in Sources */,
C0F5868A1E24F820001248E2 /* KWMSelectedGoodsVC.m in Sources */,
C034E8661D6B10A0006EE129 /* PhotoItemView.m in Sources */,
......
iCemarose/Base.lproj/Main.storyboard
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="n8p-We-k4e">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="n8p-We-k4e">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -718,7 +718,7 @@
<scene sceneID="bOf-dv-ZzC">
<objects>
<navigationController id="u8P-hB-9hk" userLabel="首页tab" sceneMemberID="viewController">
<tabBarItem key="tabBarItem" title="Item" id="XwP-f8-O3G"/>
<tabBarItem key="tabBarItem" title="首页" id="XwP-f8-O3G"/>
<navigationBar key="navigationBar" contentMode="scaleToFill" id="RA9-LY-7Yg">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
......@@ -734,7 +734,7 @@
<!--首页-->
<scene sceneID="iDT-Ta-igF">
<objects>
<viewController storyboardIdentifier="KWMHomeVC" automaticallyAdjustsScrollViewInsets="NO" useStoryboardIdentifierAsRestorationIdentifier="YES" id="NBO-61-l1q" userLabel="首页" customClass="KWMHomeVC" sceneMemberID="viewController">
<viewController storyboardIdentifier="KWMHomeVC" automaticallyAdjustsScrollViewInsets="NO" hidesBottomBarWhenPushed="YES" useStoryboardIdentifierAsRestorationIdentifier="YES" id="NBO-61-l1q" userLabel="首页" customClass="KWMHomeVC" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="f00-jP-fyg"/>
<viewControllerLayoutGuide type="bottom" id="etP-Nh-Q2m"/>
......@@ -776,14 +776,13 @@
</mask>
</variation>
</view>
<navigationItem key="navigationItem" id="2Ib-m2-1Tz"/>
<connections>
<outlet property="tbvBlog" destination="lb3-DY-TZq" id="t0G-sz-ZbP"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="GVM-zj-f6B" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-346" y="1361"/>
<point key="canvasLocation" x="-1615" y="1361"/>
</scene>
<!--商品-->
<scene sceneID="KxV-Rs-wmH">
......@@ -1010,7 +1009,7 @@
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="kMh-Eo-ATi">
<rect key="frame" x="0.0" y="167" width="375" height="451"/>
<rect key="frame" x="0.0" y="167" width="375" height="500"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<connections>
<outlet property="dataSource" destination="jDD-sy-yjq" id="svg-5f-Kbf"/>
......
iCemarose/Class/Classify/UIViewController+HTTP.h 0 → 100644
//
// UIViewController+HTTP.h
// iCemarose
//
// Created by Sanchew on 2017/7/13.
// Copyright © 2017年 kollway. All rights reserved.
//
#import <UIKit/UIKit.h>
@interface UIViewController (HTTP)
- (void) openURLWithString:(NSString *) URLString;
@end
iCemarose/Class/Classify/UIViewController+HTTP.m 0 → 100644
//
// UIViewController+HTTP.m
// iCemarose
//
// Created by Sanchew on 2017/7/13.
// Copyright © 2017年 kollway. All rights reserved.
//
#import "UIViewController+HTTP.h"
@implementation UIViewController (HTTP)
- (void)openURLWithString:(NSString *)URLString {
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:URLString]];
}
@end
iCemarose/Class/UI/Home/KWMHomeVC.m
......@@ -70,19 +70,19 @@
- (void)viewWillAppear:(BOOL)animated{
[super viewWillAppear:animated];
[self.navigationController setNavigationBarHidden:YES];
[self initHeaderView];
if (_searchBar) {
NSInteger count = [[KWMShoppingCart sharedInstance] count].integerValue;
_searchBar.count = count;
}
[_searchBar resumeView];
[self.navigationController setNavigationBarHidden:NO];
// [self initHeaderView];
// if (_searchBar) {
// NSInteger count = [[KWMShoppingCart sharedInstance] count].integerValue;
// _searchBar.count = count;
// }
// [_searchBar resumeView];
}
- (void)viewWillDisappear:(BOOL)animated{
[super viewWillDisappear:animated];
[self.navigationController setNavigationBarHidden:YES];
[_searchBar removeFromSuperview];
// [self.navigationController setNavigationBarHidden:YES];
// [_searchBar removeFromSuperview];
}
- (void)didReceiveMemoryWarning {
......@@ -91,7 +91,7 @@
-(void)awakeFromNib{
[super awakeFromNib];
self.title = @"首页";
self.title = @"发现新鲜";
}
//请求api
......
iCemarose/Class/UI/Mine/Cell/KWMOrderCell.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" 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">
<adaptation id="fullscreen"/>
</device>
......@@ -30,8 +30,8 @@
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总计:¥" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z8Q-AY-djl">
<rect key="frame" x="273" y="7" width="34.5" height="17"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总计:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z8Q-AY-djl">
<rect key="frame" x="280" y="7" width="27.5" height="17"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="12"/>
<color key="textColor" red="0.94509803920000002" green="0.57254901960000004" blue="0.60392156860000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
......@@ -190,7 +190,7 @@
<outlet property="vContent" destination="ijW-ut-DIo" id="ibM-ZX-F0E"/>
<outlet property="vHeader" destination="9GU-8G-dS5" id="esp-Xp-6d3"/>
</connections>
<point key="canvasLocation" x="54" y="-116"/>
<point key="canvasLocation" x="53.5" y="-116"/>
</tableViewCell>
</objects>
<resources>
......
iCemarose/Class/UI/NewHome/Cell/KWMMenuHeader.m
......@@ -50,5 +50,17 @@
self.vView.frame = CGRectMake(0, 0, self.frame.size.width, self.frame.size.height);
[self addSubview:self.vView];
}
- (IBAction)newAction:(id)sender {
[self.delegate kwm_onClickHotMenu];
}
- (IBAction)discoverAction:(id)sender {
[self.delegate kwm_onClickNewMenu];
}
- (IBAction)likeAction:(id)sender {
[self.delegate kwm_onClickWishMenu];
}
- (IBAction)serverAction:(id)sender {
[self.delegate kwm_onClickDeliveryMenu];
}
@end
iCemarose/Class/UI/NewHome/Cell/KWMMenuHeader.xib
......@@ -40,12 +40,16 @@
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<gestureRecognizers/>
<constraints>
<constraint firstItem="4Bg-sB-Fk4" firstAttribute="top" secondItem="Vyx-ed-YkS" secondAttribute="top" id="Qys-rx-muq"/>
<constraint firstItem="4Bg-sB-Fk4" firstAttribute="centerX" secondItem="Vyx-ed-YkS" secondAttribute="centerX" id="WEr-ts-Nib"/>
<constraint firstItem="c40-0Y-Obt" firstAttribute="top" secondItem="4Bg-sB-Fk4" secondAttribute="bottom" constant="10" id="u96-ve-TeV"/>
<constraint firstItem="c40-0Y-Obt" firstAttribute="centerX" secondItem="Vyx-ed-YkS" secondAttribute="centerX" id="vjx-GI-Sjs"/>
</constraints>
<connections>
<outletCollection property="gestureRecognizers" destination="bXR-EM-KIH" appends="YES" id="kSp-hM-baR"/>
</connections>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="92D-Xx-Bd9" userLabel="火爆热卖">
<rect key="frame" x="99" y="0.0" width="88.5" height="80"/>
......@@ -65,12 +69,16 @@
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<gestureRecognizers/>
<constraints>
<constraint firstItem="JdT-c1-AgH" firstAttribute="top" secondItem="92D-Xx-Bd9" secondAttribute="top" id="4xb-8P-Bfq"/>
<constraint firstItem="3sg-P6-odK" firstAttribute="top" secondItem="JdT-c1-AgH" secondAttribute="bottom" constant="10" id="SHS-AO-PBc"/>
<constraint firstItem="3sg-P6-odK" firstAttribute="centerX" secondItem="92D-Xx-Bd9" secondAttribute="centerX" id="g4G-UD-0fN"/>
<constraint firstItem="JdT-c1-AgH" firstAttribute="centerX" secondItem="92D-Xx-Bd9" secondAttribute="centerX" id="pGd-bq-ZI1"/>
</constraints>
<connections>
<outletCollection property="gestureRecognizers" destination="cF7-BX-xa9" appends="YES" id="7rg-sB-lvS"/>
</connections>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PAq-6Z-msb" userLabel="我喜欢的">
<rect key="frame" x="187.5" y="0.0" width="89" height="80"/>
......@@ -90,12 +98,16 @@
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<gestureRecognizers/>
<constraints>
<constraint firstItem="2Fh-Tj-POc" firstAttribute="centerX" secondItem="PAq-6Z-msb" secondAttribute="centerX" id="SWN-bO-gb1"/>
<constraint firstItem="Pfa-Sa-Cv9" firstAttribute="centerX" secondItem="PAq-6Z-msb" secondAttribute="centerX" id="bqR-bR-Fwr"/>
<constraint firstItem="2Fh-Tj-POc" firstAttribute="top" secondItem="Pfa-Sa-Cv9" secondAttribute="bottom" constant="10" id="dJl-Bc-0PQ"/>
<constraint firstItem="Pfa-Sa-Cv9" firstAttribute="top" secondItem="PAq-6Z-msb" secondAttribute="top" id="szi-Li-o6n"/>
</constraints>
<connections>
<outletCollection property="gestureRecognizers" destination="kA5-mN-m1r" appends="YES" id="wpR-al-fIV"/>
</connections>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fxs-MB-T7q" userLabel="直邮说明">
<rect key="frame" x="276.5" y="0.0" width="88.5" height="80"/>
......@@ -115,12 +127,16 @@
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<gestureRecognizers/>
<constraints>
<constraint firstItem="Izf-6L-av5" firstAttribute="top" secondItem="keV-Nx-QNu" secondAttribute="bottom" constant="10" id="2b4-9n-z6h"/>
<constraint firstItem="keV-Nx-QNu" firstAttribute="top" secondItem="fxs-MB-T7q" secondAttribute="top" id="2dK-0c-oKe"/>
<constraint firstItem="Izf-6L-av5" firstAttribute="centerX" secondItem="fxs-MB-T7q" secondAttribute="centerX" id="3rs-0K-XLv"/>
<constraint firstItem="keV-Nx-QNu" firstAttribute="centerX" secondItem="fxs-MB-T7q" secondAttribute="centerX" id="8go-Zp-Y2W"/>
</constraints>
<connections>
<outletCollection property="gestureRecognizers" destination="Nlw-ai-eZC" appends="YES" id="8rJ-FV-Jyr"/>
</connections>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
......@@ -154,6 +170,26 @@
<nil key="simulatedStatusBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
</view>
<tapGestureRecognizer id="bXR-EM-KIH" userLabel="new">
<connections>
<action selector="newAction:" destination="-1" id="f8T-3h-3L3"/>
</connections>
</tapGestureRecognizer>
<tapGestureRecognizer id="cF7-BX-xa9" userLabel="discover">
<connections>
<action selector="discoverAction:" destination="-1" id="07g-uX-2pJ"/>
</connections>
</tapGestureRecognizer>
<tapGestureRecognizer id="kA5-mN-m1r" userLabel="like">
<connections>
<action selector="likeAction:" destination="-1" id="Zig-Z6-MQb"/>
</connections>
</tapGestureRecognizer>
<tapGestureRecognizer id="Nlw-ai-eZC" userLabel="server">
<connections>
<action selector="serverAction:" destination="-1" id="TvK-1P-BoK"/>
</connections>
</tapGestureRecognizer>
</objects>
<resources>
<image name="ic_home_about_shipping" width="40" height="40"/>
......
iCemarose/Class/UI/NewHome/KWMNewHomeVC.m
......@@ -14,6 +14,7 @@
#import "KWMShoppingCart.h"
#import <RegexKitLite/RegexKitLite.h>
#import <RXCollections/RXCollection.h>
#import "KWMHomeVC.h"
typedef enum{
......@@ -159,29 +160,32 @@ typedef enum{
#pragma mark - KWMAdDelegate
-(void)kwm_gotoWebView:(NSString *)url{
// NSLog(@"click webview");
[self openURLWithString:url];
}
#pragma mark - KWMMenuDelegate
-(void)kwm_onClickHotMenu{
[self openURLWithString:@"https://cemarose.myshopify.com/collections/new"];
}
-(void)kwm_onClickNewMenu{
KWMHomeVC* selectedGoodsVC = (KWMHomeVC *)[KWMBaseVC findControllerBy:[KWMHomeVC kwmTag] fromStoryboard:@"Main"];
[self.navigationController pushViewController:selectedGoodsVC animated:YES];
}
-(void)kwm_onClickWishMenu{
NSLog(@"wishmenu");
}
-(void)kwm_onClickDeliveryMenu{
NSLog(@"deliverymenu");
}
#pragma makr - KWMRecommendDelegate KWMClothingSetsDelegate KWMHotSalesDelegate
-(void)kwm_onClickProduct:(BUYProduct *)product{
// NSLog(@"product");
[self openURLWithString:[NSString stringWithFormat:@"https://cemarose.myshopify.com/products/%@",product.handle]];
}
......
iCemarose/Header-Prefix.h
......@@ -11,6 +11,7 @@
#import "KWMAPIManager.h"
#import <MagicalRecord/MagicalRecord.h>
#import "NSDecimalNumber+Currency.h"
#import "UIViewController+HTTP.h"
#ifndef Header_Prefix_h
#define Header_Prefix_h
......
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