Merge branch 'master' of gitlab.huolea.com:lmi/dolphins

# Conflicts:
#	.DS_Store

Dolphins.xcworkspace/xcuserdata/zhangguangyi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -15,5 +15,16 @@
             stopOnStyle = "0">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
+         <BreakpointContent
+            uuid = "3D1E0B48-F25D-4803-B8BA-801A7D280BF8"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            scope = "1"
+            stopOnStyle = "0">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

Dolphins/Classes/Guard/Controller/ZJGuardViewController.m

@@ -41,7 +41,7 @@
     
     _dataSource = [[NSMutableArray alloc] init];
     [self setUI];
-    [self getFriendList];
+//    [self getFriendList];
 }
 
 - (void)setUI{
@@ -77,8 +77,26 @@
 
 -(void)requestRemindList
 {
+    NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"reminderTypeList"];
+    id response = [NSKeyedUnarchiver unarchiveObjectWithData:data];
+    if (response && [response isKindOfClass:[NSDictionary class]]) {
+        if ([response[@"result"][@"data"] isKindOfClass:[NSArray class]]) {
+            [self.dataSource removeAllObjects];
+            for (NSDictionary *dict in response[@"result"][@"data"]) {
+                ZJChooseIcon *model = [ZJChooseIcon yy_modelWithJSON:dict];
+                [self.dataSource addObject:model];
+            }
+            ZJChooseIcon *model = [ZJChooseIcon yy_modelWithJSON:@{@"name":@"添加提醒", @"iconUrl":@"remind_cell_Add"}];
+            [self.dataSource addObject:model];
+        }
+    }
+    [self.collectView reloadData];
+    
     [[TQNetworkTools shared] getWithAction:reminderTypeList parameters:@{} success:^(id  _Nonnull response) {
         if ([response[@"status"] intValue] == 200) {
+            NSData *data = [NSKeyedArchiver archivedDataWithRootObject:response];
+            [[NSUserDefaults standardUserDefaults] setObject:data forKey:@"reminderTypeList"];
+            [[NSUserDefaults standardUserDefaults] synchronize];
             [self.dataSource removeAllObjects];
             if ([response[@"result"][@"data"] isKindOfClass:[NSArray class]]) {
                 for (NSDictionary *dict in response[@"result"][@"data"]) {
@@ -244,8 +262,12 @@
     [collectionView deselectItemAtIndexPath:indexPath animated:YES];
     
     if (![ZJUserInfoManager shared].isLogin) {
-        UIViewController *vc = [[NSClassFromString(@"ZJPhoneLoginViewController") alloc] init];
-        [self.navigationController pushViewController:vc animated:YES];
+        ZJOauthLoginConfig * config = [[ZJOauthLoginConfig alloc] initWithCurrentVC:self];
+        [config loginVerify:^(id _Nonnull model) {
+            if ([model isKindOfClass:[ZJMineUserInfoModel class]] ) {
+                [self requestRemindList];
+            }
+        }];
         return;
     }