no message

ZhiJi/Classes/Care/Controller/ZJBaseCareViewController.m

@@ -56,11 +56,14 @@
 //    if ([CLLocationManager locationServicesEnabled]) {
 //         [self.locationManager startUpdatingLocation];
 //    }
-    [[ZJLocationManager shared] initWithLocationUpdateInfo:^(ZJLocationModel * model, CLLocation * location) {
+    [[ZJLocationManager shared] initWithLocationUpdateInfo:^(ZJLocationModel * model, CLLocation * location, ZJMapType mapType) {
         
+        if(!model){
+            return;
+        }
         [self updateMySelf:model];
-//        [self uploadSelfLocation:location placemark:model];
 
+//        [self uploadSelfLocation:location placemark:model];
     }];
 }
 

ZhiJi/Classes/Map/Controller/ZJBaseMapViewController.m

@@ -50,7 +50,11 @@
     });
     
     self.refershMyself = YES;
-    [[ZJLocationManager shared] initWithLocationUpdateInfo:^(ZJLocationModel * model, CLLocation * location) {
+    [[ZJLocationManager shared] initWithLocationUpdateInfo:^(ZJLocationModel * model, CLLocation * location, ZJMapType mapType) {
+        
+        if(!model){
+            return;
+        }
         
         CLLocationCoordinate2D coord = CLLocationCoordinate2DMake(model.latitude, model.longitude);
         

ZhiJi/Classes/Tools/UserInfoManager/ZJLocationManager.h

@@ -11,7 +11,12 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef void(^locationUpdateInfoCallBack)(ZJLocationModel *, CLLocation *);
+typedef enum : NSUInteger {
+    ZJ_GMSMapType,
+    ZJ_MAMapType
+} ZJMapType;
+
+typedef void(^locationUpdateInfoCallBack)(ZJLocationModel * _Nullable,  CLLocation * _Nullable , ZJMapType);
 
 @interface ZJLocationManager : NSObject
 
@@ -19,6 +24,8 @@ typedef void(^locationUpdateInfoCallBack)(ZJLocationModel *, CLLocation *);
 
 @property (nonatomic, strong, readonly) CLLocation * currentLocation;
 
+@property (nonatomic, assign, readonly) ZJMapType mapType;
+
 + (instancetype)shared;
 
 - (void)initWithLocationUpdateInfo:(locationUpdateInfoCallBack)callBack;

ZhiJi/Classes/Tools/UserInfoManager/ZJLocationManager.m

@@ -109,6 +109,7 @@ static ZJLocationManager * manager;
 
     [geocoder reverseGeocodeLocation: loctaion completionHandler:^(NSArray<CLPlacemark *> * _Nullable placemarks, NSError * _Nullable error) {
         if (placemarks.count > 0) {
+            
             CLPlacemark *placemark = [placemarks firstObject];
             //获取城市
             NSString *city = placemark.locality;
@@ -128,13 +129,19 @@ static ZJLocationManager * manager;
 //            　　NSLog(@"subLocality, %@",placemark.subLocality);
 //                 国家
 //        　　    NSLog(@"country,%@",placemark.country);
-                        
+            
             [self updateLocation:loctaion placemark:placemark];
             
         }else if (error == nil && [placemarks count] == 0) {
             NSLog(@"No results were returned.");
+            if (self.callBack) {
+                self.callBack(nil, nil, ZJ_GMSMapType);
+            }
         } else if (error != nil){
             NSLog(@"An error occurred = %@", error);
+            if (self.callBack) {
+                self.callBack(nil, nil, ZJ_GMSMapType);
+            }
         }
     }];
     
@@ -158,8 +165,12 @@ static ZJLocationManager * manager;
     
     [self uploadSelfLocation:location placemark:model];
     
+    BOOL isChina = NO;
+    isChina = [placemark.ISOcountryCode isEqualToString:@"CN"];
+    _mapType = isChina ? ZJ_MAMapType : ZJ_GMSMapType;
+    
     if (_callBack) {
-        _callBack(model, location);
+        _callBack(model, location, _mapType);
     }
 }