no message

ZhiJi.xcodeproj/project.pbxproj

@@ -1822,8 +1822,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = ZhiJi/ZhiJi.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 100;
 				DEVELOPMENT_TEAM = KQ4CS767WC;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1904,7 +1904,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.app.familymapp;
 				PRODUCT_NAME = "Family Mapp";
-				PROVISIONING_PROFILE_SPECIFIER = family_map_develop;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ZhiJi/Classes/Main/Base/ZhiJi-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "ZhiJi-Swift.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -1920,8 +1920,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = ZhiJi/ZhiJi.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;
 				DEFINES_MODULE = YES;
@@ -2004,7 +2004,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.app.familymapp;
 				PRODUCT_NAME = "Family Mapp";
-				PROVISIONING_PROFILE_SPECIFIER = family_map_develop;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ZhiJi/Classes/Main/Base/ZhiJi-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "ZhiJi-Swift.h";
 				SWIFT_VERSION = 5.0;

ZhiJi/AppDelegate.m

@@ -38,7 +38,7 @@
     [AMapServices sharedServices].apiKey = @"31b57777dd1b5f65e45c1dab247e3950";
     [AMapServices sharedServices].enableHTTPS = YES;
     
-    [UMConfigure initWithAppkey:@"5f02fdef167edd8d94000012" channel:nil];
+    [UMConfigure initWithAppkey:@"5f05b1e2895cca892f000083" channel:nil];
     [MobClick event:@"app_start"];
     
     [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];

ZhiJi/Classes/Care/Controller/ZJJinJiViewController.m

@@ -116,13 +116,13 @@
 #pragma mark 发送信息给所有紧急联系人
 - (void)sendAllEmergencyContact{
     
-    if (![ZJUserInfoManager shared].isLogin) {
+    if ([ZJUserInfoManager shared].isTourist) {
 
         ZJOauthLoginConfig * config = [[ZJOauthLoginConfig alloc] initWithCurrentVC:self];
         [config loginVerify:^(id _Nonnull model) {
             if ([model isKindOfClass:[ZJMineUserInfoModel class]] ) {
                 NSLog(@"success");
-
+                
             }
         }];
         return;

ZhiJi/Classes/LocationAttention/ZJLocationRemindSelectController.m

@@ -78,15 +78,22 @@
 - (void)setupMapViewAndUI {
     ///初始化地图
     self.mapView = [[MAMapView alloc] initWithFrame:self.view.bounds];
-    if ([ZJUserInfoManager CNLanguage]) {
-         self.mapView.mapLanguage = @0;
-    }else{
-         self.mapView.mapLanguage = @1;
-    }
     _mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     ///把地图添加至view
     [self.view addSubview: _mapView];
     [self.view sendSubviewToBack:_mapView];
+    
+    self.mapView.mapType = 0;
+    _mapView.showsWorldMap = @YES;
+    [self.mapView performSelector:@selector(setShowsWorldMap:) withObject:@(YES)];
+    if ([ZJUserInfoManager CNLanguage]) {
+        self.mapView.mapLanguage = @0;
+        [self.mapView performSelector:NSSelectorFromString(@"setMapLanguage:") withObject:@(0)];
+    }else{
+        self.mapView.mapLanguage = @1;
+        [self.mapView performSelector:NSSelectorFromString(@"setMapLanguage:") withObject:@(1)];
+    }
+    
     ///如果您需要进入地图就显示定位小蓝点，则需要下面两行代码
     _mapView.showsUserLocation = false;
     _mapView.delegate = self;

ZhiJi/Classes/Map/Controller/ZJBaseMapViewController.m

@@ -50,13 +50,13 @@
 - (void)setupUI{
     ///初始化地图
     self.mapView = [[MAMapView alloc] initWithFrame:self.view.bounds];
-    self.mapView.mapType = 0;
-    _mapView.showsWorldMap = @YES;
-    [self.mapView performSelector:@selector(setShowsWorldMap:) withObject:@(YES)];
     _mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     ///把地图添加至view
     [self.view addSubview: _mapView];
     
+    self.mapView.mapType = 0;
+    _mapView.showsWorldMap = @YES;
+    [self.mapView performSelector:@selector(setShowsWorldMap:) withObject:@(YES)];
     if ([ZJUserInfoManager CNLanguage]) {
         self.mapView.mapLanguage = @0;
         [self.mapView performSelector:NSSelectorFromString(@"setMapLanguage:") withObject:@(0)];

ZhiJi/Classes/Map/Controller/ZJFriendTrackMapViewController.m

@@ -139,6 +139,17 @@
     ///初始化地图
     self.mapView = [[MAMapView alloc] initWithFrame:self.view.bounds];
     _mapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    
+    self.mapView.mapType = 0;
+    _mapView.showsWorldMap = @YES;
+    [self.mapView performSelector:@selector(setShowsWorldMap:) withObject:@(YES)];
+    if ([ZJUserInfoManager CNLanguage]) {
+        self.mapView.mapLanguage = @0;
+        [self.mapView performSelector:NSSelectorFromString(@"setMapLanguage:") withObject:@(0)];
+    }else{
+        self.mapView.mapLanguage = @1;
+        [self.mapView performSelector:NSSelectorFromString(@"setMapLanguage:") withObject:@(1)];
+    }
     ///把地图添加至view
     [self.view addSubview: _mapView];
     

ZhiJi/Classes/Tools/PCH/ResourceHeader.pch

@@ -22,7 +22,7 @@
 
 //#if DEBUG
 //
-//#define ServerReport   @"http://report.linking100.com/ping"
+//#define ServerReport   @"http://report.linking100.com"
 //#define ServerHost     @"https://feedapitest.zhangxinhulian.com"
 //#define ServerHostFeed @"https://feedapitest.zhangxinhulian.com"
 //