strings

ZhiJi.xcodeproj/project.pbxproj

@@ -684,6 +684,7 @@
 		A948C4FE249B884900C22D69 /* Goods */ = {
 			isa = PBXGroup;
 			children = (
+				A9619E9224AB3681009A2012 /* Pay.storyboard */,
 				A948C4FF249B884900C22D69 /* Controller */,
 				A948C500249B884900C22D69 /* Model */,
 				A948C501249B884900C22D69 /* View */,
@@ -694,6 +695,11 @@
 		A948C4FF249B884900C22D69 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
+				A9619E8F24AB3662009A2012 /* ZJMemberPayViewController.h */,
+				A9619E9024AB3662009A2012 /* ZJMemberPayViewController.m */,
+				68F6DEB42499CA940034F8D5 /* ZJZhiFuViewController.h */,
+				68F6DEB32499CA940034F8D5 /* ZJZhiFuViewController.m */,
+				68F6DEB22499CA7E0034F8D5 /* ZTPurchaseManager.swift */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -791,7 +797,6 @@
 				A948C4FE249B884900C22D69 /* Goods */,
 				A95F5C11248DDE81001DB97E /* Mine */,
 				A95F5C2C248DDE81001DB97E /* Main */,
-				A9619E8E24AB3604009A2012 /* Pay */,
 				A95F5C50248DDE81001DB97E /* Login */,
 			);
 			path = Classes;
@@ -1198,19 +1203,6 @@
 			path = ZJLoginManager;
 			sourceTree = "<group>";
 		};
