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
3030a13a
Commit
3030a13a
authored
Jun 09, 2017
by
houweibin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1,删去旧筛选view
parent
fb2ff498
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
14 additions
and
327 deletions
+14
-327
project.pbxproj
iCemarose.xcodeproj/project.pbxproj
+9
-11
Brand.storyboard
iCemarose/Class/UI/Brand/Brand.storyboard
+0
-0
KWMBrandCaramelVC.h
iCemarose/Class/UI/Brand/KWMBrandCaramelVC.h
+1
-9
KWMBrandCaramelVC.m
iCemarose/Class/UI/Brand/KWMBrandCaramelVC.m
+0
-74
KWMFilterView.h
iCemarose/Class/UI/Product/Cell/KWMFilterView.h
+0
-44
KWMFilterView.m
iCemarose/Class/UI/Product/Cell/KWMFilterView.m
+0
-126
KWMFilterView.xib
iCemarose/Class/UI/Product/Cell/KWMFilterView.xib
+0
-0
KWMSelectedGoodsVC.h
iCemarose/Class/UI/Product/KWMSelectedGoodsVC.h
+1
-4
KWMSelectedGoodsVC.m
iCemarose/Class/UI/Product/KWMSelectedGoodsVC.m
+0
-55
New.storyboard
iCemarose/Class/UI/Product/New.storyboard
+3
-4
No files found.
iCemarose.xcodeproj/project.pbxproj
View file @
3030a13a
...
...
@@ -242,8 +242,6 @@
C0F586791E24F820001248E2
/* KWMDetailCell.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
C0F5864B1E24F820001248E2
/* KWMDetailCell.xib */
;
};
C0F5867A1E24F820001248E2
/* KWMDoubleTitleView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
C0F5864D1E24F820001248E2
/* KWMDoubleTitleView.m */
;
};
C0F5867B1E24F820001248E2
/* KWMDoubleTitleView.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
C0F5864E1E24F820001248E2
/* KWMDoubleTitleView.xib */
;
};
C0F5867C1E24F820001248E2
/* KWMFilterView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
C0F586501E24F820001248E2
/* KWMFilterView.m */
;
};
C0F5867D1E24F820001248E2
/* KWMFilterView.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
C0F586511E24F820001248E2
/* KWMFilterView.xib */
;
};
C0F5867E1E24F820001248E2
/* KWMNewGoodsCell.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
C0F586531E24F820001248E2
/* KWMNewGoodsCell.m */
;
};
C0F5867F1E24F820001248E2
/* KWMNewGoodsCell.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
C0F586541E24F820001248E2
/* KWMNewGoodsCell.xib */
;
};
C0F586801E24F820001248E2
/* KWMNewTypeView.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
C0F586561E24F820001248E2
/* KWMNewTypeView.m */
;
};
...
...
@@ -706,9 +704,6 @@
C0F5864C1E24F820001248E2
/* KWMDoubleTitleView.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
KWMDoubleTitleView.h
;
sourceTree
=
"<group>"
;
};
C0F5864D1E24F820001248E2
/* KWMDoubleTitleView.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
KWMDoubleTitleView.m
;
sourceTree
=
"<group>"
;
};
C0F5864E1E24F820001248E2
/* KWMDoubleTitleView.xib */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
file.xib
;
path
=
KWMDoubleTitleView.xib
;
sourceTree
=
"<group>"
;
};
C0F5864F1E24F820001248E2
/* KWMFilterView.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
KWMFilterView.h
;
sourceTree
=
"<group>"
;
};
C0F586501E24F820001248E2
/* KWMFilterView.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
KWMFilterView.m
;
sourceTree
=
"<group>"
;
};
C0F586511E24F820001248E2
/* KWMFilterView.xib */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
file.xib
;
path
=
KWMFilterView.xib
;
sourceTree
=
"<group>"
;
};
C0F586521E24F820001248E2
/* KWMNewGoodsCell.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
KWMNewGoodsCell.h
;
sourceTree
=
"<group>"
;
};
C0F586531E24F820001248E2
/* KWMNewGoodsCell.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
KWMNewGoodsCell.m
;
sourceTree
=
"<group>"
;
};
C0F586541E24F820001248E2
/* KWMNewGoodsCell.xib */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
file.xib
;
path
=
KWMNewGoodsCell.xib
;
sourceTree
=
"<group>"
;
};
...
...
@@ -1134,6 +1129,7 @@
C034E6C51D6AECF9006EE129
/* View */
=
{
isa
=
PBXGroup
;
children
=
(
C0CCB3B51EEA520C00BC2FB8
/* FilterView */
,
C0DD53251EE55190002D1E0C
/* Cell */
,
C0DD53261EE55190002D1E0C
/* Loading */
,
C034E7C31D6B10A0006EE129
/* CorePhotoBroswer */
,
...
...
@@ -1646,6 +1642,13 @@
path
=
Cell
;
sourceTree
=
"<group>"
;
};
C0CCB3B51EEA520C00BC2FB8
/* FilterView */
=
{
isa
=
PBXGroup
;
children
=
(
);
path
=
FilterView
;
sourceTree
=
"<group>"
;
};
C0DD53251EE55190002D1E0C
/* Cell */
=
{
isa
=
PBXGroup
;
children
=
(
...
...
@@ -1719,9 +1722,6 @@
C0F5864C1E24F820001248E2
/* KWMDoubleTitleView.h */
,
C0F5864D1E24F820001248E2
/* KWMDoubleTitleView.m */
,
C0F5864E1E24F820001248E2
/* KWMDoubleTitleView.xib */
,
C0F5864F1E24F820001248E2
/* KWMFilterView.h */
,
C0F586501E24F820001248E2
/* KWMFilterView.m */
,
C0F586511E24F820001248E2
/* KWMFilterView.xib */
,
C0F586521E24F820001248E2
/* KWMNewGoodsCell.h */
,
C0F586531E24F820001248E2
/* KWMNewGoodsCell.m */
,
C0F586541E24F820001248E2
/* KWMNewGoodsCell.xib */
,
...
...
@@ -1865,7 +1865,7 @@
TargetAttributes
=
{
C034E6891D6AEB12006EE129
=
{
CreatedOnToolsVersion
=
7.3.1
;
DevelopmentTeam
=
72Z44QQ9ZD
;
DevelopmentTeam
=
6HFG5LS2Y2
;
ProvisioningStyle
=
Manual
;
};
C034E6A21D6AEB13006EE129
=
{
...
...
@@ -1911,7 +1911,6 @@
801230F31DD30704008C7904
/* KWMSearchBrandsCell.xib in Resources */
,
C084F4591D6D976F00A0625D
/* KWMSearchBar.xib in Resources */
,
C0DD53381EE55190002D1E0C
/* KWMLoadingView.xib in Resources */
,
C0F5867D1E24F820001248E2
/* KWMFilterView.xib in Resources */
,
C0F586811E24F820001248E2
/* KWMNewTypeView.xib in Resources */
,
C0AF039F1DD5C8EE0060623F
/* KWMNeedAddressView.xib in Resources */
,
C084F4541D6D8CA700A0625D
/* KWMBlogCell.xib in Resources */
,
...
...
@@ -2161,7 +2160,6 @@
80ED0A491D93B82F00B28DF2
/* KWMShopCartItem+CoreDataProperties.m in Sources */
,
80537ADB1D86A7E100AB5122
/* KWMUserModel.m in Sources */
,
C034E84E1D6B10A0006EE129
/* UIImage+Water.m in Sources */
,
C0F5867C1E24F820001248E2
/* KWMFilterView.m in Sources */
,
C034E86B1D6B10A0006EE129
/* EGORefreshTableHeaderView.m in Sources */
,
C0DD53191EE54C5F002D1E0C
/* KWMSearchFeedBackView.m in Sources */
,
C03A05061E35DC5800BAA889
/* KWMNewGiftCardVC.m in Sources */
,
...
...
iCemarose/Class/UI/Brand/Brand.storyboard
View file @
3030a13a
This diff is collapsed.
Click to expand it.
iCemarose/Class/UI/Brand/KWMBrandCaramelVC.h
View file @
3030a13a
...
...
@@ -10,10 +10,8 @@
#import "KWMBarandSelectView.h"
#import "Buy/Buy.h"
#import "KWMNewGoodsModel.h"
#import "KWMFilterView.h"
#import "KWMFilterVC.h"
@interface
KWMBrandCaramelVC
:
KWMBasePageVC
<
KWMBarandSelectViewDelegate
,
KWMFilterDelegate
,
KWMFilterVCDelegate
>
@interface
KWMBrandCaramelVC
:
KWMBasePageVC
<
KWMBarandSelectViewDelegate
>
@property
(
weak
,
nonatomic
)
IBOutlet
UITableView
*
tbvBrandCaramel
;
@property
(
weak
,
nonatomic
)
IBOutlet
UITextView
*
tvDescription
;
...
...
@@ -25,12 +23,9 @@
@property
(
weak
,
nonatomic
)
IBOutlet
UIView
*
vBlurred
;
//模糊背景
@property
(
weak
,
nonatomic
)
IBOutlet
UIView
*
vNoneGoods
;
//没有商品
@property
(
weak
,
nonatomic
)
IBOutlet
UIView
*
vFilter
;
//筛选空间容器
@property
(
weak
,
nonatomic
)
IBOutlet
NSLayoutConstraint
*
vBackgroudTop
;
@property
(
weak
,
nonatomic
)
IBOutlet
NSLayoutConstraint
*
tvDescriptionTop
;
@property
(
weak
,
nonatomic
)
IBOutlet
KWMFilterView
*
filterView
;
@property
(
nonatomic
)
BOOL
isLoading
;
...
...
@@ -48,8 +43,5 @@
-
(
IBAction
)
onClickBotomBtn
:(
id
)
sender
;
-
(
IBAction
)
onClickFilter
:(
id
)
sender
;
-
(
IBAction
)
onClickSort
:(
id
)
sender
;
@end
iCemarose/Class/UI/Brand/KWMBrandCaramelVC.m
View file @
3030a13a
...
...
@@ -57,7 +57,6 @@
[
super
viewDidLoad
];
// Do any additional setup after loading the view.
self
.
collectionSort
=
BUYCollectionSortCreatedDescending
;
self
.
filterView
.
delegate
=
self
;
self
.
automaticallyAdjustsScrollViewInsets
=
NO
;
self
.
tvDescription
.
editable
=
NO
;
mark
=
-
1
;
...
...
@@ -77,17 +76,6 @@
if
(
self
.
goodModel
){
[
self
initCacheData
];
}
[
self
initFilterVC
];
}
-
(
void
)
initFilterVC
{
if
(
!
filterVC
){
UIStoryboard
*
storyboard
=
[
UIStoryboard
storyboardWithName
:
@"New"
bundle
:
nil
];
filterVC
=
[
storyboard
instantiateViewControllerWithIdentifier
:[
KWMFilterVC
kwmTag
]];
[
self
addChildViewController
:
filterVC
];
[
self
.
vFilter
addSubview
:
filterVC
.
view
];
filterVC
.
delegate
=
self
;
}
}
-
(
void
)
initCacheData
{
...
...
@@ -139,20 +127,6 @@
_barandSelectView
.
count
=
[[
KWMShoppingCart
sharedInstance
]
count
].
integerValue
;
_barandSelectView
.
lbBrand
.
text
=
[
_brand
uppercaseString
];
rightButton
=
[
UIButton
buttonWithType
:
UIButtonTypeRoundedRect
];
rightButton
.
frame
=
CGRectMake
(
UI_SCREEN_WIDTH
-
100
,
33
,
40
,
20
);
[
rightButton
addTarget
:
self
action
:
@selector
(
clickRightButton
)
forControlEvents
:
UIControlEventTouchUpInside
];
[
rightButton
setTitle
:
@"排序 +"
forState
:
UIControlStateNormal
];
[
rightButton
setTitleColor
:[
UIColor
sam_colorWithHex
:
@"4E4E4E"
]
forState
:
UIControlStateNormal
];
rightButton
.
titleLabel
.
font
=
[
UIFont
systemFontOfSize
:
11
];
[
rightButton
.
layer
setMasksToBounds
:
YES
];
rightButton
.
layer
.
cornerRadius
=
1
;
//圆角(圆形)
rightButton
.
layer
.
borderColor
=
[
UIColor
sam_colorWithHex
:
@"4E4E4E"
].
CGColor
;
//要设置的颜色
rightButton
.
layer
.
borderWidth
=
1
;
//要设置的描边宽
[
self
.
barandSelectView
addSubview
:
rightButton
];
[
self
.
view
addSubview
:
_barandSelectView
];
_barandSelectView
.
delegate
=
self
;
}
...
...
@@ -194,26 +168,6 @@ static NSString *idStr = @"KWMBrandCaramelCell";
isUp
=
!
isUp
;
}
-
(
void
)
onClickSort
:
(
id
)
sender
{
self
.
vFilter
.
hidden
=
NO
;
[
self
initFilterVC
];
if
(
filterVC
){
[
filterVC
setBgImage
:[
KWMImageBlurUtil
getBlurImage
:
self
.
tbvBrandCaramel
]];
BOOL
isSort
=
YES
;
[
filterVC
setType
:
isSort
];
}
}
-
(
void
)
onClickFilter
:
(
id
)
sender
{
self
.
vFilter
.
hidden
=
NO
;
[
self
initFilterVC
];
if
(
filterVC
){
[
filterVC
setBgImage
:[
KWMImageBlurUtil
getBlurImage
:
self
.
tbvBrandCaramel
]];
BOOL
isSort
=
YES
;
[
filterVC
setType
:
!
isSort
];
}
}
//动画 筛选显示:0:不显示 1:显示 2:没有
-
(
void
)
changeFrameBy
:
(
NSInteger
)
value
WithImageName
:
(
NSString
*
)
imageStr
AndShowView
:
(
NSInteger
)
showNum
{
...
...
@@ -232,24 +186,6 @@ static NSString *idStr = @"KWMBrandCaramelCell";
}];
}
-
(
void
)
clickRightButton
{
if
(
self
.
isLoading
){
return
;
}
self
.
filterView
.
hidden
=
!
self
.
filterView
.
hidden
;
self
.
filterView
.
collectionSort
=
self
.
collectionSort
;
if
(
self
.
filterView
.
hidden
){
rightButton
.
titleLabel
.
text
=
@"排序 +"
;
[
rightButton
setTitle
:
@"排序 +"
forState
:
UIControlStateNormal
];
}
else
{
rightButton
.
titleLabel
.
text
=
@"排序 -"
;
[
rightButton
setTitle
:
@"排序 -"
forState
:
UIControlStateNormal
];
}
}
-
(
void
)
kwm_onCancelFilter
{
self
.
vFilter
.
hidden
=
YES
;
}
-
(
void
)
kwm_onClickSort
:
(
BUYCollectionSort
)
sort
{
self
.
hasNextPage
=
YES
;
...
...
@@ -257,16 +193,6 @@ static NSString *idStr = @"KWMBrandCaramelCell";
[
self
reLoadData
];
}
-
(
void
)
kwm_onHide
{
if
(
self
.
filterView
.
hidden
){
rightButton
.
titleLabel
.
text
=
@"排序 +"
;
[
rightButton
setTitle
:
@"排序 +"
forState
:
UIControlStateNormal
];
}
else
{
[
rightButton
setTitle
:
@"排序 -"
forState
:
UIControlStateNormal
];
rightButton
.
titleLabel
.
text
=
@"排序 -"
;
}
}
#pragma mark -- KWMBarandSelectViewDelegate
//点击返回按钮回调
-
(
void
)
kwm_clickBackBtn
{
...
...
iCemarose/Class/UI/Product/Cell/KWMFilterView.h
deleted
100644 → 0
View file @
fb2ff498
//
// KWMFilterView.h
// iCemarose
//
// Created by HouWeiBin on 2016/12/9.
// Copyright © 2016年 kollway. All rights reserved.
//
#import <UIKit/UIKit.h>
#import "Buy/Buy.h"
@protocol
KWMFilterDelegate
<
NSObject
>
-
(
void
)
kwm_onClickSort
:
(
BUYCollectionSort
)
sort
;
-
(
void
)
kwm_onHide
;
@end
@interface
KWMFilterView
:
UIView
@property
(
weak
,
nonatomic
)
IBOutlet
UIView
*
vContent
;
@property
(
weak
,
nonatomic
)
IBOutlet
UIButton
*
btnNewToOld
;
@property
(
weak
,
nonatomic
)
IBOutlet
UIButton
*
btnDearToCheap
;
@property
(
weak
,
nonatomic
)
IBOutlet
UIButton
*
btnCheapToDear
;
@property
(
weak
,
nonatomic
)
id
<
KWMFilterDelegate
>
delegate
;
-
(
IBAction
)
onClikcNewToOld
:(
id
)
sender
;
-
(
IBAction
)
onClickDearToCheap
:(
id
)
sender
;
-
(
IBAction
)
onClickCheapToDear
:(
id
)
sender
;
-
(
IBAction
)
onClickBg
:(
id
)
sender
;
-
(
IBAction
)
onClickComplete
:(
id
)
sender
;
@property
(
nonatomic
)
BUYCollectionSort
collectionSort
;
@end
iCemarose/Class/UI/Product/Cell/KWMFilterView.m
deleted
100644 → 0
View file @
fb2ff498
//
// KWMFilterView.m
// iCemarose
//
// Created by HouWeiBin on 2016/12/9.
// Copyright © 2016年 kollway. All rights reserved.
//
#import "KWMFilterView.h"
#import "UIColor+SAMAdditions.h"
@implementation
KWMFilterView
-
(
id
)
init
{
if
(
self
=
[
super
init
]){
[
self
addView
];
}
return
self
;
}
-
(
id
)
initWithCoder
:
(
NSCoder
*
)
aDecoder
{
self
=
[
super
initWithCoder
:
aDecoder
];
if
(
self
)
{
[
self
addView
];
}
return
self
;
}
-
(
instancetype
)
initWithFrame
:
(
CGRect
)
frame
{
if
(
self
=
[
super
initWithFrame
:
frame
])
{
[
self
addView
];
}
return
self
;
}
-
(
void
)
awakeFromNib
{
[
super
awakeFromNib
];
}
-
(
void
)
addView
{
[[
NSBundle
mainBundle
]
loadNibNamed
:
NSStringFromClass
([
self
class
])
owner
:
self
options
:
nil
];
self
.
vContent
.
frame
=
CGRectMake
(
0
,
0
,
self
.
frame
.
size
.
width
,
self
.
frame
.
size
.
height
);
[
self
addSubview
:
self
.
vContent
];
[
self
initView
];
}
-
(
void
)
setCollectionSort
:
(
BUYCollectionSort
)
collectionSort
{
if
(
collectionSort
==
BUYCollectionSortPriceDescending
){
[
self
onClickDearToCheap
:
nil
];
}
else
if
(
collectionSort
==
BUYCollectionSortPriceAscending
){
[
self
onClickCheapToDear
:
nil
];
}
else
{
[
self
onClikcNewToOld
:
nil
];
}
}
-
(
void
)
initView
{
[
self
initButton
:
self
.
btnNewToOld
];
[
self
initButton
:
self
.
btnCheapToDear
];
[
self
initButton
:
self
.
btnDearToCheap
];
[
self
setButtonSelect
:
self
.
btnNewToOld
isSelect
:
YES
];
}
-
(
void
)
initButton
:
(
UIButton
*
)
button
{
[
button
.
layer
setMasksToBounds
:
YES
];
button
.
layer
.
cornerRadius
=
1
;
//圆角(圆形)
button
.
layer
.
borderColor
=
[
UIColor
blackColor
].
CGColor
;
//要设置的颜色
button
.
layer
.
borderWidth
=
1
;
//要设置的描边宽
}
-
(
void
)
setButtonSelect
:
(
UIButton
*
)
button
isSelect
:
(
BOOL
)
isSelect
{
if
(
isSelect
){
//设置背景颜色
button
.
backgroundColor
=
[
UIColor
sam_colorWithHex
:
@"393939"
];
button
.
titleLabel
.
textColor
=
[
UIColor
sam_colorWithHex
:
@"ffffff"
];
[
button
setTitleColor
:[
UIColor
sam_colorWithHex
:
@"ffffff"
]
forState
:
UIControlStateNormal
];
}
else
{
button
.
backgroundColor
=
[
UIColor
sam_colorWithHex
:
@"ffffff"
];
[
button
setTitleColor
:[
UIColor
sam_colorWithHex
:
@"4c5966"
]
forState
:
UIControlStateNormal
];
}
}
-
(
void
)
onClikcNewToOld
:
(
id
)
sender
{
[
self
setButtonSelect
:
self
.
btnNewToOld
isSelect
:
YES
];
[
self
setButtonSelect
:
self
.
btnDearToCheap
isSelect
:
NO
];
[
self
setButtonSelect
:
self
.
btnCheapToDear
isSelect
:
NO
];
_collectionSort
=
BUYCollectionSortCreatedDescending
;
}
-
(
void
)
onClickDearToCheap
:
(
id
)
sender
{
[
self
setButtonSelect
:
self
.
btnNewToOld
isSelect
:
NO
];
[
self
setButtonSelect
:
self
.
btnDearToCheap
isSelect
:
YES
];
[
self
setButtonSelect
:
self
.
btnCheapToDear
isSelect
:
NO
];
_collectionSort
=
BUYCollectionSortPriceDescending
;
}
-
(
void
)
onClickCheapToDear
:
(
id
)
sender
{
[
self
setButtonSelect
:
self
.
btnNewToOld
isSelect
:
NO
];
[
self
setButtonSelect
:
self
.
btnDearToCheap
isSelect
:
NO
];
[
self
setButtonSelect
:
self
.
btnCheapToDear
isSelect
:
YES
];
_collectionSort
=
BUYCollectionSortPriceAscending
;
}
-
(
void
)
onClickBg
:
(
id
)
sender
{
self
.
hidden
=
YES
;
if
(
self
.
delegate
!=
nil
){
[
self
.
delegate
kwm_onHide
];
}
}
-
(
void
)
onClickComplete
:
(
id
)
sender
{
self
.
hidden
=
YES
;
if
(
self
.
delegate
!=
nil
){
[
self
.
delegate
kwm_onClickSort
:
_collectionSort
];
[
self
.
delegate
kwm_onHide
];
}
}
@end
iCemarose/Class/UI/Product/Cell/KWMFilterView.xib
deleted
100644 → 0
View file @
fb2ff498
This diff is collapsed.
Click to expand it.
iCemarose/Class/UI/Product/KWMSelectedGoodsVC.h
View file @
3030a13a
...
...
@@ -9,12 +9,11 @@
#import "KWMBasePageVC.h"
#import "KWMProductType.h"
#import "KWMDoubleTitleView.h"
#import "KWMFilterView.h"
#import "KWMBrandCaramelCell.h"
#import "UIColor+SAMAdditions.h"
//选中的商品列表
@interface
KWMSelectedGoodsVC
:
KWMBasePageVC
<
KWMBrandCaramelCellDelegate
,
KWMFilterDelegate
>
@interface
KWMSelectedGoodsVC
:
KWMBasePageVC
<
KWMBrandCaramelCellDelegate
>
@property
(
weak
,
nonatomic
)
IBOutlet
UITableView
*
tbvSelectedGoods
;
...
...
@@ -26,8 +25,6 @@
@property
(
weak
,
nonatomic
)
IBOutlet
KWMDoubleTitleView
*
vDoubleTitle
;
@property
(
weak
,
nonatomic
)
IBOutlet
KWMFilterView
*
filterView
;
@property
(
weak
,
nonatomic
)
IBOutlet
UIImageView
*
testImageView
;
//双重标题view的高度
...
...
iCemarose/Class/UI/Product/KWMSelectedGoodsVC.m
View file @
3030a13a
...
...
@@ -48,7 +48,6 @@ static NSString *idStr = @"KWMBrandCaramelCell";
-
(
void
)
initView
{
self
.
collectionSort
=
BUYCollectionSortCreatedDescending
;
self
.
filterView
.
delegate
=
self
;
if
(
self
.
productType
!=
nil
){
//初始化双行标题栏
NSString
*
mTitle
;
...
...
@@ -69,18 +68,6 @@ static NSString *idStr = @"KWMBrandCaramelCell";
openPosition
=
-
1
;
self
.
automaticallyAdjustsScrollViewInsets
=
NO
;
rightButton
=
[
UIButton
buttonWithType
:
UIButtonTypeRoundedRect
];
rightButton
.
frame
=
CGRectMake
(
0
,
5
,
40
,
20
);
[
rightButton
addTarget
:
self
action
:
@selector
(
clickRightButton
)
forControlEvents
:
UIControlEventTouchUpInside
];
[
rightButton
setTitle
:
@"排序 +"
forState
:
UIControlStateNormal
];
UIBarButtonItem
*
button
=
[[
UIBarButtonItem
alloc
]
initWithCustomView
:
rightButton
];
self
.
navigationItem
.
rightBarButtonItem
=
button
;
rightButton
.
titleLabel
.
font
=
[
UIFont
systemFontOfSize
:
11
];
[
rightButton
.
layer
setMasksToBounds
:
YES
];
rightButton
.
layer
.
cornerRadius
=
1
;
//圆角(圆形)
rightButton
.
layer
.
borderColor
=
[
UIColor
sam_colorWithHex
:
@"4E4E4E"
].
CGColor
;
//要设置的颜色
rightButton
.
layer
.
borderWidth
=
1
;
//要设置的描边宽
isSelect
=
NO
;
vStopTap
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
20
,
UI_SCREEN_WIDTH
,
44
)];
vStopTap
.
backgroundColor
=
[
UIColor
clearColor
];
...
...
@@ -119,48 +106,6 @@ static NSString *idStr = @"KWMBrandCaramelCell";
}
}
-
(
void
)
clickRightButton
{
// UIToolbar *toolBar = [[UIToolbar alloc]initWithFrame:self.testImageView.frame];
// toolBar.barStyle = UIBarStyleDefault;
// [self.view addSubview:toolBar];
// UIBlurEffect *beffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark];
// UIVisualEffectView *view = [[UIVisualEffectView alloc]initWithEffect:beffect];
// view.frame = self.testImageView.frame;
// [self.view addSubview:view];
if
(
self
.
isLoading
){
return
;
}
self
.
filterView
.
hidden
=
!
self
.
filterView
.
hidden
;
self
.
filterView
.
collectionSort
=
self
.
collectionSort
;
if
(
self
.
filterView
.
hidden
){
rightButton
.
titleLabel
.
text
=
@"排序 +"
;
[
rightButton
setTitle
:
@"排序 +"
forState
:
UIControlStateNormal
];
}
else
{
[
rightButton
setTitle
:
@"排序 -"
forState
:
UIControlStateNormal
];
rightButton
.
titleLabel
.
text
=
@"排序 -"
;
}
}
-
(
void
)
kwm_onClickSort
:
(
BUYCollectionSort
)
sort
{
self
.
hasNextPage
=
YES
;
self
.
collectionSort
=
sort
;
[
self
reLoadData
];
}
-
(
void
)
kwm_onHide
{
if
(
self
.
filterView
.
hidden
){
rightButton
.
titleLabel
.
text
=
@"排序 +"
;
[
rightButton
setTitle
:
@"排序 +"
forState
:
UIControlStateNormal
];
}
else
{
rightButton
.
titleLabel
.
text
=
@"排序 -"
;
[
rightButton
setTitle
:
@"排序 -"
forState
:
UIControlStateNormal
];
}
}
-
(
UITableView
*
)
targetTableView
{
return
self
.
tbvSelectedGoods
;
}
...
...
iCemarose/Class/UI/Product/New.storyboard
View file @
3030a13a
<?xml version="1.0" encoding="UTF-8"?>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB"
version=
"3.0"
toolsVersion=
"121
18"
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=
"121
20"
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=
"1208
6
"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"1208
8
"
/>
<capability
name=
"Constraints to layout margins"
minToolsVersion=
"6.0"
/>
<capability
name=
"documents saved in the Xcode 8 format"
minToolsVersion=
"8.0"
/>
</dependencies>
...
...
@@ -157,7 +157,7 @@
<rect
key=
"frame"
x=
"0.0"
y=
"20"
width=
"375"
height=
"647"
/>
<color
key=
"backgroundColor"
red=
"0.0"
green=
"0.0"
blue=
"0.0"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
</view>
<view
hidden=
"YES"
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"PWv-M7-7vS"
customClass=
"KWMFilterView"
>
<view
hidden=
"YES"
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"PWv-M7-7vS"
>
<rect
key=
"frame"
x=
"0.0"
y=
"20"
width=
"375"
height=
"647"
/>
<color
key=
"backgroundColor"
red=
"0.99607843137254903"
green=
"0.99607843137254903"
blue=
"0.99607843137254903"
alpha=
"0.0"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
</view>
...
...
@@ -179,7 +179,6 @@
</constraints>
</view>
<connections>
<outlet
property=
"filterView"
destination=
"PWv-M7-7vS"
id=
"piZ-Y6-d6q"
/>
<outlet
property=
"tbvSelectedGoods"
destination=
"fcD-Y9-l8X"
id=
"Dem-kS-25O"
/>
<outlet
property=
"vBackground"
destination=
"UZg-qo-bkR"
id=
"JQg-We-lk1"
/>
<outlet
property=
"vHeard"
destination=
"ZQ3-np-q9I"
id=
"Xrs-R6-EGM"
/>
...
...
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