基本完成

KXCardHelp.xcodeproj/xcuserdata/chuangyejia.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>KXCardHelp.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 	</dict>
 </dict>

KXCardHelp.xcworkspace/xcuserdata/chuangyejia.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,4 +2,128 @@
 <Bucket
    type = "0"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            scope = "0"
+            stopOnStyle = "0">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KXCardHelp/Base/VC/LVKBBaseViewController.m"
+            timestampString = "559241188.502535"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "60"
+            endingLineNumber = "60"
+            landmarkName = "-showMessage:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KXCardHelp/Base/VC/LVKBBaseViewController.m"
+            timestampString = "559241188.503283"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "64"
+            endingLineNumber = "64"
+            landmarkName = "-showMessage:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KXCardHelp/GS/NewHome/View/LVKBNewHomeTableViewCell.m"
+            timestampString = "559244148.923709"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "47"
+            endingLineNumber = "47"
+            landmarkName = "-switchAction:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KXCardHelp/GS/NewHome/VC/LVKBNewHomeViewController.m"
+            timestampString = "559249326.567625"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "346"
+            endingLineNumber = "346"
+            landmarkName = "-creatNotTitle:day:hour:min:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KXCardHelp/GS/NewHome/VC/LVKBNewHomeViewController.m"
+            timestampString = "559249326.567701"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "132"
+            endingLineNumber = "132"
+            landmarkName = "-switchActionByIndex:status:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KXCardHelp/GS/NewHome/VC/LVKBNewHomeViewController.m"
+            timestampString = "559249326.56802"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "360"
+            endingLineNumber = "360"
+            landmarkName = "-creatNotTitle:day:hour:min:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KXCardHelp/GS/NewHome/VC/LVKBNewHomeViewController.m"
+            timestampString = "559249326.568078"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "311"
+            endingLineNumber = "311"
+            landmarkName = "-alarmView"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

KXCardHelp/Assets.xcassets/LaunchImage1.launchimage/Contents.json

@@ -30,7 +30,7 @@
     {
       "orientation" : "portrait",
       "idiom" : "iphone",
-      "filename" : "640 copy 2.png",
+      "filename" : "640 copy.png",
       "extent" : "full-screen",
       "minimum-system-version" : "7.0",
       "scale" : "2x"

KXCardHelp/Base/Tab/LVKBBaseTabBarViewController.m

@@ -9,6 +9,9 @@
 #import "LVKBBaseTabBarViewController.h"
 #import "ORCHMoneyRecord2ChildViewController.h"
 @interface LVKBBaseTabBarViewController ()
+<
+LVKBNewHomeViewControllerDelegate
+>
 @property(nonatomic)BOOL initViewFlag;//已经初始化了视图
 @end
 
@@ -36,6 +39,25 @@
 //    self.tabBar.layer.shadowRadius=7;
     self.tabBar.layer.shadowOpacity =0.1f;
 }
