no message

ZhiJi.xcodeproj/project.pbxproj

@@ -158,6 +158,7 @@
 		A9764A5C2492380D00463B78 /* ZJImagePickerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A9764A5B2492380D00463B78 /* ZJImagePickerManager.m */; };
 		A9C2B61F24CEC0DC00010EAE /* ZJCustomAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B61E24CEC0DC00010EAE /* ZJCustomAnnotation.m */; };
 		A9C2B62224CFF5F900010EAE /* MAMapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9C2B62124CFF5F900010EAE /* MAMapKit.framework */; };
+		A9C2B63924D02ED600010EAE /* ZJMapPinchGestureRecognizer.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2B63824D02ED600010EAE /* ZJMapPinchGestureRecognizer.m */; };
 		A9F91E28249CCA4B006157BF /* ZJUpgradeAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = A9F91E27249CCA4B006157BF /* ZJUpgradeAlertView.m */; };
 		A9F91E3E249DFC53006157BF /* BaseWebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9F91E3D249DFC53006157BF /* BaseWebViewController.m */; };
 		D5167D5B2490C87400A79CB6 /* ZJSheZhiView.m in Sources */ = {isa = PBXBuildFile; fileRef = D5167D592490C87400A79CB6 /* ZJSheZhiView.m */; };
@@ -470,6 +471,8 @@
 		A9C2B61D24CEC0DC00010EAE /* ZJCustomAnnotation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJCustomAnnotation.h; sourceTree = "<group>"; };
 		A9C2B61E24CEC0DC00010EAE /* ZJCustomAnnotation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJCustomAnnotation.m; sourceTree = "<group>"; };
 		A9C2B62124CFF5F900010EAE /* MAMapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MAMapKit.framework; sourceTree = "<group>"; };
+		A9C2B63724D02ED600010EAE /* ZJMapPinchGestureRecognizer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJMapPinchGestureRecognizer.h; sourceTree = "<group>"; };
+		A9C2B63824D02ED600010EAE /* ZJMapPinchGestureRecognizer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJMapPinchGestureRecognizer.m; sourceTree = "<group>"; };
 		A9F91E26249CCA4B006157BF /* ZJUpgradeAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJUpgradeAlertView.h; sourceTree = "<group>"; };
 		A9F91E27249CCA4B006157BF /* ZJUpgradeAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJUpgradeAlertView.m; sourceTree = "<group>"; };
 		A9F91E3C249DFC53006157BF /* BaseWebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseWebViewController.h; sourceTree = "<group>"; };
@@ -1032,6 +1035,8 @@
 				64F52441248F34DB0032BCA2 /* ZJFriendTrackMapViewController.m */,
 				A9C2B61D24CEC0DC00010EAE /* ZJCustomAnnotation.h */,
 				A9C2B61E24CEC0DC00010EAE /* ZJCustomAnnotation.m */,
+				A9C2B63724D02ED600010EAE /* ZJMapPinchGestureRecognizer.h */,
+				A9C2B63824D02ED600010EAE /* ZJMapPinchGestureRecognizer.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -1480,6 +1485,7 @@
 				A95F5C6E248DDE81001DB97E /* UITableView+SDAutoTableViewCellHeight.m in Sources */,
 				D5271EC6248FBD9C00F8B107 /* Dequeuable.swift in Sources */,
 				A948C4A92493B31E00C22D69 /* ZJSelectEmergencyPersonCell.m in Sources */,
+				A9C2B63924D02ED600010EAE /* ZJMapPinchGestureRecognizer.m in Sources */,
 				6453730F2497792500FD4C07 /* ZJLocationRemindSelectController.m in Sources */,
 				A95BD59224AC500A00962B06 /* ZYPinYinSearch.m in Sources */,
 				A95F5C5D248DDE81001DB97E /* YCShadowView.m in Sources */,

ZhiJi/Classes/LocationAttention/ZJLocationRemindSelectController.m

@@ -19,6 +19,7 @@
 
 #import <MapKit/MapKit.h>
 #import "ZJCustomAnnotation.h"
