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
19613b2d
Commit
19613b2d
authored
Nov 15, 2017
by
houweibin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1,热卖商品广告图比例
2,缓存collection的图片为空时出现的quit 3,删除雨衣分类 4,商品列表标题
parent
1ab32e11
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
11 deletions
+24
-11
KWMCategoryVC.m
iCemarose/Class/UI/Category/KWMCategoryVC.m
+1
-1
KWMHotSalesHeader.xib
iCemarose/Class/UI/NewHome/Cell/KWMHotSalesHeader.xib
+3
-3
KWMNewHomeVC.m
iCemarose/Class/UI/NewHome/KWMNewHomeVC.m
+4
-2
KWMPPCacheUtil.m
iCemarose/Class/Util/KWMPPCacheUtil.m
+16
-5
No files found.
iCemarose/Class/UI/Category/KWMCategoryVC.m
View file @
19613b2d
...
@@ -108,7 +108,7 @@
...
@@ -108,7 +108,7 @@
@{
@"title"
:
@"连裤袜"
,
@"collection_id"
:
@"192437830"
,
@"image"
:
@"ic_type_pantyhose"
},
@{
@"title"
:
@"连裤袜"
,
@"collection_id"
:
@"192437830"
,
@"image"
:
@"ic_type_pantyhose"
},
@{
@"title"
:
@"打底裤"
,
@"collection_id"
:
@"192435334"
,
@"image"
:
@"ic_type_leggings"
},
@{
@"title"
:
@"打底裤"
,
@"collection_id"
:
@"192435334"
,
@"image"
:
@"ic_type_leggings"
},
@{
@"title"
:
@"内衣"
,
@"collection_id"
:
@"333026694"
,
@"image"
:
@"ic_type_underwear"
},
@{
@"title"
:
@"内衣"
,
@"collection_id"
:
@"333026694"
,
@"image"
:
@"ic_type_underwear"
},
@{
@"title"
:
@"雨衣"
,
@"collection_id"
:
@"423509068"
,
@"image"
:
@"ic_type_raincoat"
},
//
@{@"title":@"雨衣",@"collection_id":@"423509068",@"image":@"ic_type_raincoat"},
@{
@"title"
:
@"鞋子"
,
@"collection_id"
:
@"171856134"
,
@"image"
:
@"ic_type_shoe"
},
@{
@"title"
:
@"鞋子"
,
@"collection_id"
:
@"171856134"
,
@"image"
:
@"ic_type_shoe"
},
@{
@"title"
:
@"玩具"
,
@"collection_id"
:
@"332990918"
,
@"image"
:
@"ic_type_toy"
},
@{
@"title"
:
@"玩具"
,
@"collection_id"
:
@"332990918"
,
@"image"
:
@"ic_type_toy"
},
@{
@"title"
:
@"配件"
,
@"collection_id"
:
@"191376966"
,
@"image"
:
@"ic_type_Acc"
},
@{
@"title"
:
@"配件"
,
@"collection_id"
:
@"191376966"
,
@"image"
:
@"ic_type_Acc"
},
...
...
iCemarose/Class/UI/NewHome/Cell/KWMHotSalesHeader.xib
View file @
19613b2d
...
@@ -5,7 +5,8 @@
...
@@ -5,7 +5,8 @@
</device>
</device>
<dependencies>
<dependencies>
<deployment
identifier=
"iOS"
/>
<deployment
identifier=
"iOS"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"13173"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"13174"
/>
<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>
<customFonts
key=
"customFonts"
>
<customFonts
key=
"customFonts"
>
...
@@ -17,7 +18,6 @@
...
@@ -17,7 +18,6 @@
<placeholder
placeholderIdentifier=
"IBFilesOwner"
id=
"-1"
userLabel=
"File's Owner"
customClass=
"KWMHotSalesHeader"
>
<placeholder
placeholderIdentifier=
"IBFilesOwner"
id=
"-1"
userLabel=
"File's Owner"
customClass=
"KWMHotSalesHeader"
>
<connections>
<connections>
<outlet
property=
"bannerView"
destination=
"Ruv-UI-DGw"
id=
"USH-xg-KHp"
/>
<outlet
property=
"bannerView"
destination=
"Ruv-UI-DGw"
id=
"USH-xg-KHp"
/>
<outlet
property=
"heightBannerView"
destination=
"NbW-Kh-s5O"
id=
"zdT-r2-QNE"
/>
<outlet
property=
"heightSingleShowView"
destination=
"SEw-Tw-g0a"
id=
"PcT-Pv-gcm"
/>
<outlet
property=
"heightSingleShowView"
destination=
"SEw-Tw-g0a"
id=
"PcT-Pv-gcm"
/>
<outlet
property=
"singleShowView"
destination=
"UGY-II-IMu"
id=
"wxp-gP-PDh"
/>
<outlet
property=
"singleShowView"
destination=
"UGY-II-IMu"
id=
"wxp-gP-PDh"
/>
<outlet
property=
"vView"
destination=
"iN0-l3-epB"
id=
"bI2-U9-soo"
/>
<outlet
property=
"vView"
destination=
"iN0-l3-epB"
id=
"bI2-U9-soo"
/>
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"375"
height=
"190"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"375"
height=
"190"
/>
<color
key=
"backgroundColor"
red=
"0.90588235289999997"
green=
"0.81960784310000001"
blue=
"0.74117647060000003"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
<color
key=
"backgroundColor"
red=
"0.90588235289999997"
green=
"0.81960784310000001"
blue=
"0.74117647060000003"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
<constraints>
<constraints>
<constraint
firstAttribute=
"
height"
constant=
"190"
id=
"NbW-Kh-s5O
"
/>
<constraint
firstAttribute=
"
width"
secondItem=
"Ruv-UI-DGw"
secondAttribute=
"height"
multiplier=
"375:190"
id=
"wq7-qE-RyI
"
/>
</constraints>
</constraints>
</view>
</view>
<collectionView
clipsSubviews=
"YES"
multipleTouchEnabled=
"YES"
contentMode=
"scaleToFill"
scrollEnabled=
"NO"
showsHorizontalScrollIndicator=
"NO"
showsVerticalScrollIndicator=
"NO"
dataMode=
"none"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"UGY-II-IMu"
>
<collectionView
clipsSubviews=
"YES"
multipleTouchEnabled=
"YES"
contentMode=
"scaleToFill"
scrollEnabled=
"NO"
showsHorizontalScrollIndicator=
"NO"
showsVerticalScrollIndicator=
"NO"
dataMode=
"none"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"UGY-II-IMu"
>
...
...
iCemarose/Class/UI/NewHome/KWMNewHomeVC.m
View file @
19613b2d
...
@@ -68,6 +68,7 @@ typedef enum{
...
@@ -68,6 +68,7 @@ typedef enum{
@implementation
KWMNewHomeVC
{
@implementation
KWMNewHomeVC
{
CGFloat
heightAdHeader
;
CGFloat
heightAdHeader
;
CGFloat
heightClothingSets
;
CGFloat
heightClothingSets
;
CGFloat
heightHotSale
;
}
}
-
(
void
)
viewDidLoad
{
-
(
void
)
viewDidLoad
{
...
@@ -99,11 +100,12 @@ typedef enum{
...
@@ -99,11 +100,12 @@ typedef enum{
// self.title = @"首页";
// self.title = @"首页";
heightAdHeader
=
UI_SCREEN_WIDTH
*
275
/
375
;
heightAdHeader
=
UI_SCREEN_WIDTH
*
275
/
375
;
heightClothingSets
=
UI_SCREEN_WIDTH
*
190
/
375
+
127
;
//127为图片外的布局高度
heightClothingSets
=
UI_SCREEN_WIDTH
*
190
/
375
+
127
;
//127为图片外的布局高度
heightHotSale
=
UI_SCREEN_WIDTH
*
190
/
375
+
60
;
//60为图片外的布局高度
self
.
adHeader
=
[[
KWMAdHeader
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
UI_SCREEN_WIDTH
,
heightAdHeader
)];
self
.
adHeader
=
[[
KWMAdHeader
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
UI_SCREEN_WIDTH
,
heightAdHeader
)];
self
.
menuHeader
=
[[
KWMMenuHeader
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
UI_SCREEN_WIDTH
,
100
)];
self
.
menuHeader
=
[[
KWMMenuHeader
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
UI_SCREEN_WIDTH
,
100
)];
self
.
recommendHeader
=
[[
KWMRecommendHeader
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
UI_SCREEN_WIDTH
,
230
)];
self
.
recommendHeader
=
[[
KWMRecommendHeader
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
UI_SCREEN_WIDTH
,
230
)];
self
.
clothingSetsHeader
=
[[
KWMClothingSetsHeader
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
UI_SCREEN_WIDTH
,
heightClothingSets
)];
self
.
clothingSetsHeader
=
[[
KWMClothingSetsHeader
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
UI_SCREEN_WIDTH
,
heightClothingSets
)];
self
.
hotSalesHeader
=
[[
KWMHotSalesHeader
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
UI_SCREEN_WIDTH
,
250
)];
self
.
hotSalesHeader
=
[[
KWMHotSalesHeader
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
UI_SCREEN_WIDTH
,
heightHotSale
)];
self
.
adHeader
.
delegate
=
self
;
self
.
adHeader
.
delegate
=
self
;
self
.
menuHeader
.
delegate
=
self
;
self
.
menuHeader
.
delegate
=
self
;
...
@@ -291,7 +293,7 @@ typedef enum{
...
@@ -291,7 +293,7 @@ typedef enum{
height
=
heightClothingSets
;
height
=
heightClothingSets
;
break
;
break
;
case
HeaderHotSales
:
case
HeaderHotSales
:
height
=
self
.
hotSalesHeader
.
actrualHeight
;
height
=
heightHotSale
;
break
;
break
;
default
:
default
:
break
;
break
;
...
...
iCemarose/Class/Util/KWMPPCacheUtil.m
View file @
19613b2d
...
@@ -84,12 +84,17 @@
...
@@ -84,12 +84,17 @@
// NSDictionary *saveDict = collection.JSONDictionary;
// NSDictionary *saveDict = collection.JSONDictionary;
// [PPNetworkCache setHttpCache:saveDict URL:urlKey parameters:cacheKeyDictionary];
// [PPNetworkCache setHttpCache:saveDict URL:urlKey parameters:cacheKeyDictionary];
// }
// }
if
(
collection
){
if
(
collection
&&
collection
.
identifier
){
NSString
*
imageString
=
collection
.
image
.
sourceURL
.
absoluteString
;
NSMutableDictionary
*
collectionData
=
@{
@"identifier"
:
collection
.
identifier
.
stringValue
,
NSDictionary
*
collectionData
=
@{
@"image"
:
imageString
,
@"identifier"
:
collection
.
identifier
.
stringValue
,
@"description"
:
collection
.
htmlDescription
,
@"description"
:
collection
.
htmlDescription
,
};
}.
mutableCopy
;;
if
(
collection
.
image
&&
collection
.
image
.
sourceURL
)
{
NSString
*
imageString
=
collection
.
image
.
sourceURL
.
absoluteString
;
collectionData
[
@"image"
]
=
imageString
;
}
if
(
collection
.
htmlDescription
){
collectionData
[
@"description"
]
=
collection
.
htmlDescription
;
}
[
PPNetworkCache
setHttpCache
:
collectionData
URL
:
urlKey
parameters
:
cacheKeyDictionary
];
[
PPNetworkCache
setHttpCache
:
collectionData
URL
:
urlKey
parameters
:
cacheKeyDictionary
];
}
}
}
}
...
@@ -100,10 +105,16 @@
...
@@ -100,10 +105,16 @@
// BUYCollection *collection = (BUYCollection *)[[BUYModelManager modelManager] buy_objectWithEntityName:[BUYCollection entityName] JSONDictionary:cacheDictionary];
// BUYCollection *collection = (BUYCollection *)[[BUYModelManager modelManager] buy_objectWithEntityName:[BUYCollection entityName] JSONDictionary:cacheDictionary];
// return collection;
// return collection;
BUYCollection
*
collection
=
[[
BUYCollection
alloc
]
init
];
BUYCollection
*
collection
=
[[
BUYCollection
alloc
]
init
];
if
(
cacheDictionary
[
@"image"
]){
collection
.
image
=
[[
BUYImageLink
alloc
]
init
];
collection
.
image
=
[[
BUYImageLink
alloc
]
init
];
NSString
*
imageString
=
cacheDictionary
[
@"image"
];
NSString
*
imageString
=
cacheDictionary
[
@"image"
];
collection
.
image
.
sourceURL
=
[[
NSURL
alloc
]
initWithString
:
imageString
];
collection
.
image
.
sourceURL
=
[[
NSURL
alloc
]
initWithString
:
imageString
];
}
if
(
cacheDictionary
[
@"description"
]){
collection
.
htmlDescription
=
cacheDictionary
[
@"description"
];
collection
.
htmlDescription
=
cacheDictionary
[
@"description"
];
}
else
{
collection
.
htmlDescription
=
@""
;
}
NSString
*
idString
=
cacheDictionary
[
@"identifier"
];
NSString
*
idString
=
cacheDictionary
[
@"identifier"
];
collection
.
identifier
=
@
([
idString
integerValue
]);
collection
.
identifier
=
@
([
idString
integerValue
]);
return
collection
;
return
collection
;
...
...
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