0.6.3

yanglingyu
1 parent 408a5e0a
Showing 3 changed files with 20 additions and 5 deletions
CNLiveCMineModule.podspec
CNLiveCMineModule/Classes/Colletion/ViewController/CNMineCollectController.m
CNLiveCMineModule/Classes/Colletion/ViewController/CNMineGoodsCollectViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCMineModule'
-  s.version          = '0.6.2'
+  s.version          = '0.6.3'
   s.summary          = '网家家C端个人中心'
 # This description is used to generate tags and improve search results.
@@ -101,6 +101,7 @@ static NSString * const kCNLiveWebViewForCollectionRefreshKey = @&quot;kCNLiveWebView
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
     if([_isRefresh isEqualToString:@"0"]){
+        _isRefresh = @"1";//1不刷新
         if(self.data.count > 0){
             _pageNo = 1;
             _isRefreshing = NO;
@@ -116,8 +117,9 @@ static NSString * const kCNLiveWebViewForCollectionRefreshKey = @&quot;kCNLiveWebView
 }
 - (void)viewDidDisappear:(BOOL)animated {
     [super viewDidDisappear:animated];
-    _isRefresh = @"0";//1不刷新
-//    [self.tableView scrollToTopAnimated:NO];
+    if ([self.isRefresh isEqualToString:@"0"]){
+        [self.tableView scrollToTopAnimated:NO];
+    }
 }
 - (void)viewDidLoad {
@@ -125,7 +127,7 @@ static NSString * const kCNLiveWebViewForCollectionRefreshKey = @&quot;kCNLiveWebView
     // Do any additional setup after loading the view.
 //    self.title = @"收藏";
     self.view.backgroundColor = CNLiveColorWithHexString(@"#F2F2F2");
-    
+    self.isRefresh = @"1";
     _pageNo = 1;
     _isRefreshing = NO;
@@ -232,6 +234,7 @@ static NSString * const kCNLiveWebViewForCollectionRefreshKey = @&quot;kCNLiveWebView
 }
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    self.isRefresh = @"0";
     CNMyCollectDataSourceModel *model = self.data[indexPath.row];
     if ([model.type isEqualToString:@"3"]) {
         [[CNLiveCMineService shareMineProtocol] pushCMineInteContentForCMainWebViewWithURL:model.shareUrl statue:CNLiveCMineIntePushWebViewStatueAnnotationDetail];
@@ -78,6 +78,7 @@
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
+    self.isRefresh = @"1";
     self.view.backgroundColor = CNLiveColorWithHexString(@"#F2F2F2");
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.tableView.backgroundColor = CNLiveColorWithHexString(@"#F2F2F2");
@@ -91,7 +92,17 @@
 -(void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
-    [self loadData];
+    //跳转到二级刷新页面
+    if([self.isRefresh isEqualToString:@"0"]){
+        self.isRefresh = @"1";
+        [self loadData];
+    }
+}
+- (void)viewDidDisappear:(BOOL)animated{
+    [super viewDidDisappear:animated];
+    if([self.isRefresh isEqualToString:@"0"]){
+        [self.tableView scrollToTopAnimated:NO];
+    }
 }
 -(void)loadData{
     _pageNo = 1;
@@ -145,6 +156,7 @@
 }
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    self.isRefresh = @"0";
     CNCollectGoodListModel *model = self.data[indexPath.row];
     [[NSUserDefaults standardUserDefaults] setObject:@{@"time":@0,@"activity_id":@"ds_collect"}  forKey:@"CNLiveWebViewUnionNewActivityKey"];
     [[CNLiveCMineService  shareMineProtocol] skipType:@"2" to:model.id shopType:model.shop_type currentVC:self];