Skip to content

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

no message

parent f7f4f972
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 23 deletions
ZhiJi/Classes/Care/View/ZJFriendSettingView.m
View file @ 685d403c
......@@ -86,11 +86,12 @@
UILabel * textLab = [[UILabel alloc] init];
textLab.text = titleArr[count];
textLab.font = [UIFont systemFontOfSize:KFont(14)];
textLab.adjustsFontSizeToFitWidth = YES;
[bgview addSubview:textLab];
[textLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(bgview).mas_offset(start+interval*count);
make.left.mas_equalTo(bgview).mas_offset(KScaleWidth(23));
make.width.mas_equalTo(KScaleWidth(140));
make.width.mas_equalTo(KScaleWidth(200));
make.height.mas_equalTo(interval);
}];
currentlab = textLab;
......@@ -115,7 +116,7 @@
[customViewArr addObject:customView];
[customView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(bgview).mas_offset(start+interval*count);
make.width.mas_equalTo(KScaleWidth(160));
make.width.mas_equalTo(KScaleWidth(200));
make.right.mas_equalTo(bgview.mas_right).mas_offset(-KScaleWidth(23));
make.height.mas_equalTo(interval);
}];
......@@ -124,7 +125,7 @@
phoneTextField = customViewArr[0];
phoneTextField.userInteractionEnabled = NO;
phoneTextField.delegate = self;
phoneTextField.text = @"12345678910";
phoneTextField.text = @"";
phoneTextField.font = [UIFont systemFontOfSize:KFont(14)];
phoneTextField.textAlignment = NSTextAlignmentRight;
......@@ -134,6 +135,7 @@
nickTextField.delegate = self;
nickTextField.font = [UIFont systemFontOfSize:KFont(14)];
nickTextField.textAlignment = NSTextAlignmentRight;
nickTextField.adjustsFontSizeToFitWidth = YES;
addressTextField = customViewArr[2];
addressTextField.text = kLocalizedString(@"alert_setting");
......
ZhiJi/Classes/LocationAttention/ZJLocationAttentionVC.swift
View file @ 685d403c
......@@ -33,7 +33,7 @@ class ZJLocationAttentionVC: BaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
self.navigationItem.title = "地点提醒"
self.navigationItem.title = NSLocalizedString("location_address_remind", comment: "")
setUI()
self.getSingleFriendLocationRemindList(currentFriendModel)
......@@ -94,7 +94,7 @@ class ZJLocationAttentionVC: BaseViewController {
hiddenDelete()
guard let selectLocationVC = UIStoryboard(name: "Location", bundle: nil).instantiateViewController(withIdentifier: "ZJLocationRemindSelectController") as? ZJLocationRemindSelectController else { return }
selectLocationVC.title = "选择地点"
selectLocationVC.title = NSLocalizedString("location_address_choose", comment: "")
selectLocationVC.commitAddressClosure = { model in
self.addFriendLocationRemind(model, false)
print(model.addressName)
......@@ -110,7 +110,7 @@ class ZJLocationAttentionVC: BaseViewController {
let editModel = self.locationRemindDataSource[sender.tag-0x64]
guard let selectLocationVC = UIStoryboard(name: "Location", bundle: nil).instantiateViewController(withIdentifier: "ZJLocationRemindSelectController") as? ZJLocationRemindSelectController else { return }
selectLocationVC.title = "编辑地点"
selectLocationVC.title = NSLocalizedString("location_address_edit", comment: "")
selectLocationVC.editModel = editModel
selectLocationVC.commitAddressClosure = { model in
self.addFriendLocationRemind(model, true)
......@@ -200,7 +200,7 @@ extension ZJLocationAttentionVC {
guard let jsonData = try? JSONSerialization.data(withJSONObject: modelDic, options: []) else { return ; }
let string = String.init(data: jsonData, encoding: .utf8)
MBProgressHUD.showLoading("请稍后...", to: self.view)
MBProgressHUD.showLoading(NSLocalizedString("alert_loading", comment: ""), to: self.view)
TQNetworkTools.shared().post(with: action, parameters: ["locationFollowed":string], success: { (response) in
MBProgressHUD.hide(for: self.view)
let dict = self.dataToDict(response as! Foundation.Data)
......
ZhiJi/Classes/LocationAttention/ZJLocationAttentionVC.xib
View file @ 685d403c
......@@ -32,7 +32,7 @@
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LocationHint_bg" highlightedImage="LocationHint_bg" translatesAutoresizingMaskIntoConstraints="NO" id="j5y-pY-6pp">
<rect key="frame" x="107" y="15" width="200" height="194"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uob-FV-s6z">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uob-FV-s6z">
<rect key="frame" x="79" y="598.5" width="256.5" height="57.5"/>
<state key="normal" backgroundImage="LocationHint_back_btn"/>
<connections>
......
ZhiJi/Classes/LocationVC/View/ZJAlertView.xib
View file @ 685d403c
......@@ -10,7 +10,7 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="ZJAlertView" customModule="知迹" customModuleProvider="target">
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="ZJAlertView" customModule="Family_Mapp" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
......@@ -18,26 +18,23 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CGI-ke-b0A">
<rect key="frame" x="36" y="359" width="342" height="178"/>
<rect key="frame" x="36" y="355.5" width="342" height="185"/>
<subviews>
<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="26" width="286" height="21.5"/>
<rect key="frame" x="10" y="26" width="322" 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" 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="59.5" width="322" height="54.5"/>
<rect key="frame" x="10" y="84" 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="124" width="137" height="44"/>
<rect key="frame" x="26" y="121" 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="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"/>
</state>
......@@ -48,8 +45,11 @@
</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="124" width="137" height="44"/>
<rect key="frame" x="179" y="121" 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="44" id="RZg-J1-TCo"/>
</constraints>
<state key="normal" title="知道了">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
......@@ -62,20 +62,20 @@
</subviews>
<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="RiW-bm-Ym2" firstAttribute="top" relation="greaterThanOrEqual" 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 firstAttribute="trailing" secondItem="hoz-Eb-z9r" secondAttribute="trailing" constant="10" id="Eds-19-Iyh"/>
<constraint firstItem="hoz-Eb-z9r" firstAttribute="top" secondItem="CGI-ke-b0A" secondAttribute="top" constant="26" id="Hoy-S8-QSV"/>
<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" relation="lessThanOrEqual" secondItem="RiW-bm-Ym2" secondAttribute="bottom" constant="10" id="R8G-yq-VZf"/>
<constraint firstItem="e2s-u7-pzI" firstAttribute="top" secondItem="RiW-bm-Ym2" secondAttribute="bottom" constant="20" id="R8G-yq-VZf"/>
<constraint firstItem="e2s-u7-pzI" firstAttribute="width" secondItem="cZn-YZ-lp6" secondAttribute="width" id="RTv-E3-fjO"/>
<constraint firstItem="RiW-bm-Ym2" firstAttribute="centerY" secondItem="CGI-ke-b0A" secondAttribute="centerY" id="TeB-BO-X0K"/>
<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="hoz-Eb-z9r" firstAttribute="leading" secondItem="CGI-ke-b0A" secondAttribute="leading" constant="10" id="a2J-P8-Hjc"/>
<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 firstAttribute="bottom" secondItem="cZn-YZ-lp6" secondAttribute="bottom" constant="10" id="kuO-cG-xYR"/>
<constraint firstAttribute="bottom" secondItem="cZn-YZ-lp6" secondAttribute="bottom" constant="20" id="kuO-cG-xYR"/>
<constraint firstItem="e2s-u7-pzI" firstAttribute="centerY" secondItem="cZn-YZ-lp6" secondAttribute="centerY" id="paQ-pj-jEg"/>
</constraints>
<userDefinedRuntimeAttributes>
......
ZhiJi/en.lproj/Localizable.strings
View file @ 685d403c
......@@ -135,6 +135,10 @@ appName = "Family Mapp";
"location_friend"="Locating Friends";
"location_send_invite"="Invitation sent";
"location_address_remind"="Location remind";
"location_address_choose"="Select Location";
"location_address_edit"="Edit location";
//mine
"mine_sign"="Sign in";
"mine_click_nickname"="Click nickname to edit";
......
ZhiJi/zh-Hans.lproj/Localizable.strings
View file @ 685d403c
......@@ -133,6 +133,10 @@ appName = "Family Mapp";
"location_friend"="定位Ta";
"location_send_invite"="已发送邀请";
"location_address_remind"="地点提醒";
"location_address_choose"="选择地点";
"location_address_edit"="编辑地点";
//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