Skip to content

Z
ZhiJi-Overseas
Commit a04e52dd authored by lmj_521aiau@163.com's avatar lmj_521aiau@163.com
Browse files
Options

strings

parent 5d0b6124
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 307 additions and 130 deletions
ZhiJi.xcodeproj/project.pbxproj
View file @ a04e52dd
......@@ -8,7 +8,6 @@
/* Begin PBXBuildFile section */
642A43F424921CAD0064A98B /* ZJLocationRemindFriendSelectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 642A43F324921CAD0064A98B /* ZJLocationRemindFriendSelectView.m */; };
6453730C249778C700FD4C07 /* Location.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6453730B249778C700FD4C07 /* Location.storyboard */; };
6453730F2497792500FD4C07 /* ZJLocationRemindSelectController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6453730E2497792500FD4C07 /* ZJLocationRemindSelectController.m */; };
64537312249783E400FD4C07 /* ZJLocationFindSearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 64537311249783E400FD4C07 /* ZJLocationFindSearchViewController.m */; };
645373162497876300FD4C07 /* ZJLocationFindViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 645373142497876300FD4C07 /* ZJLocationFindViewCell.m */; };
......@@ -75,6 +74,7 @@
A95BD59524AC500A00962B06 /* PinYinForObjc.m in Sources */ = {isa = PBXBuildFile; fileRef = A95BD58724AC500A00962B06 /* PinYinForObjc.m */; };
A95BD59624AC500A00962B06 /* HCSortString.m in Sources */ = {isa = PBXBuildFile; fileRef = A95BD58A24AC500A00962B06 /* HCSortString.m */; };
A95BD59724AC500A00962B06 /* UIAlertController+HCAdd.m in Sources */ = {isa = PBXBuildFile; fileRef = A95BD58B24AC500A00962B06 /* UIAlertController+HCAdd.m */; };
A95BD59D24ACBF0100962B06 /* Location.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A95BD59F24ACBF0100962B06 /* Location.storyboard */; };
A95F5C58248DDE81001DB97E /* UIButton+HExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = A95F5BC3248DDE81001DB97E /* UIButton+HExtension.m */; };
A95F5C59248DDE81001DB97E /* NSArray+Category.m in Sources */ = {isa = PBXBuildFile; fileRef = A95F5BC4248DDE81001DB97E /* NSArray+Category.m */; };
A95F5C5A248DDE81001DB97E /* UIControl+Extension.m in Sources */ = {isa = PBXBuildFile; fileRef = A95F5BC5248DDE81001DB97E /* UIControl+Extension.m */; };
......@@ -181,7 +181,6 @@
/* Begin PBXFileReference section */
642A43F224921CAD0064A98B /* ZJLocationRemindFriendSelectView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJLocationRemindFriendSelectView.h; sourceTree = "<group>"; };
642A43F324921CAD0064A98B /* ZJLocationRemindFriendSelectView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJLocationRemindFriendSelectView.m; sourceTree = "<group>"; };
6453730B249778C700FD4C07 /* Location.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Location.storyboard; sourceTree = "<group>"; };
6453730D2497792500FD4C07 /* ZJLocationRemindSelectController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJLocationRemindSelectController.h; sourceTree = "<group>"; };
6453730E2497792500FD4C07 /* ZJLocationRemindSelectController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJLocationRemindSelectController.m; sourceTree = "<group>"; };
64537310249783E400FD4C07 /* ZJLocationFindSearchViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJLocationFindSearchViewController.h; sourceTree = "<group>"; };
......@@ -210,7 +209,7 @@
67DC7E3FDED0772FA92B7876 /* Pods-ZhiJi.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZhiJi.debug.xcconfig"; path = "Target Support Files/Pods-ZhiJi/Pods-ZhiJi.debug.xcconfig"; sourceTree = "<group>"; };
6822CCDE249B8FB700D69A07 /* ZJDefaultTools.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZJDefaultTools.h; sourceTree = "<group>"; };
6822CCDF249B8FB700D69A07 /* ZJDefaultTools.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZJDefaultTools.m; sourceTree = "<group>"; };
686A7C942487644600C7200C /* 知迹.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "知迹.app"; sourceTree = BUILT_PRODUCTS_DIR; };
686A7C942487644600C7200C /* Family Mapp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Family Mapp.app"; sourceTree = BUILT_PRODUCTS_DIR; };
686A7C972487644600C7200C /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
686A7C982487644600C7200C /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
686A7C9A2487644600C7200C /* SceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
......@@ -305,6 +304,9 @@
A95BD58B24AC500A00962B06 /* UIAlertController+HCAdd.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIAlertController+HCAdd.m"; sourceTree = "<group>"; };
A95BD58C24AC500A00962B06 /* HCSortString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HCSortString.h; sourceTree = "<group>"; };
A95BD59924AC91F000962B06 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "zh-Hans"; path = "zh-Hans.lproj/Info.plist"; sourceTree = "<group>"; };
A95BD5A424ACBF4A00962B06 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Location.storyboard; sourceTree = "<group>"; };
A95BD5A924ACBF7C00962B06 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Location.strings; sourceTree = "<group>"; };
A95BD5AA24ACBF8500962B06 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Location.strings"; sourceTree = "<group>"; };
A95F5BBF248DDE80001DB97E /* UIButton+ImageTitleSpacing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIButton+ImageTitleSpacing.h"; sourceTree = "<group>"; };
A95F5BC0248DDE80001DB97E /* UIView+HExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+HExtension.h"; sourceTree = "<group>"; };
A95F5BC1248DDE80001DB97E /* UIColor+HExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+HExtension.h"; sourceTree = "<group>"; };
......@@ -541,7 +543,7 @@
686A7C952487644600C7200C /* Products */ = {
isa = PBXGroup;
children = (
686A7C942487644600C7200C /* 知迹.app */,
686A7C942487644600C7200C /* Family Mapp.app */,
);
name = Products;
sourceTree = "<group>";
......@@ -1245,7 +1247,7 @@
645373132497876300FD4C07 /* ZJLocationFindViewCell.h */,
645373142497876300FD4C07 /* ZJLocationFindViewCell.m */,
645373152497876300FD4C07 /* ZJLocationFindViewCell.xib */,
6453730B249778C700FD4C07 /* Location.storyboard */,
A95BD59F24ACBF0100962B06 /* Location.storyboard */,
);
path = LocationAttention;
sourceTree = "<group>";
......@@ -1291,7 +1293,7 @@
);
name = ZhiJi;
productName = ZhiJi;
productReference = 686A7C942487644600C7200C /* 知迹.app */;
productReference = 686A7C942487644600C7200C /* Family Mapp.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
......@@ -1352,7 +1354,7 @@
F733B0FF249E3F5F00C30230 /* launch1@3x.png in Resources */,
A9619E8824AAE2D3009A2012 /* LaunchScreenPlaceHolderView.xib in Resources */,
686A7CA72487644800C7200C /* LaunchScreen.storyboard in Resources */,
6453730C249778C700FD4C07 /* Location.storyboard in Resources */,
A95BD59D24ACBF0100962B06 /* Location.storyboard in Resources */,
686A7CA42487644800C7200C /* Assets.xcassets in Resources */,
A948C4CE2497122B00C22D69 /* ZJMapViewPersonCardView.xib in Resources */,
A95590952490AE3C00F3BB41 /* MBProgressHUD.bundle in Resources */,
......@@ -1590,6 +1592,16 @@
name = Info.plist;
sourceTree = "<group>";
};
A95BD59F24ACBF0100962B06 /* Location.storyboard */ = {
isa = PBXVariantGroup;
children = (
A95BD5A424ACBF4A00962B06 /* Base */,
A95BD5A924ACBF7C00962B06 /* en */,
A95BD5AA24ACBF8500962B06 /* zh-Hans */,
);
name = Location.storyboard;
sourceTree = "<group>";
};
A9619E5224A8B3E4009A2012 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
......@@ -1734,7 +1746,7 @@
CODE_SIGN_ENTITLEMENTS = ZhiJi/ZhiJi.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 101;
CURRENT_PROJECT_VERSION = 100;
DEVELOPMENT_TEAM = KQ4CS767WC;
GCC_NO_COMMON_BLOCKS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
......@@ -1808,7 +1820,7 @@
"-all_load",
);
PRODUCT_BUNDLE_IDENTIFIER = com.app.familymapp;
PRODUCT_NAME = "知迹";
PRODUCT_NAME = "Family Mapp";
PROVISIONING_PROFILE_SPECIFIER = family_map_develop;
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ZhiJi/Classes/Main/Base/ZhiJi-Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = "ZhiJi-Swift.h";
......@@ -1827,7 +1839,7 @@
CODE_SIGN_ENTITLEMENTS = ZhiJi/ZhiJi.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 101;
CURRENT_PROJECT_VERSION = 100;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = KQ4CS767WC;
......@@ -1903,7 +1915,7 @@
"-all_load",
);
PRODUCT_BUNDLE_IDENTIFIER = com.app.familymapp;
PRODUCT_NAME = "知迹";
PRODUCT_NAME = "Family Mapp";
PROVISIONING_PROFILE_SPECIFIER = family_map_develop;
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/ZhiJi/Classes/Main/Base/ZhiJi-Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = "ZhiJi-Swift.h";
......
ZhiJi/Assets.xcassets/guide/guide_image_1.imageset/Contents.json 0 → 100644
View file @ a04e52dd
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "x3.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Classes/Care/Controller/ZJCareStyle2ViewController.m
View file @ a04e52dd
......@@ -47,7 +47,7 @@
make.size.mas_offset(CGSizeMake(KScaleWidth(10), KScaleWidth(12)));
}];
UIButton * trackBtn = [[UIButton alloc] initWithframe:CGRectMake(0, 0, 188, KScaleWidth(14)) setImage:@"care_style2_table_header_arrow" title:kLocalizedString(@"track_mine") titleFont:[UIFont systemFontOfSize:KFont(14)] titleColor:kColorWithRGB(34, 34, 34) backgroundColor:[UIColor clearColor] imageLeft:NO interval:KScaleWidth(6) target:self action:@selector(myTrack)];
UIButton * trackBtn = [[UIButton alloc] initWithframe:CGRectMake(0, 0, 188, KScaleWidth(14)) setImage:@"care_style2_table_header_arrow" title:kLocalizedString(@"track_mine") titleFont:[UIFont systemFontOfSize:KFont(14)] titleColor:kColorWithRGB(34, 34, 34) backgroundColor:[UIColor clearColor] imageLeft:NO interval:KScaleWidth(10) target:self action:@selector(myTrack)];
[self.view addSubview:trackBtn];
[trackBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(locationIV.mas_right);
......
ZhiJi/Classes/LocationAttention/ZJLocationAttentionFooter.swift
View file @ a04e52dd
......@@ -11,12 +11,9 @@ import UIKit
class ZJLocationAttentionFooter: UIView {
@IBOutlet weak var bottom_addBtn: UIButton!
/*
// Only override draw() if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
override func draw(_ rect: CGRect) {
// Drawing code
override func awakeFromNib() {
bottom_addBtn.setTitle(NSLocalizedString("location_no_address_remind", comment: ""), for: .normal)
}
*/
}
ZhiJi/Classes/LocationAttention/ZJLocationAttentionVC.swift
View file @ a04e52dd
......@@ -12,6 +12,7 @@ class ZJLocationAttentionVC: BaseViewController {
@IBOutlet weak var locationTableView: UITableView!
@IBOutlet weak var maskBgView: UIView!
@IBOutlet weak var hintLab: UILabel!
@IBOutlet weak var headerViewHeight: NSLayoutConstraint?
@objc var headerFriendsDataSource: Array<ZJFriendModel>?
......@@ -62,6 +63,7 @@ class ZJLocationAttentionVC: BaseViewController {
maskBgView.isHidden = true
hintLab.text = NSLocalizedString("location_no_address_remind", comment: "");
addLongPres()
}
......
ZhiJi/Classes/LocationAttention/ZJLocationAttentionVC.xib
View file @ a04e52dd
......@@ -7,9 +7,10 @@
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ZJLocationAttentionVC" customModule="ZhiJi" customModuleProvider="target">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ZJLocationAttentionVC" customModule="Family_Mapp" customModuleProvider="target">
<connections>
<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"/>
<outlet property="maskBgView" destination="jqH-qv-uUS" id="fRy-uE-ul3"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
......
ZhiJi/Classes/LocationAttention/en.lproj/Location.strings 0 → 100644
View file @ a04e52dd
/* Class = "UIButton"; normalTitle = "确认"; ObjectID = "5vU-Px-2bq"; */
"5vU-Px-2bq.normalTitle" = "Confirm";
/* Class = "UITextField"; placeholder = "请输入地点"; ObjectID = "7BE-9A-Q8h"; */
"7BE-9A-Q8h.placeholder" = "Please enter location";
/* Class = "UILabel"; text = "地点备注"; ObjectID = "8aA-rx-erU"; */
"8aA-rx-erU.text" = "Place mark";
/* Class = "UIButton"; normalTitle = "取消"; ObjectID = "Df2-1g-WVS"; */
"Df2-1g-WVS.normalTitle" = "Cancel";
/* Class = "UITextField"; placeholder = "如：家/公司"; ObjectID = "Ew3-wv-sL7"; */
"Ew3-wv-sL7.placeholder" = "For example：Home/company";
/* Class = "UILabel"; text = "青龙胡同35号"; ObjectID = "ZI4-UW-sIm"; */
"ZI4-UW-sIm.text" = "";
/* Class = "UILabel"; text = "范围半径"; ObjectID = "fld-XX-ju3"; */
"fld-XX-ju3.text" = "Radius";
/* Class = "UILabel"; text = "查找地点"; ObjectID = "lJC-uI-DUy"; */
"lJC-uI-DUy.text" = "Find place";
/* Class = "UILabel"; text = "500m"; ObjectID = "lWH-a8-J2r"; */
"lWH-a8-J2r.text" = "0m";
/* Class = "UILabel"; text = "东城去第二图书馆"; ObjectID = "rYs-Rr-B8q"; */
"rYs-Rr-B8q.text" = "";
ZhiJi/Classes/LocationAttention/zh-Hans.lproj/Location.strings 0 → 100644
View file @ a04e52dd
/* Class = "UIButton"; normalTitle = "确认"; ObjectID = "5vU-Px-2bq"; */
"5vU-Px-2bq.normalTitle" = "确认";
/* Class = "UITextField"; placeholder = "请输入地点"; ObjectID = "7BE-9A-Q8h"; */
"7BE-9A-Q8h.placeholder" = "请输入地点";
/* Class = "UILabel"; text = "地点备注"; ObjectID = "8aA-rx-erU"; */
"8aA-rx-erU.text" = "地点备注";
/* Class = "UIButton"; normalTitle = "取消"; ObjectID = "Df2-1g-WVS"; */
"Df2-1g-WVS.normalTitle" = "取消";
/* Class = "UITextField"; placeholder = "如：家/公司"; ObjectID = "Ew3-wv-sL7"; */
"Ew3-wv-sL7.placeholder" = "如：家/公司";
/* Class = "UILabel"; text = "青龙胡同35号"; ObjectID = "ZI4-UW-sIm"; */
"ZI4-UW-sIm.text" = "";
/* Class = "UILabel"; text = "范围半径"; ObjectID = "fld-XX-ju3"; */
"fld-XX-ju3.text" = "范围半径";
/* Class = "UILabel"; text = "查找地点"; ObjectID = "lJC-uI-DUy"; */
"lJC-uI-DUy.text" = "查找地点";
/* Class = "UILabel"; text = "500m"; ObjectID = "lWH-a8-J2r"; */
"lWH-a8-J2r.text" = "0m";
/* Class = "UILabel"; text = "东城去第二图书馆"; ObjectID = "rYs-Rr-B8q"; */
"rYs-Rr-B8q.text" = "";
ZhiJi/Classes/LocationVC/View/ZJAlertView.swift
View file @ a04e52dd
......@@ -20,6 +20,13 @@ import UIKit
@IBOutlet weak var rightButton: UIButton!
@IBOutlet weak var alertSubtitle: UILabel!
override func awakeFromNib() {
alertTitle.text = NSLocalizedString("track_friend_timeWithin_no_location", comment: "")
alertSubtitle.text = NSLocalizedString("track_friend_authority_alert", comment: "")
leftButton.setTitle(NSLocalizedString("location_check_tutorial", comment: ""), for: .normal)
rightButton.setTitle(NSLocalizedString("location_check_tutorial_cancel", comment: ""), for: .normal)
}
/// 展示
@objc func show() {
guard let view = UIApplication.shared.keyWindow else { return }
......
ZhiJi/Classes/LocationVC/View/ZJAlertView.xib
View file @ a04e52dd
......@@ -20,23 +20,23 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CGI-ke-b0A">
<rect key="frame" x="36" y="359" width="342" height="178"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="对方该时间段未收录位置信息" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hoz-Eb-z9r">
<rect key="frame" x="28" y="30" width="286" height="21"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="对方该时间段未收录位置信息" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hoz-Eb-z9r">
<rect key="frame" x="28" y="30" width="286" height="21.5"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请确定对方是否授权知迹位置权限" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RiW-bm-Ym2">
<rect key="frame" x="0.0" y="63" width="342" height="17"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请确定对方是否授权Family Mapp位置权限" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RiW-bm-Ym2">
<rect key="frame" x="10" y="63.5" width="322" height="17"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cZn-YZ-lp6">
<rect key="frame" x="26" y="110" width="137" height="50"/>
<rect key="frame" x="26" y="110.5" width="137" height="44"/>
<color key="backgroundColor" red="0.96861571069999997" green="0.96862143280000002" blue="0.96863609549999996" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="EBF-wW-f5n"/>
<constraint firstAttribute="height" constant="44" id="EBF-wW-f5n"/>
</constraints>
<state key="normal" title="查看教程">
<color key="titleColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="calibratedRGB"/>
......@@ -48,11 +48,8 @@
</userDefinedRuntimeAttributes>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="e2s-u7-pzI">
<rect key="frame" x="179" y="110" width="137" height="50"/>
<rect key="frame" x="179" y="110.5" width="137" height="44"/>
<color key="backgroundColor" red="0.37147963049999999" green="0.54078811410000005" blue="0.96867829559999996" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="BGP-wl-BjM"/>
</constraints>
<state key="normal" title="知道了">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
......@@ -66,18 +63,20 @@
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="RiW-bm-Ym2" firstAttribute="top" secondItem="hoz-Eb-z9r" secondAttribute="bottom" constant="12" id="3fw-vL-IfG"/>
<constraint firstItem="e2s-u7-pzI" firstAttribute="height" secondItem="cZn-YZ-lp6" secondAttribute="height" id="5Cc-n5-97g"/>
<constraint firstAttribute="trailing" secondItem="hoz-Eb-z9r" secondAttribute="trailing" constant="28" id="Eds-19-Iyh"/>
<constraint firstItem="hoz-Eb-z9r" firstAttribute="top" secondItem="CGI-ke-b0A" secondAttribute="top" constant="30" id="Hoy-S8-QSV"/>
<constraint firstItem="RiW-bm-Ym2" firstAttribute="leading" secondItem="CGI-ke-b0A" secondAttribute="leading" id="Kuz-rQ-kh6"/>
<constraint firstItem="RiW-bm-Ym2" firstAttribute="leading" secondItem="CGI-ke-b0A" secondAttribute="leading" constant="10" id="Kuz-rQ-kh6"/>
<constraint firstAttribute="trailing" secondItem="e2s-u7-pzI" secondAttribute="trailing" constant="26" id="QtK-IE-Nj7"/>
<constraint firstItem="e2s-u7-pzI" firstAttribute="top" secondItem="RiW-bm-Ym2" secondAttribute="bottom" constant="30" id="R8G-yq-VZf"/>
<constraint firstItem="e2s-u7-pzI" firstAttribute="width" secondItem="cZn-YZ-lp6" secondAttribute="width" id="RTv-E3-fjO"/>
<constraint firstAttribute="trailing" secondItem="RiW-bm-Ym2" secondAttribute="trailing" id="XRT-y6-ggA"/>
<constraint firstAttribute="trailing" secondItem="RiW-bm-Ym2" secondAttribute="trailing" constant="10" id="XRT-y6-ggA"/>
<constraint firstItem="hoz-Eb-z9r" firstAttribute="leading" secondItem="CGI-ke-b0A" secondAttribute="leading" constant="28" id="a2J-P8-Hjc"/>
<constraint firstAttribute="height" constant="178" id="dvZ-VX-JJ4"/>
<constraint firstItem="e2s-u7-pzI" firstAttribute="leading" secondItem="cZn-YZ-lp6" secondAttribute="trailing" constant="16" id="fpW-9Y-gyK"/>
<constraint firstItem="cZn-YZ-lp6" firstAttribute="leading" secondItem="CGI-ke-b0A" secondAttribute="leading" constant="26" id="gTn-dv-w2c"/>
<constraint firstItem="cZn-YZ-lp6" firstAttribute="top" secondItem="RiW-bm-Ym2" secondAttribute="bottom" constant="30" id="hvi-vf-4z3"/>
<constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="cZn-YZ-lp6" secondAttribute="bottom" constant="4" id="kuO-cG-xYR"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
......
ZhiJi/Classes/LocationVC/ZJLocationVC.swift
View file @ a04e52dd
......@@ -14,9 +14,23 @@ class ZJLocationVC: UIViewController {
@IBOutlet weak var shareAppButton: UIButton!
@IBOutlet weak var detailsLab_0: UILabel!
@IBOutlet weak var detailsLab_1: UILabel!
@IBOutlet weak var detailsLab_2: UILabel!
@IBOutlet weak var detailsLab_3: UILabel!
@IBOutlet weak var detailsLab_4: UILabel!
override func viewDidLoad() {
super.viewDidLoad()
title = "定位Ta教程"
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: "")
detailsLab_3.text = NSLocalizedString("location_alert_details_3", comment: "")
detailsLab_4.text = NSLocalizedString("location_alert_details_4", comment: "")
shareAppButton.setTitle(NSLocalizedString("location_alert_share", comment: ""), for: .normal)
self.shareAppButton.addTarget(self, action: #selector(shareApp), for: .touchUpInside)
}
......
ZhiJi/Classes/LocationVC/ZJLocationVC.xib
View file @ a04e52dd
This diff is collapsed.
ZhiJi/Classes/Login/Controller/ZJPhoneLoginViewController.m
View file @ a04e52dd
......@@ -189,6 +189,7 @@
//点击有阴影效果 需修改
textview = [[UITextView alloc] initWithFrame:CGRectMake(10, 100, 400, 100)];
textview.attributedText = [self textView:isSelect];
textview.linkTextAttributes = @{NSUnderlineStyleAttributeName:@1, NSUnderlineColorAttributeName:[UIColor blueColor]};
textview.delegate = self;
textview.editable = NO; //必须禁止输入，否则点击将弹出输入键盘
textview.scrollEnabled = NO;
......@@ -239,12 +240,8 @@
[MBProgressHUD showMessage:kLocalizedString(@"emergency_enter_phone")];
return;
}
if (!isSelect) {
[MBProgressHUD showMessage:@"请阅读并同意《用户协议》《隐私政策》"];
return;
}
if (codeTextfield.text.length==0) {
[MBProgressHUD showMessage:@"请输入验证码"];
[MBProgressHUD showMessage:kLocalizedString(@"login_sms_code")];
return;
}
......@@ -334,8 +331,9 @@
NSString * str1 = kLocalizedString(@"login_read");
NSString * str2 = kLocalizedString(@"setting_service");
NSString * str3 = kLocalizedString(@"setting_privacy");
NSString * clauseStr = [NSString stringWithFormat:@" %@《%@》 《%@》", str1, str2, str3];
// NSString * str3 = kLocalizedString(@"setting_privacy");
// NSString * clauseStr = [NSString stringWithFormat:@"%@ %@ %@", str1, str2, str3];
NSString * clauseStr = [NSString stringWithFormat:@"%@ %@", str1, str2];
// NSString * clauseStr = @" 已阅读并同意《用户协议》《隐私政策》";
NSMutableAttributedString * attStr = [[NSMutableAttributedString alloc] initWithString:clauseStr];
......@@ -344,24 +342,24 @@
style.lineSpacing = KScaleWidth(6);
[attStr addAttributes:@{NSForegroundColorAttributeName:kColorWithRGB(82, 139, 255), NSLinkAttributeName:@"user://"} range:[clauseStr rangeOfString:str2]];
[attStr addAttributes:@{NSForegroundColorAttributeName:kColorWithRGB(82, 139, 255), NSLinkAttributeName:@"privacy://"} range:[clauseStr rangeOfString:str3]];
UIImage *image = [UIImage imageNamed:isSelect == NO ? @"quick_login_clause_select" : @"quick_login_clause_selected"];
CGSize size = CGSizeMake(KScaleWidth(12+8), KScaleWidth(12+8));
UIGraphicsBeginImageContextWithOptions(size, false, 0);
[image drawInRect:CGRectMake(0, 0, size.width, size.height)];
UIImage *resizeImage = UIGraphicsGetImageFromCurrentImageContext();
UIGraphicsEndImageContext();
NSTextAttachment *textAttachment = [[NSTextAttachment alloc] init];
textAttachment.bounds = CGRectMake(0, -KScaleWidth(5.5), size.width, size.height);
textAttachment.image = resizeImage;
NSMutableAttributedString *imageString = [[NSMutableAttributedString alloc] initWithAttributedString:[NSMutableAttributedString attributedStringWithAttachment:textAttachment]];
[imageString addAttribute:NSLinkAttributeName
value:@"agree://"
range:NSMakeRange(0, imageString.length)];
[attStr insertAttributedString:imageString atIndex:0];
// [attStr addAttributes:@{NSForegroundColorAttributeName:kColorWithRGB(82, 139, 255), NSLinkAttributeName:@"privacy://"} range:[clauseStr rangeOfString:str3]];
// UIImage *image = [UIImage imageNamed:isSelect == NO ? @"quick_login_clause_select" : @"quick_login_clause_selected"];
//
// CGSize size = CGSizeMake(KScaleWidth(12+8), KScaleWidth(12+8));
// UIGraphicsBeginImageContextWithOptions(size, false, 0);
// [image drawInRect:CGRectMake(0, 0, size.width, size.height)];
// UIImage *resizeImage = UIGraphicsGetImageFromCurrentImageContext();
// UIGraphicsEndImageContext();
//
// NSTextAttachment *textAttachment = [[NSTextAttachment alloc] init];
// textAttachment.bounds = CGRectMake(0, -KScaleWidth(5.5), size.width, size.height);
// textAttachment.image = resizeImage;
// NSMutableAttributedString *imageString = [[NSMutableAttributedString alloc] initWithAttributedString:[NSMutableAttributedString attributedStringWithAttachment:textAttachment]];
// [imageString addAttribute:NSLinkAttributeName
// value:@"agree://"
// range:NSMakeRange(0, imageString.length)];
// [attStr insertAttributedString:imageString atIndex:0];
[attStr addAttributes:@{NSParagraphStyleAttributeName:style, NSFontAttributeName:[UIFont systemFontOfSize:KFont(13)]} range:[clauseStr rangeOfString:clauseStr]];
......
ZhiJi/Classes/Main/View/Protocol.m
View file @ a04e52dd
......@@ -57,7 +57,7 @@
//neiRongLabel
NSString *str = @" 知迹APP需要双方安装并加好友授权同意，APP付费方即可时刻关注对方的位置信息。\n 注册为知迹会员或接受付费会员的好友邀请意味着 您将向平台和该付费会员提供地理位置，行为轨迹，高度等隐私信息。您正在使用的产品/服务及其功能将会收集、储存和使用您的相关信息，包括但不限于您的GPS定位、设备信息、手机通讯录等，您将受到《用户协议》和《隐私政策》的约束。您点击类似“同意并继续”按钮后或进行主动勾选同 义本协议等操作后，即表示您充分理解隐私政策内 容以及上述描述，并已同意授权平台按照隐私政策 内容合法收集、储存和使用您的个人信息。为保护 您的合法权益，请认真阅读并充分理解《隐私政策》内容。";
NSString *str = @" Family MappAPP需要双方安装并加好友授权同意，APP付费方即可时刻关注对方的位置信息。\n 注册为Family Mapp会员或接受付费会员的好友邀请意味着 您将向平台和该付费会员提供地理位置，行为轨迹，高度等隐私信息。您正在使用的产品/服务及其功能将会收集、储存和使用您的相关信息，包括但不限于您的GPS定位、设备信息、手机通讯录等，您将受到《用户协议》和《隐私政策》的约束。您点击类似“同意并继续”按钮后或进行主动勾选同 义本协议等操作后，即表示您充分理解隐私政策内 容以及上述描述，并已同意授权平台按照隐私政策 内容合法收集、储存和使用您的个人信息。为保护 您的合法权益，请认真阅读并充分理解《隐私政策》内容。";
_neiRongLabel = [UILabel labelWithtext:str font:[UIFont systemFontOfSize:KFont(13)] textColor:[UIColor colorWithHex:0x333333] alignment:NSTextAlignmentLeft];
//设置行间距
......
ZhiJi/Classes/Map/Controller/ZJMapStyle2ViewController.m
View file @ a04e52dd
......@@ -186,8 +186,8 @@
- (void)tipsBtnClick:(UIButton *)sender{
if (self.phoneTF.text.length != 11) {
[MBProgressHUD showMessage:@"请输入11位手机号"];
if (self.phoneTF.text.length == 0) {
[MBProgressHUD showMessage:kLocalizedString(@"emergency_enter_phone")];
return;
}
......
ZhiJi/Classes/Map/View/ZJMapTrackDatePickerView.m
View file @ a04e52dd
......@@ -22,6 +22,7 @@
NSLocale *locale = [[NSLocale alloc]initWithLocaleIdentifier:@"zh_CN"];
self.datePickerView.locale = locale;
self.datePickerTitleLabel.text = kLocalizedString(@"track_start_time");
}
- (IBAction)cancelAction:(UIButton *)sender {
......
ZhiJi/Classes/Map/View/ZJUserTrackTimeView.m
View file @ a04e52dd
......@@ -9,6 +9,13 @@
#import "ZJUserTrackTimeView.h"
#import "ZJMapTrackDatePickerView.h"
@interface ZJUserTrackTimeView()
@property (nonatomic, weak) IBOutlet UILabel * startLab;
@property (nonatomic, weak) IBOutlet UILabel * endLab;
@end
@implementation ZJUserTrackTimeView
- (void)awakeFromNib {
......@@ -25,6 +32,9 @@
[components setHour:([components hour] - 5)];
NSDate *beginningOfWeek = [gregorian dateFromComponents:components];
self.stratDate = beginningOfWeek;
_startLab.text = kLocalizedString(@"track_start_time");
_endLab.text = kLocalizedString(@"track_end_time");
}
- (IBAction)drawTrackAction:(UIButton *)sender {
......@@ -35,14 +45,14 @@
- (IBAction)selectBeginTimeAction:(UIButton *)sender {
ZJMapTrackDatePickerView *datePciker = [[[NSBundle mainBundle] loadNibNamed:@"ZJMapTrackDatePickerView" owner:self options:nil] lastObject];
datePciker.datePickerTitleLabel.text = @"开始时间";
datePciker.datePickerTitleLabel.text = kLocalizedString(@"track_start_time");
[datePciker show];
__weak typeof(self) weakSelf = self;
datePciker.commitTrackDateClosre = ^(NSDate *date) {
NSLog(@"%@", date);
if ([date compare:weakSelf.endDate] == NSOrderedDescending) {
[MBProgressHUD showError:@"开始时间必须小于结束时间"];
[MBProgressHUD showError:kLocalizedString(@"track_start_time_less_end")];
return;
}
[weakSelf.beginTimeButton setTitle: [weakSelf getDateStringFromDate:date] forState:UIControlStateNormal];
......@@ -55,7 +65,7 @@
- (IBAction)selectEndTimeAction:(UIButton *)sender {
ZJMapTrackDatePickerView *datePciker = [[[NSBundle mainBundle] loadNibNamed:@"ZJMapTrackDatePickerView" owner:self options:nil] lastObject];
datePciker.datePickerTitleLabel.text = @"结束时间";
datePciker.datePickerTitleLabel.text = kLocalizedString(@"track_end_time");
[datePciker show];
......@@ -64,7 +74,7 @@
NSLog(@"endTime %@", date);
if ([date compare:weakSelf.stratDate] == NSOrderedAscending) {
[MBProgressHUD showError:@"结束时间必须大于开始时间"];
[MBProgressHUD showError:kLocalizedString(@"track_end_time_great_start")];
return;
}
......
ZhiJi/Classes/Map/View/ZJUserTrackTimeView.xib
View file @ a04e52dd
......@@ -113,7 +113,9 @@
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<connections>
<outlet property="beginTimeButton" destination="O7A-vi-Bcd" id="rkj-rz-qun"/>
<outlet property="endLab" destination="BUF-h4-Rn3" id="cj0-hq-v6g"/>
<outlet property="endTimeButton" destination="nTc-tF-9cI" id="Lkj-g0-ytH"/>
<outlet property="startLab" destination="vrv-qG-urb" id="HEr-eL-8gI"/>
<outlet property="trackButton" destination="iH0-na-DhI" id="dew-3x-MAx"/>
</connections>
<point key="canvasLocation" x="106.40000000000001" y="-155.62218890554723"/>
......
ZhiJi/Classes/Mine/Controller/ZJMineViewController.m
View file @ a04e52dd
......@@ -251,8 +251,7 @@ static NSString *ID = @"mineID";
break;
case HeaderTapTypeRennewal:
{
NSLog(@"续费点击");
// [ZJUserInfoManager shared].userInfoModel && ![ZJUserInfoManager shared].userInfoModel.isMember
if (![ZJUserInfoManager shared].userInfoModel.isMember) {
// ZJMemberPayViewController *zhiFuVC = [[ZJMemberPayViewController alloc] init];
......
ZhiJi/Classes/Mine/View/ZJMineHeaderView.m
View file @ a04e52dd
......@@ -78,10 +78,10 @@
//[UIFont fontWithName:@"PingFangSC-Medium" size:KFont(24)];
[self addSubview:self.nicknameLabel];
[self.nicknameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.touXiangImageView).mas_offset(KScaleWidth(7));
make.top.equalTo(self.touXiangImageView).mas_offset(KScaleWidth(2));
make.left.equalTo(self.touXiangImageView.mas_right).mas_offset(KScaleWidth(18));
make.right.equalTo(self.mas_right).mas_offset(-KScaleWidth(20));
make.height.mas_equalTo(KScaleWidth(20));
make.height.mas_equalTo(KScaleWidth(28));
}];
[self.nicknameLabel addTapBlock:^(UITapGestureRecognizer *tap) {
[weakSelf clickType:HeaderTapTypeNick];
......@@ -94,7 +94,7 @@
self.userIdLabel.textAlignment = NSTextAlignmentLeft;
[self.userIdLabel setUserInteractionEnabled:true];
[self.userIdLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.nicknameLabel.mas_bottom).mas_offset(KScaleWidth(10));
make.top.equalTo(self.nicknameLabel.mas_bottom).mas_offset(KScaleWidth(2));
make.left.equalTo(self.nicknameLabel);//.mas_offset(0);
make.right.equalTo(self);
make.height.equalTo(_nicknameLabel);
......@@ -118,7 +118,7 @@
//xufeiButton
self.xuFeiButton = [UIButton buttonWithType:UIButtonTypeCustom];
[self.xuFeiButton setBackgroundImage:[UIImage imageNamed:@"xuFei_Btn"] forState:UIControlStateNormal];
[self.xuFeiButton setTitle:@"续费" forState:0];
[self.xuFeiButton setTitle:kLocalizedString(@"mine_renewal") forState:0];
[self.xuFeiButton setTitleColor:[UIColor colorWithHex:0x38180D] forState:0];
[self.xuFeiButton.titleLabel setFont:[UIFont systemFontOfSize:KFont(14)]];
[self.xuFeiButton setBackgroundColor:[UIColor colorWithHex:0xEBC6B4]];
......
ZhiJi/Classes/Pay/ZJZhiFuViewController.m
View file @ a04e52dd
......@@ -273,7 +273,7 @@
self.tongYButton = [UIButton buttonWithType:UIButtonTypeCustom];
// self.tongYButton.backgroundColor = [UIColor redColor];
self.tongYButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
[self.tongYButton setTitle:@"购买前请先阅读并同意《知迹付费会员服务协议》" forState:0];
[self.tongYButton setTitle:@"购买前请先阅读并同意《Family Mapp付费会员服务协议》" forState:0];
[self.tongYButton setTitleColor:[UIColor colorWithHex:0x666666] forState:UIControlStateNormal];
[self.tongYButton.titleLabel setFont:[UIFont systemFontOfSize:KFont(13)]];
[self.beiJingView addSubview:self.tongYButton];
......
ZhiJi/Classes/Tools/Category/UIButton+Category.m
View file @ a04e52dd
......@@ -50,7 +50,7 @@
- (instancetype)initWithframe:(CGRect)frame selectImage:(NSString *)image selectedImage:(NSString *)selectedImage title:(NSString *)tilte titleFont:(UIFont *)font titleColor:(UIColor *)color backgroundColor:(UIColor *)bgColor attributed:(BOOL)attributed attributedString:(NSMutableAttributedString *)attributeStr paragraphStyle:(NSMutableParagraphStyle *)paragraphStyle imageLeft:(BOOL)left interval:(CGFloat)interval target:(id)target action:(SEL)action{
if (self = [super initWithFrame:frame]) {
CGRect titleRect = [tilte boundingRectWithSize:CGSizeMake(KScreenWidth, frame.size.width) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : font , NSForegroundColorAttributeName : color} context:nil];
CGRect titleRect = [tilte boundingRectWithSize:CGSizeMake(KScreenWidth, frame.size.height) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : font , NSForegroundColorAttributeName : color} context:nil];
self.titleLabel.font = font;
[self setTitleColor:color forState:UIControlStateNormal];
......@@ -71,15 +71,13 @@
if (left) {
[self setImageEdgeInsets:UIEdgeInsetsMake(0, -interval/2, 0, 0)];
[self setTitleEdgeInsets:UIEdgeInsetsMake(0, interval/2, 0, 0)];
[self setTitleEdgeInsets:UIEdgeInsetsMake(0, 0, 0, -interval/2)];
if (attributed) {
titleRect = [tilte boundingRectWithSize:CGSizeMake(KScreenWidth, frame.size.width) options:nil attributes:@{NSFontAttributeName : font , NSForegroundColorAttributeName : color} context:nil];
titleRect = [tilte boundingRectWithSize:CGSizeMake(KScreenWidth, frame.size.height) options:nil attributes:@{NSFontAttributeName : font , NSForegroundColorAttributeName : color} context:nil];
[self setImageEdgeInsets:UIEdgeInsetsMake(-titleRect.size.height-paragraphStyle.lineSpacing, -interval/2, 0, 0)];
}
}else{
// [self setImageEdgeInsets:UIEdgeInsetsMake(0, titleRect.size.width+self.currentImage.size.width+interval/2, 0, 0)];
// [self setTitleEdgeInsets:UIEdgeInsetsMake(0, -self.currentImage.size.width-titleRect.size.width/2-interval/2, 0, 0)];
[self setImageEdgeInsets:UIEdgeInsetsMake(0, titleRect.size.width+self.currentImage.size.width+interval*2, 0, 0)];
[self setImageEdgeInsets:UIEdgeInsetsMake(0, 0, 0, -titleRect.size.width*2-self.currentImage.size.width+interval/2)];
[self setTitleEdgeInsets:UIEdgeInsetsMake(0, -self.currentImage.size.width-interval, 0, 0)];
}
}
......
ZhiJi/Classes/Tools/Guide/GuideViewController.m
View file @ a04e52dd
......@@ -137,11 +137,11 @@
self.images = [NSMutableArray array];
for (int i = 0; i < 1; i++) {
NSString *name = @"";
// if (ZJDefaultTools.hasTopNotch) {
// name = @"guide_image_";
// } else {
if (ZJDefaultTools.hasTopNotch) {
name = @"guide_image_";
} else {
name = @"guide_";
// }
}
UIImageView *guidePage = [[UIImageView alloc] initWithImage:[UIImage imageNamed:[name stringByAppendingFormat:@"%d", i+1]]];
guidePage.tag = i;
guidePage.contentMode = UIViewContentModeScaleToFill;
......
ZhiJi/Classes/Tools/Guide/ZJGuideConfig.m
View file @ a04e52dd
......@@ -37,7 +37,7 @@
config.vc = [[GuideViewController alloc] init];
[[ZJUserInfoManager shared] getUserInfo:nil failure:nil];
// [[ZJUserInfoManager shared] getServiceInfo:nil];
[[ZJUserInfoManager shared] getServiceInfo:nil];
});
return config;
}
......
ZhiJi/Classes/Tools/Network/TQNetworkTools.m
View file @ a04e52dd
......@@ -212,10 +212,9 @@ static TQNetworkTools* _tools = nil;
// [dict setValue: @"1" forKey: @"tgtk"];
// 获取BundleID
[dict setValue: [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] forKey: @"pkg"];
// [dict setValue: @"com.zxhl.location" forKey: @"pkg"];
// [dict setValue: @"com.zxhl.track" forKey: @"pkg"];
// [dict setValue: [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] forKey: @"pkg"];
[dict setValue: @"com.app.zhiji" forKey: @"pkg"];
NSString *identifierForVendor = [[data Read] objectForKey:@"Identifier"];;
[dict setValue: identifierForVendor forKey: @"device"];
NSLog(@"identifierForVendor info == %@", identifierForVendor);
......@@ -230,7 +229,8 @@ static TQNetworkTools* _tools = nil;
// }
//appLs
[dict setValue: @"040087e60c36fd63" forKey: @"appLs"];
// [dict setValue: @"040087e60c36fd63" forKey: @"appLs"];
[dict setValue: @"d904ceaa1b3f6444" forKey: @"appLs"];
// 设置网络类型
[[AFNetworkReachabilityManager sharedManager] setReachabilityStatusChangeBlock:^(AFNetworkReachabilityStatus status) {
......@@ -508,7 +508,8 @@ static TQNetworkTools* _tools = nil;
[dict setValue: identifierForVendor forKey: @"device"];
NSLog(@"identifierForVendor info == %@", identifierForVendor);
// 获取BundleID
[dict setValue: [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] forKey: @"pkg"];
// [dict setValue: [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"] forKey: @"pkg"];
[dict setValue: @"com.app.zhiji" forKey: @"pkg"];
// 设置时间戳
NSTimeInterval today = [[NSDate date] timeIntervalSince1970] * 1000;
......@@ -520,7 +521,9 @@ static TQNetworkTools* _tools = nil;
// }
//appLs
[dict setValue: @"040087e60c36fd63" forKey: @"appLs"];
// [dict setValue: @"040087e60c36fd63" forKey: @"appLs"];
[dict setValue: @"d904ceaa1b3f6444" forKey: @"appLs"];
[dict addEntriesFromDictionary:[self signParams:dict]];
......
ZhiJi/Classes/Tools/PCH/ResourceHeader.pch
View file @ a04e52dd
......@@ -17,22 +17,19 @@
#define saltA @"HXHJ4KDL1QPFHGA0"
#define saltB @"ZJQJQ66AH9COTXSU"
#define WXAppId @"wx8b8bbccffda2f453"
#define WXUniversalLink @"https://www.wayaya.info/"
#define aesIvParameter @"e2e7d664d72f710b" // 密钥默认偏移，可更改
#define aesKey @"c20505927997d952" // key必须为16位，可更改为自己的key
//#if DEBUG
//
//#define ServerReport @"http://report.zhangxinhulian.com"
//#define ServerHost @"https://feedapitest.zhangxinhulian.com"
//#define ServerHostFeed @"https://feedapitest.zhangxinhulian.com"
#define ServerReport @"http://report.zhangxinhulian.com"
#define ServerHost @"https://feedapitest.zhangxinhulian.com"
#define ServerHostFeed @"https://feedapitest.zhangxinhulian.com"
//
//#else
#define ServerReport @"http://report.zhangxinhulian.com"
#define ServerHost @"https://feedapi.zhangxinhulian.com"
#define ServerHostFeed @"https://feedapi.zhangxinhulian.com"
//#define ServerReport @"http://report.zhangxinhulian.com"
//#define ServerHost @"https://feedapi.zhangxinhulian.com"
//#define ServerHostFeed @"https://feedapi.zhangxinhulian.com"
//#endif
ZhiJi/en.lproj/InfoPlist.strings
View file @ a04e52dd
......@@ -8,12 +8,12 @@
CFBundleDisplayName = "Family Mapp";
NSCameraUsageDescription = "知迹修改您的头像 test";
NSPhotoLibraryUsageDescription = "知迹修改您的头像需 test";
NSCameraUsageDescription = "Family Mapp Modify your avatar requires your camera permission";
NSPhotoLibraryUsageDescription = "Family Mapp Modify your avatar requires your album permission";
NSContactsUsageDescription = "知迹获取您的好友需要您的 test";
NSContactsUsageDescription = "Family Mapp to get your friends needs your address book permission";
NSLocationAlwaysUsageDescription = "知迹绘制您的轨迹需要您的 test";
NSLocationWhenInUseUsageDescription = "知迹绘制您的轨迹需要您的 test";
NSLocationAlwaysAndWhenInUseUsageDescription = "知迹绘制您的轨迹需要您的 test";
NSLocationWhenInUseUsageDescription = "知迹绘制您的轨迹需要您的 test";
NSLocationAlwaysUsageDescription = "Family Mapp needs your location permission to draw your track";
NSLocationWhenInUseUsageDescription = "Family Mapp needs your location permission to draw your track";
NSLocationAlwaysAndWhenInUseUsageDescription = "Family Mapp needs your location permission to draw your track";
NSLocationWhenInUseUsageDescription = "Family Mapp needs your location permission to draw your track";
ZhiJi/en.lproj/Localizable.strings
View file @ a04e52dd
......@@ -59,6 +59,12 @@ appName = "Family Mapp";
"area"="Select the area";
"area_search"="Search countries";
"login_sms_code"="Please enter the SMS verification code";
"知道了"="";
"知道了"="";
"知道了"="";
"知道了"="";
"手机号快捷登录"="";
"请输入手机号码"="";
"请输入验证码"="";
......@@ -109,6 +115,23 @@ appName = "Family Mapp";
"track_cleck"="View His/Her Location";
"track_no_friend"="No friend yet";
"track_start_time"="The start time";
"track_end_time"="The end time";
"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
"location_no_address_remind"="You did not set a location reminder for the friend ~";
"location_check_tutorial"="View the tutorial";
"location_check_tutorial_cancel"="Cancel";
"location_alert_details_0"="为了您能更好地体验Family MappApp,请进行以下设置：";
"location_alert_details_1"="确认对方没有删除Family Mapp";
"location_alert_details_2"="如果删除了请分享应用给Ta重新下载并安装、登录";
"location_alert_details_3"="位置权限设置";
"location_alert_details_4"="如果Ta关闭了位置权限，请让Ta前往设置>权限管理>Family Mapp里开启位置权限。";
"location_alert_share"="分享应用";
//mine
"mine_sign"="Sign in";
"mine_click_nickname"="Click nickname to edit";
......@@ -156,3 +179,11 @@ appName = "Family Mapp";
"share_invite"="Let’s be friend in Family Mapp";
"share_upload"="View real-time location Be long-time companion";
"share_friend"="Let’s be friend in %@";
"定位Ta教程"="";
"为了您能更好地体验Family MappApp,请进行以下设置："="";
"确认对方没有删除Family Mapp"="";
"如果删除了请分享应用给Ta重新下载并安装、登录"="";
"位置权限设置"="";
"如果Ta关闭了位置权限，请让Ta前往设置>权限管理>Family Mapp里开启位置权限。"="";
ZhiJi/zh-Hans.lproj/InfoPlist.strings
View file @ a04e52dd
......@@ -6,14 +6,14 @@
Copyright © 2020 Company. All rights reserved.
*/
CFBundleDisplayName = "知迹海外";
CFBundleDisplayName = "Family Mapp";
NSCameraUsageDescription = "知迹修改您的头像需要您的相机权限";
NSPhotoLibraryUsageDescription = "知迹修改您的头像需要您的相册权限";
NSCameraUsageDescription = "Family Mapp修改您的头像需要您的相机权限";
NSPhotoLibraryUsageDescription = "Family Mapp修改您的头像需要您的相册权限";
NSContactsUsageDescription = "知迹获取您的好友需要您的通讯录权限";
NSContactsUsageDescription = "Family Mapp获取您的好友需要您的通讯录权限";
NSLocationAlwaysUsageDescription = "知迹绘制您的轨迹需要您的定位权限";
NSLocationWhenInUseUsageDescription = "知迹绘制您的轨迹需要您的定位权限";
NSLocationAlwaysAndWhenInUseUsageDescription = "知迹绘制您的轨迹需要您的定位权限";
NSLocationWhenInUseUsageDescription = "知迹绘制您的轨迹需要您的定位权限";
NSLocationAlwaysUsageDescription = "Family Mapp绘制您的轨迹需要您的定位权限";
NSLocationWhenInUseUsageDescription = "Family Mapp绘制您的轨迹需要您的定位权限";
NSLocationAlwaysAndWhenInUseUsageDescription = "Family Mapp绘制您的轨迹需要您的定位权限";
NSLocationWhenInUseUsageDescription = "Family Mapp绘制您的轨迹需要您的定位权限";
ZhiJi/zh-Hans.lproj/Localizable.strings
View file @ a04e52dd
......@@ -6,7 +6,7 @@
Copyright © 2020 Company. All rights reserved.
*/
appName = "知迹";
appName = "Family Mapp";
//alert
"alert_notice"="温馨提示";
......@@ -28,10 +28,10 @@ appName = "知迹";
"alert_location_setting"="位置权限未开启，请进入系统［设置］> [%@] > [位置]中允许访问位置信息，用来绘制您的轨迹";
"alert_location_enble"="去开启";
"alert_location_authority"="知迹绘制您的轨迹需要您开启定位服务";
"alert_location_authority"="Family Mapp绘制您的轨迹需要您开启定位服务";
"alert_location_service"="定位服务未开启，请进入系统［设置］> [隐私] > [定位服务]中打开开关，并允许使用定位服务";
"alert_addressBook_allow"="请授权通讯录权限";
"alert_addressBook_setting"="请在iPhone的\"设置-隐私-通讯录\"选项中,允许知迹访问你的通讯录";
"alert_addressBook_setting"="请在iPhone的\"设置-隐私-通讯录\"选项中,允许Family Mapp访问你的通讯录";
"alert_setting"="去设置";
"alert_OK"="好的";
......@@ -55,6 +55,8 @@ appName = "知迹";
"login_already_send_code"="已发送";
"login_read"="已阅读并同意";
"login_sms_code"="请输入短信验证码";
"area"="区域";
"area_search"="搜索国家";
......@@ -72,7 +74,7 @@ appName = "知迹";
//track
"track_friend"="TA的轨迹";
"track_friend_authority_alert"="请确定对方是否授权知迹位置权限";
"track_friend_authority_alert"="请确定对方是否授权Family Mapp位置权限";
"track_friend_timeWithin_no_location"="对方该时间段未收录位置信息";
"track_friend_check_noData_alert"="请查看其它时段或稍等几分钟";
"track_mine_timeWithin_no_location"="您当前时段未收录位置信息";
......@@ -80,6 +82,23 @@ appName = "知迹";
"track_cleck"="查看Ta的位置";
"track_no_friend"="暂无可选好友";
"track_start_time"="开始时间";
"track_end_time"="结束时间";
"track_start_time_less_end"="开始时间必须小于结束时间";
"track_end_time_great_start"="结束时间必须大于开始时间";
//location
"location_no_address_remind"="您没有为该好友设置地点提醒～";
"location_check_tutorial"="查看教程";
"location_check_tutorial_cancel"="知道了";
"location_alert_details_0"="为了您能更好地体验Family MappApp,请进行以下设置：";
"location_alert_details_1"="确认对方没有删除Family Mapp";
"location_alert_details_2"="如果删除了请分享应用给Ta重新下载并安装、登录";
"location_alert_details_3"="位置权限设置";
"location_alert_details_4"="如果Ta关闭了位置权限，请让Ta前往设置>权限管理>Family Mapp里开启位置权限。";
"location_alert_share"="分享应用";
//mine
"mine_sign"="点击登录";
"mine_click_nickname"="点击昵称可自定义昵称";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment