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
93d0f77a
Commit
93d0f77a
authored
Jul 24, 2020
by
lmj_521aiau@163.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
track animation
parent
f79d917b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
8 deletions
+17
-8
ZhiJi.xcscheme
ZhiJi.xcodeproj/xcshareddata/xcschemes/ZhiJi.xcscheme
+1
-1
ZJFriendTrackMapViewController.m
...i/Classes/Map/Controller/ZJFriendTrackMapViewController.m
+14
-5
ZJLocationManager.m
ZhiJi/Classes/Tools/UserInfoManager/ZJLocationManager.m
+2
-2
No files found.
ZhiJi.xcodeproj/xcshareddata/xcschemes/ZhiJi.xcscheme
View file @
93d0f77a
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
ignoresPersistentStateOnLaunch =
"NO"
ignoresPersistentStateOnLaunch =
"NO"
debugDocumentVersioning =
"YES"
debugDocumentVersioning =
"YES"
debugServiceExtension =
"internal"
debugServiceExtension =
"internal"
allowLocationSimulation =
"
NO
"
>
allowLocationSimulation =
"
YES
"
>
<BuildableProductRunnable
<BuildableProductRunnable
runnableDebuggingMode =
"0"
>
runnableDebuggingMode =
"0"
>
<BuildableReference
<BuildableReference
...
...
ZhiJi/Classes/Map/Controller/ZJFriendTrackMapViewController.m
View file @
93d0f77a
...
@@ -50,6 +50,7 @@
...
@@ -50,6 +50,7 @@
@property
(
nonatomic
,
strong
)
GMSCircle
*
selfCircle
;
@property
(
nonatomic
,
strong
)
GMSCircle
*
selfCircle
;
@property
(
nonatomic
,
strong
)
GMSMarker
*
selfMarker
;
@property
(
nonatomic
,
strong
)
GMSMarker
*
selfMarker
;
@property
(
nonatomic
,
assign
)
float
__block
zoom
;
@property
(
nonatomic
,
assign
)
float
__block
zoom
;
@property
(
nonatomic
,
assign
)
float
__block
animationZoom
;
@property
(
nonatomic
,
assign
)
NSTimer
*
ttt
;
@property
(
nonatomic
,
assign
)
NSTimer
*
ttt
;
@property
(
nonatomic
,
assign
)
NSInteger
tttCount
;
@property
(
nonatomic
,
assign
)
NSInteger
tttCount
;
...
@@ -172,7 +173,7 @@
...
@@ -172,7 +173,7 @@
}
}
-
(
void
)
setMapType
:
(
ZJMapType
)
mapType
{
-
(
void
)
setMapType
:
(
ZJMapType
)
mapType
{
_mapType
=
m
apType
;
_mapType
=
ZJ_GMSM
apType
;
if
(
_mapType
==
ZJ_GMSMapType
)
{
if
(
_mapType
==
ZJ_GMSMapType
)
{
_GGMapView
.
hidden
=
NO
;
_GGMapView
.
hidden
=
NO
;
_GDMapView
.
hidden
=
YES
;
_GDMapView
.
hidden
=
YES
;
...
@@ -669,6 +670,7 @@
...
@@ -669,6 +670,7 @@
[
self
.
trackTimeView
.
trackButton
setSelected
:
true
];
[
self
.
trackTimeView
.
trackButton
setSelected
:
true
];
[
self
.
trackTimeView
.
trackButton
setEnabled
:
false
];
[
self
.
trackTimeView
.
trackButton
setEnabled
:
false
];
//路径动画1
// dispatch_source_t timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0));
// dispatch_source_t timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0));
// dispatch_source_set_timer(timer, DISPATCH_TIME_NOW, 0.15 * NSEC_PER_SEC, 0 * NSEC_PER_SEC);
// dispatch_source_set_timer(timer, DISPATCH_TIME_NOW, 0.15 * NSEC_PER_SEC, 0 * NSEC_PER_SEC);
// dispatch_source_set_event_handler(timer, ^{
// dispatch_source_set_event_handler(timer, ^{
...
@@ -706,8 +708,15 @@
...
@@ -706,8 +708,15 @@
// });
// });
// dispatch_resume(timer);
// dispatch_resume(timer);
//路径动画2
//定位路径区域
GMSCoordinateBounds
*
bounds
=
[[
GMSCoordinateBounds
alloc
]
initWithPath
:
_initiallinepath
];
GMSCameraPosition
*
position
=
[
_GGMapView
cameraForBounds
:
bounds
insets
:
UIEdgeInsetsZero
];
_animationZoom
=
position
.
zoom
;
[
self
.
GGMapView
animateToZoom
:
_animationZoom
];
self
.
tttCount
=
0
;
self
.
tttCount
=
0
;
_ttt
=
[
NSTimer
scheduledTimerWithTimeInterval
:
0
.
1
5
target
:
self
selector
:
@selector
(
animate
)
userInfo
:
nil
repeats
:
YES
];
_ttt
=
[
NSTimer
scheduledTimerWithTimeInterval
:
0
.
2
5
target
:
self
selector
:
@selector
(
animate
)
userInfo
:
nil
repeats
:
YES
];
[[
NSRunLoop
currentRunLoop
]
addTimer
:
_ttt
forMode
:
NSRunLoopCommonModes
];
[[
NSRunLoop
currentRunLoop
]
addTimer
:
_ttt
forMode
:
NSRunLoopCommonModes
];
}
}
...
@@ -723,7 +732,7 @@
...
@@ -723,7 +732,7 @@
self
.
actionPolyline
.
strokeColor
=
[
UIColor
greenColor
];
self
.
actionPolyline
.
strokeColor
=
[
UIColor
greenColor
];
self
.
actionPolyline
.
strokeWidth
=
2
;
self
.
actionPolyline
.
strokeWidth
=
2
;
GMSCameraPosition
*
camera
=
[
GMSCameraPosition
cameraWithLatitude
:
coordinate
.
latitude
longitude
:
coordinate
.
longitude
zoom
:
20
];
GMSCameraPosition
*
camera
=
[
GMSCameraPosition
cameraWithLatitude
:
coordinate
.
latitude
longitude
:
coordinate
.
longitude
zoom
:
self
.
animationZoom
];
self
.
actionMarker
.
position
=
coordinate
;
self
.
actionMarker
.
position
=
coordinate
;
// self.actionMarker.rotation = location.course
// self.actionMarker.rotation = location.course
...
@@ -742,8 +751,8 @@
...
@@ -742,8 +751,8 @@
// self.actionMarker.map = nil;
// self.actionMarker.map = nil;
// self.actionlinepath = [[GMSMutablePath alloc] init];
// self.actionlinepath = [[GMSMutablePath alloc] init];
[
self
.
trackTimeView
.
trackButton
set
Select
ed
:
true
];
[
self
.
trackTimeView
.
trackButton
set
Enabl
ed
:
true
];
[
self
.
trackTimeView
.
trackButton
set
Enabl
ed
:
false
];
[
self
.
trackTimeView
.
trackButton
set
Select
ed
:
false
];
[
self
.
ttt
invalidate
];
[
self
.
ttt
invalidate
];
self
.
ttt
=
nil
;
self
.
ttt
=
nil
;
...
...
ZhiJi/Classes/Tools/UserInfoManager/ZJLocationManager.m
View file @
93d0f77a
...
@@ -134,13 +134,13 @@ static ZJLocationManager * manager;
...
@@ -134,13 +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"
];
//
[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"
];
//
[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
);
}
}
...
...
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