|
@@ -11,7 +11,6 @@ import 'package:location/data/repositories/account_repository.dart';
|
|
|
import 'package:location/data/repositories/friends_repository.dart';
|
|
import 'package:location/data/repositories/friends_repository.dart';
|
|
|
import 'package:flutter_map/flutter_map.dart';
|
|
import 'package:flutter_map/flutter_map.dart';
|
|
|
import 'package:location/sdk/map/map_helper.dart';
|
|
import 'package:location/sdk/map/map_helper.dart';
|
|
|
-import 'package:location/utils/atmob_log.dart';
|
|
|
|
|
import 'package:location/utils/base_expand.dart';
|
|
import 'package:location/utils/base_expand.dart';
|
|
|
import '../../dialog/add_friend_dialog.dart';
|
|
import '../../dialog/add_friend_dialog.dart';
|
|
|
import '../../dialog/check_loation_permission_dialog.dart';
|
|
import '../../dialog/check_loation_permission_dialog.dart';
|
|
@@ -46,7 +45,7 @@ class MainController extends BaseController {
|
|
|
void onReady() {
|
|
void onReady() {
|
|
|
super.onReady();
|
|
super.onReady();
|
|
|
friendsList.listen((list) {
|
|
friendsList.listen((list) {
|
|
|
- mapController.updateMarkers(
|
|
|
|
|
|
|
+ mapController.updateOrAddMarkers(
|
|
|
Location2MarkerUtil.userInfoList2MarkerList(list, selectedFriend));
|
|
Location2MarkerUtil.userInfoList2MarkerList(list, selectedFriend));
|
|
|
});
|
|
});
|
|
|
AddFriendDialog.show(
|
|
AddFriendDialog.show(
|
|
@@ -58,7 +57,7 @@ class MainController extends BaseController {
|
|
|
mineLocationSubscription =
|
|
mineLocationSubscription =
|
|
|
accountRepository.mineUserInfo.value.lastLocation.listen((location) {
|
|
accountRepository.mineUserInfo.value.lastLocation.listen((location) {
|
|
|
final mineInfo = accountRepository.mineUserInfo.value;
|
|
final mineInfo = accountRepository.mineUserInfo.value;
|
|
|
- mapController.updateMarker(Location2MarkerUtil.userInfo2Marker(
|
|
|
|
|
|
|
+ mapController.updateOrAddMarker(Location2MarkerUtil.userInfo2Marker(
|
|
|
mineInfo, selectedFriend == mineInfo));
|
|
mineInfo, selectedFriend == mineInfo));
|
|
|
if (isFirstShowMineLocation && location != null) {
|
|
if (isFirstShowMineLocation && location != null) {
|
|
|
isFirstShowMineLocation = false;
|
|
isFirstShowMineLocation = false;
|
|
@@ -98,7 +97,7 @@ class MainController extends BaseController {
|
|
|
markers.add(oldInfo);
|
|
markers.add(oldInfo);
|
|
|
}
|
|
}
|
|
|
markers.add(newInfo);
|
|
markers.add(newInfo);
|
|
|
- mapController.updateMarkers(
|
|
|
|
|
|
|
+ mapController.updateOrAddMarkers(
|
|
|
Location2MarkerUtil.userInfoList2MarkerList(markers, selectedFriend));
|
|
Location2MarkerUtil.userInfoList2MarkerList(markers, selectedFriend));
|
|
|
}
|
|
}
|
|
|
|
|
|