no message

ZhiJi.xcodeproj/project.pbxproj

@@ -1824,7 +1824,7 @@
 				CODE_SIGN_ENTITLEMENTS = ZhiJi/ZhiJi.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 102;
+				CURRENT_PROJECT_VERSION = 100;
 				DEVELOPMENT_TEAM = KQ4CS767WC;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1922,7 +1922,7 @@
 				CODE_SIGN_ENTITLEMENTS = ZhiJi/ZhiJi.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 102;
+				CURRENT_PROJECT_VERSION = 100;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = KQ4CS767WC;

ZhiJi/AppDelegate.m

@@ -38,7 +38,7 @@
     [AMapServices sharedServices].apiKey = @"31b57777dd1b5f65e45c1dab247e3950";
     [AMapServices sharedServices].enableHTTPS = YES;
     
-    [UMConfigure initWithAppkey:@"5f030692dbc2ec07770ffda4" channel:nil];
+    [UMConfigure initWithAppkey:@"5f02fdef167edd8d94000012" channel:nil];
     [MobClick event:@"app_start"];
     
     [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions];

ZhiJi/Assets.xcassets/Goods/guide/goods_top_mask.imageset/Contents.json

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

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

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

ZhiJi/Classes/Care/Controller/ZJBaseCareViewController.m

@@ -243,7 +243,7 @@
     //紧急Button
     self.jinJiButton = [UIButton buttonWithType:UIButtonTypeCustom];
     [self.view addSubview:self.jinJiButton];
-    [self.jinJiButton setBackgroundImage:[UIImage imageNamed:kLocalizedString(@"friend_emergency_alert")] forState:UIControlStateNormal];
+    [self.jinJiButton setBackgroundImage:[UIImage imageNamed:@"紧急警报"] forState:UIControlStateNormal];
     [self.jinJiButton setTitleColor:[UIColor colorWithHex:0xffffff] forState:UIControlStateNormal];
     [self.jinJiButton addTarget:self action:@selector(jinJiButtonClick) forControlEvents:UIControlEventTouchUpInside];
     [self.jinJiButton mas_makeConstraints:^(MASConstraintMaker *make) {

ZhiJi/Classes/Care/Controller/ZJCareStyle2ViewController.m

@@ -104,7 +104,8 @@
     self.memberTableView.tableHeaderView = self.headerView;
     self.memberTableView.tableFooterView = self.footerView_style2;
     
-    [self.view bringSubviewToFront:self.memberTableView];
+//    [self.view bringSubviewToFront:self.memberTableView];
+    [self.view sendSubviewToBack:self.memberTableView];
 }
 
 - (UIView *)headerView{
@@ -146,7 +147,7 @@
         _footer_detailsLab_1.numberOfLines = 0;
         _footer_detailsLab_1.lineBreakMode = NSLineBreakByCharWrapping;
         _footer_detailsLab_1.textAlignment = NSTextAlignmentCenter;
-        _footer_detailsLab_1.font = [UIFont systemFontOfSize:KFont(12)];
+        _footer_detailsLab_1.font = [UIFont systemFontOfSize:KFont(13)];
         [_footer_firstView addSubview:_footer_detailsLab_1];
         [_footer_detailsLab_1 mas_makeConstraints:^(MASConstraintMaker *make) {
             make.top.mas_equalTo(_footer_detailsLab_0.mas_bottom).mas_offset(KScaleWidth(20));
@@ -553,7 +554,7 @@
     if ([ZJUserInfoManager shared].userInfoModel.isMember || indexPath.row==0) {
         ZJFriendTrackMapViewController *trackMapVc = [[ZJFriendTrackMapViewController alloc] init];
         trackMapVc.model = self.friendDataSource[indexPath.row];
-        trackMapVc.isMyTrack = (indexPath.row == 0);
+//        trackMapVc.isMyTrack = (indexPath.row == 0);
         [self.navigationController showViewController:trackMapVc sender:nil];
     }else{
         [self showUpgradeLlert];

ZhiJi/Classes/Goods/Controller/ZJMemberPayViewController.m

@@ -85,6 +85,11 @@
 - (void)setupView {
     self.view.backgroundColor = [UIColor whiteColor];
     
+    UIImageView * maskImV = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, kNavigationBarHeight)];
+    maskImV.image = [UIImage imageNamed:@"goods_top_mask"];
+    [self.view addSubview:maskImV];
+    [self.view sendSubviewToBack:maskImV];
+    
     self.mainScrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, KScreenHeight)];
     self.mainScrollView.showsHorizontalScrollIndicator = NO;
     self.mainScrollView.showsVerticalScrollIndicator = NO;
@@ -192,7 +197,7 @@
                 }
             }
             weakSelf.currentProduct = weakSelf.products.firstObject;
