Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveCMineModule

* 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveCMineModule: 0.6.5输入框配置 0.6.4 0.6.3 0.6.2 修复云测bug

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveCMineModule
* 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveCMineModule: 0.6.5输入框配置 0.6.4 0.6.3 0.6.2 修复云测bug
yanglingyu
2 parents a9b75049 8aae71fb
Showing 8 changed files with 59 additions and 9 deletions
CNLiveCMineModule.podspec
CNLiveCMineModule/Classes/CNCMine/View/CNMineEvaAlertView.m
CNLiveCMineModule/Classes/CNCSubMine/ViewController/CNMineCodeVC.m
CNLiveCMineModule/Classes/CNWallet/ViewController/CNChangePayPasswordController.m
CNLiveCMineModule/Classes/CNWallet/ViewController/CNTradingRecordController.m
CNLiveCMineModule/Classes/Colletion/ViewController/CNMineCollectController.m
CNLiveCMineModule/Classes/Colletion/ViewController/CNMineGoodsCollectViewController.m
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteDetailViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCMineModule'
-  s.version          = '0.6.1'
+  s.version          = '0.6.5'
   s.summary          = '网家家C端个人中心'
 # This description is used to generate tags and improve search results.
@@ -78,5 +78,7 @@ TODO: Add long description of the pod here.
    s.dependency 'libksygpulive'
    s.dependency 'CNLiveNewTripartiteManagement/MBProgressHUD'
    s.dependency 'CNLiveNewIMAManagerKit'
+   s.dependency 'CNLiveNewTripartiteManagement/IQKeyboardManager'
 end
+
@@ -9,6 +9,7 @@
 #import "CNSwitchView.h"
 #import "CNPlaceholderTextView.h"
 #import <DSBaseModule/DSBaseModule.h>
+#import <IQKeyboardManager/IQKeyboardManager.h>
 @interface CNMineEvaAlertView()
 @property (nonatomic, strong) UIImageView *topImage;
 @property (nonatomic, strong) UIView *bgView;
@@ -93,9 +94,9 @@
 }
 + (CNMineEvaAlertView *)setUpFeelBadEvaluateAlertViewDoneBlock:(void (^)(NSString * _Nonnull))doneBlock cancelBlock:(nonnull void (^)(void))cancelBlock{
     CNMineEvaAlertView *alertView = [CNMineEvaAlertView alertView];
+    __weak typeof(alertView) weakAlert = alertView;
     UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
-        alertView.frame = CGRectMake(0, 0,DS_adapt_length(339), DS_adapt_length(567));
-        [alertView.textView endEditing:YES];
+        [weakAlert.textView endEditing:YES];
     }];
     [alertView addGestureRecognizer:tap];
     alertView.frame = CGRectMake(0, 0,kScreenWidth *339/367, kScreenWidth *567/367);
