Skip to content

Z
ZhiJi-Overseas
Commit 37e55d02 authored by lmj_521aiau@163.com's avatar lmj_521aiau@163.com
Browse files
Options

no message

parent 2dcce617
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 28 deletions
ZhiJi.xcodeproj/project.pbxproj
View file @ 37e55d02
......@@ -153,7 +153,6 @@
A96696D724AF517300CF6992 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A96696D624AF517300CF6992 /* libz.tbd */; };
A96696D924AF518400CF6992 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A96696D824AF518400CF6992 /* libc++.tbd */; };
A96696DB24AF5C0700CF6992 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A96696DA24AF5C0700CF6992 /* GLKit.framework */; };
A96696E224AF5DE000CF6992 /* MAMapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A96696E124AF5DE000CF6992 /* MAMapKit.framework */; };
A96696E424AF5E7700CF6992 /* AMap.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A96696E324AF5E7700CF6992 /* AMap.bundle */; };
A9764A522490EAC600463B78 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9764A512490EAC600463B78 /* CoreGraphics.framework */; };
A9764A5C2492380D00463B78 /* ZJImagePickerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = A9764A5B2492380D00463B78 /* ZJImagePickerManager.m */; };
......@@ -462,7 +461,6 @@
A96696D624AF517300CF6992 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
A96696D824AF518400CF6992 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
A96696DA24AF5C0700CF6992 /* GLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLKit.framework; path = System/Library/Frameworks/GLKit.framework; sourceTree = SDKROOT; };
A96696E124AF5DE000CF6992 /* MAMapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MAMapKit.framework; sourceTree = "<group>"; };
A96696E324AF5E7700CF6992 /* AMap.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = AMap.bundle; path = ZhiJi/Classes/Tools/MAMAP/MAMapKit.framework/AMap.bundle; sourceTree = "<group>"; };
A9764A512490EAC600463B78 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
A9764A5A2492380D00463B78 /* ZJImagePickerManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJImagePickerManager.h; sourceTree = "<group>"; };
......@@ -512,7 +510,6 @@
A96696D924AF518400CF6992 /* libc++.tbd in Frameworks */,
A96696D724AF517300CF6992 /* libz.tbd in Frameworks */,
A95BD5B924AE0DEE00962B06 /* libsqlite3.0.tbd in Frameworks */,
A96696E224AF5DE000CF6992 /* MAMapKit.framework in Frameworks */,
A9764A522490EAC600463B78 /* CoreGraphics.framework in Frameworks */,
A95F5CC0248F6D25001DB97E /* libc++.1.tbd in Frameworks */,
A95F5CBE248F2506001DB97E /* CoreTelephony.framework in Frameworks */,
......@@ -829,7 +826,6 @@
A95F5BBC248DDE80001DB97E /* Tools */ = {
isa = PBXGroup;
children = (
A96696E024AF5DE000CF6992 /* MAMAP */,
A95BD57524AC500A00962B06 /* Vendor */,
A9619E8D24AB0E90009A2012 /* ZJLoginManager */,
A9619E8C24AB082D009A2012 /* ShareManager */,
......@@ -1230,14 +1226,6 @@
path = ZJLoginManager;
sourceTree = "<group>";
};
A96696E024AF5DE000CF6992 /* MAMAP */ = {
isa = PBXGroup;
children = (
A96696E124AF5DE000CF6992 /* MAMapKit.framework */,
);
path = MAMAP;
sourceTree = "<group>";
};
A9764A59249237F200463B78 /* ImagePicker */ = {
isa = PBXGroup;
children = (
......
ZhiJi/Classes/LocationAttention/ZJLocationRemindSelectController.m
View file @ 37e55d02
......@@ -223,7 +223,6 @@
- (void)mapView:(MAMapView *)mapView mapDidMoveByUser:(BOOL)wasUserAction {
self.location = [[CLLocation alloc] initWithLatitude:mapView.centerCoordinate.latitude longitude:mapView.centerCoordinate.longitude];
[self reverseGeocodeLocation: self.location];
}
/// Description
......
ZhiJi/Classes/Map/Controller/ZJBaseMapViewController.h
View file @ 37e55d02
......@@ -7,8 +7,6 @@
//
#import "BaseViewController.h"
#import <MAMapKit/MAMapKit.h>
#import <AMapFoundationKit/AMapFoundationKit.h>
#import "ZJMapViewPersonCardView.h"
#import "ZJFriendTrackMapViewController.h"
#import "ZJUserInfoManager.h"
......
ZhiJi/Classes/Map/Controller/ZJBaseMapViewController.m
View file @ 37e55d02
......@@ -9,7 +9,7 @@
#import "ZJBaseMapViewController.h"
#import <MapKit/MapKit.h>
@interface ZJBaseMapViewController ()<MAMapViewDelegate, XMPopupListViewDelegate, MKMapViewDelegate>
@interface ZJBaseMapViewController ()<XMPopupListViewDelegate, MKMapViewDelegate>
@property (nonatomic, strong) MKMapView *mapView;
......@@ -49,7 +49,7 @@
///初始化地图
self.mapView = [[MKMapView alloc] initWithFrame:self.view.bounds];
_mapView.showsUserLocation = YES;
_mapView.userTrackingMode = MAUserTrackingModeFollow;
_mapView.userTrackingMode = MKUserTrackingModeFollow;
_mapView.delegate = self;
_mapView.showsScale = false;
_mapView.showsCompass = false;
......@@ -112,7 +112,7 @@
//未登录
///如果您需要进入地图就显示定位小蓝点，则需要下面两行代码
_mapView.showsUserLocation = YES;
_mapView.userTrackingMode = MAUserTrackingModeFollow;
_mapView.userTrackingMode = MKUserTrackingModeFollow;
return;
}
[self.friendDataSource removeAllObjects];
......@@ -133,7 +133,7 @@
[weakSelf.style2BgImV setHidden:false];
///如果您需要进入地图就显示定位小蓝点，则需要下面两行代码
weakSelf.mapView.showsUserLocation = YES;
weakSelf.mapView.userTrackingMode = MAUserTrackingModeFollow;
weakSelf.mapView.userTrackingMode = MKUserTrackingModeFollow;
} else {
[weakSelf.cardView setHidden:false];
[weakSelf.addCareButton setHidden:true];
......@@ -156,7 +156,7 @@
} else {
///如果您需要进入地图就显示定位小蓝点，则需要下面两行代码
weakSelf.mapView.showsUserLocation = YES;
weakSelf.mapView.userTrackingMode = MAUserTrackingModeFollow;
weakSelf.mapView.userTrackingMode = MKUserTrackingModeFollow;
// [MBProgressHUD showError:[NSString stringWithFormat:@"获取好友列表失败\n%@", [response objectForKey:@"msg"]] toView:self.view];
}
......
ZhiJi/Classes/Map/Controller/ZJFriendTrackMapViewController.m
View file @ 37e55d02
......@@ -7,8 +7,6 @@
//
#import "ZJFriendTrackMapViewController.h"
#import <MAMapKit/MAMapKit.h>
#import <AMapFoundationKit/AMapFoundationKit.h>
#import "ZJUserTrackTimeView.h"
#import "ZhiJi-Swift.h"
#import "ZJUserInfoManager.h"
......@@ -23,7 +21,7 @@
#define AnimationDuration 8
@interface ZJFriendTrackMapViewController () <MAMapViewDelegate, MKMapViewDelegate, CAAnimationDelegate>{
@interface ZJFriendTrackMapViewController () <MKMapViewDelegate, CAAnimationDelegate>{
float* hues;
float *velocity;
ZJCustomAnnotation * endAnnotation;
......@@ -141,7 +139,7 @@
///如果您需要进入地图就显示定位小蓝点，则需要下面两行代码
// _mapView.showsUserLocation = false;
_mapView.showsUserLocation = YES;
_mapView.userTrackingMode = MAUserTrackingModeFollow;
_mapView.userTrackingMode = MKUserTrackingModeFollow;
_mapView.delegate = self;
_mapView.showsScale = false;
_mapView.showsCompass = false;
......@@ -374,13 +372,13 @@
if ([ZJUserInfoManager shared].uid.length <= 0) {
///如果您需要进入地图就显示定位小蓝点，则需要下面两行代码
self.mapView.showsUserLocation = YES;
self.mapView.userTrackingMode = MAUserTrackingModeFollow;
self.mapView.userTrackingMode = MKUserTrackingModeFollow;
return;
}
if ([ZJUserInfoManager shared].token.length <= 0) {
///如果您需要进入地图就显示定位小蓝点，则需要下面两行代码
self.mapView.showsUserLocation = YES;
self.mapView.userTrackingMode = MAUserTrackingModeFollow;
self.mapView.userTrackingMode = MKUserTrackingModeFollow;
return;
}
......@@ -440,7 +438,7 @@
if ([ZJUserInfoManager shared].uid.length <= 0) {
///如果您需要进入地图就显示定位小蓝点，则需要下面两行代码
self.mapView.showsUserLocation = YES;
self.mapView.userTrackingMode = MAUserTrackingModeFollow;
self.mapView.userTrackingMode = MKUserTrackingModeFollow;
return;
}
__weak typeof(self) _self = self;
......@@ -449,7 +447,7 @@
if (uid.length <= 0) {
///如果您需要进入地图就显示定位小蓝点，则需要下面两行代码
self.mapView.showsUserLocation = YES;
self.mapView.userTrackingMode = MAUserTrackingModeFollow;
self.mapView.userTrackingMode = MKUserTrackingModeFollow;
uid = [ZJUserInfoManager shared].uid;
}
[[TQNetworkTools shared] getWithAction:getLocationDataLast parameters:@{@"tid": uid} success:^(id _Nonnull response) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment