add

2018-09-26 00:33:06 +08:00
parent 69522b22fc
commit d0230f55ed
68 changed files with 1599 additions and 209 deletions
@@ -112,7 +112,6 @@
        if ([self.imageNames  containsObject: name]) {
            [self.imageNames removeObject:name];
        }
-        
        [self.imageNames addObject:name];
        
    }];
@@ -140,8 +139,7 @@

 -(CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section
 {
-    //设置最小的列间距
-    
+    //设置最小的列间
    return 22.0f;
    
 }
@@ -164,12 +162,13 @@
    
 }

+
 -(void)addBtnAction:(UIButton*)btn{
    
-    if (self.pickerBalock) {
+    if (self.pickerBalock){
        self.pickerBalock();
    }
-  
+
 }

 - (void)photoPikerComplete:(GiGaPhotoPickerBlock)pikerComplete{
@@ -7,12 +7,13 @@
 //

 #import <UIKit/UIKit.h>
+#import "GIGaFeedKind.h"

@interface GiGaFeedBackKindView : UIViewController
-typedef void (^SelectedItemBlock)(NSString *tile);
+typedef void (^SelectedItemBlock)(GIGaFeedKind *kind);

 +(GiGaFeedBackKindView *)showAt:(UIViewController *)vc  atRow:(NSInteger)row;
-@property(nonatomic,copy)NSString  *showStr;
+@property(nonatomic,strong)GIGaFeedKind  *showKind;
@property(nonatomic) NSInteger  defultRow;
@property (nonatomic, copy) SelectedItemBlock selectedItemBlock;

@@ -50,7 +50,7 @@
            [self.pickerView selectRow:self.defultRow inComponent:0 animated:YES];
            GIGaFeedKind *mode = self.pickerDataArr[self.defultRow];
            if (mode) {
-                self.showStr =mode.remarks;
+                self.showKind =mode;
            }
        
        }else{
@@ -123,7 +123,7 @@
        label.textAlignment = NSTextAlignmentCenter;
        label.textColor = [UIColor blackColor];
        GIGaFeedKind *mode =  self.pickerDataArr[row];
-        label.text = mode.remarks;
+        label.text = mode.dictLabel;
    }
    return label;
 }
@@ -135,8 +135,8 @@
        
        if (self.pickerDataArr.count > 0 ) {
            GIGaFeedKind *mode = self.pickerDataArr[row];
-            self.showStr = mode.remarks;
-            self.selectedItemBlock(self.showStr);
+            self.showKind = mode;
+            self.selectedItemBlock(mode);
        }
    }

@@ -145,11 +145,12 @@
 -(void)done:(UIButton *)btn{
    
    if (self.selectedItemBlock) {
-        if ([self.showStr isEqualToString:@"未知"]) {
+        if ([self.showKind.dictLabel isEqualToString:@"未知"]) {
            [self hide];
            return;
        }
-        self.selectedItemBlock(self.showStr);
+        
+        self.selectedItemBlock(self.showKind);
        
    }
    
@@ -189,8 +190,10 @@
    
    if (self = [super init]) {
        self.modalPresentationStyle = UIModalPresentationOverCurrentContext;
-        self.showStr = @"未知";
-    
+        
+        self.showKind = [[GIGaFeedKind alloc] init];
+        self.showKind.dictLabel = @"未知";
+        
        [self requstData];
    
    }