+#import "ZJMapPinchGestureRecognizer.h"
 
 @interface ZJLocationRemindSelectController ()<MAMapViewDelegate, SJSliderDelegate, AMapSearchDelegate, MKMapViewDelegate>{
     BOOL sliderDrag;
@@ -129,7 +130,11 @@
     self.remarkString = _editModel.remark;
     self.addressMainTitleLabel.text = _editModel.address;
     self.addressSubTitleLabel.text = _editModel.addressName;
+ 
+    CLLocationCoordinate2D centerLocationCoordinate = [self.mapView convertPoint:self.mapView.center toCoordinateFromView:self.mapView];
+    [self.mapView setRegion:MKCoordinateRegionMakeWithDistance( centerLocationCoordinate, 10000, 10000) animated:false];
     
+    [self.mapView addGestureRecognizer:[[ZJMapPinchGestureRecognizer alloc] initWithMapView:self.mapView]];
 }
 
 - (void)mapView:(MKMapView *)mapView regionWillChangeAnimated:(BOOL)animated{
@@ -148,9 +153,17 @@
     
     self.circle = [MKCircle circleWithCenterCoordinate:self.mapView.centerCoordinate radius:500];
     [self.mapView addOverlay:self.circle];
+//
+//    CLLocationCoordinate2D center = mapView.region.center;
+//    //设置跨度为当前地图范围的跨度 * 比例系数
+//    MKCoordinateSpan span = MKCoordinateSpanMake(mapView.region.span.latitudeDelta * 2, mapView.region.span.longitudeDelta * 2);
+//    [mapView setRegion:MKCoordinateRegionMake(center, span) animated:NO];
     
     self.location =  [[CLLocation alloc] initWithLatitude:mapView.centerCoordinate.latitude longitude:mapView.centerCoordinate.longitude];
     [self centerLocation:self.location];
+    
+    
+    
 }
 
 - (void)centerLocation:(CLLocation *)location {

ZhiJi/Classes/Map/Controller/ZJMapPinchGestureRecognizer.h

+//
+//  ZJMapPinchGestureRecognizer.h
+//  ZhiJi
+//
+//  Created by 明津李 on 2020/7/28.
+//  Copyright © 2020 Company. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import <MapKit/MapKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ZJMapPinchGestureRecognizer : UIPinchGestureRecognizer
+
+- (id)initWithMapView:(MKMapView *)mapView;
+
+@end
+
+NS_ASSUME_NONNULL_END

ZhiJi/Classes/Map/Controller/ZJMapPinchGestureRecognizer.m

+//
+//  ZJMapPinchGestureRecognizer.m
+//  ZhiJi
+//
+//  Created by 明津李 on 2020/7/28.
+//  Copyright © 2020 Company. All rights reserved.
+//
+
+#import "ZJMapPinchGestureRecognizer.h"
+
+@interface ZJMapPinchGestureRecognizer ()
+
+- (void)handlePinchGesture;
+
+@property (nonatomic, assign) MKMapView *mapView;
+
+@end
+
+@implementation ZJMapPinchGestureRecognizer
+
+- (id)initWithMapView:(MKMapView *)mapView {
+  if (mapView == nil) {
+    [NSException raise:NSInvalidArgumentException format:@"mapView cannot be nil."];
+  }
+
+  if ((self = [super initWithTarget:self action:@selector(handlePinchGesture)])) {
+    self.mapView = mapView;
+  }
+
+  return self;
+}
+
+- (BOOL)canBePreventedByGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer {
+  return NO;
+}
+
+- (BOOL)canPreventGestureRecognizer:(UIGestureRecognizer *)gestureRecognizer {
+  return NO;
+}
+
+- (void)handlePinchGesture {
+  CLLocation *location = self.mapView.userLocation.location;
+  if (location != nil) {
+    [self.mapView setCenterCoordinate:location.coordinate];
+  }
+}
+
+@end

ZhiJi/Classes/Tools/Network/TQNetworkTools.m

@@ -213,8 +213,8 @@ static TQNetworkTools* _tools = nil;
     //    [dict setValue: @"1" forKey: @"tgtk"];
     
     // 获取BundleID
-//    [dict setValue: [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] forKey: @"pkg"];
-    [dict setValue: @"com.app.zhiji" forKey: @"pkg"];  //cs
+    [dict setValue: [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] forKey: @"pkg"];
+//    [dict setValue: @"com.app.zhiji" forKey: @"pkg"];  //cs
 
     NSString *identifierForVendor = [[data Read] objectForKey:@"Identifier"];;
     [dict setValue: identifierForVendor forKey: @"device"];
@@ -230,8 +230,8 @@ static TQNetworkTools* _tools = nil;
     //    }
     
     //appLs
-//    [dict setValue: @"040087e60c36fd63" forKey: @"appLs"];
-    [dict setValue: @"d904ceaa1b3f6444" forKey: @"appLs"];  //cs
+    [dict setValue: @"040087e60c36fd63" forKey: @"appLs"];
+//    [dict setValue: @"d904ceaa1b3f6444" forKey: @"appLs"];  //cs
     
     // 设置网络类型
     [[AFNetworkReachabilityManager sharedManager] setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) {
@@ -556,8 +556,8 @@ static TQNetworkTools* _tools = nil;
     [dict setValue: identifierForVendor forKey: @"device"];
     NSLog(@"identifierForVendor info == %@", identifierForVendor);
     // 获取BundleID
-//    [dict setValue: [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] forKey: @"pkg"];
-    [dict setValue: @"com.app.zhiji" forKey: @"pkg"];
+    [dict setValue: [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] forKey: @"pkg"];
+//    [dict setValue: @"com.app.zhiji" forKey: @"pkg"];
     
     // 设置时间戳
     NSTimeInterval today = [[NSDate date] timeIntervalSince1970] * 1000;
@@ -569,8 +569,8 @@ static TQNetworkTools* _tools = nil;
     //    }
     
     //appLs
-//    [dict setValue: @"040087e60c36fd63" forKey: @"appLs"];
-    [dict setValue: @"d904ceaa1b3f6444" forKey: @"appLs"];
+    [dict setValue: @"040087e60c36fd63" forKey: @"appLs"];
+//    [dict setValue: @"d904ceaa1b3f6444" forKey: @"appLs"];
     
     [dict addEntriesFromDictionary:[self signParams:dict]];