Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
Z
ZhiJi-Overseas
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lmj
ZhiJi-Overseas
Commits
c7f26015
Commit
c7f26015
authored
Jul 23, 2020
by
lmj_521aiau@163.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
track gmsmap mamap
parent
c4c6f713
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
89 additions
and
44 deletions
+89
-44
.DS_Store
.DS_Store
+0
-0
ZhiJi.xcscheme
ZhiJi.xcodeproj/xcshareddata/xcschemes/ZhiJi.xcscheme
+2
-2
ZJFriendTrackMapViewController.h
...i/Classes/Map/Controller/ZJFriendTrackMapViewController.h
+2
-2
ZJFriendTrackMapViewController.m
...i/Classes/Map/Controller/ZJFriendTrackMapViewController.m
+78
-39
ZJLocationManager.h
ZhiJi/Classes/Tools/UserInfoManager/ZJLocationManager.h
+1
-1
ZJLocationManager.m
ZhiJi/Classes/Tools/UserInfoManager/ZJLocationManager.m
+6
-0
No files found.
.DS_Store
View file @
c7f26015
No preview for this file type
ZhiJi.xcodeproj/xcshareddata/xcschemes/ZhiJi.xcscheme
View file @
c7f26015
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
ignoresPersistentStateOnLaunch =
"NO"
ignoresPersistentStateOnLaunch =
"NO"
debugDocumentVersioning =
"YES"
debugDocumentVersioning =
"YES"
debugServiceExtension =
"internal"
debugServiceExtension =
"internal"
allowLocationSimulation =
"
YES
"
>
allowLocationSimulation =
"
NO
"
>
<BuildableProductRunnable
<BuildableProductRunnable
runnableDebuggingMode =
"0"
>
runnableDebuggingMode =
"0"
>
<BuildableReference
<BuildableReference
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
</BuildableReference>
</BuildableReference>
</BuildableProductRunnable>
</BuildableProductRunnable>
<LocationScenarioReference
<LocationScenarioReference
identifier =
"
Hong Kong, China
"
identifier =
"
London, England
"
referenceType =
"1"
>
referenceType =
"1"
>
</LocationScenarioReference>
</LocationScenarioReference>
</LaunchAction>
</LaunchAction>
...
...
ZhiJi/Classes/Map/Controller/ZJFriendTrackMapViewController.h
View file @
c7f26015
...
@@ -6,11 +6,11 @@
...
@@ -6,11 +6,11 @@
// Copyright © 2020 Company. All rights reserved.
// Copyright © 2020 Company. All rights reserved.
//
//
#import
<UIKit/UIKit.h>
#import
"BaseViewController.h"
#import "ZJFriendModel.h"
#import "ZJFriendModel.h"
NS_ASSUME_NONNULL_BEGIN
NS_ASSUME_NONNULL_BEGIN
@interface
ZJFriendTrackMapViewController
:
UI
ViewController
@interface
ZJFriendTrackMapViewController
:
Base
ViewController
@property
(
nonatomic
,
strong
)
ZJFriendModel
*
model
;
@property
(
nonatomic
,
strong
)
ZJFriendModel
*
model
;
@property
(
nonatomic
,
assign
)
BOOL
autoTrack
;
@property
(
nonatomic
,
assign
)
BOOL
autoTrack
;
...
...
ZhiJi/Classes/Map/Controller/ZJFriendTrackMapViewController.m
View file @
c7f26015
This diff is collapsed.
Click to expand it.
ZhiJi/Classes/Tools/UserInfoManager/ZJLocationManager.h
View file @
c7f26015
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
NS_ASSUME_NONNULL_BEGIN
NS_ASSUME_NONNULL_BEGIN
typedef
enum
:
NSUInteger
{
typedef
enum
:
NSUInteger
{
ZJ_GMSMapType
,
ZJ_GMSMapType
=
1
,
ZJ_MAMapType
ZJ_MAMapType
}
ZJMapType
;
}
ZJMapType
;
...
...
ZhiJi/Classes/Tools/UserInfoManager/ZJLocationManager.m
View file @
c7f26015
...
@@ -134,11 +134,13 @@ static ZJLocationManager * manager;
...
@@ -134,11 +134,13 @@ static ZJLocationManager * manager;
}
else
if
(
error
==
nil
&&
[
placemarks
count
]
==
0
)
{
}
else
if
(
error
==
nil
&&
[
placemarks
count
]
==
0
)
{
NSLog
(
@"No results were returned."
);
NSLog
(
@"No results were returned."
);
[
self
.
data
WirteDic
:
@
(
ZJ_GMSMapType
)
Key
:
@"mapType"
];
if
(
self
.
callBack
)
{
if
(
self
.
callBack
)
{
self
.
callBack
(
nil
,
nil
,
ZJ_GMSMapType
);
self
.
callBack
(
nil
,
nil
,
ZJ_GMSMapType
);
}
}
}
else
if
(
error
!=
nil
){
}
else
if
(
error
!=
nil
){
NSLog
(
@"An error occurred = %@"
,
error
);
NSLog
(
@"An error occurred = %@"
,
error
);
[
self
.
data
WirteDic
:
@
(
ZJ_GMSMapType
)
Key
:
@"mapType"
];
if
(
self
.
callBack
)
{
if
(
self
.
callBack
)
{
self
.
callBack
(
nil
,
nil
,
ZJ_GMSMapType
);
self
.
callBack
(
nil
,
nil
,
ZJ_GMSMapType
);
}
}
...
@@ -169,6 +171,10 @@ static ZJLocationManager * manager;
...
@@ -169,6 +171,10 @@ static ZJLocationManager * manager;
isChina
=
[
placemark
.
ISOcountryCode
isEqualToString
:
@"CN"
];
isChina
=
[
placemark
.
ISOcountryCode
isEqualToString
:
@"CN"
];
_mapType
=
isChina
?
ZJ_MAMapType
:
ZJ_GMSMapType
;
_mapType
=
isChina
?
ZJ_MAMapType
:
ZJ_GMSMapType
;
[
self
.
data
WirteDic
:
@
(
_mapType
)
Key
:
@"mapType"
];
[
self
.
data
WirteDic
:
@
(
coord
.
latitude
)
Key
:
@"latitude"
];
[
self
.
data
WirteDic
:
@
(
coord
.
longitude
)
Key
:
@"longitude"
];
if
(
_callBack
)
{
if
(
_callBack
)
{
_callBack
(
model
,
location
,
_mapType
);
_callBack
(
model
,
location
,
_mapType
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment