strings. image

ZhiJi/Assets.xcassets/Map/map_track_btn_bg.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "91593688640_.pic.jpg",
       "idiom" : "universal",
-      "filename" : "map_track_btn_bg@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "81593688633_.pic.jpg",
       "idiom" : "universal",
-      "filename" : "map_track_btn_bg@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }

ZhiJi/Assets.xcassets/Map/map_track_btn_bg_zh.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "map_track_btn_bg@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "map_track_btn_bg@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

ZhiJi/Assets.xcassets/Map/map_track_end_icon.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "map_track_end_icon@2x.png",
+      "filename" : "编组 7@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "map_track_end_icon@3x.png",
+      "filename" : "编组 7@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

ZhiJi/Assets.xcassets/lixiren_icon.imageset/Contents.json → ZhiJi/Assets.xcassets/Map/map_track_end_icon_zh.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "头像.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "头像@2x.png",
+      "filename" : "map_track_end_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "头像@3x.png",
+      "filename" : "map_track_end_icon@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

ZhiJi/Assets.xcassets/Map/map_track_start_icon.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "map_track_start_icon@2x.png",
+      "filename" : "编组 6@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "map_track_start_icon@3x.png",
+      "filename" : "编组 6@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

ZhiJi/Assets.xcassets/Map/map_track_start_icon_zh.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "map_track_start_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "map_track_start_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ZhiJi/Classes/Map/Controller/ZJFriendTrackMapViewController.m

@@ -287,10 +287,10 @@
         
         if ([annotation.title isEqualToString:@"start"]) {
             annotationView.enabled = NO;
-            annotationView.image = [UIImage imageNamed:@"map_track_start_icon"];
+            annotationView.image = [UIImage imageNamed:kLocalizedString(@"map_track_start_icon")];
         } else if ([annotation.title isEqualToString:@"end"]) {
             annotationView.enabled = NO;
-            annotationView.image = [UIImage imageNamed:@"map_track_end_icon"];
+            annotationView.image = [UIImage imageNamed:kLocalizedString(@"map_track_end_icon")];
         } else {
             annotationView.enabled = NO;
             annotationView.image = [UIImage imageNamed:@"userPosition"];

ZhiJi/Classes/Map/View/ZJMapViewPersonCardView.h

@@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UILabel *latestTimeLabel;
 @property (weak, nonatomic) IBOutlet UILabel *nicknameLabel;
 @property (weak, nonatomic) IBOutlet UIButton *selectFriendButton;
+@property (weak, nonatomic) IBOutlet UIButton *trackBtn;
 
 - (void)configWithFriendModel: (ZJFriendModel *)model;
 

ZhiJi/Classes/Map/View/ZJMapViewPersonCardView.m

@@ -19,6 +19,7 @@
     [super awakeFromNib];
     
     [_selectFriendButton setTitle:kLocalizedString(@"care_find_others") forState:(UIControlStateNormal)];
+    [_trackBtn setImage:[UIImage imageNamed:kLocalizedString(@"map_track_btn_bg")] forState:(UIControlStateNormal)];
 }
 
 - (void)configWithFriendModel: (ZJFriendModel *)model {

ZhiJi/Classes/Map/View/ZJMapViewPersonCardView.xib

@@ -121,6 +121,7 @@
                 <outlet property="latestTimeLabel" destination="Get-5d-nwZ" id="PP3-85-13m"/>
                 <outlet property="nicknameLabel" destination="0yD-Yk-UhO" id="Uf3-4e-7sr"/>
                 <outlet property="selectFriendButton" destination="Lpu-hs-U1c" id="baj-lG-KTi"/>
+                <outlet property="trackBtn" destination="D2w-FI-Uwd" id="amr-h1-tpg"/>
                 <outlet property="userAddressLabel" destination="vbo-AD-gBj" id="zoJ-HH-WLk"/>
                 <outlet property="userProfileIconView" destination="THe-E4-wJc" id="4He-DT-ny5"/>
             </connections>

ZhiJi/en.lproj/Localizable.strings

@@ -185,3 +185,6 @@ appName = "Family Mapp";
 "LocationHint_back_btn"="LocationHint_back_btn";
 "delete"="delete";
 "message_revice_btn"="message_revice_btn";
+"map_track_btn_bg"="map_track_btn_bg";
+"map_track_start_icon"="map_track_start_icon";
+"map_track_end_icon"="map_track_end_icon";

ZhiJi/zh-Hans.lproj/Localizable.strings

@@ -183,3 +183,6 @@ appName = "Family Mapp";
 "LocationHint_back_btn"="LocationHint_back_btn_zh";
 "delete"="delete_zh";
 "message_revice_btn"="message_revice_btn_zh";
+"map_track_btn_bg"="map_track_btn_bg_zh";
+"map_track_start_icon"="map_track_start_icon_zh";
+"map_track_end_icon"="map_track_end_icon_zh";