浏览代码

1.修改AutoComplete Xib,关闭Safe Area。

Pen Li 8 年之前
父节点
当前提交
a55bdc3302
共有 2 个文件被更改,包括 70 次插入6 次删除
  1. 35 0
      common/customUI/ResultViewController.h
  2. 35 6
      common/customUI/ResultViewController.m

+ 35 - 0
common/customUI/ResultViewController.h

@@ -9,9 +9,24 @@
 #import <UIKit/UIKit.h>
 //#import "TouchLabel.h"
 #import "MDHTMLLabel.h"
+
+UIKIT_EXTERN const int delta;
+
 @interface ResultViewController : UIViewController<UIPopoverPresentationControllerDelegate>
 @property (weak, nonatomic) IBOutlet UITableView *tableview;
 @property (weak, nonatomic) IBOutlet UIScrollView *scrollview;
+
+@property (nonatomic,strong) IBOutlet UIView *titleBar;
+@property (nonatomic,strong) IBOutlet UILabel *titleLabel;
+
+@property (nonatomic,strong) IBOutlet UIView *refreshHeaderBar;
+@property (nonatomic,strong) IBOutlet UILabel *refreshHeaderTitleLb;
+@property (nonatomic,strong) IBOutlet UIView *refreshFooterBar;
+@property (nonatomic,strong) IBOutlet UILabel *refreshFooterTitleLb;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *header_top_constraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *footer_top_constraint;
+
 @property (strong, nonatomic) NSMutableDictionary* content_layout;
 @property (strong, nonatomic) NSMutableArray* content_action;
 @property (strong, nonatomic) NSMutableDictionary* content_data;
@@ -19,10 +34,30 @@
 @property (strong, nonatomic) MDHTMLLabel *label;
 @property (strong, nonatomic) NSString *download_query;
 
+@property (nonatomic,assign) NSInteger offset;
+@property (nonatomic,strong) NSDictionary *params;
+
 - (void)setQueryParams:(NSDictionary *)params;
 
 //@property (strong, nonatomic)UITapGestureRecognizer* labelTap;
 //
 //@property (strong, nonatomic)UITapGestureRecognizer* cellDoubleTap;
+
+
+/**
+ * 0: init load
+ * 1: refresh
+ * 2: load more
+ */
+- (void)loadContentWithOption:(int)option Complete:(void (^)(int result,int count))finish;
+
+- (void)updateTableFrame;
+
+- (void)setupNavigationBar;
+
+- (NSInteger)resultItemCount;
+
+-(void) resize_tableHeader;
+
 @end
 

+ 35 - 6
common/customUI/ResultViewController.m

@@ -21,15 +21,13 @@
 //#import "RTLabel.h"
 
 
-static const int delta = 25;
+const int delta = 25;
 
 @interface ResultViewController () <JLRefreshDelegate,QLPreviewControllerDataSource,QLPreviewControllerDelegate>
 
 @property (nonatomic,strong) QLPreviewController *quickLook;
 @property (nonatomic,copy) NSString *documentPath;
 
-@property (nonatomic,assign) NSInteger offset;
-@property (nonatomic,strong) NSDictionary *params;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *w_constraint;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *h_constraint;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *trail_constraint;
@@ -99,7 +97,7 @@ static const int delta = 25;
     [self loadContent];
     
     
-    self.tableview.tableHeaderView = [self get_tableHeader];
+//    self.tableview.tableHeaderView = [self get_tableHeader];
 }
 
 -(void)cellDoubleTapAction:(UIGestureRecognizer*)gestureRecognizer
@@ -686,11 +684,37 @@ static const int delta = 25;
 #pragma mark - Private
 
 - (void)setupTableRefreshView {
+    
+    __weak typeof(self) weakSelf = self;
     self.tableview.jl_header = [[JLRefreshHeader alloc] init];
     self.tableview.jl_header.refreshDelegate = self;
+    self.tableview.jl_header.clear = YES;
+    self.tableview.jl_header.offsetBlock = ^(CGFloat offset) {
+        if (offset <= 0) {
+            weakSelf.header_top_constraint.constant = -offset;
+        }
+        
+    };
+    self.tableview.jl_header.stateChangeBlock = ^(JLRefreshState state) {
+        
+        NSString *title = [weakSelf.tableview.jl_header refreshTitleForState:state];
+        weakSelf.refreshHeaderTitleLb.text = title;
+    };
     
     self.tableview.jl_footer = [[JLRefreshFooter alloc] init];
     self.tableview.jl_footer.refreshDelegate = self;
+    self.tableview.jl_footer.clear = YES;
+    self.tableview.jl_footer.offsetBlock = ^(CGFloat offset) {
+       
+        if (offset <= 0) {
+            weakSelf.footer_top_constraint.constant = offset;
+        }
+    };
+    self.tableview.jl_footer.stateChangeBlock = ^(JLRefreshState state) {
+        
+        NSString *title = [weakSelf.tableview.jl_footer refreshTitleForState:state];
+        weakSelf.refreshFooterTitleLb.text = title;
+    };
 }
 
 - (void)setupNavigationBar {
@@ -932,12 +956,17 @@ static const int delta = 25;
 
 - (void)jl_pullRefresh:(JLRefreshBasis *)refresh state:(JLRefreshState)state percentage:(float)percentage {
     
+//    NSString *title = [refresh refreshTitleForState:state];
+//    CGFloat offset = refresh.jl_height * percentage;
+    
     if ([refresh isEqual:self.tableview.jl_header]) {
-       
+//        self.refreshHeaderTitleLb.text = title;
+//        self.header_top_constraint.constant = offset;
     }
     
     if (refresh == self.tableview.jl_footer) {
-       
+//        self.refreshFooterTitleLb.text = title;
+//        self.footer_top_constraint.constant = -offset;
     }
     
 }