+-(void)resetTabByIndex:(NSInteger)index{
+    switch (index) {
+        case 0:
+            self.selectedIndex=1;
+            break;
+        case 1:
+        {
+            self.selectedIndex=1;
+            UINavigationController *nav = (UINavigationController *)self.viewControllers[1];
+            LVKBNewCardViewController *vc=(LVKBNewCardViewController *)(nav.topViewController);
+            [vc addCard];
+            
+        }
+            break;
+        default:
+            break;
+    }
+}
+
 
 #pragma mark ------------------ 版本更新检测 ------
 /**
@@ -129,9 +151,11 @@
     //还款记录表
     [[YDFMDB sharedInstance] createTableName:@"repayRecordTable" fieldNamesDictionaryArray:@[@{@"name":@"month",@"type":@"text"},@{@"name":@"day",@"type":@"text"},@{@"name":@"noOverRePay",@"type":@"text"}]];
     //银行卡表
-     [[YDFMDB sharedInstance] createTableName:@"homeTable" fieldNamesDictionaryArray:@[@{@"name":@"cardBankName",@"type":@"text"},@{@"name":@"cardCode",@"type":@"text"},@{@"name":@"dayStr",@"type":@"text"}]];
-    LVKBBaseNavViewController *newHome=[self navigationControllerWithViewController:[[LVKBNewHomeViewController alloc]init] title:@"首页" imageName:@"tab_home"];
-    LVKBBaseNavViewController *newCard=[self navigationControllerWithViewController:[[ORCHMoneyRecord2ChildViewController alloc]init] title:@"添加卡" imageName:@"tab_handleCard"];
+     [[YDFMDB sharedInstance] createTableName:@"homeTable" fieldNamesDictionaryArray:@[@{@"name":@"cardBankName",@"type":@"text"},@{@"name":@"cardCode",@"type":@"text"}]];
+    LVKBNewHomeViewController *vc=[[LVKBNewHomeViewController alloc]init];
+    vc.delegate=self;
+    LVKBBaseNavViewController *newHome=[self navigationControllerWithViewController:vc title:@"首页" imageName:@"tab_home"];
+    LVKBBaseNavViewController *newCard=[self navigationControllerWithViewController:[[LVKBNewCardViewController alloc]init] title:@"添加卡" imageName:@"tab_handleCard"];
 //    LVKBNewCardViewController
     LVKBBaseNavViewController *person=[self navigationControllerWithViewController:[[LVKBPersonViewController alloc]init] title:@"个人" imageName:@"tab_person"];
     self.viewControllers=@[newHome,newCard,person];
@@ -151,4 +175,23 @@
 
 
 
+//// 1.创建通知
+//UILocalNotification *localNotification = [[UILocalNotification alloc] init];
+//// 2.设置通知的必选参数
+//// 设置通知显示的内容
+//localNotification.alertBody = @"本地通知测试";
+//// 设置通知的发送时间,单位秒
+//localNotification.fireDate = [NSDate dateWithTimeIntervalSinceNow:10];
+////解锁滑动时的事件
+//localNotification.alertAction = @"别磨蹭了!";
+////收到通知时App icon的角标
+//localNotification.applicationIconBadgeNumber = 1;
+////推送是带的声音提醒，设置默认的字段为UILocalNotificationDefaultSoundName
+//localNotification.soundName = UILocalNotificationDefaultSoundName;
+//// 3.发送通知(🐽 : 根据项目需要使用)
+//// 方式一: 根据通知的发送时间(fireDate)发送通知
+//[[UIApplication sharedApplication] scheduleLocalNotification:localNotification];
+
+
+
 @end

KXCardHelp/Category/NSDate+JCYEX.h

@@ -13,5 +13,5 @@
 +(NSInteger)getCurrentMonthDayCount;
 +(NSInteger)getCurrentDay;
 +(NSString *)getCurrentYearMonthDay;
-
++(NSString *)getCurrentYearMonth;
 @end

KXCardHelp/Category/NSDate+JCYEX.m

@@ -53,7 +53,12 @@
     [formatter setDateFormat:@"yyyy-MM-dd"];
     NSString *currentDate=[formatter stringFromDate:date];
     return currentDate;
-    
-    
+}
++(NSString *)getCurrentYearMonth{
+    NSDate *date=[NSDate date];
+    NSDateFormatter *formatter = [[NSDateFormatter alloc]init];
+    [formatter setDateFormat:@"yyyy-MM"];
+    NSString *currentDate=[formatter stringFromDate:date];
+    return currentDate;
 }
 @end

KXCardHelp/GS/NewCard/VC/LVKBNewCardViewController.h

@@ -9,5 +9,5 @@
 #import "LVKBBaseViewController.h"
 
 @interface LVKBNewCardViewController : LVKBBaseViewController
-
+-(void)addCard;
 @end

KXCardHelp/GS/NewCard/VC/LVKBNewCardViewController.m

@@ -9,6 +9,7 @@
 #import "LVKBNewCardViewController.h"
 #import "LVKBHomeCardsTableViewCell.h"
 #import "LVKBHomeCardsModel.h"
+#import "NewHomeModel.h"
 @interface LVKBNewCardViewController ()
 <
 UITableViewDelegate,
@@ -30,6 +31,21 @@ CHHomeCardsTableViewCellDelegate
     [self adjustUI];
 }
 
+
+-(void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+    NSArray *arr=[[YDFMDB sharedInstance]selectDataByConditionString:nil withSelectStringArray:@[@"cardBankName",@"cardCode"] withTableName:@"homeTable" limit:-1 descID:YES];
+    [self.dataArray removeAllObjects];
+    for (NSDictionary *dic in arr) {
+        NSLog(@"dic--%@",dic);
+        LVKBHomeCardsModel *model=[[LVKBHomeCardsModel alloc]init];
+        model.bank_name=dic[@"cardBankName"];
+        model.card_num=dic[@"cardCode"];
+        [self.dataArray addObject:model];
+    }
+    [self.tableView reloadData];
+}
+
 -(void)initUI{
     [self.view addSubview:self.createCard];
     [self.view addSubview:self.tableView];
@@ -58,17 +74,17 @@ CHHomeCardsTableViewCellDelegate
 #pragma mark -代理
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
-    return self.dataArray.count+1;
+    return self.dataArray.count;
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
     LVKBHomeCardsTableViewCell *cell=[tableView dequeueReusableCellWithIdentifier:@"cell"];
-//    LVKBHomeCardsModel *model=self.dataArray[indexPath.row];
-//    if (indexPath.row==0) {
-//        model.is_main=@"1";
-//    }
-//    cell.model=model;
-//    cell.cellDelegate=self;
-//    cell.indexPath=indexPath;
+    LVKBHomeCardsModel *model=self.dataArray[indexPath.row];
+    if (indexPath.row==0) {
+        model.is_main=@"1";
+    }
+    cell.model=model;
+    cell.cellDelegate=self;
+    cell.indexPath=indexPath;
     cell.selectionStyle=UITableViewCellSelectionStyleNone;
     return cell;
 }
@@ -78,11 +94,106 @@ CHHomeCardsTableViewCellDelegate
 
 
 -(void)jcy_homeCardsCellDeleteByIndexPath:(NSIndexPath *)indexPath{
+    LVKBHomeCardsModel *model=self.dataArray[indexPath.row];
+    [[YDFMDB sharedInstance]deleteDataByEqualConditionStringDictionary:@{@"cardCode":model.card_num} withTableName:@"homeTable"];
+    [self.dataArray removeObjectAtIndex:indexPath.row];
+    [self.tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationTop];
     
     
+}
+
+
+
+-(void)addCard{
+    NSLog(@"+添加信用卡还款记录");
+    WeakSelf(weakSelf)
+    UIAlertController *addAlertVC = [UIAlertController alertControllerWithTitle:@"添加信用卡" message:@"" preferredStyle:UIAlertControllerStyleAlert];
+    [addAlertVC addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+        textField.placeholder = @"请输入信用卡所属银行";
+    }];
+    [addAlertVC addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+        textField.placeholder = @"请输入卡号";
+        textField.keyboardType=UIKeyboardTypeDecimalPad;
+    }];
     
+    UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:nil];
+    UIAlertAction *opAction = [UIAlertAction actionWithTitle:@"信用卡拍照识别" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        [self bankCardOCROnline];
+    }];
+    UIAlertAction *okAction = [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        NSString *cardBank=addAlertVC.textFields.firstObject.text;
+        NSString *cardCode=addAlertVC.textFields[1].text;
+        if (cardBank.length==0) {
+            [weakSelf homeShowMessage:@"您没有输入银行"];
+        }else if(cardCode.length<4){
+            [weakSelf homeShowMessage:@"卡号必须大于4位"];
+        }else{
+            [weakSelf homeShowMessage:@"添加完成"];
+            LVKBHomeCardsModel *model=[[LVKBHomeCardsModel alloc]init];
+            model.bank_name=cardBank;
+            model.card_num=cardCode;
+            [[YDFMDB sharedInstance]addSingleDataStringDictionary:@{@"cardBankName":model.bank_name,@"cardCode":model.card_num} withTableName:@"homeTable"];
+            [weakSelf.dataArray insertObject:model atIndex:0];
+            [weakSelf.tableView reloadData];
+        }
+        
+    }];
+    //添加 取消事件 到 弹窗界面
+    [addAlertVC addAction:cancelAction];
+    [addAlertVC addAction:opAction];
+    [addAlertVC addAction:okAction];
+    [weakSelf.navigationController presentViewController:addAlertVC animated:NO completion:nil];
 }
 
+#pragma mark -百度ocr
+- (void)bankCardOCROnline{
+    if(![PublicFunction isCanUseCamera]){
+        [self showMessage:@"没有相机权限,请前往设置开启"];
+        return;
+    }
+    WeakSelf(weakSelf)
+    UIViewController * vc =
+    [AipCaptureCardVC ViewControllerWithCardType:CardTypeBankCard andImageHandler:^(UIImage *image) {
+        [self dismissViewControllerAnimated:YES completion:nil];
+        [[AipOcrService shardService] detectBankCardFromImage:image successHandler:^(id result) {
+            if ([NSThread currentThread]!=[NSThread mainThread]) {
+                dispatch_sync(dispatch_get_main_queue(), ^{
+                    if (result[@"result"]) {
+                        if (result[@"result"][@"bank_name"]&&result[@"result"][@"bank_card_number"]) {
+                            LVKBHomeCardsModel *model=[[LVKBHomeCardsModel alloc]init];
+                            model.bank_name=result[@"result"][@"bank_name"];
+                            model.card_num=result[@"result"][@"bank_card_number"];
+                            [[YDFMDB sharedInstance]addSingleDataStringDictionary:@{@"cardBankName":model.bank_name,@"cardCode":model.card_num} withTableName:@"homeTable"];
+                            [weakSelf.dataArray insertObject:model atIndex:0];
+                            [weakSelf.tableView reloadData];
+                        }
+                    }
+                    
+                });
+            }else{
+                if (result[@"result"]) {
+                    LVKBHomeCardsModel *model=[[LVKBHomeCardsModel alloc]init];
+                    model.bank_name=result[@"result"][@"bank_name"];
+                    model.card_num=result[@"result"][@"bank_card_number"];
+                    [[YDFMDB sharedInstance]addSingleDataStringDictionary:@{@"cardBankName":model.bank_name,@"cardCode":model.card_num} withTableName:@"homeTable"];
+                    [weakSelf.dataArray insertObject:model atIndex:0];
+                    [weakSelf.tableView reloadData];
+                }
+            }
+        } failHandler:^(NSError *err) {
+            [self showMessage:@"识别失败"];
+        }];
+    }];
+    [self presentViewController:vc animated:YES completion:nil];
+    
+}
+
+
+-(void)homeShowMessage:(NSString *)msg{
+    [MBProgressHUD showMessage:msg toView:self.view];
+}
+
+
 
 #pragma mark -懒加载
 -(UIButton *)createCard{
@@ -95,7 +206,7 @@ CHHomeCardsTableViewCellDelegate
         _createCard.layer.cornerRadius=8;
         _createCard.layer.masksToBounds=YES;
         [[_createCard rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(id x) {
-//            [self requestCheckIdentityStatus];
+            [self addCard];
         }];
         _createCard.frame=CGRectMake(FITSIZE(12), NavBarHeight+10, SCREEN_WIDTH-2*FITSIZE(12), 46);
     }

KXCardHelp/GS/NewCard/VC/ORCHMoneyRecord2ChildViewController.m

@@ -228,7 +228,6 @@ UITextFieldDelegate
         }];
     }];
     [self presentViewController:vc animated:YES completion:nil];
-    
 }
 
 

KXCardHelp/GS/NewHome/VC/LVKBNewHomeViewController.h

@@ -8,6 +8,12 @@
 
 #import "LVKBBaseViewController.h"
 
-@interface LVKBNewHomeViewController : LVKBBaseViewController
+@protocol LVKBNewHomeViewControllerDelegate <NSObject>
+
+-(void)resetTabByIndex:(NSInteger)index;
 
 @end
+
+@interface LVKBNewHomeViewController : LVKBBaseViewController
+@property(nonatomic,strong)id<LVKBNewHomeViewControllerDelegate> delegate;
+@end

KXCardHelp/GS/NewHome/VC/LVKBNewHomeViewController.m

@@ -41,12 +41,29 @@ LVKBNewHomeTableViewHeaderDelegate
     
 }
 
+
+-(void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+    NSArray *arr=[[YDFMDB sharedInstance]selectDataByConditionString:nil withSelectStringArray:@[@"notiStr",@"day",@"hour",@"min",@"isOpen"] withTableName:@"notiTable" limit:-1 descID:YES];
+    [self.dataArray removeAllObjects];
+    for (NSDictionary *dic in arr) {
+        LVKBNewHomeModel *model=[[LVKBNewHomeModel alloc]init];
+        model.title=dic[@"notiStr"];
+        model.day=[dic[@"day"] integerValue];
+        model.hour=[dic[@"hour"] integerValue];
+        model.min=[dic[@"min"] integerValue];
+        model.isOpen=[dic[@"isOpen"] integerValue];
+        [self.dataArray addObject:model];
+    }
+    [self.tableView reloadData];
+}
+
 -(void)initUI{
     [self.view addSubview:self.topImageView];
     [self.view addSubview:self.tableView];
     [self.view addSubview:self.centerView];
     [self.view addSubview:self.signInBtn];
-    [[UIApplication sharedApplication].keyWindow addSubview:self.siginInView];
+    [self.view addSubview:self.siginInView];
     [self.view addSubview:self.alarmView];
 }
 
@@ -94,6 +111,7 @@ LVKBNewHomeTableViewHeaderDelegate
     LVKBNewHomeModel *model=self.dataArray[indexPath.row];
     model.index=indexPath.row;
     [cell setModel:model];
+    cell.delegate=self;
     cell.layer.cornerRadius=5;
     cell.layer.masksToBounds=YES;
     return cell;
@@ -104,9 +122,20 @@ LVKBNewHomeTableViewHeaderDelegate
 }
 
 -(void)switchActionByIndex:(NSInteger)index status:(BOOL)status{
+    
+    
+    
     LVKBNewHomeModel *model=self.dataArray[index];
+    
     model.isOpen=status;
     
+    if (status) {
+        [self creatNotTitle:model.title  day:model.day hour:model.hour min:model.min];
+    }else{
+        [self deleteNotTitle:model.title  day:model.day hour:model.hour min:model.min];
+    }
+    
+    [[YDFMDB sharedInstance] changeDataByEqualConditionStringDictionary:@{@"notiStr":model.title,@"day":@(model.day),@"hour":@(model.hour),@"min":@(model.min)} withNewStringDictionary:@{@"isOpen":@(model.isOpen)} withTableName:@"notiTable"];
 }
 - (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
     return YES;
@@ -124,6 +153,9 @@ LVKBNewHomeTableViewHeaderDelegate
 - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
     //在这里实现删除操作
     //删除数据，和删除动画
+    LVKBNewHomeModel *model=self.dataArray[indexPath.row];
+    [self deleteNotTitle:model.title  day:model.day hour:model.hour min:model.min];
+    [[YDFMDB sharedInstance] deleteDataByEqualConditionStringDictionary:@{@"notiStr":model.title,@"day":@(model.day),@"hour":@(model.hour),@"min":@(model.min),@"isOpen":@(model.isOpen)} withTableName:@"notiTable"];
     [self.dataArray removeObjectAtIndex:indexPath.row];
     [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationLeft];
 }
@@ -135,15 +167,14 @@ LVKBNewHomeTableViewHeaderDelegate
 
 -(void)didSelectItemByIndex:(NSInteger)index{
     NSLog(@"didSelectItemByIndex--%@",@(index));
+    
     switch (index) {
         case 0:
-        {
-            
-        }
-            break;
         case 1:
         {
-            
+            if (self.delegate &&[self.delegate respondsToSelector:@selector(resetTabByIndex:)]) {
+                [self.delegate resetTabByIndex:index];
+            }
         }
             break;
         case 2:
@@ -158,8 +189,6 @@ LVKBNewHomeTableViewHeaderDelegate
     }
 }
 -(void)didSelectBtn{
-    NSLog(@"didSelectBtn");
-    
     [UIView  animateWithDuration:0.5f animations:^{
         self.alarmView.y=0;
     }];
@@ -204,7 +233,17 @@ LVKBNewHomeTableViewHeaderDelegate
         UILabel *label=[[UILabel alloc]init];
         label.font=[UIFont systemFontOfSize:20];
         label.textColor=[UIColor CHColorWithHex:0x333333];
-        label.text=@"距离主卡还款日还有 10 天";
+        NSString *day=[[NSUserDefaults standardUserDefaults] objectForKey:@"zhuka_huankuan"];
+        NSInteger currentDay=[NSDate getCurrentDay];
+        if (day) {
+            if ([day integerValue]>=currentDay) {
+                 label.text=[NSString stringWithFormat:@"距离主卡还款日还有 %li 天",[day integerValue]-currentDay];
+            }else{
+                label.text=[NSString stringWithFormat:@"距离主卡还款日还有 %li 天",30-currentDay+[day integerValue]];
+            }
+        }else{
+            label.text=@"距离主卡还款日还有 -- 天";
+        }
         label.tag=1001;
         [_centerView addSubview:label];
     }
@@ -231,6 +270,21 @@ LVKBNewHomeTableViewHeaderDelegate
         _signInBtn=[UIButton buttonWithType:UIButtonTypeCustom];
         [_signInBtn setImage:[UIImage imageNamed:@"gs_signIn"] forState:UIControlStateNormal];
         [[_signInBtn rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(id x) {
+            NSInteger day=[NSDate getCurrentDay];
+            NSNumber *num=[[NSUserDefaults standardUserDefaults]objectForKey:@"gs_day"];
+            NSNumber *numCount=[[NSUserDefaults standardUserDefaults]objectForKey:@"gs_daycount"];
+            if (day==[num integerValue]) {
+                
+            }else if ((day-[num integerValue]%30)==1) {
+                //签到一天
+                numCount=@([numCount integerValue]+1);
+            }else{
+                numCount=@(1);
+            }
+            self.siginInView.dayCountLabel.text=[numCount stringValue];
+            [[NSUserDefaults standardUserDefaults]setObject:@(day) forKey:@"gs_day"];
+            [[NSUserDefaults standardUserDefaults]setObject:numCount forKey:@"gs_daycount"];
+            
             [UIView  animateWithDuration:0.5f animations:^{
                 self.siginInView.y=0;
             }];
@@ -266,6 +320,17 @@ LVKBNewHomeTableViewHeaderDelegate
             model.hour=hour;
             model.min=min;
             model.isOpen=1;
+            [[YDFMDB sharedInstance]addSingleDataStringDictionary:
+              @{@"notiStr":dic[@"notiStr"],
+                @"day":@(day),
+                @"hour":@(hour),
+                @"min":@(min),
+                @"isOpen":@(1)
+                } withTableName:@"notiTable"];
+            if (weakSelf.dataArray.count==0) {
+                [[NSUserDefaults standardUserDefaults]setObject:@(day) forKey:@"zhuka_huankuan"];
+            }
+            [weakSelf creatNotTitle:dic[@"notiStr"] day:day hour:hour min:min];
             [weakSelf.dataArray addObject:model];
             [weakSelf.tableView reloadData];
         };
@@ -274,4 +339,70 @@ LVKBNewHomeTableViewHeaderDelegate
     return _alarmView;
 }
 
+
+
+
+-(void)creatNotTitle:(NSString *)title day:(NSInteger )day hour:(NSInteger )hour min:(NSInteger) min{
+    UILocalNotification *localNotification = [[UILocalNotification alloc] init];
+    if (localNotification == nil) {
+        return;
+    }
+    //设置本地通知的触发时间（如果要立即触发，无需设置），这里设置为20妙后
+    NSString *date=[NSDate getCurrentYearMonth];
+    date=[NSString stringWithFormat:@"%@-%2li %2li-%2li",date,day,hour,min];
+    
+    NSDateFormatter *formatter1 = [[NSDateFormatter alloc]init];
+    [formatter1 setDateFormat:@"yyyy-MM-dd HH-mm"];
+    NSDate *resDate = [formatter1 dateFromString:date];
+    
+    localNotification.fireDate = resDate;
+    //设置本地通知的时区
+    localNotification.timeZone = [NSTimeZone defaultTimeZone];
+    //设置通知的内容
+    localNotification.alertBody = title;
+    //设置通知动作按钮的标题
+    localNotification.alertAction = @"查看";
+    //设置提醒的声音，可以自己添加声音文件，这里设置为默认提示声
+    localNotification.soundName = UILocalNotificationDefaultSoundName;
+    //设置通知的相关信息，这个很重要，可以添加一些标记性内容，方便以后区分和获取通知的信息
+    NSDictionary *dict =@{@"sign":[NSString stringWithFormat:@"%@%li%li%li",title,day,hour,min]};
+    [localNotification setUserInfo:dict];
+    
+    // ios8后，需要添加这个注册，才能得到授权
+    if ([[UIApplication sharedApplication] respondsToSelector:@selector(registerUserNotificationSettings:)]) {
+        UIUserNotificationType type =  UIUserNotificationTypeAlert | UIUserNotificationTypeBadge | UIUserNotificationTypeSound;
+        UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:type
+                                                                                 categories:nil];
+        [[UIApplication sharedApplication] registerUserNotificationSettings:settings];
+        // 通知重复提示的单位，可以是天、周、月
+        localNotification.repeatInterval = NSCalendarUnitMonth;
+    }
+    
+    //在规定的日期触发通知
+    [[UIApplication sharedApplication] scheduleLocalNotification:localNotification];
+}
+
+-(void)deleteNotTitle:(NSString *)title day:(NSInteger )day hour:(NSInteger )hour min:(NSInteger) min{
+     NSDictionary *dict =@{@"sign":[NSString stringWithFormat:@"%@%li%li%li",title,day,hour,min]};
+    NSArray *narry=[[UIApplication sharedApplication] scheduledLocalNotifications];
+    NSUInteger acount=[narry count];
+    if (acount>0)
+    {
+        // 遍历找到对应nfkey和notificationtag的通知
+        for (int i=0; i<acount; i++)
+        {
+            UILocalNotification *myUILocalNotification = [narry objectAtIndex:i];
+            NSDictionary *userInfo = myUILocalNotification.userInfo;
+            NSString *obj = [userInfo objectForKey:@"sign"];
+            if (obj==dict[@"sign"])
+            {
+                // 删除本地通知
+                [[UIApplication sharedApplication] cancelLocalNotification:myUILocalNotification];
+                break;
+            }
+        }
+    }
+    
+}
+
 @end

KXCardHelp/GS/NewHome/View/LVKBAddAlarmClockView.m

@@ -151,7 +151,7 @@ UITextFieldDelegate
     }else{
         UITableViewCell *cell=[self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:1 inSection:0]];
         cell.textLabel.text=[NSString stringWithFormat:@"%@",[string substringWithRange:NSMakeRange(string.length-5, 5)]];
-        self.hour   =[[string substringToIndex:2] integerValue];
+        self.hour   =[[[string componentsSeparatedByString:@" "][1] substringToIndex:2] integerValue];
         self.secound=[[string substringFromIndex:string.length-2] integerValue];
     }
 }

KXCardHelp/GS/NewHome/View/LVKBAddAlarmClockView.xib

@@ -30,17 +30,28 @@
                         </view>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3yu-nl-Xbt">
                             <rect key="frame" x="33" y="303" width="210" height="50"/>
-                            <color key="backgroundColor" red="0.42854352680000002" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="backgroundColor" red="0.55686274509803924" green="0.50196078431372548" blue="0.97647058823529409" alpha="1" colorSpace="calibratedRGB"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="50" id="wks-2D-rqc"/>
                             </constraints>
                             <state key="normal" title="保存">
                                 <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </state>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                    <integer key="value" value="5"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
                             <connections>
                                 <action selector="closeAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="aAL-yC-j8Y"/>
                             </connections>
                         </button>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(默认第一个闹钟为主卡还款日)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5ad-Wk-WxG">
+                            <rect key="frame" x="54" y="268" width="168.5" height="14.5"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                            <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
@@ -53,7 +64,9 @@
                         <constraint firstItem="3yu-nl-Xbt" firstAttribute="leading" secondItem="4Me-Wp-lh2" secondAttribute="leading" constant="33" id="e60-s7-azp"/>
                         <constraint firstItem="3yu-nl-Xbt" firstAttribute="top" secondItem="5oD-hs-CFx" secondAttribute="bottom" constant="45" id="l1S-FA-v6I"/>
                         <constraint firstItem="5oD-hs-CFx" firstAttribute="top" secondItem="CWJ-3o-iNf" secondAttribute="bottom" constant="30" id="nGX-IG-co8"/>
+                        <constraint firstItem="5ad-Wk-WxG" firstAttribute="centerX" secondItem="5oD-hs-CFx" secondAttribute="centerX" id="nYG-WO-BPY"/>
                         <constraint firstAttribute="trailing" secondItem="3yu-nl-Xbt" secondAttribute="trailing" constant="33" id="tUv-ea-ZCI"/>
+                        <constraint firstItem="5ad-Wk-WxG" firstAttribute="top" secondItem="5oD-hs-CFx" secondAttribute="bottom" constant="10" id="vcM-jP-vwc"/>
                         <constraint firstItem="CWJ-3o-iNf" firstAttribute="top" secondItem="4Me-Wp-lh2" secondAttribute="top" constant="31" id="viV-Jp-bya"/>
                         <constraint firstItem="CWJ-3o-iNf" firstAttribute="centerX" secondItem="4Me-Wp-lh2" secondAttribute="centerX" id="yDN-Cd-Bai"/>
                     </constraints>

KXCardHelp/GS/NewHome/View/LVKBNewSignInView.h

@@ -11,6 +11,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface LVKBNewSignInView : UIView
+@property (weak, nonatomic) IBOutlet UILabel *dayCountLabel;
 
 @end
 

KXCardHelp/GS/NewHome/View/LVKBNewSignInView.xib

@@ -25,8 +25,12 @@
                                 <constraint firstAttribute="width" constant="181" id="yCr-tX-LGV"/>
                             </constraints>
                         </imageView>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p8u-sV-TrR">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p8u-sV-TrR">
                             <rect key="frame" x="152.5" y="59.5" width="31.5" height="36"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="36" id="Css-vi-NS1"/>
+                                <constraint firstAttribute="width" constant="31.5" id="MmF-Wv-QQt"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="30"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
@@ -70,6 +74,9 @@
                 <constraint firstItem="pRs-tL-PYs" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="QkI-DF-HME"/>
                 <constraint firstItem="st7-8f-jqG" firstAttribute="centerY" secondItem="pRs-tL-PYs" secondAttribute="centerY" id="aQG-64-nXh"/>
             </constraints>
+            <connections>
+                <outlet property="dayCountLabel" destination="p8u-sV-TrR" id="dc2-qS-C7s"/>
+            </connections>
         </view>
     </objects>
     <resources>

KXCardHelp/GS/NewHome/cardManage/LVKBCardManageViewController.m

@@ -33,13 +33,24 @@ UITableViewDataSource
     [self adjustUI];
 }
 
+-(void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+
+    NSArray *arr=[[YDFMDB sharedInstance]selectDataByConditionString:nil withSelectStringArray:@[@"month",@"day",@"noOverRePay"] withTableName:@"repayRecordTable" limit:-1 descID:YES];
+    [self.dataArray removeAllObjects];
+    [self.dataArray addObjectsFromArray:arr];
+    [self sortData];
+    [self.tableView reloadData];
+}
+
+
 -(void)initUI{
     [self.view addSubview:self.createCard];
     [self.view addSubview:self.tableView];
     [self.view addSubview:self.addView];
-    
 }
 
+
 -(void)adjustUI{
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(0);
@@ -144,7 +155,7 @@ UITableViewDataSource
                                 @"day":@(day),
                                 @"noOverRePay":@(noOverRePay)
                                 };
-            
+            [[YDFMDB sharedInstance]addSingleDataStringDictionary:@{@"month":@(month),@"day":@(day),@"noOverRePay":@(noOverRePay)} withTableName:@"repayRecordTable"];
             [weakSelf.dataArray addObject:dic];
             [weakSelf sortData];
             [weakSelf.tableView reloadData];

KXCardHelp/Main/Home/Card/View/LVKBHomeCardsTableViewCell.m

@@ -37,7 +37,7 @@
 
 -(void)setModel:(LVKBHomeCardsModel *)model{
     _model=model;
-    [self.leftImgview sd_setImageWithURL:[NSURL URLWithString:model.bank_icon]];
+    [self.leftImgview sd_setImageWithURL:[NSURL URLWithString:model.bank_icon] placeholderImage:[UIImage imageNamed:@"bank_icon_blue"]];
     self.bankNameLabel.text=model.bank_name;
     self.bankCodeLabel.text=model.card_num;
     if ([model.is_main integerValue]==1) {
@@ -45,7 +45,7 @@
     }else{
         self.bankTypeLabel.text=@"";
     }
-    self.userNameLabel.text=model.user_name;
+    self.userNameLabel.text=(model.user_name==nil?@"卡帮":model.user_name);
 }
 
 @end

Pods/Pods.xcodeproj/xcuserdata/chuangyejia.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>AFNetworking.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 		<key>FLAnimatedImage.xcscheme</key>
 		<dict>