Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
X
xffruit
Project
Project
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
张杰
xffruit
Commits
280ce145
Commit
280ce145
authored
Dec 14, 2015
by
陈俊俊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化
parent
377450c7
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
123 additions
and
13 deletions
+123
-13
PurchaseViewController.m
...Controllers/Purchase/Controllers/PurchaseViewController.m
+16
-2
PurchaseNoticeViewController.m
...PurchaseNotice/Controllers/PurchaseNoticeViewController.m
+25
-2
ReceiveViewController.m
...Controllers/Receiving/Controllers/ReceiveViewController.m
+25
-3
SurveyViewController.m
...ViewControllers/Survey/controllers/SurveyViewController.m
+25
-2
TransferViewController.m
...Controllers/Transfer/Controllers/TransferViewController.m
+16
-2
TransportViewController.m
...ntrollers/Transport/Controllers/TransportViewController.m
+16
-2
No files found.
XFFruit/ViewControllers/Purchase/Controllers/PurchaseViewController.m
View file @
280ce145
...
...
@@ -28,7 +28,7 @@ typedef enum : NSUInteger {
BoltTag
}
BtnTag
;
@interface
PurchaseViewController
()
<
UITableViewDataSource
,
UITableViewDelegate
,
PurchaseViewDelegate
,
SortMaskViewDelegate
>
@interface
PurchaseViewController
()
<
UITableViewDataSource
,
UITableViewDelegate
,
PurchaseViewDelegate
,
SortMaskViewDelegate
,
UIGestureRecognizerDelegate
>
{
UIView
*
_maskView
;
UIButton
*
currentBtn
;
...
...
@@ -227,10 +227,24 @@ typedef enum : NSUInteger {
_maskView
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
TopMargin
,
ScreenSize
.
width
,
ScreenSize
.
height
-
64
-
TopMargin
)];
_maskView
.
backgroundColor
=
RGBA
(
0
,
0
,
0
,
0
.
5
);
UITapGestureRecognizer
*
tap
=
[[
UITapGestureRecognizer
alloc
]
initWithTarget
:
self
action
:
@selector
(
hiddenMaskView
)];
[
_maskView
addGestureRecognizer
:
tap
];
tap
.
delegate
=
self
;
_maskView
.
hidden
=
YES
;
[
self
.
view
addSubview
:
_maskView
];
}
#pragma mark - 手势代理方法
-
(
BOOL
)
gestureRecognizer
:
(
UIGestureRecognizer
*
)
gestureRecognizer
shouldReceiveTouch
:
(
UITouch
*
)
touch
{
// 输出点击的view的类名
NSLog
(
@"%@"
,
NSStringFromClass
([
touch
.
view
class
]));
// 若为UITableViewCellContentView(即点击了tableViewCell),则不截获Touch事件
if
([
NSStringFromClass
([
touch
.
view
class
])
isEqualToString
:
@"UITableViewCellContentView"
])
{
return
NO
;
}
return
YES
;
}
#pragma mark -按钮事件
-
(
void
)
sortClick
:
(
UIButton
*
)
btn
{
_maskView
.
backgroundColor
=
RGBA
(
0
,
0
,
0
,
0
.
5
);
...
...
XFFruit/ViewControllers/PurchaseNotice/Controllers/PurchaseNoticeViewController.m
View file @
280ce145
...
...
@@ -28,7 +28,7 @@ typedef enum : NSUInteger {
BoltTag
}
BtnTag
;
@interface
PurchaseNoticeViewController
()
<
UITableViewDataSource
,
UITableViewDelegate
,
BoltMaskViewDelegate
,
SortMaskViewDelegate
>
@interface
PurchaseNoticeViewController
()
<
UITableViewDataSource
,
UITableViewDelegate
,
BoltMaskViewDelegate
,
SortMaskViewDelegate
,
UIGestureRecognizerDelegate
>
{
UIView
*
_maskView
;
UIButton
*
currentBtn
;
...
...
@@ -205,10 +205,33 @@ typedef enum : NSUInteger {
_maskView
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
TopMargin
,
ScreenSize
.
width
,
ScreenSize
.
height
-
64
-
TopMargin
)];
_maskView
.
backgroundColor
=
RGBA
(
0
,
0
,
0
,
0
.
5
);
UITapGestureRecognizer
*
tap
=
[[
UITapGestureRecognizer
alloc
]
initWithTarget
:
self
action
:
@selector
(
hiddenMaskView
)];
[
_maskView
addGestureRecognizer
:
tap
];
tap
.
delegate
=
self
;
_maskView
.
hidden
=
YES
;
[
self
.
view
addSubview
:
_maskView
];
}
#pragma mark - 手势代理方法
-
(
BOOL
)
gestureRecognizer
:
(
UIGestureRecognizer
*
)
gestureRecognizer
shouldReceiveTouch
:
(
UITouch
*
)
touch
{
// 输出点击的view的类名
NSLog
(
@"%@"
,
NSStringFromClass
([
touch
.
view
class
]));
// 若为UITableViewCellContentView(即点击了tableViewCell),则不截获Touch事件
if
([
NSStringFromClass
([
touch
.
view
class
])
isEqualToString
:
@"UITableViewCellContentView"
])
{
return
NO
;
}
return
YES
;
}
#pragma mark - 隐藏maskView
-
(
void
)
hiddenMaskView
{
if
(
_sortView
)
{
[
self
hiddenSortMaskView
:
YES
];
}
if
(
_boltView
)
{
[
self
hiddenBoltMaskView
:
YES
];
}
}
#pragma mark -按钮事件
-
(
void
)
sortClick
:
(
UIButton
*
)
btn
{
_maskView
.
backgroundColor
=
RGBA
(
0
,
0
,
0
,
0
.
5
);
...
...
XFFruit/ViewControllers/Receiving/Controllers/ReceiveViewController.m
View file @
280ce145
...
...
@@ -27,7 +27,7 @@ typedef enum : NSUInteger {
}
BtnTag
;
@interface
ReceiveViewController
()
<
UITableViewDataSource
,
UITableViewDelegate
,
ReceiveBoltViewDelegate
,
SortMaskViewDelegate
>
@interface
ReceiveViewController
()
<
UITableViewDataSource
,
UITableViewDelegate
,
ReceiveBoltViewDelegate
,
SortMaskViewDelegate
,
UIGestureRecognizerDelegate
>
{
UIView
*
_maskView
;
UIButton
*
currentBtn
;
...
...
@@ -193,9 +193,23 @@ typedef enum : NSUInteger {
_maskView
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
TopMargin
,
ScreenSize
.
width
,
ScreenSize
.
height
-
64
-
TopMargin
)];
_maskView
.
backgroundColor
=
RGBA
(
0
,
0
,
0
,
0
.
5
);
_maskView
.
hidden
=
YES
;
UITapGestureRecognizer
*
tap
=
[[
UITapGestureRecognizer
alloc
]
initWithTarget
:
self
action
:
@selector
(
hiddenMaskView
)];
[
_maskView
addGestureRecognizer
:
tap
];
tap
.
delegate
=
self
;
[
self
.
view
addSubview
:
_maskView
];
}
#pragma mark - 手势代理方法
-
(
BOOL
)
gestureRecognizer
:
(
UIGestureRecognizer
*
)
gestureRecognizer
shouldReceiveTouch
:
(
UITouch
*
)
touch
{
// 输出点击的view的类名
NSLog
(
@"%@"
,
NSStringFromClass
([
touch
.
view
class
]));
// 若为UITableViewCellContentView(即点击了tableViewCell),则不截获Touch事件
if
([
NSStringFromClass
([
touch
.
view
class
])
isEqualToString
:
@"UITableViewCellContentView"
])
{
return
NO
;
}
return
YES
;
}
#pragma mark -按钮事件
-
(
void
)
sortClick
:
(
UIButton
*
)
btn
{
_maskView
.
backgroundColor
=
RGBA
(
0
,
0
,
0
,
0
.
5
);
...
...
@@ -344,7 +358,15 @@ typedef enum : NSUInteger {
self
.
state
=
@""
;
}
}
#pragma mark - 隐藏maskView
-
(
void
)
hiddenMaskView
{
if
(
_sortView
)
{
[
self
hiddenSortMaskView
:
YES
];
}
if
(
_boltView
)
{
[
self
hiddenBoltMaskView
:
YES
];
}
}
#pragma mark - 协议方法
-
(
NSInteger
)
numberOfSectionsInTableView
:
(
UITableView
*
)
tableView
{
return
1
;
...
...
XFFruit/ViewControllers/Survey/controllers/SurveyViewController.m
View file @
280ce145
...
...
@@ -28,7 +28,7 @@ typedef enum : NSUInteger {
}
BtnTag
;
@interface
SurveyViewController
()
<
UITableViewDataSource
,
UITableViewDelegate
,
BoltMaskViewDelegate
,
SortMaskViewDelegate
>
@interface
SurveyViewController
()
<
UITableViewDataSource
,
UITableViewDelegate
,
BoltMaskViewDelegate
,
SortMaskViewDelegate
,
UIGestureRecognizerDelegate
>
{
UIView
*
_maskView
;
UIButton
*
currentBtn
;
...
...
@@ -226,10 +226,24 @@ typedef enum : NSUInteger {
_maskView
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
TopMargin
,
ScreenSize
.
width
,
ScreenSize
.
height
-
64
-
TopMargin
)];
_maskView
.
backgroundColor
=
RGBA
(
0
,
0
,
0
,
0
.
5
);
UITapGestureRecognizer
*
tap
=
[[
UITapGestureRecognizer
alloc
]
initWithTarget
:
self
action
:
@selector
(
hiddenMaskView
)];
[
_maskView
addGestureRecognizer
:
tap
];
tap
.
delegate
=
self
;
_maskView
.
hidden
=
YES
;
[
self
.
view
addSubview
:
_maskView
];
}
#pragma mark - 手势代理方法
-
(
BOOL
)
gestureRecognizer
:
(
UIGestureRecognizer
*
)
gestureRecognizer
shouldReceiveTouch
:
(
UITouch
*
)
touch
{
// 输出点击的view的类名
NSLog
(
@"%@"
,
NSStringFromClass
([
touch
.
view
class
]));
// 若为UITableViewCellContentView(即点击了tableViewCell),则不截获Touch事件
if
([
NSStringFromClass
([
touch
.
view
class
])
isEqualToString
:
@"UITableViewCellContentView"
])
{
return
NO
;
}
return
YES
;
}
//检测排序的颜色
-
(
void
)
checkSortBtnColor
{
if
(
self
.
orderDirection
.
length
>
0
)
{
...
...
@@ -393,6 +407,15 @@ typedef enum : NSUInteger {
self
.
state
=
@""
;
}
}
#pragma mark - 隐藏maskView
-
(
void
)
hiddenMaskView
{
if
(
_sortView
)
{
[
self
hiddenSortMaskView
:
YES
];
}
if
(
_boltView
)
{
[
self
hiddenBoltMaskView
:
YES
];
}
}
#pragma mark - 协议方法
-
(
NSInteger
)
numberOfSectionsInTableView
:
(
UITableView
*
)
tableView
{
return
1
;
...
...
XFFruit/ViewControllers/Transfer/Controllers/TransferViewController.m
View file @
280ce145
...
...
@@ -29,7 +29,7 @@ typedef enum : NSUInteger {
}
BtnTag
;
@interface
TransferViewController
()
<
UITableViewDataSource
,
UITableViewDelegate
,
TransferBoltViewDelegate
,
SortMaskViewDelegate
>
@interface
TransferViewController
()
<
UITableViewDataSource
,
UITableViewDelegate
,
TransferBoltViewDelegate
,
SortMaskViewDelegate
,
UIGestureRecognizerDelegate
>
{
UIView
*
_maskView
;
UIButton
*
currentBtn
;
...
...
@@ -216,9 +216,23 @@ typedef enum : NSUInteger {
_maskView
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
TopMargin
,
ScreenSize
.
width
,
ScreenSize
.
height
-
64
-
TopMargin
)];
_maskView
.
backgroundColor
=
RGBA
(
0
,
0
,
0
,
0
.
5
);
_maskView
.
hidden
=
YES
;
UITapGestureRecognizer
*
tap
=
[[
UITapGestureRecognizer
alloc
]
initWithTarget
:
self
action
:
@selector
(
hiddenMaskView
)];
[
_maskView
addGestureRecognizer
:
tap
];
tap
.
delegate
=
self
;
[
self
.
view
addSubview
:
_maskView
];
}
#pragma mark - 手势代理方法
-
(
BOOL
)
gestureRecognizer
:
(
UIGestureRecognizer
*
)
gestureRecognizer
shouldReceiveTouch
:
(
UITouch
*
)
touch
{
// 输出点击的view的类名
NSLog
(
@"%@"
,
NSStringFromClass
([
touch
.
view
class
]));
// 若为UITableViewCellContentView(即点击了tableViewCell),则不截获Touch事件
if
([
NSStringFromClass
([
touch
.
view
class
])
isEqualToString
:
@"UITableViewCellContentView"
])
{
return
NO
;
}
return
YES
;
}
#pragma mark -按钮事件
-
(
void
)
sortClick
:
(
UIButton
*
)
btn
{
_maskView
.
backgroundColor
=
RGBA
(
0
,
0
,
0
,
0
.
5
);
...
...
XFFruit/ViewControllers/Transport/Controllers/TransportViewController.m
View file @
280ce145
...
...
@@ -30,7 +30,7 @@ typedef enum : NSUInteger {
}
BtnTag
;
@interface
TransportViewController
()
<
UITableViewDataSource
,
UITableViewDelegate
,
TransportBoltViewDelegate
,
SortMaskViewDelegate
>
@interface
TransportViewController
()
<
UITableViewDataSource
,
UITableViewDelegate
,
TransportBoltViewDelegate
,
SortMaskViewDelegate
,
UIGestureRecognizerDelegate
>
{
UIView
*
_maskView
;
UIButton
*
currentBtn
;
...
...
@@ -219,9 +219,23 @@ typedef enum : NSUInteger {
_maskView
=
[[
UIView
alloc
]
initWithFrame
:
CGRectMake
(
0
,
TopMargin
,
ScreenSize
.
width
,
ScreenSize
.
height
-
64
-
TopMargin
)];
_maskView
.
backgroundColor
=
RGBA
(
0
,
0
,
0
,
0
.
5
);
_maskView
.
hidden
=
YES
;
UITapGestureRecognizer
*
tap
=
[[
UITapGestureRecognizer
alloc
]
initWithTarget
:
self
action
:
@selector
(
hiddenMaskView
)];
[
_maskView
addGestureRecognizer
:
tap
];
tap
.
delegate
=
self
;
[
self
.
view
addSubview
:
_maskView
];
}
#pragma mark - 手势代理方法
-
(
BOOL
)
gestureRecognizer
:
(
UIGestureRecognizer
*
)
gestureRecognizer
shouldReceiveTouch
:
(
UITouch
*
)
touch
{
// 输出点击的view的类名
NSLog
(
@"%@"
,
NSStringFromClass
([
touch
.
view
class
]));
// 若为UITableViewCellContentView(即点击了tableViewCell),则不截获Touch事件
if
([
NSStringFromClass
([
touch
.
view
class
])
isEqualToString
:
@"UITableViewCellContentView"
])
{
return
NO
;
}
return
YES
;
}
#pragma mark -按钮事件
-
(
void
)
sortClick
:
(
UIButton
*
)
btn
{
_maskView
.
backgroundColor
=
RGBA
(
0
,
0
,
0
,
0
.
5
);
...
...
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