@@ -112,6 +113,7 @@
     __block NSString *swichChooseStr = nil;
     alertView.switchView.chooseBlock = ^(NSString * _Nonnull result) {
         swichChooseStr = result;
+        [weakAlert.textView endEditing:YES];
     };
     [alertView.closeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.top.equalTo(alertView);
@@ -169,7 +171,6 @@
     modalViewController.contentView = alertView;
     modalViewController.modal = YES;
     [modalViewController showWithAnimated:YES completion:nil];
-    __weak typeof(alertView) weakAlert = alertView;
     [alertView.closeBtn addBlockForControlEvents:UIControlEventTouchUpInside block:^(id  _Nonnull sender) {
         [weakModal hideWithAnimated:YES completion:^(BOOL finished) {
             if (cancelBlock) cancelBlock();
@@ -186,6 +187,26 @@
     }];
     return alertView;
 }
+- (void)dealloc{
+//    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    NSLog(@"CNMineEvaAlertView - dealloc");
+}
+- (instancetype)init{
+    if(self = [super init]){
+//        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardShowNoti:) name:UIKeyboardWillShowNotification object:Nil];
+        [IQKeyboardManager sharedManager].enable = YES;
+            [IQKeyboardManager sharedManager].enableAutoToolbar = YES;
+    }
+    return self;
+}
+#pragma mark - notification
+- (void)keyboardShowNoti:(NSNotification *)noti{
+    NSDictionary *userInfo = noti.userInfo;
+    CGRect keyboardRect = [[userInfo objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
+    CGFloat heyboardHeight = keyboardRect.size.height;
+    self.top -= heyboardHeight;
+}
+#pragma mark - Getting
 - (UIView *)bgView
 {
     if (!_bgView) {
@@ -84,9 +84,11 @@
 {
     [super viewWillAppear:animated];
     [BHConfig set:@"2" value:@"darenPayMent"];
+    self.navigationController.navigationBarHidden = YES;
 }
 - (void)viewWillDisappear:(BOOL)animated{
     [super viewWillDisappear:animated];
+    self.navigationController.navigationBarHidden = NO;
 }
 - (BOOL)preferredNavigationBarHidden
 {
@@ -226,7 +226,7 @@
             [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNCheckVerifyCodeSetPasswordUrl Param:paramDict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
                 if (error) {
                     [QMUITips showError:@"验证验证码失败" inView:self.view hideAfterDelay:1.5];
-                    self.sendNoteButton.userInteractionEnabled = YES;
+//                    self.sendNoteButton.userInteractionEnabled = YES;
                     return;
                 }
                 NSLog(@"data:%@",responseObject);
@@ -36,7 +36,7 @@ static NSString *walletDetailCellId = @&quot;walletDetailCellId&quot;;
 @property (nonatomic, strong) CNNoOrderView *noDataView;
 @property (nonatomic, strong) NSArray *timeArr;
 @property (nonatomic, copy) NSString *monthStr;
-
+@property (nonatomic, strong)NSDate *selectDate;
 @end
 @implementation CNTradingRecordController
@@ -132,6 +132,7 @@ static NSString *walletDetailCellId = @&quot;walletDetailCellId&quot;;
         [CNLiveNetworking setupShowDataResult:YES];
         weakself
         [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNViewTransferRecordUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+            [QMUITips hideAllTips];
             if (error) {
                 NSLog(@"error:%@",error.localizedDescription);
                 [weakSelf.tableView.mj_header endRefreshing];
@@ -213,6 +214,7 @@ static NSString *walletDetailCellId = @&quot;walletDetailCellId&quot;;
     //获取当前时间日期
     NSString *dateStr = [dateFormatter stringFromDate:[NSDate date]];
     datePicker.minimumDate = [dateFormatter dateFromString: @"2017-01"];
+    [datePicker setDate:self.selectDate?self.selectDate: [dateFormatter dateFromString: dateStr]];
     datePicker.maximumDate = [dateFormatter dateFromString: dateStr];
     [self presentViewController:datePickManager animated:false completion:nil];
 }
@@ -230,6 +232,10 @@ static NSString *walletDetailCellId = @&quot;walletDetailCellId&quot;;
     dateComponents.day = 1;
     NSCalendar * calendar = [NSCalendar currentCalendar];
     NSDate * date = [calendar dateFromComponents:dateComponents];
+    if ([date compare:datePicker.maximumDate] == NSOrderedDescending) {
+        date = datePicker.maximumDate;
+    }
+    self.selectDate = date;
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
     [dateFormatter setLocale:[NSLocale currentLocale]];
     [dateFormatter setDateFormat:@"yyyy年M月"];//dd日h:mm:ss t
@@ -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,7 +117,9 @@ static NSString * const kCNLiveWebViewForCollectionRefreshKey = @&quot;kCNLiveWebView
 }
 - (void)viewDidDisappear:(BOOL)animated {
     [super viewDidDisappear:animated];
-    _isRefresh = @"0";//1不刷新
+    if ([self.isRefresh isEqualToString:@"0"]){
+        [self.tableView scrollToTopAnimated:NO];
+    }
 }
 - (void)viewDidLoad {
@@ -124,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;
@@ -231,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];
@@ -114,6 +114,9 @@ static NSInteger const kCNLiveSectionHeaderHeight = 120;//头视图高度
     dateComponents.day = 1;
     NSCalendar * calendar = [NSCalendar currentCalendar];
     NSDate * date = [calendar dateFromComponents:dateComponents];
+    if ([date compare:datePicker.maximumDate] == NSOrderedDescending) {
+        date = datePicker.maximumDate;
+    }
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
     [dateFormatter setLocale:[NSLocale currentLocale]];
     [dateFormatter setDateFormat:@"yyyy-MM"];