guard

Dolphins.xcodeproj/project.pbxproj

@@ -349,7 +349,7 @@
 		A9C2B8CC24D039B400010EAE /* ZJZMFAPIFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZJZMFAPIFactory.h; sourceTree = "<group>"; };
 		A9C2B8CF24D039B400010EAE /* ZJBaseCareViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZJBaseCareViewController.h; sourceTree = "<group>"; };
 		A9C2B8D024D039B400010EAE /* ZJJinJiViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZJJinJiViewController.h; sourceTree = "<group>"; };
-		A9C2B8D124D039B400010EAE /* ZJXiaoXiViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZJXiaoXiViewController.m; sourceTree = "<group>"; };
+		A9C2B8D124D039B400010EAE /* ZJXiaoXiViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZJXiaoXiViewController.m; sourceTree = "<group>"; wrapsLines = 0; };
 		A9C2B8D224D039B400010EAE /* ZJCareViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZJCareViewController.m; sourceTree = "<group>"; };
 		A9C2B8D324D039B400010EAE /* ZJCareStyle2ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZJCareStyle2ViewController.h; sourceTree = "<group>"; };
 		A9C2B8D424D039B400010EAE /* ZJTianJiaViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZJTianJiaViewController.m; sourceTree = "<group>"; };
@@ -1059,14 +1059,14 @@
 		A9C2B8F624D039B400010EAE /* Controller */ = {
 			isa = PBXGroup;
 			children = (
-				A9C2B8F724D039B400010EAE /* ZJMapStyle2ViewController.m */,
-				A9C2B8F824D039B400010EAE /* ZJFriendTrackMapViewController.m */,
+				A9C2B8FC24D039B400010EAE /* ZJBaseMapViewController.h */,
 				A9C2B8F924D039B400010EAE /* ZJBaseMapViewController.m */,
-				A9C2B8FA24D039B400010EAE /* ZJMapViewController.h */,
 				A9C2B8FB24D039B400010EAE /* ZJMapStyle2ViewController.h */,
-				A9C2B8FC24D039B400010EAE /* ZJBaseMapViewController.h */,
-				A9C2B8FD24D039B400010EAE /* ZJFriendTrackMapViewController.h */,
+				A9C2B8F724D039B400010EAE /* ZJMapStyle2ViewController.m */,
+				A9C2B8FA24D039B400010EAE /* ZJMapViewController.h */,
 				A9C2B8FE24D039B400010EAE /* ZJMapViewController.m */,
+				A9C2B8FD24D039B400010EAE /* ZJFriendTrackMapViewController.h */,
+				A9C2B8F824D039B400010EAE /* ZJFriendTrackMapViewController.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -1114,14 +1114,14 @@
 		A9C2B91224D039B400010EAE /* Controller */ = {
 			isa = PBXGroup;
 			children = (
+				A9C2B91A24D039B400010EAE /* ZJMineViewController.h */,
+				A9C2B91624D039B400010EAE /* ZJMineViewController.m */,
 				A9C2B91324D039B400010EAE /* ZJSettingViewController.h */,
 				A9C2B91424D039B400010EAE /* ZJEmergencyContactViewController.m */,
 				A9C2B91524D039B400010EAE /* ZJSelectEmergencyPersonVC.m */,
-				A9C2B91624D039B400010EAE /* ZJMineViewController.m */,
 				A9C2B91724D039B400010EAE /* ZJSettingViewController.m */,
 				A9C2B91824D039B400010EAE /* ZJEmergencyContactViewController.h */,
 				A9C2B91924D039B400010EAE /* ZJSelectEmergencyPersonVC.h */,
-				A9C2B91A24D039B400010EAE /* ZJMineViewController.h */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -1332,10 +1332,10 @@
 			isa = PBXGroup;
 			children = (
 				A9C2B98B24D039B400010EAE /* ZJPhoneLoginViewController.h */,
-				A9C2B98C24D039B400010EAE /* ZJOauthLoginManager.h */,
-				A9C2B98D24D039B400010EAE /* ZJOauthLoginConfig.h */,
 				A9C2B98E24D039B400010EAE /* ZJPhoneLoginViewController.m */,
+				A9C2B98C24D039B400010EAE /* ZJOauthLoginManager.h */,
 				A9C2B98F24D039B400010EAE /* ZJOauthLoginManager.m */,
+				A9C2B98D24D039B400010EAE /* ZJOauthLoginConfig.h */,
 				A9C2B99024D039B400010EAE /* ZJOauthLoginConfig.m */,
 			);
 			path = Controller;
@@ -1961,8 +1961,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Dolphins/Dolphins.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 100;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = C87SJ88289;
@@ -2045,7 +2045,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.app.dolphinsguard;
 				PRODUCT_NAME = "海豚守护";
-				PROVISIONING_PROFILE_SPECIFIER = dev_dolphins_guard_profile;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Dolphins/Classes/Main/Base/Dolphins-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PROJECT_NAME)-Swift.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -2061,8 +2061,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Dolphins/Dolphins.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 100;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = C87SJ88289;
@@ -2145,7 +2145,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.app.dolphinsguard;
 				PRODUCT_NAME = "海豚守护";
-				PROVISIONING_PROFILE_SPECIFIER = dev_dolphins_guard_profile;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Dolphins/Classes/Main/Base/Dolphins-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PROJECT_NAME)-Swift.h";
 				SWIFT_VERSION = 5.0;

Dolphins/AppDelegate.m

@@ -43,28 +43,28 @@
     if([WXApi registerApp:WXAppId universalLink:WXUniversalLink]){
         NSLog(@"初始化成功");
     }
-    
+
     [self initializeIQKeyboardManager];
-    
+
     [AMapServices sharedServices].apiKey = @"501f8a894329f4b57bbfee208a11676f";
-    
+
     [UMConfigure initWithAppkey:@"5f02fdef167edd8d94000012" channel:nil];
     [MobClick event:@"app_start"];
-    
+
     BuglyConfig * config = [[BuglyConfig alloc] init];
     config.blockMonitorEnable = YES;
     config.blockMonitorTimeout = 1;
     [Bugly startWithAppId:@"3339c2079b" config:config];
-        
+
     Data * data = [[Data alloc]init];
     [data InitPlist];
-    
+
     [KeychainItemManager ReadUUIDAndNickName];
     [ZTPurchaseManager launchWithSwiftyStoreKit];
-    
+
     //创蓝
     [ZJOauthLoginManager initWithShanYanAppID:ShanYanAppID];
-    
+
     [self logCollection];
 
     // 通过个推平台分配的appId、 appKey 、appSecret 启动SDK，注：该方法需要在主线程中调用
@@ -83,7 +83,7 @@
         self.window.rootViewController = [[BaseViewController alloc] init];
         //      guide setting
 //        [ZJGuideConfig configWithWindow:self.window finishMainVC:[BaseTabBarViewController new]];
-        
+
         BaseTabBarViewController * tabbar = [[BaseTabBarViewController alloc] init];
         tabbar.launch = YES;
         [ZJGuideConfig configWithWindow:self.window finishMainVC:tabbar];

Dolphins/Assets.xcassets/Care/底框(2).imageset/Contents.json

@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
+      "filename" : "底框@2x(2).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "组 8@3x.png",
+      "filename" : "底框@3x(2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Dolphins/Base.lproj/LaunchScreen.storyboard

@@ -20,7 +20,7 @@
                                 <rect key="frame" x="146" y="173.5" width="122" height="146"/>
                             </imageView>
                         </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="dC3-SO-tgb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" multiplier="0.55" id="2Va-Mo-5Ql"/>
                             <constraint firstItem="dC3-SO-tgb" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="ssc-pU-r2l"/>

Dolphins/Classes/Care/Controller/ZJXiaoXiViewController.m

@@ -57,7 +57,6 @@ static NSString *ID = @"xiaoXi";
 - (void)loadData{
     
     self.dataArray = [NSMutableArray array];
-    self.systemDataArray = [NSMutableArray array];
     
     [[TQNetworkTools shared] getWithAction:messageList parameters:@{} success:^(id  _Nonnull response) {
         
@@ -79,10 +78,13 @@ static NSString *ID = @"xiaoXi";
     } failure:^(NSError * _Nonnull error) {
         NSLog(@"getMessage_failure");
     }];
+}
 
+- (void)systemMessageDataSource{
     
+    self.systemDataArray = [NSMutableArray array];
     [[TQNetworkTools shared] getWithAction:systemMessageList parameters:@{@"page":@"1", @"size":@"100"} success:^(id  _Nonnull response) {
-        
+       
         if([[response objectForKey:@"status"] integerValue] == 200){
 
             for (NSDictionary * dic in response[@"result"][@"data"]) {
@@ -91,7 +93,8 @@ static NSString *ID = @"xiaoXi";
                 [model setValuesForKeysWithDictionary:dic];
                 [self.systemDataArray addObject:model];
             }
-            
+            self.xiaoXiTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+            self.currentDataArray = self.systemDataArray;
             [self.xiaoXiTableView reloadData];
             
         }else{
@@ -167,11 +170,20 @@ static NSString *ID = @"xiaoXi";
     if (sender.tag - 0x64 == 0) {
         _msgType = DGFriendMsgType;
         _currentDataArray = self.dataArray;
+        
+        self.xiaoXiTableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine;
+        [self.xiaoXiTableView reloadData];
     }else{
+        
         _msgType = DGSystemMsgType;
-        _currentDataArray = self.systemDataArray;
+        if (self.systemDataArray) {
+            self.xiaoXiTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+            _currentDataArray = self.systemDataArray;
+            [self.xiaoXiTableView reloadData];
+        }else{
+            [self systemMessageDataSource];
+        }
     }
-    [self.xiaoXiTableView reloadData];
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
@@ -214,7 +226,7 @@ static NSString *ID = @"xiaoXi";
         [systemCell.headerImV sd_setImageWithURL:[NSURL URLWithString:model.iconUrl]];
         systemCell.titleLab.text = model.remindUser;
         systemCell.timeLab.text = model.createdAt;
-        systemCell.desLab.text = model.remark;
+        systemCell.desLab.text = model.remindName;
 
         cell = systemCell;
     }

Dolphins/Classes/Guard/Controller/ZJGuardViewController.m

@@ -130,6 +130,7 @@
             BOOL map_style2 = switchDic && [[NSString stringWithFormat:@"%@",[switchDic objectForKey:@"map_page_style"]] isEqualToString:@"1"];
             
             ZJBaseMapViewController * map = map_style2 ? [[ZJMapStyle2ViewController alloc] init] : [[ZJMapViewController alloc] init];
+            map.title = @"Ta的位置";
             [self.navigationController pushViewController:map animated:YES];
         }
             break;

Dolphins/Classes/Login/Controller/ZJPhoneLoginViewController.m

@@ -266,9 +266,11 @@
     [self removeKeyBoard];
     
     [[TQNetworkTools shared] postWithAction:getSmsCode parameters:@{@"phoneNo":phoneTextfield.text} success:^(id  _Nonnull response) {
-//        self->isSend = YES;
-        NSLog(@"getSmsCode response %@", response);
-        [self countDown:sender];
+        if([[response objectForKey:@"status"] integerValue] == 200){
+            [self countDown:sender];
+        }else{
+            [MBProgressHUD showError:[response objectForKey:@"msg"] toView:self.view];
+        }
     } failure:^(NSError * _Nonnull error) {
         NSLog(@"loginWithPhone 失败 %@", error);
     }];

Dolphins/Classes/Map/Controller/ZJBaseMapViewController.m

@@ -196,7 +196,8 @@
             
             NSString *aa = [NSString stringWithFormat:@"%@", response[@"result"][@"data"]];
             
-            if (aa.length == 6) {
+            if (aa.length == 6 || [response[@"result"][@"data"][@"lat"] isMemberOfClass:[NSNull class]] || [response[@"result"][@"data"][@"lon"] isMemberOfClass:[NSNull class]]) {
+                [MBProgressHUD showMessage:@"暂无数据" toView:self.view];
                 return;
             }
             

Dolphins/Classes/Map/Controller/ZJFriendTrackMapViewController.m

@@ -463,7 +463,8 @@
             
             NSString *aa = [NSString stringWithFormat:@"%@", response[@"result"][@"data"]];
             
-            if (aa.length == 6) {
+            if (aa.length == 6 || [response[@"result"][@"data"][@"lat"] isMemberOfClass:[NSNull class]] || [response[@"result"][@"data"][@"lon"] isMemberOfClass:[NSNull class]]) {
+                [MBProgressHUD showMessage:@"暂无数据" toView:self.view];
                 return;
             }
             

Dolphins/Classes/Tools/BasicMacro.h

@@ -46,11 +46,11 @@ green:((CGFloat)((rgbValue & 0xFF00) >> 8)) / 255.0 \
 blue:((CGFloat)(rgbValue & 0xFF)) / 255.0 alpha:(a)]
 
 // 正常打印(包括方法名和代码所在的行数)
-#ifdef DEBUG
-#define NSLog(format, ...) printf("\n[%s] %s [%d行] %s\n", __TIME__, __FUNCTION__, __LINE__, [[NSString stringWithFormat:format, ## __VA_ARGS__] UTF8String]);
-#else
-#define NSLog(format, ...) nil
-#endif
+//#ifdef DEBUG
+//#define NSLog(format, ...) printf("\n[%s] %s [%d行] %s\n", __TIME__, __FUNCTION__, __LINE__, [[NSString stringWithFormat:format, ## __VA_ARGS__] UTF8String]);
+//#else
+//#define NSLog(format, ...) nil
+//#endif
 
 // 打印错误日志
 #ifdef DEBUG

Dolphins/Classes/Tools/LaunchScreen/LaunchScreenPlaceHolderView.xib

@@ -18,7 +18,7 @@
                     <rect key="frame" x="146" y="173.5" width="122" height="146"/>
                 </imageView>
             </subviews>
-            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstItem="Z3I-sh-qPI" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="RWp-yG-pPE"/>
                 <constraint firstItem="Z3I-sh-qPI" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" multiplier="0.55" id="hsl-Hi-mKr"/>

Dolphins/SceneDelegate.m

@@ -98,6 +98,7 @@
 
 
 - (void)sceneDidBecomeActive:(UIScene *)scene {
+    [UIApplication sharedApplication].applicationIconBadgeNumber = 0;
     [[ZJUserInfoManager shared] inviteFriendWithCode];
     [[ZJGoodsMagager shared] loadingGoodsUrl:nil];
 }