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
2ad75b5e
Commit
2ad75b5e
authored
Nov 22, 2016
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改项说明:
parent
41e71846
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
15 deletions
+14
-15
SceneLibraryViewController.m
Class/SceneLibraryViewController.m
+11
-12
Info.plist
Lighting/Info.plist
+1
-1
PrefixHeader.pch
Tools/PrefixHeader.pch
+2
-2
No files found.
Class/SceneLibraryViewController.m
View file @
2ad75b5e
...
@@ -121,17 +121,17 @@
...
@@ -121,17 +121,17 @@
[
self
.
backView
addSubview
:
self
.
SpaceButton
];
[
self
.
backView
addSubview
:
self
.
SpaceButton
];
//下拉刷新
//下拉刷新
WS
(
weakSelf
);
MjRefreshHeaderCustom
*
headerRefresh
=
[
MjRefreshHeaderCustom
headerWithRefreshingBlock
:
^
{
MjRefreshHeaderCustom
*
headerRefresh
=
[
MjRefreshHeaderCustom
headerWithRefreshingBlock
:
^
{
//默认数据
//默认数据
s
elf
.
indexPage
=
ONE
;
weakS
elf
.
indexPage
=
ONE
;
DataPage
*
page
=
[[
DataPage
alloc
]
init
];
DataPage
*
page
=
[[
DataPage
alloc
]
init
];
page
.
page
=
s
elf
.
indexPage
;
page
.
page
=
weakS
elf
.
indexPage
;
page
.
rows
=
KROWS
;
page
.
rows
=
KROWS
;
s
elf
.
conditionModel
.
page
=
page
;
weakS
elf
.
conditionModel
.
page
=
page
;
[
s
elf
.
seceneLibararyCollectionView
.
mj_footer
resetNoMoreData
];
[
weakS
elf
.
seceneLibararyCollectionView
.
mj_footer
resetNoMoreData
];
[
self
getSceneLibrarydatas
:
s
elf
.
conditionModel
isRemove
:
YES
];
[
weakSelf
getSceneLibrarydatas
:
weakS
elf
.
conditionModel
isRemove
:
YES
];
}];
}];
headerRefresh
.
stateLabel
.
hidden
=
YES
;
headerRefresh
.
stateLabel
.
hidden
=
YES
;
headerRefresh
.
lastUpdatedTimeLabel
.
hidden
=
YES
;
headerRefresh
.
lastUpdatedTimeLabel
.
hidden
=
YES
;
self
.
seceneLibararyCollectionView
.
mj_header
=
headerRefresh
;
self
.
seceneLibararyCollectionView
.
mj_header
=
headerRefresh
;
...
@@ -139,16 +139,16 @@
...
@@ -139,16 +139,16 @@
//上拉加载
//上拉加载
self
.
seceneLibararyCollectionView
.
mj_footer
=
[
MJRefreshAutoNormalFooter
footerWithRefreshingBlock
:
^
{
self
.
seceneLibararyCollectionView
.
mj_footer
=
[
MJRefreshAutoNormalFooter
footerWithRefreshingBlock
:
^
{
if
(
++
self
.
indexPage
>
s
elf
.
totalPages
)
{
if
(
++
weakSelf
.
indexPage
>
weakS
elf
.
totalPages
)
{
[
s
elf
.
seceneLibararyCollectionView
.
mj_footer
endRefreshingWithNoMoreData
];
[
weakS
elf
.
seceneLibararyCollectionView
.
mj_footer
endRefreshingWithNoMoreData
];
}
else
}
else
{
{
//默认数据
//默认数据
DataPage
*
Newpage
=
[[
DataPage
alloc
]
init
];
DataPage
*
Newpage
=
[[
DataPage
alloc
]
init
];
Newpage
.
page
=
s
elf
.
indexPage
;
Newpage
.
page
=
weakS
elf
.
indexPage
;
Newpage
.
rows
=
KROWS
;
Newpage
.
rows
=
KROWS
;
s
elf
.
conditionModel
.
page
=
Newpage
;
weakS
elf
.
conditionModel
.
page
=
Newpage
;
[
self
getSceneLibrarydatas
:
s
elf
.
conditionModel
isRemove
:
NO
];
[
weakSelf
getSceneLibrarydatas
:
weakS
elf
.
conditionModel
isRemove
:
NO
];
}
}
}];
}];
self
.
seceneLibararyCollectionView
.
mj_footer
.
automaticallyHidden
=
YES
;
self
.
seceneLibararyCollectionView
.
mj_footer
.
automaticallyHidden
=
YES
;
...
@@ -212,7 +212,6 @@
...
@@ -212,7 +212,6 @@
[
weakSelf
ErrorMBProgressView
:
NETWORK
];
[
weakSelf
ErrorMBProgressView
:
NETWORK
];
}
WithFailureBlock
:^
(
NSError
*
error
)
{
}
WithFailureBlock
:^
(
NSError
*
error
)
{
[
weakSelf
RemoveMBProgressHUDLoding
];
[
weakSelf
RemoveMBProgressHUDLoding
];
[
weakSelf
endRefreshingForTableView
:
weakSelf
.
seceneLibararyCollectionView
];
[
weakSelf
endRefreshingForTableView
:
weakSelf
.
seceneLibararyCollectionView
];
[
weakSelf
ErrorMBProgressView
:
error
.
localizedDescription
];
[
weakSelf
ErrorMBProgressView
:
error
.
localizedDescription
];
...
...
Lighting/Info.plist
View file @
2ad75b5e
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<
k
e
y
>
CFBundleName
<
/k
e
y
>
<
k
e
y
>
CFBundleName
<
/k
e
y
>
<
string
>
欧立方
<
/string
>
<
string
>
欧立方
<
/string
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
string
>
1.2.
2
<
/string
>
<
string
>
1.2.
3
<
/string
>
<
k
e
y
>
CFBundleURLTypes
<
/k
e
y
>
<
k
e
y
>
CFBundleURLTypes
<
/k
e
y
>
<
a
rr
a
y
>
<
a
rr
a
y
>
<
d
i
c
t
>
<
d
i
c
t
>
...
...
Tools/PrefixHeader.pch
View file @
2ad75b5e
...
@@ -140,13 +140,13 @@
...
@@ -140,13 +140,13 @@
/**
/**
* 服务器开发地址
* 服务器开发地址
*/
*/
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
//
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
/**
/**
* 服务器测试地址
* 服务器测试地址
*/
*/
//
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
//**
//**
// * 服务器正式地址
// * 服务器正式地址
...
...
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