Prechádzať zdrojové kódy

[new]完善轨迹查询头像显示

zk 6 mesiacov pred
rodič
commit
9f6cdf0eb1

+ 18 - 1
lib/data/consts/constants.dart

@@ -15,9 +15,14 @@ class Constants {
 
   static const String _prodBaseUrl = "http://loc-api.v8dashen.com";
 
-  static const String locationClientUrl =
+  static const String _locationProdClientUrl =
       "ws://loc-api.v8dashen.com/websocket/";
 
+  static const String _locationDevClientUrl =
+      "ws://192.168.10.230:8880/websocket/";
+
+  static const String _locationTestClientUrl = "";
+
   static String baseUrl = getBaseUrl();
 
   static bool isProdEnv() {
@@ -54,3 +59,15 @@ String getBaseUrl() {
   }
 }
 
+String getLocationClientUrl() {
+  switch (Constants.env) {
+    case Constants.envDev:
+      return Constants._locationDevClientUrl;
+    case Constants.envTest:
+      return Constants._locationTestClientUrl;
+    case Constants.envProd:
+      return Constants._locationProdClientUrl;
+    default:
+      return Constants._locationProdClientUrl;
+  }
+}

+ 10 - 7
lib/module/track/track_controller.dart

@@ -305,6 +305,7 @@ class TrackController extends BaseController
       markerType: userInfo!.isMine == true
           ? MarkerType.traceEndMinePoint
           : MarkerType.traceEndFriendPoint,
+      customAvatarUrl: userInfo!.avatar,
     ));
     mapController.animateCamera(CameraPosition(
         latitude: currentLocation!.latitude,
@@ -327,13 +328,15 @@ class TrackController extends BaseController
         latitude: points!.first.latitude,
         markerType: MarkerType.traceStartPoint));
     mapController.updateOrAddMarker(Marker(
-        id: Constants.traceEndId,
-        markerName: userInfo?.getUserNickName() ?? '',
-        longitude: points!.last.longitude,
-        latitude: points!.last.latitude,
-        markerType: userInfo?.isMine == true
-            ? MarkerType.traceEndMinePoint
-            : MarkerType.traceEndFriendPoint));
+      id: Constants.traceEndId,
+      markerName: userInfo?.getUserNickName() ?? '',
+      longitude: points!.last.longitude,
+      latitude: points!.last.latitude,
+      markerType: userInfo?.isMine == true
+          ? MarkerType.traceEndMinePoint
+          : MarkerType.traceEndFriendPoint,
+      customAvatarUrl: userInfo?.avatar,
+    ));
     //显示起点标记
     // drawMarker();
     //显示终点标记

+ 4 - 6
lib/module/track/track_page.dart

@@ -192,12 +192,10 @@ class TrackPage extends BasePage<TrackController> {
       children: [
         SizedBox(width: 14.w),
         Obx(() {
-          return Image(
-              image: controller.userInfo?.isMine == true
-                  ? Assets.images.iconDefaultMineAvatar.provider()
-                  : Assets.images.iconDefaultFriendAvatar.provider(),
-              width: 32.w,
-              height: 32.w);
+          return buildCustomAvatarOrDefaultAvatarView(
+              size: 32.w,
+              avatar: controller.userInfo?.avatar,
+              isMine: controller.userInfo?.isMine == true);
         }),
         SizedBox(width: 10.w),
         Expanded(

+ 1 - 1
lib/socket/socket_constants.dart

@@ -1,7 +1,7 @@
 import '../data/consts/constants.dart';
 
 class SocketConstants {
-  static const String locationBaseUrl = Constants.locationClientUrl;
+  static String locationBaseUrl = getLocationClientUrl();
 
   static const String refreshFriendList = 'd.refresh.friend.list'; // 刷新好友列表
   static const String refreshFriendRequest =