Merge branch 'master' into learningCenter

Class/SceneLibraryViewController.m

@@ -121,17 +121,17 @@
     [self.backView addSubview:self.SpaceButton];
     
     //下拉刷新
+    WS(weakSelf);
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
         //默认数据
-        self.indexPage = ONE;
+        weakSelf.indexPage = ONE;
         DataPage *page = [[DataPage alloc]init];
-        page.page = self.indexPage;
+        page.page = weakSelf.indexPage;
         page.rows = KROWS;
-        self.conditionModel.page = page;
-        [self.seceneLibararyCollectionView.mj_footer resetNoMoreData];
-        [self getSceneLibrarydatas:self.conditionModel isRemove:YES];
+        weakSelf.conditionModel.page = page;
+        [weakSelf.seceneLibararyCollectionView.mj_footer resetNoMoreData];
+        [weakSelf getSceneLibrarydatas:weakSelf.conditionModel isRemove:YES];
     }];
-    
     headerRefresh.stateLabel.hidden = YES;
     headerRefresh.lastUpdatedTimeLabel.hidden = YES;
     self.seceneLibararyCollectionView.mj_header = headerRefresh;
@@ -139,16 +139,16 @@
     //上拉加载
     self.seceneLibararyCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
         
-        if ( ++ self.indexPage > self.totalPages) {
-            [self.seceneLibararyCollectionView.mj_footer endRefreshingWithNoMoreData];
+        if ( ++ weakSelf.indexPage > weakSelf.totalPages) {
+            [weakSelf.seceneLibararyCollectionView.mj_footer endRefreshingWithNoMoreData];
         }else
         {
             //默认数据
             DataPage *Newpage = [[DataPage alloc]init];
-            Newpage.page = self.indexPage;
+            Newpage.page = weakSelf.indexPage;
             Newpage.rows = KROWS;
-            self.conditionModel.page = Newpage;
-            [self getSceneLibrarydatas:self.conditionModel isRemove:NO];
+            weakSelf.conditionModel.page = Newpage;
+            [weakSelf getSceneLibrarydatas:weakSelf.conditionModel isRemove:NO];
         }
     }];
     self.seceneLibararyCollectionView.mj_footer.automaticallyHidden = YES;
@@ -212,7 +212,6 @@
         [weakSelf ErrorMBProgressView:NETWORK];
         
     } WithFailureBlock:^(NSError *error) {
-        
         [weakSelf RemoveMBProgressHUDLoding];
         [weakSelf endRefreshingForTableView:weakSelf.seceneLibararyCollectionView];
         [weakSelf ErrorMBProgressView:error.localizedDescription];

Lighting/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundleName</key>
 	<string>欧立方</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.2</string>
+	<string>1.2.3</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

Tools/PrefixHeader.pch

@@ -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]
 
 //**
 // *  服务器正式地址