-		A9619E8E24AB3604009A2012 /* Pay */ = {
-			isa = PBXGroup;
-			children = (
-				A9619E9224AB3681009A2012 /* Pay.storyboard */,
-				A9619E8F24AB3662009A2012 /* ZJMemberPayViewController.h */,
-				A9619E9024AB3662009A2012 /* ZJMemberPayViewController.m */,
-				68F6DEB42499CA940034F8D5 /* ZJZhiFuViewController.h */,
-				68F6DEB32499CA940034F8D5 /* ZJZhiFuViewController.m */,
-				68F6DEB22499CA7E0034F8D5 /* ZTPurchaseManager.swift */,
-			);
-			path = Pay;
-			sourceTree = "<group>";
-		};
 		A9764A59249237F200463B78 /* ImagePicker */ = {
 			isa = PBXGroup;
 			children = (

ZhiJi/Assets.xcassets/Care/home_care_add_btn.imageset/Contents.json → ZhiJi/Assets.xcassets/JinJi/emergency_send_now_zh.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "添加按钮@2x.png",
+      "filename" : "编组 3@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "添加按钮@3x.png",
+      "filename" : "编组 3@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

ZhiJi/Assets.xcassets/LocationHint/LocationHint_back_btn_zh.imageset/Contents.json

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

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

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "map_track_datepicker_cancel@2x.png",
+      "filename" : "取消@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "map_track_datepicker_cancel@3x.png",
+      "filename" : "取消@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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

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

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

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "map_track_datepicker_commit@2x.png",
+      "filename" : "确定@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "map_track_datepicker_commit@3x.png",
+      "filename" : "确定@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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

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

ZhiJi/Assets.xcassets/ShowLocationInfo/delete_zh.imageset/Contents.json

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

ZhiJi/Assets.xcassets/xiaoXiTiShi/message_revice_btn_zh.imageset/Contents.json

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

ZhiJi/Classes/Care/Controller/ZJJinJiViewController.m

@@ -55,7 +55,7 @@
     //faChuButton
     self.faChuButton = [[UIButton alloc] init];
     [self.view addSubview:self.faChuButton];
-    [self.faChuButton setImage:[UIImage imageNamed:@"编组 3"] forState:UIControlStateNormal];
+    [self.faChuButton setImage:[UIImage imageNamed:kLocalizedString(@"emergency_send_now")] forState:UIControlStateNormal];
     [self.faChuButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.jinJiImageView.mas_bottom).mas_offset(KScaleWidth(41));
         make.centerX.equalTo(self.view);

ZhiJi/Classes/Care/View/ZJXiaoxiView.m

@@ -102,7 +102,7 @@
 //    jieSouButton
     _jieSouButton= [[UIButton alloc] init];
     [_beiJingView addSubview:_jieSouButton];
-    [_jieSouButton setBackgroundImage:[UIImage imageNamed:@"矩形 2"] forState:UIControlStateNormal];
+    [_jieSouButton setBackgroundImage:[UIImage imageNamed:kLocalizedString(@"message_revice_btn")] forState:UIControlStateNormal];
     [_jieSouButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(_label.mas_bottom).mas_offset(KScaleWidth(16));
         make.centerX.equalTo(_beiJingView);

ZhiJi/Classes/LocationAttention/ZJLocationAttentionCell.swift

@@ -35,7 +35,7 @@ class ZJLocationAttentionCell: UITableViewCell, DequeuableRegistrable {
     }
     @objc func showDelete() {
         let image = UIImageView(frame: CGRect(x: self.width / 2 - 33, y: 5, width: 66, height: 34))
-        image.image = UIImage.init(named: "delete")
+        image.image = UIImage.init(named: NSLocalizedString("delete", comment: ""))
         image.isUserInteractionEnabled = true
         image.addTap { [weak self](_) in
             self?.deleteAction?()

ZhiJi/Classes/LocationAttention/ZJLocationAttentionVC.swift

@@ -13,6 +13,7 @@ class ZJLocationAttentionVC: BaseViewController {
     @IBOutlet weak var locationTableView: UITableView!
     @IBOutlet weak var maskBgView: UIView!
     @IBOutlet weak var hintLab: UILabel!
+    @IBOutlet weak var addBtn: UIButton!
     @IBOutlet weak var headerViewHeight: NSLayoutConstraint?
     
     @objc var headerFriendsDataSource: Array<ZJFriendModel>?
@@ -64,6 +65,7 @@ class ZJLocationAttentionVC: BaseViewController {
         maskBgView.isHidden = true
         
         hintLab.text = NSLocalizedString("location_no_address_remind", comment: "");
+        addBtn.setImage(UIImage.init(named: NSLocalizedString("LocationHint_back_btn", comment: "")), for: .normal)
         addLongPres()
     }
     
@@ -147,7 +149,7 @@ class ZJLocationAttentionVC: BaseViewController {
                 deleteImage.removeFromSuperview()
             }
             deleteImage = UIImageView(frame: CGRect(x: KScreen_Width / 2 - 33, y: 5, width: 66, height: 34))
-            deleteImage.image = UIImage.init(named: "delete")
+            deleteImage.image = UIImage.init(named: NSLocalizedString("delete", comment: ""))
             deleteImage.isUserInteractionEnabled = true
             deleteImage.addTap { [weak self](_) in
                 self?.deleteAction?(indexPath.row)

ZhiJi/Classes/LocationAttention/ZJLocationAttentionVC.xib

@@ -9,6 +9,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ZJLocationAttentionVC" customModule="Family_Mapp" customModuleProvider="target">
             <connections>
+                <outlet property="addBtn" destination="Uob-FV-s6z" id="doW-Hn-Go1"/>
                 <outlet property="headerViewHeight" destination="uOU-2f-4Ee" id="6WQ-Xh-JRV"/>
                 <outlet property="hintLab" destination="chR-61-Bcl" id="LPD-qS-PQM"/>
                 <outlet property="locationTableView" destination="Ylo-1W-DQo" id="m1N-aM-uwu"/>

ZhiJi/Classes/Map/View/ZJMapTrackDatePickerView.m

@@ -8,6 +8,14 @@
 
 #import "ZJMapTrackDatePickerView.h"
 
+@interface ZJMapTrackDatePickerView()
+
+@property (weak, nonatomic) IBOutlet UIButton * confirmBtn;
+
+@property (weak, nonatomic) IBOutlet UIButton * cancelBtn;
+
+@end
+
 @implementation ZJMapTrackDatePickerView
 
 - (void)awakeFromNib {
@@ -23,6 +31,8 @@
     self.datePickerView.locale = locale;
 
     self.datePickerTitleLabel.text = kLocalizedString(@"track_start_time");
+    [_confirmBtn setTitle:kLocalizedString(@"map_track_datepicker_commit") forState:(UIControlStateNormal)];
+    [_cancelBtn setTitle:kLocalizedString(@"map_track_datepicker_cancel") forState:(UIControlStateNormal)];
 }
 
 - (IBAction)cancelAction:(UIButton *)sender {

ZhiJi/Classes/Map/View/ZJMapTrackDatePickerView.xib

@@ -83,6 +83,8 @@
             </constraints>
             <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <connections>
+                <outlet property="cancelBtn" destination="MPF-Uk-amq" id="Ucy-Bo-OTk"/>
+                <outlet property="confirmBtn" destination="qIk-wq-rm4" id="Odt-9k-nik"/>
                 <outlet property="datePickerTitleLabel" destination="Vpm-tL-tRA" id="5f1-mm-TlU"/>
                 <outlet property="datePickerView" destination="UT5-We-gdM" id="5Xe-iK-j92"/>
             </connections>

ZhiJi/en.lproj/Localizable.strings

@@ -179,3 +179,9 @@ appName = "Family Mapp";
 
 //imageView.image
 "showLocationInfo"="showLocationInfo";
+"map_track_datepicker_cancel"="map_track_datepicker_cancel";
+"map_track_datepicker_commit"="map_track_datepicker_commit";
+"emergency_send_now"="emergency_send_now";
+"LocationHint_back_btn"="LocationHint_back_btn";
+"delete"="delete";
+"message_revice_btn"="message_revice_btn";

ZhiJi/zh-Hans.lproj/Localizable.strings

@@ -177,3 +177,9 @@ appName = "Family Mapp";
 
 //imageView.image
 "showLocationInfo"="showLocationInfo_zh";
+"map_track_datepicker_cancel"="map_track_datepicker_cancel_zh";
+"map_track_datepicker_commit"="map_track_datepicker_commit_zh";
+"emergency_send_now"="emergency_send_now_zh";
+"LocationHint_back_btn"="LocationHint_back_btn_zh";
+"delete"="delete_zh";
+"message_revice_btn"="message_revice_btn_zh";