Merge remote-tracking branch 'origin/master'

Lighting/Class/ProductLibraryView.h

@@ -19,7 +19,7 @@
 @end
 
 @interface ProductLibraryView :BaseViewController<UIGestureRecognizerDelegate,UITableViewDelegate,UITableViewDataSource,UITableViewDataSource,UICollectionViewDataSource,
-UICollectionViewDelegate,UICollectionViewDelegateFlowLayout>
+UICollectionViewDelegate,UICollectionViewDelegateFlowLayout,UITextFieldDelegate>
 @property (nonatomic,strong) id<AddProductPicturedelegate> delegate;
 @property (nonatomic,strong) UIView *subView;
 @property (nonatomic,strong) UIView *headerView;

Lighting/Class/ProductLibraryView.m

@@ -105,7 +105,7 @@
                         NSArray *spacrArray = [self.selectedCode componentsSeparatedByString:@"到"];
                         self.condtionModel.startprice = [NSNumber numberWithInteger:[[spacrArray objectAtIndex_opple:0] integerValue]];
                         self.condtionModel.endprice = [NSNumber numberWithInteger:[[spacrArray objectAtIndex_opple:1] integerValue]];
-                        self.condtionModel.categoryEquals = self.selectedCode;
+//                        self.condtionModel.categoryEquals = self.selectedCode;
                     }
                         break;
                         
@@ -128,7 +128,7 @@
     self.collectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
         
         
-            if (self.indexPage ++ > self.totalPages) {
+            if (++self.indexPage  > self.totalPages) {
                 [self.collectionView.mj_footer endRefreshingWithNoMoreData];
             }else
             {
@@ -241,6 +241,7 @@
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
 
             GoodsResponse *sponse = [[GoodsResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
+             self.totalPages = [returnValue[@"data"][@"totalpages"] intValue];
             //返回结果
             finish(sponse);
         }
@@ -329,6 +330,7 @@
     self.searchTextField.placeholder = @" 请输入产品关键字";
     self.searchTextField.font = [UIFont systemFontOfSize:12];
     self.searchTextField.returnKeyType = UIReturnKeySearch;
+    self.searchTextField.delegate=self;
     [backView addSubview:self.searchTextField];
 //
     
@@ -410,7 +412,7 @@
             break;
         case 101://类型
         {
-            if ([[NSString stringWithFormat:@"%ld",sender.tag-100 ]isEqualToString:[NSString stringWithFormat:@"%@",[self.showSection firstObject]]]) {
+            if ([[NSString stringWithFormat:@"%d",sender.tag-100 ]isEqualToString:[NSString stringWithFormat:@"%@",[self.showSection firstObject]]]) {
                 [self.cellArray removeAllObjects ];
                 [self.showSection removeAllObjects];
                 [self.seceneTableView reloadData];
@@ -421,7 +423,7 @@
                 self.selectedCode = [[self.arrayData objectAtIndex_opple:sender.tag-100] fid] ;
                 [self.collectionView.mj_header beginRefreshing];
                 self.cellArray=[NSMutableArray arrayWithArray:[[self.arrayData objectAtIndex_opple:sender.tag-100] children]];
-                [self.showSection addObject:[NSString stringWithFormat:@"%ld",sender.tag-100]];
+                [self.showSection addObject:[NSString stringWithFormat:@"%d",sender.tag-100]];
                 [self.seceneTableView reloadData];
             }
           
@@ -442,12 +444,15 @@
             break;
         case 104://价格
         {
-            self.selectedCode = [[self.arrayData objectAtIndex_opple:sender.tag-100] typecode] ;
+            self.selectedCode = [[self.arrayData objectAtIndex_opple:sender.tag-100] typename] ;
             [self.collectionView.mj_header beginRefreshing];
         }
             break;
             
+       
         default:
+            self.condtionModel.nameLike = self.selectedCode;
+            break;
             break;
     }
 
@@ -630,6 +635,20 @@
     }
     
 }
+#pragma mark -Return键检测
+- (BOOL)textFieldShouldReturn:(UITextField *)textField
+{
+     [textField resignFirstResponder];
+    if (self.searchTextField.text==nil||[self.searchTextField.text isEqualToString:@""]) {
+        [self  SHOWPrompttext:@"请先输入搜索关键字"];
+    }else
+    {
+        self.condtionModel.nameLike=self.searchTextField.text;
+        [self.collectionView.mj_header beginRefreshing];
+        
+    }
+    return YES;
+}
 
 -(void)DismissScreenView:(UITapGestureRecognizer*)sender{
     CGPoint point = [sender locationInView:self.view];

Lighting/Class/SeceneLibraryView.m

@@ -61,7 +61,7 @@
     //上拉加载
     self.collectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
         
-        if (self.indexPage ++ > self.totalPages) {
+        if (++self.indexPage > self.totalPages) {
             [self.collectionView.mj_footer endRefreshingWithNoMoreData];
         }else
         {
@@ -115,6 +115,7 @@
 //                [self.responseArray removeAllObjects];
 //            }
             self.response = [[SceneResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
+             self.totalPages = [returnValue[@"data"][@"totalpages"] intValue];
             NSArray* array=[[NSArray alloc]init];
             array=self.response.list;
             [ self.collectionView reloadData];

Lighting/Lighting.xcodeproj/project.pbxproj

@@ -1879,8 +1879,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
 				CLANG_ENABLE_OBJC_WEAK = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COMPRESS_PNG_FILES = NO;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -1922,7 +1922,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "e9bd3600-5e9c-4cd0-a0d5-b7d8b0882ca8";
+				PROVISIONING_PROFILE = "1984600d-9582-4f80-b666-2975a03aee8f";
 				STRIP_PNG_TEXT = NO;
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
 			};
@@ -1935,8 +1935,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
 				CLANG_ENABLE_OBJC_WEAK = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
+				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				COMPRESS_PNG_FILES = NO;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -1978,7 +1978,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "e9bd3600-5e9c-4cd0-a0d5-b7d8b0882ca8";
+				PROVISIONING_PROFILE = "1984600d-9582-4f80-b666-2975a03aee8f";
 				STRIP_PNG_TEXT = NO;
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
 			};