Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
Opple-iOS
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
张杰
Opple-iOS
Commits
61cd6341
Commit
61cd6341
authored
Aug 30, 2016
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复搜索界面滑动bug
parent
521d6dec
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
34 additions
and
1 deletion
+34
-1
ClientViewController.m
Lighting/Class/ClientViewController.m
+6
-0
OrderdetailsViewController.m
Lighting/Class/OrderdetailsViewController.m
+6
-0
PaymentsViewController.m
Lighting/Class/PaymentsViewController.m
+2
-0
SearchViewController.m
Lighting/Class/SearchViewController.m
+6
-0
GenerateOrdersViewController.m
Lighting/Class/Shoppingcart/GenerateOrdersViewController.m
+6
-0
ShoppingViewController.m
Lighting/Class/Shoppingcart/ShoppingViewController.m
+6
-0
WithdrawalViewController.m
Lighting/Class/WithdrawalViewController.m
+1
-0
BaseViewController.m
Lighting/Tools/BaseViewController.m
+1
-1
No files found.
Lighting/Class/ClientViewController.m
View file @
61cd6341
...
@@ -73,12 +73,18 @@
...
@@ -73,12 +73,18 @@
{
{
[
super
viewDidAppear
:
animated
];
[
super
viewDidAppear
:
animated
];
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
NO
;
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
NO
;
if
([
self
.
navigationController
respondsToSelector
:
@selector
(
interactivePopGestureRecognizer
)])
{
self
.
navigationController
.
interactivePopGestureRecognizer
.
enabled
=
NO
;
}
}
}
-
(
void
)
viewWillDisappear
:
(
BOOL
)
animated
-
(
void
)
viewWillDisappear
:
(
BOOL
)
animated
{
{
[
super
viewWillDisappear
:
animated
];
[
super
viewWillDisappear
:
animated
];
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
YES
;
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
YES
;
if
([
self
.
navigationController
respondsToSelector
:
@selector
(
interactivePopGestureRecognizer
)])
{
self
.
navigationController
.
interactivePopGestureRecognizer
.
enabled
=
YES
;
}
}
}
...
...
Lighting/Class/OrderdetailsViewController.m
View file @
61cd6341
...
@@ -44,6 +44,9 @@
...
@@ -44,6 +44,9 @@
if
(
self
.
isSliding
)
{
if
(
self
.
isSliding
)
{
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
NO
;
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
NO
;
if
([
self
.
navigationController
respondsToSelector
:
@selector
(
interactivePopGestureRecognizer
)])
{
self
.
navigationController
.
interactivePopGestureRecognizer
.
enabled
=
NO
;
}
}
}
}
}
...
@@ -53,6 +56,9 @@
...
@@ -53,6 +56,9 @@
[
super
viewWillDisappear
:
animated
];
[
super
viewWillDisappear
:
animated
];
// 开启
// 开启
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
YES
;
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
YES
;
if
([
self
.
navigationController
respondsToSelector
:
@selector
(
interactivePopGestureRecognizer
)])
{
self
.
navigationController
.
interactivePopGestureRecognizer
.
enabled
=
YES
;
}
}
}
...
...
Lighting/Class/PaymentsViewController.m
View file @
61cd6341
...
@@ -112,9 +112,11 @@
...
@@ -112,9 +112,11 @@
}
}
}
WithErrorCodeBlock
:^
(
id
errorCodeValue
)
{
}
WithErrorCodeBlock
:^
(
id
errorCodeValue
)
{
[
weakSelf
RemoveMBProgressHUDLoding
];
[
weakSelf
endRefreshingForTableView
:
weakSelf
.
paymentsTableView
];
[
weakSelf
endRefreshingForTableView
:
weakSelf
.
paymentsTableView
];
[
weakSelf
SHOWPrompttext
:
NETWORK
];
[
weakSelf
SHOWPrompttext
:
NETWORK
];
}
WithFailureBlock
:^
(
NSError
*
error
)
{
}
WithFailureBlock
:^
(
NSError
*
error
)
{
[
weakSelf
RemoveMBProgressHUDLoding
];
[
weakSelf
endRefreshingForTableView
:
weakSelf
.
paymentsTableView
];
[
weakSelf
endRefreshingForTableView
:
weakSelf
.
paymentsTableView
];
[
weakSelf
SHOWPrompttext
:
error
.
localizedDescription
];
[
weakSelf
SHOWPrompttext
:
error
.
localizedDescription
];
}];
}];
...
...
Lighting/Class/SearchViewController.m
View file @
61cd6341
...
@@ -57,6 +57,9 @@
...
@@ -57,6 +57,9 @@
{
{
[
super
viewDidAppear
:
animated
];
[
super
viewDidAppear
:
animated
];
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
NO
;
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
NO
;
if
([
self
.
navigationController
respondsToSelector
:
@selector
(
interactivePopGestureRecognizer
)])
{
self
.
navigationController
.
interactivePopGestureRecognizer
.
enabled
=
NO
;
}
}
}
#pragma mark -视图即将消失
#pragma mark -视图即将消失
...
@@ -64,6 +67,9 @@
...
@@ -64,6 +67,9 @@
{
{
[
super
viewWillDisappear
:
animated
];
[
super
viewWillDisappear
:
animated
];
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
YES
;
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
YES
;
if
([
self
.
navigationController
respondsToSelector
:
@selector
(
interactivePopGestureRecognizer
)])
{
self
.
navigationController
.
interactivePopGestureRecognizer
.
enabled
=
YES
;
}
}
}
...
...
Lighting/Class/Shoppingcart/GenerateOrdersViewController.m
View file @
61cd6341
...
@@ -70,6 +70,9 @@
...
@@ -70,6 +70,9 @@
{
{
[
super
viewDidAppear
:
animated
];
[
super
viewDidAppear
:
animated
];
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
NO
;
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
NO
;
if
([
self
.
navigationController
respondsToSelector
:
@selector
(
interactivePopGestureRecognizer
)])
{
self
.
navigationController
.
interactivePopGestureRecognizer
.
enabled
=
NO
;
}
}
}
...
@@ -78,6 +81,9 @@
...
@@ -78,6 +81,9 @@
{
{
[
super
viewWillDisappear
:
animated
];
[
super
viewWillDisappear
:
animated
];
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
YES
;
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
YES
;
if
([
self
.
navigationController
respondsToSelector
:
@selector
(
interactivePopGestureRecognizer
)])
{
self
.
navigationController
.
interactivePopGestureRecognizer
.
enabled
=
YES
;
}
}
}
...
...
Lighting/Class/Shoppingcart/ShoppingViewController.m
View file @
61cd6341
...
@@ -59,6 +59,9 @@
...
@@ -59,6 +59,9 @@
{
{
[
super
viewDidAppear
:
animated
];
[
super
viewDidAppear
:
animated
];
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
NO
;
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
NO
;
if
([
self
.
navigationController
respondsToSelector
:
@selector
(
interactivePopGestureRecognizer
)])
{
self
.
navigationController
.
interactivePopGestureRecognizer
.
enabled
=
NO
;
}
[
self
.
shopResponseArray
removeAllObjects
];
[
self
.
shopResponseArray
removeAllObjects
];
[
self
InitializeState
];
[
self
InitializeState
];
[
self
getShoppingCardata
];
[
self
getShoppingCardata
];
...
@@ -69,6 +72,9 @@
...
@@ -69,6 +72,9 @@
{
{
[
super
viewWillDisappear
:
animated
];
[
super
viewWillDisappear
:
animated
];
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
YES
;
self
.
navigationController
.
fd_fullscreenPopGestureRecognizer
.
enabled
=
YES
;
if
([
self
.
navigationController
respondsToSelector
:
@selector
(
interactivePopGestureRecognizer
)])
{
self
.
navigationController
.
interactivePopGestureRecognizer
.
enabled
=
YES
;
}
}
}
#pragma mark -初始化状态
#pragma mark -初始化状态
...
...
Lighting/Class/WithdrawalViewController.m
View file @
61cd6341
...
@@ -58,6 +58,7 @@
...
@@ -58,6 +58,7 @@
-
(
void
)
viewDidLoad
{
-
(
void
)
viewDidLoad
{
[
super
viewDidLoad
];
[
super
viewDidLoad
];
self
.
withdrawalTableView
.
tableFooterView
=
[
UIView
new
];
[
self
setupRefreshing
];
[
self
setupRefreshing
];
}
}
...
...
Lighting/Tools/BaseViewController.m
View file @
61cd6341
...
@@ -69,9 +69,9 @@
...
@@ -69,9 +69,9 @@
self
.
automaticallyAdjustsScrollViewInsets
=
NO
;
self
.
automaticallyAdjustsScrollViewInsets
=
NO
;
//检测登陆超时通知
//检测登陆超时通知
[[
NSNotificationCenter
defaultCenter
]
addObserver
:
self
selector
:
@selector
(
logintimeoutNotification
:
)
name
:
LOGINTIMEOUT
object
:
nil
];
[[
NSNotificationCenter
defaultCenter
]
addObserver
:
self
selector
:
@selector
(
logintimeoutNotification
:
)
name
:
LOGINTIMEOUT
object
:
nil
];
}
}
#pragma mark -登陆超时回调
#pragma mark -登陆超时回调
-
(
void
)
logintimeoutNotification
:
(
NSNotification
*
)
not
-
(
void
)
logintimeoutNotification
:
(
NSNotification
*
)
not
{
{
...
...
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