-            weakSelf.orderLab.text = [NSString stringWithFormat:@"%.0f",weakSelf.currentProduct.cash];
+            weakSelf.orderLab.text = [NSString stringWithFormat:@"%@", weakSelf.currentProduct.payDesc];
             self.productID = weakSelf.currentProduct.productId;
             [self updateScrollView:weakSelf.orderLab.text des:nil];
             

ZhiJi/Classes/LocationVC/ZJLocationVC.swift

@@ -26,6 +26,7 @@ class ZJLocationVC: UIViewController {
         super.viewDidLoad()
         title = NSLocalizedString("location_tutorial_location", comment: "")
         
+        detailsLab_0.adjustsFontSizeToFitWidth = true;
         detailsLab_0.text = NSLocalizedString("location_alert_details_0", comment: "")
         detailsLab_1.text = NSLocalizedString("location_alert_details_1", comment: "")
         detailsLab_2.text = NSLocalizedString("location_alert_details_2", comment: "")

ZhiJi/Classes/LocationVC/ZJLocationVC.xib

@@ -52,14 +52,14 @@
                                 <constraint firstAttribute="height" constant="36" id="mGl-Xg-BFq"/>
                             </constraints>
                         </view>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确认对方没有删除Family Mapp" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FTA-M6-PwX">
-                            <rect key="frame" x="14.5" y="65" width="296.5" height="21"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确认对方没有删除Family Mapp" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FTA-M6-PwX">
+                            <rect key="frame" x="14.5" y="65" width="296.5" height="21.5"/>
                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="22h-Ja-XjZ">
-                            <rect key="frame" x="316" y="58.5" width="84" height="34"/>
+                            <rect key="frame" x="316" y="59" width="84" height="34"/>
                             <color key="backgroundColor" red="0.38273251060000002" green="0.55322641130000005" blue="0.95691186189999999" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="84" id="VK5-av-6bc"/>
@@ -75,7 +75,7 @@
                             </userDefinedRuntimeAttributes>
                         </button>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YK4-n6-cGm">
-                            <rect key="frame" x="14.5" y="100.5" width="385.5" height="17"/>
+                            <rect key="frame" x="14.5" y="101" width="385.5" height="17"/>
                             <string key="text" base64-UTF8="YES">
 5aaC5p6c5Yig6Zmk5LqG6K+35YiG5Lqr5bqU55So57uZVGHph43mlrDkuIvovb3lubblronoo4XjgIHn
 mbvlvZUDA
@@ -85,21 +85,21 @@ mbvlvZUDA
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="位置权限设置" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V3d-Sr-7wE">
-                            <rect key="frame" x="14.5" y="142.5" width="385.5" height="21"/>
+                            <rect key="frame" x="14.5" y="143" width="385.5" height="21"/>
                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="46g-dc-NS9">
-                            <rect key="frame" x="14.5" y="177.5" width="385.5" height="33.5"/>
+                            <rect key="frame" x="14.5" y="178" width="385.5" height="33.5"/>
                             <string key="text">如果Ta关闭了位置权限，请让Ta前往设置&gt;权限管理
 &gt;Family Mapp里开启位置权限。</string>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="showLocationInfo" translatesAutoresizingMaskIntoConstraints="NO" id="eCq-Sh-7TY">
-                            <rect key="frame" x="34.5" y="229" width="345" height="190"/>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="showLocationInfo" translatesAutoresizingMaskIntoConstraints="NO" id="eCq-Sh-7TY">
+                            <rect key="frame" x="34.5" y="229.5" width="345" height="190"/>
                         </imageView>
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>

ZhiJi/Classes/Map/Controller/ZJFriendTrackMapViewController.m

@@ -75,12 +75,17 @@
 
 - (void)showAlertView {
     
+    if (self.alertView.superview) {
+        return;
+    }
+    
     self.alertView = [[UINib nibWithNibName:@"ZJAlertView" bundle:nil] instantiateWithOwner:self options:nil].firstObject;
     [self.alertView show];
     
     if (self.isMyTrack) {
         self.alertView.alertTitle.text = kLocalizedString(@"track_mine_timeWithin_no_location");
         self.alertView.alertSubtitle.text = kLocalizedString(@"track_friend_check_noData_alert");
+        [self.alertView.leftButton setTitle:kLocalizedString(@"alert_setting") forState:(UIControlStateNormal)];
     } else {
         self.alertView.alertTitle.text = kLocalizedString(@"track_friend_timeWithin_no_location");
         self.alertView.alertSubtitle.text = kLocalizedString(@"track_friend_authority_alert");
@@ -91,12 +96,25 @@
         NSLog(@"%@", @"leftButton");
         
         if (self.isMyTrack) {
-            NSDictionary * dic = [ZJUserInfoManager shared].h5_url;
-            BaseWebViewController * web = [[BaseWebViewController alloc] init];
-            web.title = kLocalizedString(@"mine_location_setting");
-            web.neverRefreshTitle = YES;
-            web.url = [dic objectForKey:@"tutorial"];
-            [self.navigationController pushViewController:web animated:YES];
+            
+            
+            NSURL * url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
+
+            if([[UIApplication sharedApplication] canOpenURL:url]) {
+
+                if (@available(iOS 10.0, *)) {
+                    [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
+                }else{
+                    [[UIApplication sharedApplication] openURL:url];
+                }
+            }
+            
+//            NSDictionary * dic = [ZJUserInfoManager shared].h5_url;
+//            BaseWebViewController * web = [[BaseWebViewController alloc] init];
+//            web.title = kLocalizedString(@"mine_location_setting");
+//            web.neverRefreshTitle = YES;
+//            web.url = [dic objectForKey:@"tutorial"];
+//            [self.navigationController pushViewController:web animated:YES];
         }
         else {
             

ZhiJi/Classes/Map/View/ZJUserTrackTimeView.m

@@ -38,6 +38,12 @@
 }
 
 - (IBAction)drawTrackAction:(UIButton *)sender {
+    
+    if ([self.stratDate compare:self.endDate] == NSOrderedDescending) {
+        [MBProgressHUD showError:kLocalizedString(@"track_start_time_less_end")];
+        return;
+    }
+    
     if (_drawTrackHandle) {
         _drawTrackHandle();
     }
@@ -51,10 +57,10 @@
     __weak typeof(self) weakSelf = self;
     datePciker.commitTrackDateClosre = ^(NSDate *date) {
         NSLog(@"%@", date);
-        if ([date compare:weakSelf.endDate] == NSOrderedDescending) {
-             [MBProgressHUD showError:kLocalizedString(@"track_start_time_less_end")];
-             return;
-         }
+//        if ([date compare:weakSelf.endDate] == NSOrderedDescending) {
+//             [MBProgressHUD showError:kLocalizedString(@"track_start_time_less_end")];
+//             return;
+//        }
         [weakSelf.beginTimeButton setTitle: [weakSelf getDateStringFromDate:date] forState:UIControlStateNormal];
         weakSelf.stratDate = date;
         if (weakSelf.dateSelectFinishedHandle) {
@@ -73,10 +79,10 @@
     datePciker.commitTrackDateClosre = ^(NSDate *date) {
         NSLog(@"endTime %@", date);
         
-        if ([date compare:weakSelf.stratDate] == NSOrderedAscending) {
-            [MBProgressHUD showError:kLocalizedString(@"track_end_time_great_start")];
-            return;
-        }
+//        if ([date compare:weakSelf.stratDate] == NSOrderedAscending) {
+//            [MBProgressHUD showError:kLocalizedString(@"track_end_time_great_start")];
+//            return;
+//        }
         
         weakSelf.endDate = date;
         [weakSelf.endTimeButton setTitle: [weakSelf getDateStringFromDate:date] forState:UIControlStateNormal];

ZhiJi/Classes/Mine/Controller/ZJEmergencyContactViewController.m

@@ -73,7 +73,9 @@
         
         [_addPersonBtn setTitle:kLocalizedString(@"emergency_add_alert_style2") forState:UIControlStateNormal];
         [_addPersonBtn setTitleColor:[UIColor colorWithHex:0xFFFFFF] forState:UIControlStateNormal];
-        [_addPersonBtn setBackgroundImage:[UIImage imageNamed:@"Add_btn"] forState:UIControlStateNormal];
+        _addPersonBtn.layer.cornerRadius = KScaleWidth(48)/2;
+        _addPersonBtn.backgroundColor = kMassColor;
+//        [_addPersonBtn setBackgroundImage:[UIImage imageNamed:@"Add_btn"] forState:UIControlStateNormal];
         _addPersonBtn.titleLabel.font = [UIFont fontWithName:@"PingFangSC-Regular" size:KFont(18)];
         [_addPersonBtn addTarget:self action:@selector(addBtnClick:) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -100,7 +102,7 @@
         
         UIView *view = [[UIView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, 100)];
         [view addSubview:self.addPersonBtn];
-        self.addPersonBtn.sd_layout.topSpaceToView(view, KScaleWidth(33)).centerXEqualToView(view).heightIs(KScaleWidth(64)).widthIs(KScaleWidth(208));
+        self.addPersonBtn.sd_layout.topSpaceToView(view, KScaleWidth(33)).centerXEqualToView(view).heightIs(KScaleWidth(48)).widthIs(KScaleWidth(256));
         _tableView.tableFooterView = view;
     }
     return _tableView;

ZhiJi/Classes/Mine/Controller/ZJMineViewController.m

@@ -200,13 +200,13 @@ static NSString *ID = @"mineID";
                        /*@{@"icon":@"Mine_Cell_Icon_4", @"title":kLocalizedString(@"mine_guides")},*/
                        @{@"icon":@"Mine_Cell_Icon_5", @"title":kLocalizedString(@"mine_share")},
                        @{@"icon":@"Mine_Cell_Icon_6", @"title":kLocalizedString(@"mine_location_setting")},
-                       @{@"icon":@"Mine_Cell_Icon_7", @"title":kLocalizedString(@"mine_online_service")}];
+                       /*@{@"icon":@"Mine_Cell_Icon_7", @"title":kLocalizedString(@"mine_online_service")}*/];
         if(![ZJShareManager installed]){
             dataSource = @[@{@"icon":@"Mine_Cell_Icon_2", @"title":kLocalizedString(@"mine_track")},
                            @{@"icon":@"Mine_Cell_Icon_3", @"title":kLocalizedString(@"mine_emergenry_contacts")},
                            /*@{@"icon":@"Mine_Cell_Icon_4", @"title":kLocalizedString(@"mine_guides")},*/
                            @{@"icon":@"Mine_Cell_Icon_6", @"title":kLocalizedString(@"mine_location_setting")},
-                           @{@"icon":@"Mine_Cell_Icon_7", @"title":kLocalizedString(@"mine_online_service")}];
+                           /*@{@"icon":@"Mine_Cell_Icon_7", @"title":kLocalizedString(@"mine_online_service")}*/];
         }
     }else {
         dataSource = @[@{@"icon":@"Mine_Cell_Icon_2", @"title":kLocalizedString(@"mine_track")},

ZhiJi/Classes/Mine/View/ZJAddEmergencyContactView.m

@@ -96,9 +96,9 @@
     areaCodeBtn = [[UIButton alloc] initWithFrame:CGRectMake(CGRectGetMaxX(phoneTFLeftImageView.frame), KScaleWidth(12), KScaleWidth(56), KScaleWidth(29))];
     areaCodeBtn.titleLabel.adjustsFontSizeToFitWidth = YES;
     areaCodeBtn.titleLabel.font = [UIFont systemFontOfSize:KFont(18)];
-    areaCodeBtn.layer.cornerRadius = areaCodeBtn.frame.size.height/2;
-    areaCodeBtn.layer.borderColor = kMassColor.CGColor;
-    areaCodeBtn.layer.borderWidth = 1.f;
+//    areaCodeBtn.layer.cornerRadius = areaCodeBtn.frame.size.height/2;
+//    areaCodeBtn.layer.borderColor = kMassColor.CGColor;
+//    areaCodeBtn.layer.borderWidth = 1.f;
     [areaCodeBtn setTitleColor:kMassColor forState:(UIControlStateNormal)];
 //    areaCodeBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
     if ([[data Read] objectForKey:@"currentCountryCode"]) {

ZhiJi/en.lproj/Localizable.strings

@@ -66,10 +66,10 @@ appName = "Family Mapp";
 "login_already_send_code"="Get again in";
 "login_read"="View";
 
-"area"="Select the area";
-"area_search"="Select a country/region";
-
 "login_sms_code"="Please enter the SMS verification code";
+
+"area"="Select a country/region";
+"area_search"="Search...";
 "area_no_data"="No result";
 
 //care
@@ -86,7 +86,7 @@ appName = "Family Mapp";
 "care_footer_details_0"="Where is my friend?";
 "care_footer_details_1"="Enter the number of the location of the friend you want to find and continue";
 
-"care_Emergency_alarm"="Emergency alarm";
+"care_Emergency_alarm"="Emergency Alert";
 "care_who_prosen"="I'm one of those who care about you";
 
 //map
@@ -116,9 +116,9 @@ appName = "Family Mapp";
 "message_complete"="Confirmed";
 "message_receive"="When you receive this invitation, you are deemed to have fully understood and complied with the contents of the \"User Agreement\" and \"Privacy Agreement\" and agreed to authorize the platform to legally collect, store and use your personal information in accordance with the contents of the privacy policy";
 //track
-"track_friend"="Friends' History Foots";
+"track_friend"="Friend's track";
 "track_friend_authority_alert"="Please confirm whether the other party authorizes Family Mapp to allow location authority";
-"track_friend_timeWithin_no_location"="The other party did not record location information during this time";
+"track_friend_timeWithin_no_location"="No location information recorded during this time";
 "track_friend_check_noData_alert"="Please check other time periods or wait a few minutes";
 "track_mine_timeWithin_no_location"="You did not record location information during this time";
 "track_mine"="My location and history";
@@ -130,9 +130,10 @@ appName = "Family Mapp";
 "track_start_time_less_end"="The start time must be less than the end time";
 "track_end_time_great_start"="The end time must be greater than the start time";
 
-//location
+//locations
 "location_no_address_remind"="You did not set a location reminder for the friend ~";
 "location_check_tutorial"="View the tutorial";
+//"location_check_tutorial"="Setting";
 "location_check_tutorial_cancel"="Cancel";
 
 "location_alert_details_0"="For you to better experience Family Mapp, please set the following: ";
@@ -154,7 +155,7 @@ appName = "Family Mapp";
 "mine_sign"="Sign in";
 "mine_click_nickname"="Click name to edit";
 "mine_unlock_more_services"="Unlock to access Premium services";
-"mine_unlock"="Unlock";
+"mine_unlock"="Unlocked";
 "mine_userID"="User ID";
 "mine_track"="My track";
 "mine_emergenry_contacts"="Emergency contacts";
@@ -162,7 +163,7 @@ appName = "Family Mapp";
 "mine_share"="Share";
 "mine_location_setting"="Location permission settings";
 "mine_online_service"="Help";
-"mine_unlocked"="unlocked";
+"mine_unlocked"="Unlocked";
 
 "mine_valid_until"="Valid until";
 "mine_renewal"="Renewal";
@@ -173,7 +174,7 @@ appName = "Family Mapp";
 "myself"="Me";
 "myself_style2"="Myself";
 
-"mine_free_used"="Free use";
+"mine_free_used"="Free for life";
 
 //setting
 "setting"="Settings";
@@ -191,7 +192,7 @@ appName = "Family Mapp";
 //emergency contact
 "emergency_none"="No Emergency Contact";
 "emergency_add"="Add";
-"emergency_add_alert"="Add Emergency Contacts (up to 3)";
+"emergency_add_alert"="Add Emergency Contacts (Up to 3)";
 "emergency_add_alert_style2"="Add Emergency Contacts";
 "emergency_delete_alert"="Are you sure you want to delete this emergency contact?";
 "emergency_enter_phone"="Enter a phone number";
@@ -220,5 +221,9 @@ appName = "Family Mapp";
 "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";
+//"map_track_start_icon"="map_track_start_icon";
+//"map_track_end_icon"="map_track_end_icon";
+
+"map_track_start_icon"="map_track_srart_end_icon";
+"map_track_end_icon"="map_track_srart_end_icon";
+

ZhiJi/zh-Hans.lproj/Localizable.strings

@@ -218,5 +218,8 @@ appName = "Family Mapp";
 "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";
+//"map_track_start_icon"="map_track_start_icon_zh";
+//"map_track_end_icon"="map_track_end_icon_zh";
+"map_track_start_icon"="map_track_srart_end_icon";
+"map_track_end_icon"="map_track_srart_end_icon";
+