Skip to content

Commit ff66f28

Browse files
thanhdt-vietmapthanhdt-vietmap
committed
feat: upgrade vietmap to v4.0.0
1 parent 8dc82a0 commit ff66f28

File tree

13 files changed

+71
-242
lines changed

13 files changed

+71
-242
lines changed

‎.fvm/flutter_sdk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/Users/dev/fvm/versions/3.24.5
1+
/Users/dev/fvm/versions/3.29.0

‎.fvm/fvm_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"flutterSdkVersion": "3.24.5",
2+
"flutterSdkVersion": "3.29.0",
33
"flavors": {}
44
}

‎android/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ gradle-wrapper.jar
55
/gradlew.bat
66
/local.properties
77
GeneratedPluginRegistrant.java
8-
8+
/app/.cxx/
99
# Remember to never publicly share your keystore.
1010
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
1111
key.properties

‎android/app/androidauto/src/main/java/vn/vietmap/androidauto/helper/VietMapNavigationHelper.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class VietMapNavigationHelper {
4545
fun buildOverviewCameraUpdate(
4646
padding: IntArray, routePoints: List<Point>,
4747
): CameraUpdate {
48+
if(routePoints.size < 2) return buildResetCameraUpdate()
4849
val routeBounds = convertRoutePointsToLatLngBounds(routePoints)
4950
return newLatLngBounds(
5051
routeBounds, padding[0], padding[1], padding[2], padding[3]

‎android/app/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,6 @@ dependencies {
7777
implementation 'com.github.vietmap-company:vietmap-services-turf-android:1.0.2'
7878
implementation 'com.github.vietmap-company:vietmap-services-android:1.1.2'
7979
implementation 'com.github.vietmap-company:vietmap-services-geojson-android:1.0.0'
80+
81+
8082
}

‎android/app/src/main/kotlin/vn/vietmap/vietmap_map/MainActivity.kt

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
package vn.vietmap.vietmap_map
22

3-
import android.annotation.SuppressLint
4-
import android.location.Location
5-
import android.os.Bundle
6-
import android.util.Log
7-
import androidx.lifecycle.Lifecycle
8-
import androidx.lifecycle.LifecycleObserver
9-
import androidx.lifecycle.OnLifecycleEvent
103
import androidx.lifecycle.lifecycleScope
114
import io.flutter.embedding.android.FlutterActivity
125
import io.flutter.embedding.engine.FlutterEngine
@@ -18,7 +11,7 @@ import vn.vietmap.androidauto.service.IAndroidAutoNavigationCommunicator
1811
import vn.vietmap.androidauto.service.IAndroidAutoSearchCommunicator
1912

2013

21-
class MainActivity: FlutterActivity(), LifecycleObserver {
14+
class MainActivity: FlutterActivity() {
2215
private var androidAutoCommunicator: IAndroidAutoNavigationCommunicator? = null
2316
private var androidAutoSearchCommunicator: IAndroidAutoSearchCommunicator? = null
2417
private lateinit var methodChannel: MethodChannel
@@ -27,12 +20,6 @@ class MainActivity: FlutterActivity(), LifecycleObserver {
2720
const val VIETMAP_ANDROID_AUTO_CHANNEL = "vn.vietmap.automotive"
2821
}
2922

30-
override fun onCreate(savedInstanceState: Bundle?) {
31-
super.onCreate(savedInstanceState)
32-
lifecycle.addObserver(this)
33-
}
34-
35-
@SuppressLint("MissingPermission")
3623
override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
3724
super.configureFlutterEngine(flutterEngine)
3825
lifecycleScope.launch {
@@ -101,11 +88,4 @@ class MainActivity: FlutterActivity(), LifecycleObserver {
10188
}
10289
}
10390
}
104-
105-
@OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
106-
private fun doDestroy() {
107-
methodChannel.setMethodCallHandler(null)
108-
androidAutoCommunicator = null
109-
androidAutoSearchCommunicator = null
110-
}
11191
}

‎ios/Runner.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@
387387
CLANG_ENABLE_MODULES = YES;
388388
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
389389
CURRENT_PROJECT_VERSION = 10;
390-
DEVELOPMENT_TEAM = G6HZK3JBDW;
390+
DEVELOPMENT_TEAM = 44G4R58CHN;
391391
ENABLE_BITCODE = NO;
392392
INFOPLIST_FILE = Runner/Info.plist;
393393
INFOPLIST_KEY_CFBundleDisplayName = "Vietmap Flutter Demo";
@@ -521,7 +521,7 @@
521521
CLANG_ENABLE_MODULES = YES;
522522
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
523523
CURRENT_PROJECT_VERSION = 10;
524-
DEVELOPMENT_TEAM = G6HZK3JBDW;
524+
DEVELOPMENT_TEAM = 44G4R58CHN;
525525
ENABLE_BITCODE = NO;
526526
INFOPLIST_FILE = Runner/Info.plist;
527527
INFOPLIST_KEY_CFBundleDisplayName = "Vietmap Flutter Demo";
@@ -549,7 +549,7 @@
549549
CLANG_ENABLE_MODULES = YES;
550550
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
551551
CURRENT_PROJECT_VERSION = 10;
552-
DEVELOPMENT_TEAM = G6HZK3JBDW;
552+
DEVELOPMENT_TEAM = 44G4R58CHN;
553553
ENABLE_BITCODE = NO;
554554
INFOPLIST_FILE = Runner/Info.plist;
555555
INFOPLIST_KEY_CFBundleDisplayName = "Vietmap Flutter Demo";

‎lib/features/map_screen/maps_screen.dart

Lines changed: 51 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:geolocator/geolocator.dart';
77
import 'package:sliding_up_panel2/sliding_up_panel2.dart';
88
import 'package:talker/talker.dart';
99
import 'package:vietmap_flutter_gl/vietmap_flutter_gl.dart';
10-
import 'package:vietmap_map/extension/tilemap_extension.dart';
10+
import 'package:vietmap_gl_platform_interface/vietmap_gl_platform_interface.dart';
1111
import 'package:vietmap_map/features/map_screen/components/category_marker.dart';
1212
import 'package:vietmap_map/method_channel/vietmap_automotive_plugin.dart';
1313
import '../../constants/colors.dart';
@@ -41,8 +41,8 @@ class _MapScreenState extends State<MapScreen> {
4141
bool isShowMarker = true;
4242
final PanelController _panelController = PanelController();
4343
MyLocationTrackingMode myLocationTrackingMode =
44-
MyLocationTrackingMode.Tracking;
45-
MyLocationRenderMode myLocationRenderMode = MyLocationRenderMode.COMPASS;
44+
MyLocationTrackingMode.tracking;
45+
MyLocationRenderMode myLocationRenderMode = MyLocationRenderMode.compass;
4646
final talker = Talker();
4747
String tileMap = AppContext.getVietmapMapStyleUrl() ?? "";
4848
@override
@@ -95,8 +95,8 @@ class _MapScreenState extends State<MapScreen> {
9595
setState(() {});
9696
}
9797
if (state is MapStateChangeMapTilesSuccess) {
98-
_controller?.setStyle(
99-
state.mapTile.getMapTiles(AppContext.getVietmapAPIKey() ?? ""));
98+
// _controller?.setStyle(
99+
// state.mapTile.getMapTiles(AppContext.getVietmapAPIKey() ?? ""));
100100
}
101101
if (state is MapStateGetLocationFromCoordinateSuccess &&
102102
ModalRoute.of(context)?.isCurrent == true) {
@@ -178,7 +178,7 @@ class _MapScreenState extends State<MapScreen> {
178178
VietmapGL(
179179
myLocationEnabled: true,
180180
myLocationTrackingMode:
181-
MyLocationTrackingMode.TrackingCompass,
181+
MyLocationTrackingMode.trackingCompass,
182182
myLocationRenderMode: myLocationRenderMode,
183183
trackCameraPosition: true,
184184
compassViewMargins:
@@ -252,7 +252,7 @@ class _MapScreenState extends State<MapScreen> {
252252
);
253253
break;
254254
case Events.onRecenter:
255-
await _controller?.recenter();
255+
// await _controller?.recenter();
256256
break;
257257
default:
258258
}
@@ -264,7 +264,7 @@ class _MapScreenState extends State<MapScreen> {
264264
_removeRoutes();
265265
_clearMarker();
266266
var response =
267-
await _controller?.queryRenderedFeatures(point: point);
267+
await _controller?.queryRenderedFeatures(point, [], []);
268268
if (response == null || response.isEmpty) return;
269269
for (var item in response) {
270270
talker.good(item);
@@ -293,13 +293,46 @@ class _MapScreenState extends State<MapScreen> {
293293
}
294294
// talker.info(response);
295295
},
296-
onMapLongClick: (point, coordinates) {
296+
onMapLongClick: (point, coordinates) async {
297297
setState(() {
298298
_nearbyMarker = [];
299299
});
300300
context
301301
.read<MapBloc>()
302302
.add(MapEventOnUserLongTapOnMap(coordinates));
303+
304+
// var res = await VietmapApiRepositories().findRoute(
305+
// VietMapRoutingParams(
306+
// apiKey: AppContext.getVietmapAPIKey()!,
307+
// vehicle: VehicleType.motorcycle,
308+
// originPoint: LatLng(10, 106),
309+
// destinationPoint: coordinates));
310+
// res.fold((l) {
311+
// EasyLoading.showError('Có lỗi xảy ra');
312+
// }, (r) {
313+
// var locs = VietmapPolylineDecoder.decodePolyline(
314+
// r.paths!.first.points!, false)
315+
// .map((e) {
316+
// return LatLng(e.latitude, e.longitude);
317+
// }).toList();
318+
// _controller?.addPolyline(PolylineOptions(
319+
// geometry: locs,
320+
// polylineWidth: 4,
321+
// polylineColor: vietmapColor,
322+
// ));
323+
// var bbox = r.paths?.first.bbox;
324+
// if (bbox == null) return;
325+
// _controller?.moveCamera(CameraUpdate.newLatLngBounds(
326+
// LatLngBounds(
327+
// southwest: LatLng(
328+
// bbox[1]!.toDouble(), bbox[0]!.toDouble()),
329+
// northeast: LatLng(
330+
// bbox[3]!.toDouble(), bbox[2]!.toDouble())),
331+
// left: 200,
332+
// right: 200,
333+
// top: 200,
334+
// bottom: 200));
335+
// });
303336
},
304337
),
305338
_controller == null
@@ -426,7 +459,7 @@ class _MapScreenState extends State<MapScreen> {
426459
heroTag: "recenter",
427460
backgroundColor: Colors.white,
428461
onPressed: () async {
429-
await _controller?.recenter();
462+
// await _controller?.recenter();
430463
await _mapAutomotivePlugin.recenter();
431464
},
432465
child: Icon(
@@ -440,29 +473,29 @@ class _MapScreenState extends State<MapScreen> {
440473
backgroundColor: Colors.white,
441474
onPressed: () {
442475
if (myLocationTrackingMode !=
443-
MyLocationTrackingMode.TrackingCompass) {
476+
MyLocationTrackingMode.trackingCompass) {
444477
_controller?.updateMyLocationTrackingMode(
445-
MyLocationTrackingMode.TrackingCompass);
478+
MyLocationTrackingMode.trackingCompass);
446479
setState(() {
447480
myLocationTrackingMode =
448-
MyLocationTrackingMode.TrackingCompass;
481+
MyLocationTrackingMode.trackingCompass;
449482
myLocationRenderMode =
450-
MyLocationRenderMode.COMPASS;
483+
MyLocationRenderMode.compass;
451484
});
452485
} else {
453486
_controller?.updateMyLocationTrackingMode(
454-
MyLocationTrackingMode.TrackingGPS);
487+
MyLocationTrackingMode.trackingGps);
455488
setState(() {
456489
myLocationTrackingMode =
457-
MyLocationTrackingMode.TrackingGPS;
490+
MyLocationTrackingMode.trackingGps;
458491
myLocationRenderMode =
459-
MyLocationRenderMode.NORMAL;
492+
MyLocationRenderMode.normal;
460493
});
461494
}
462495
},
463496
child: Icon(
464497
myLocationTrackingMode ==
465-
MyLocationTrackingMode.TrackingCompass
498+
MyLocationTrackingMode.trackingCompass
466499
? Icons.compass_calibration_sharp
467500
: Icons.gps_fixed,
468501
color: Colors.grey[800]),

0 commit comments

Comments
 (0)