Commit 2ad75b5e authored by 曹云霄's avatar 曹云霄

修改项说明:

parent 41e71846
...@@ -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:^{
//默认数据 //默认数据
self.indexPage = ONE; weakSelf.indexPage = ONE;
DataPage *page = [[DataPage alloc]init]; DataPage *page = [[DataPage alloc]init];
page.page = self.indexPage; page.page = weakSelf.indexPage;
page.rows = KROWS; page.rows = KROWS;
self.conditionModel.page = page; weakSelf.conditionModel.page = page;
[self.seceneLibararyCollectionView.mj_footer resetNoMoreData]; [weakSelf.seceneLibararyCollectionView.mj_footer resetNoMoreData];
[self getSceneLibrarydatas:self.conditionModel isRemove:YES]; [weakSelf getSceneLibrarydatas:weakSelf.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 > self.totalPages) { if ( ++ weakSelf.indexPage > weakSelf.totalPages) {
[self.seceneLibararyCollectionView.mj_footer endRefreshingWithNoMoreData]; [weakSelf.seceneLibararyCollectionView.mj_footer endRefreshingWithNoMoreData];
}else }else
{ {
//默认数据 //默认数据
DataPage *Newpage = [[DataPage alloc]init]; DataPage *Newpage = [[DataPage alloc]init];
Newpage.page = self.indexPage; Newpage.page = weakSelf.indexPage;
Newpage.rows = KROWS; Newpage.rows = KROWS;
self.conditionModel.page = Newpage; weakSelf.conditionModel.page = Newpage;
[self getSceneLibrarydatas:self.conditionModel isRemove:NO]; [weakSelf getSceneLibrarydatas:weakSelf.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];
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundleName</key> <key>CFBundleName</key>
<string>欧立方</string> <string>欧立方</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.2.2</string> <string>1.2.3</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
<array> <array>
<dict> <dict>
......
...@@ -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]
//** //**
// * 服务器正式地址 // * 服务器正式地址
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment