Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
ios1x
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cemarose
ios1x
Commits
8ff4e40d
Commit
8ff4e40d
authored
Nov 23, 2017
by
lee
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
u
parent
c85f88bd
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
7 deletions
+14
-7
project.pbxproj
iCemarose.xcodeproj/project.pbxproj
+4
-4
AppDelegate+Deeplink.m
iCemarose/Class/AppDelegate+Deeplink.m
+6
-3
KWMNewHomeVC.m
iCemarose/Class/UI/NewHome/KWMNewHomeVC.m
+4
-0
No files found.
iCemarose.xcodeproj/project.pbxproj
View file @
8ff4e40d
...
@@ -2543,7 +2543,7 @@
...
@@ -2543,7 +2543,7 @@
"$PODS_CONFIGURATION_BUILD_DIR/Mobile-Buy-SDK/Buy.bundle"
,
"$PODS_CONFIGURATION_BUILD_DIR/Mobile-Buy-SDK/Buy.bundle"
,
"${PODS_ROOT}/SAMCategories/SAMCategories/SAMCategories.bundle"
,
"${PODS_ROOT}/SAMCategories/SAMCategories/SAMCategories.bundle"
,
"${PODS_ROOT}/SAMKeychain/Support/SAMKeychain.bundle"
,
"${PODS_ROOT}/SAMKeychain/Support/SAMKeychain.bundle"
,
"$PODS_CONFIGURATION_BUILD_DIR/TOWebViewController/TOWebViewControllerLocalizable.bundle"
,
$PODS_CONFIGURATION_BUILD_DIR/TOWebViewController/TOWebViewControllerLocalizable.bundle
,
);
);
name
=
"[CP] Copy Pods Resources"
;
name
=
"[CP] Copy Pods Resources"
;
outputPaths
=
(
outputPaths
=
(
...
@@ -3024,7 +3024,7 @@
...
@@ -3024,7 +3024,7 @@
);
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.kollway.cemarose
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.kollway.cemarose
;
PRODUCT_NAME
=
Cemarose
;
PRODUCT_NAME
=
Cemarose
;
PROVISIONING_PROFILE
=
"6
9b2b79b-9e23-4461-84e1-d6a05cdb90fa
"
;
PROVISIONING_PROFILE
=
"6
418b86d-f979-4a16-92fd-3e47c5f5ae06
"
;
PROVISIONING_PROFILE_SPECIFIER
=
ios_distribution_dev_cemarose
;
PROVISIONING_PROFILE_SPECIFIER
=
ios_distribution_dev_cemarose
;
TARGETED_DEVICE_FAMILY
=
1
;
TARGETED_DEVICE_FAMILY
=
1
;
};
};
...
@@ -3096,8 +3096,8 @@
...
@@ -3096,8 +3096,8 @@
);
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.kollway.cemarose
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.kollway.cemarose
;
PRODUCT_NAME
=
Cemarose
;
PRODUCT_NAME
=
Cemarose
;
PROVISIONING_PROFILE
=
"
69b2b79b-9e23-4461-84e1-d6a05cdb90fa
"
;
PROVISIONING_PROFILE
=
"
de8d5d4b-22ac-4e5d-ab5e-87ac04c3d35b
"
;
PROVISIONING_PROFILE_SPECIFIER
=
ios_distribution_
dev
_cemarose
;
PROVISIONING_PROFILE_SPECIFIER
=
ios_distribution_
appstore
_cemarose
;
TARGETED_DEVICE_FAMILY
=
1
;
TARGETED_DEVICE_FAMILY
=
1
;
};
};
name
=
Release
;
name
=
Release
;
...
...
iCemarose/Class/AppDelegate+Deeplink.m
View file @
8ff4e40d
...
@@ -50,14 +50,17 @@ static NSMutableDictionary *controllerCache = nil;
...
@@ -50,14 +50,17 @@ static NSMutableDictionary *controllerCache = nil;
NSDictionary
*
brandNames
=
@{
@"amelie-wang"
:
@"Amelie Wang"
,
@"babywalker"
:
@"Babywalker"
,
@"beau-loves"
:
@"Beau Loves"
,
@"billieblush"
:
@"Billieblush"
,
@"billybandit"
:
@"Billybandit"
,
@"bonpoint"
:
@"Bonpoint"
,
@"burberry"
:
@"Burberry"
,
@"caramel"
:
@"Caramel"
,
@"chloe"
:
@"Chloé"
,
@"dolce-gabbana"
:
@"Dolce & Gabbana"
,
@"emile-et-ida"
:
@"Emile et Ida"
,
@"fendi"
:
@"Fendi"
,
@"givenchy"
:
@"Givenchy"
,
@"gucci"
:
@"Gucci"
,
@"hucklebones"
:
@"Hucklebones"
,
@"il-gufo"
:
@"Il Gufo"
,
@"indikidual"
:
@"Indikidual"
,
@"karl-lagerfeld-kids"
:
@"Karl Lagerfeld Kids"
,
@"kenzo"
:
@"Kenzo"
,
@"lanvin"
:
@"Lanvin"
,
@"little-marc-jacobs"
:
@"Little Marc Jacobs"
,
@"loud-apparel"
:
@"Loud Apparel"
,
@"louis-louise"
:
@"Louis Louise"
,
@"louise-misha"
:
@"Louise Misha"
,
@"marie-chantal"
:
@"Marie-Chantal"
,
@"marni"
:
@"Marni"
,
@"mini-melissa"
:
@"Mini Melissa"
,
@"mini-rodini"
:
@"Mini Rodini"
,
@"mischka-aoki"
:
@"Mischka Aoki"
,
@"moncler"
:
@"Moncler"
,
@"moschino"
:
@"MOSCHINO"
,
@"msgm"
:
@"MSGM"
,
@"nailmatic"
:
@"Nailmatic"
,
@"nana-huchy"
:
@"Nana Huchy"
,
@"noukies"
:
@"Noukie's"
,
@"oeuf"
:
@"Oeuf"
,
@"patachou"
:
@"Patachou"
,
@"paul-smith"
:
@"Paul Smith"
,
@"pepe"
:
@"PèPè"
,
@"sons-daughters-eyewear"
:
@"Sons + Daughters Eyewear"
,
@"stella-mccartney-kids"
:
@"Stella McCartney Kids"
,
@"story-loris"
:
@"Story Loris"
,
@"tartine-et-chocolat"
:
@"Tartine et Chocolat"
,
@"the-animals-observatory"
:
@"The Animals Observatory"
,
@"tiny-cottons"
:
@"Tiny Cottons"
,
@"tip-toey-joey"
:
@"Tip Toey Joey"
,
@"veja"
:
@"Veja"
,
@"young-versace"
:
@"Young Versace"
,
@"zadig-voltaire"
:
@"Zadig & Voltaire"
};
NSDictionary
*
brandNames
=
@{
@"amelie-wang"
:
@"Amelie Wang"
,
@"babywalker"
:
@"Babywalker"
,
@"beau-loves"
:
@"Beau Loves"
,
@"billieblush"
:
@"Billieblush"
,
@"billybandit"
:
@"Billybandit"
,
@"bonpoint"
:
@"Bonpoint"
,
@"burberry"
:
@"Burberry"
,
@"caramel"
:
@"Caramel"
,
@"chloe"
:
@"Chloé"
,
@"dolce-gabbana"
:
@"Dolce & Gabbana"
,
@"emile-et-ida"
:
@"Emile et Ida"
,
@"fendi"
:
@"Fendi"
,
@"givenchy"
:
@"Givenchy"
,
@"gucci"
:
@"Gucci"
,
@"hucklebones"
:
@"Hucklebones"
,
@"il-gufo"
:
@"Il Gufo"
,
@"indikidual"
:
@"Indikidual"
,
@"karl-lagerfeld-kids"
:
@"Karl Lagerfeld Kids"
,
@"kenzo"
:
@"Kenzo"
,
@"lanvin"
:
@"Lanvin"
,
@"little-marc-jacobs"
:
@"Little Marc Jacobs"
,
@"loud-apparel"
:
@"Loud Apparel"
,
@"louis-louise"
:
@"Louis Louise"
,
@"louise-misha"
:
@"Louise Misha"
,
@"marie-chantal"
:
@"Marie-Chantal"
,
@"marni"
:
@"Marni"
,
@"mini-melissa"
:
@"Mini Melissa"
,
@"mini-rodini"
:
@"Mini Rodini"
,
@"mischka-aoki"
:
@"Mischka Aoki"
,
@"moncler"
:
@"Moncler"
,
@"moschino"
:
@"MOSCHINO"
,
@"msgm"
:
@"MSGM"
,
@"nailmatic"
:
@"Nailmatic"
,
@"nana-huchy"
:
@"Nana Huchy"
,
@"noukies"
:
@"Noukie's"
,
@"oeuf"
:
@"Oeuf"
,
@"patachou"
:
@"Patachou"
,
@"paul-smith"
:
@"Paul Smith"
,
@"pepe"
:
@"PèPè"
,
@"sons-daughters-eyewear"
:
@"Sons + Daughters Eyewear"
,
@"stella-mccartney-kids"
:
@"Stella McCartney Kids"
,
@"story-loris"
:
@"Story Loris"
,
@"tartine-et-chocolat"
:
@"Tartine et Chocolat"
,
@"the-animals-observatory"
:
@"The Animals Observatory"
,
@"tiny-cottons"
:
@"Tiny Cottons"
,
@"tip-toey-joey"
:
@"Tip Toey Joey"
,
@"veja"
:
@"Veja"
,
@"young-versace"
:
@"Young Versace"
,
@"zadig-voltaire"
:
@"Zadig & Voltaire"
};
//将handle的转化放到这里,转化之前将没转化过的handle存为标题
//将handle的转化放到这里,转化之前将没转化过的handle存为标题
NSString
*
title
=
handle
;
NSString
*
title
=
handle
;
handle
=
[[
KWMStringUtil
deleteOtherCharExceptLetterWithLine
:
handle
]
lowercaseString
];
// handle = [[KWMStringUtil deleteOtherCharExceptLetterWithLine:handle] lowercaseString];
if
(
parameters
[
@"title"
])
{
title
=
parameters
[
@"title"
];
}
if
([
brands
containsObject
:[
handle
lowercaseString
]])
{
if
([
brands
containsObject
:[
handle
lowercaseString
]])
{
KWMBrandCaramelVC
*
brandCaramelVC
=
[
KWMBrandCaramelVC
getNewInstance
];
KWMBrandCaramelVC
*
brandCaramelVC
=
[
KWMBrandCaramelVC
getNewInstance
];
brandCaramelVC
.
isSale
=
NO
;
brandCaramelVC
.
isSale
=
NO
;
brandCaramelVC
.
handle
=
handle
;
brandCaramelVC
.
handle
=
handle
;
//brandCaramelVC.brand = brandNames[[handle lowercaseString]];
//brandCaramelVC.brand = brandNames[[handle lowercaseString]];
brandCaramelVC
.
brand
=
title
;
brandCaramelVC
.
brand
=
brandNames
[
handle
]
;
brandCaramelVC
.
title
=
brandCaramelVC
.
brand
;
brandCaramelVC
.
title
=
title
;
[
self
pushViewController
:
brandCaramelVC
];
[
self
pushViewController
:
brandCaramelVC
];
[
controllerCache
setObject
:
brandCaramelVC
forKey
:
url
];
[
controllerCache
setObject
:
brandCaramelVC
forKey
:
url
];
}
else
{
}
else
{
...
...
iCemarose/Class/UI/NewHome/KWMNewHomeVC.m
View file @
8ff4e40d
...
@@ -198,6 +198,10 @@ typedef enum{
...
@@ -198,6 +198,10 @@ typedef enum{
}
}
-
(
void
)
kwm_onClickFocusImage
{
-
(
void
)
kwm_onClickFocusImage
{
//#if DEBUG
// [self openURLWithString:@"https://test.cemarose.com/static/wd/weeklydeal.htm"];
// return;
//#endif
if
(
!
[
KWMStringUtil
isBlank
:
self
.
homeData
.
clothing_sets
.
action
])
{
if
(
!
[
KWMStringUtil
isBlank
:
self
.
homeData
.
clothing_sets
.
action
])
{
[
self
openURLWithString
:
self
.
homeData
.
clothing_sets
.
action
];
[
self
openURLWithString
:
self
.
homeData
.
clothing_sets
.
action
];
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment