Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
T
total
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
张杰
total
Commits
0d826879
Commit
0d826879
authored
8 years ago
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化适配
parent
ce9a391f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2046 additions
and
1222 deletions
+2046
-1222
project.pbxproj
total.xcodeproj/project.pbxproj
+6
-6
BusinessStoryBoard.storyboard
total/GTOApp/Business/BusinessStoryBoard.storyboard
+2018
-1194
NewObtainViewController.m
total/GTOApp/Business/NewObtainViewController.m
+3
-3
IBTRefreshTableView.h
total/IBTUtilites/IBTRefreshTableView/IBTRefreshTableView.h
+1
-1
IBTRefreshTableView.m
total/IBTUtilites/IBTRefreshTableView/IBTRefreshTableView.m
+18
-18
No files found.
total.xcodeproj/project.pbxproj
View file @
0d826879
...
...
@@ -3145,8 +3145,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
CLANG_ENABLE_MODULES
=
YES
;
CODE_SIGN_IDENTITY
=
"iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone D
istribution: Shanghai Gomore Information Technology Co.,Ltd
"
;
DEVELOPMENT_TEAM
=
""
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone D
eveloper
"
;
DEVELOPMENT_TEAM
=
W54V2VB863
;
ENABLE_BITCODE
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
(
"$(inherited)"
,
...
...
@@ -3162,7 +3162,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomoe.total
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE
=
"
f96494cb-c220-43ce-8034-75e000c2193f
"
;
PROVISIONING_PROFILE
=
""
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
SWIFT_OBJC_BRIDGING_HEADER
=
"total/total-Bridging-Header.h"
;
SWIFT_OPTIMIZATION_LEVEL
=
"-Onone"
;
...
...
@@ -3178,8 +3178,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
CLANG_ENABLE_MODULES
=
YES
;
CODE_SIGN_IDENTITY
=
"iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone D
istribution: Shanghai Gomore Information Technology Co.,Ltd
"
;
DEVELOPMENT_TEAM
=
""
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone D
eveloper
"
;
DEVELOPMENT_TEAM
=
W54V2VB863
;
ENABLE_BITCODE
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
(
"$(inherited)"
,
...
...
@@ -3195,7 +3195,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomoe.total
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE
=
"
f96494cb-c220-43ce-8034-75e000c2193f
"
;
PROVISIONING_PROFILE
=
""
;
PROVISIONING_PROFILE_SPECIFIER
=
""
;
SWIFT_OBJC_BRIDGING_HEADER
=
"total/total-Bridging-Header.h"
;
TARGETED_DEVICE_FAMILY
=
"1,2"
;
...
...
This diff is collapsed.
Click to expand it.
total/GTOApp/Business/BusinessStoryBoard.storyboard
View file @
0d826879
This source diff could not be displayed because it is too large. You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
total/GTOApp/Business/NewObtainViewController.m
View file @
0d826879
...
...
@@ -605,9 +605,9 @@
#pragma mark -油站选择
-
(
void
)
selectedGasStation
:
(
UIButton
*
)
btn
{
if
(
!
self
.
recordSelectOrder
)
{
[
IBTLoadingView
showTextOnly
:
@"请先选择配油单"
];
return
;
}
//
if (!self.recordSelectOrder) {
//
[IBTLoadingView showTextOnly:@"请先选择配油单"];return;
//
}
PromptTableViewController
*
promptVoew
=
[[
PromptTableViewController
alloc
]
init
];
promptVoew
.
isBoolValue
=
YES
;
__weak
typeof
(
self
)
weakSelf
=
self
;
...
...
This diff is collapsed.
Click to expand it.
total/IBTUtilites/IBTRefreshTableView/IBTRefreshTableView.h
View file @
0d826879
...
...
@@ -13,7 +13,7 @@
@interface
IBTRefreshTableView
:
IBTTableView
@property
(
assign
,
nonatomic
)
id
<
IBTScrollViewRefreshDelegate
>
refreshDelegate
;
@property
(
strong
,
nonatomic
)
UIRefreshControl
*
refreshC
ontrol
;
@property
(
strong
,
nonatomic
)
UIRefreshControl
*
refreshC
tr
;
@property
(
strong
,
nonatomic
)
IBTScrollLoadMoreView
*
loadMoreView
;
-
(
void
)
scrollToTopAnimated
:(
BOOL
)
animated
;
...
...
This diff is collapsed.
Click to expand it.
total/IBTUtilites/IBTRefreshTableView/IBTRefreshTableView.m
View file @
0d826879
...
...
@@ -56,8 +56,8 @@
[
super
didMoveToWindow
];
if
(
!
self
.
window
)
{
if
(
_refreshC
ontrol
)
{
[
_refreshC
ontrol
endRefreshing
];
if
(
_refreshC
tr
)
{
[
_refreshC
tr
endRefreshing
];
}
if
(
_refreshFooterView
)
{
...
...
@@ -126,31 +126,31 @@
animated
:
animated
];
}
-
(
void
)
add
RefreshControl
WithText
:
(
NSString
*
)
text
{
if
(
!
_refreshC
ontrol
)
{
self
.
refreshC
ontrol
=
[[
UIRefreshControl
alloc
]
init
];
[
_refreshC
ontrol
addTarget
:
self
-
(
void
)
add
refreshCtr
WithText
:
(
NSString
*
)
text
{
if
(
!
_refreshC
tr
)
{
self
.
refreshC
tr
=
[[
UIRefreshControl
alloc
]
init
];
[
_refreshC
tr
addTarget
:
self
action
:
@selector
(
handleRefresh
:
)
forControlEvents
:
UIControlEventValueChanged
];
}
if
(
text
.
length
>
0
)
{
_refreshC
ontrol
.
attributedTitle
=
[[
NSAttributedString
alloc
]
initWithString
:
text
];
_refreshC
tr
.
attributedTitle
=
[[
NSAttributedString
alloc
]
initWithString
:
text
];
}
if
(
!
_refreshC
ontrol
.
superview
)
{
[
self
addSubview
:
_refreshC
ontrol
];
if
(
!
_refreshC
tr
.
superview
)
{
[
self
addSubview
:
_refreshC
tr
];
}
}
-
(
void
)
remove
RefreshControl
{
if
(
_refreshC
ontrol
&&
_refreshControl
.
superview
)
{
[
_refreshC
ontrol
removeFromSuperview
];
-
(
void
)
remove
refreshCtr
{
if
(
_refreshC
tr
&&
_refreshCtr
.
superview
)
{
[
_refreshC
tr
removeFromSuperview
];
}
}
-
(
void
)
handleRefresh
:
(
id
)
sender
{
// UI
RefreshControl *refreshControl = (UIRefreshControl
*)sender;
// UI
refreshCtr *refreshCtr = (UIrefreshCtr
*)sender;
if
([
_refreshDelegate
respondsToSelector
:
@selector
(
startRefreshData
:)])
{
// Do networking in |startRefreshData:|
[
_refreshDelegate
startRefreshData
:
self
];
...
...
@@ -182,14 +182,14 @@
// }
//
// if (textStr.length > 0) {
// _refreshC
ontrol
.attributedTitle = [[NSAttributedString alloc] initWithString:textStr];
// _refreshC
tr
.attributedTitle = [[NSAttributedString alloc] initWithString:textStr];
// }
if
(
_refreshC
ontrol
.
refreshing
)
{
[
_refreshC
ontrol
endRefreshing
];
if
(
_refreshC
tr
.
refreshing
)
{
[
_refreshC
tr
endRefreshing
];
// Fix ContentInset became -60 when UI
RefreshControl
ler endRefreshing
// http://stackoverflow.com/questions/20101572/ios7-uirefresh
control
-changes-contentinset
// Fix ContentInset became -60 when UI
refreshCtr
ler endRefreshing
// http://stackoverflow.com/questions/20101572/ios7-uirefresh
Ctr
-changes-contentinset
if
(
self
.
contentInset
.
top
<
0
)
{
UIEdgeInsets
inset
=
self
.
contentInset
;
inset
.
top
=
0
;
...
...
This diff is collapsed.
Click to expand it.
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