Skip to content

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

no message

parent 14ba157f
Hide whitespace changes
Inline Side-by-side
Showing with 1617 additions and 172 deletions
ZhiJi/Assets.xcassets/Goods/pay_header_bg.imageset/Contents.json deleted 100644 → 0
View file @ 14ba157f
{
"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/JinJi/矩形 3.imageset/Contents.json
View file @ 9db1047a
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "矩形 3@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
ZhiJi/Assets.xcassets/LaunchScreen/launch1.imageset/Contents.json
View file @ 9db1047a
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "组 1@2x.png",
"filename" : "launch1@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "组 1@3x.png",
"filename" : "launch1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
ZhiJi/Assets.xcassets/LocationFind/location_find_seleted_icon.imageset/Contents.json
View file @ 9db1047a
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "location_find_seleted_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
ZhiJi/Assets.xcassets/LocationHint/LocationHint_back_btn.imageset/Contents.json
View file @ 9db1047a
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "site_btn_default@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "site_btn_default@3x.png",
"filename" : "site_btn_default@3x副本.png",
"idiom" : "universal",
"scale" : "3x"
}
......
ZhiJi/Assets.xcassets/LocationHint/LocationHint_back_btn_zh.imageset/Contents.json
View file @ 9db1047a
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "site_btn_default@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
ZhiJi/Assets.xcassets/Login/login_area_code_arrow.imageset/Contents.json
View file @ 9db1047a
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "Bitmap备份 2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
ZhiJi/Assets.xcassets/Login/login_clause_selected.imageset/Contents.json
View file @ 9db1047a
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "形状 2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
ZhiJi/Assets.xcassets/Login/quick_login_clause_selected.imageset/Contents.json
View file @ 9db1047a
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "打开@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
ZhiJi/Assets.xcassets/Map/map_track_btn_bg.imageset/Contents.json
View file @ 9db1047a
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "91593688640_.pic.jpg",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "81593688633_.pic.jpg",
"filename" : "81593688633x_.pic.png",
"idiom" : "universal",
"scale" : "3x"
}
......
ZhiJi/Assets.xcassets/Map/map_track_btn_bg_zh.imageset/Contents.json
View file @ 9db1047a
......@@ -6,17 +6,16 @@
},
{
"idiom" : "universal",
"filename" : "map_track_btn_bg@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "map_track_btn_bg@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
\ No newline at end of file
}
ZhiJi/Assets.xcassets/Map/map_track_datepicker_cancel.imageset/Contents.json
View file @ 9db1047a
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "取消@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
ZhiJi/Assets.xcassets/Map/map_track_datepicker_cancel_zh.imageset/Contents.json
View file @ 9db1047a
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "map_track_datepicker_cancel@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
ZhiJi/Assets.xcassets/Map/map_track_datepicker_commit.imageset/Contents.json
View file @ 9db1047a
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "确定@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
ZhiJi/Assets.xcassets/Map/map_track_datepicker_commit_zh.imageset/Contents.json
View file @ 9db1047a
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "map_track_datepicker_commit@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
ZhiJi/Assets.xcassets/Map/map_track_end_icon.imageset/Contents.json deleted 100644 → 0
View file @ 14ba157f
{
"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/Assets.xcassets/Map/map_track_end_icon_zh.imageset/Contents.json deleted 100644 → 0
View file @ 14ba157f
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "map_track_end_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "map_track_end_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Assets.xcassets/Map/map_track_get_icon.imageset/Contents.json
View file @ 9db1047a
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "map_track_get_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
ZhiJi/Assets.xcassets/Map/map_track_start_icon.imageset/Contents.json deleted 100644 → 0
View file @ 14ba157f
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "编组 6@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "编组 6@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Assets.xcassets/Map/map_track_start_icon_zh.imageset/Contents.json deleted 100644 → 0
View file @ 14ba157f
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "map_track_start_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "map_track_start_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Assets.xcassets/Map/userPosition.imageset/Contents.json
View file @ 9db1047a
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "userPosition.png",
"idiom" : "universal",
"scale" : "2x"
},
......
ZhiJi/Assets.xcassets/Mine/Add_btn.imageset/Contents.json deleted 100644 → 0
View file @ 14ba157f
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Add_btn@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Add_btn@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
ZhiJi/Assets.xcassets/XiaoXi/xiaoXi.imageset/Contents.json
View file @ 9db1047a
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "形状 1@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
ZhiJi/Base.lproj/LaunchScreen.storyboard
View file @ 9db1047a
......@@ -17,7 +17,10 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch2" translatesAutoresizingMaskIntoConstraints="NO" id="2f0-Ky-54O">
<rect key="frame" x="0.0" y="347.5" width="414" height="548.5"/>
<rect key="frame" x="0.0" y="463.5" width="414" height="432.5"/>
<constraints>
<constraint firstAttribute="width" secondItem="2f0-Ky-54O" secondAttribute="height" multiplier="1504:1572" id="eCv-f6-POk"/>
</constraints>
</imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch1" translatesAutoresizingMaskIntoConstraints="NO" id="QBu-ql-K1q">
<rect key="frame" x="0.0" y="44" width="414" height="303.5"/>
......@@ -29,7 +32,6 @@
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="QBu-ql-K1q" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="1Sf-lB-DMr"/>
<constraint firstItem="2f0-Ky-54O" firstAttribute="top" secondItem="QBu-ql-K1q" secondAttribute="bottom" id="CvV-Lb-Of9"/>
<constraint firstItem="QBu-ql-K1q" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" id="EgB-et-jcz"/>
<constraint firstAttribute="bottom" secondItem="2f0-Ky-54O" secondAttribute="bottom" id="JDQ-R5-K31"/>
<constraint firstItem="2f0-Ky-54O" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="THF-M2-dGE"/>
......@@ -46,6 +48,6 @@
</scenes>
<resources>
<image name="launch1" width="360" height="263.5"/>
<image name="launch2" width="360" height="376.5"/>
<image name="launch2" width="752" height="786"/>
</resources>
</document>
ZhiJi/Classes/Goods/Pay.storyboard
View file @ 9db1047a
This source diff could not be displayed because it is too large. You can view the blob instead.
ZhiJi/Classes/Mine/Controller/ZJEmergencyContactViewController.m
View file @ 9db1047a
......@@ -75,7 +75,6 @@
[_addPersonBtn setTitleColor:[UIColor colorWithHex:0xFFFFFF] 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];
}
......
ZhiJi/en.lproj/Localizable.strings
View file @ 9db1047a
......@@ -225,8 +225,6 @@ 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_srart_end_icon";
"map_track_end_icon"="map_track_srart_end_icon";
......
ZhiJi/launch1@2x.png
View replaced file @ 14ba157f View file @ 9db1047a
ZhiJi/launch1@2x.png

21.3 KB | W: | H:

ZhiJi/launch1@2x.png

206 KB | W: | H:

ZhiJi/launch1@2x.png
ZhiJi/launch1@2x.png
ZhiJi/launch1@2x.png
ZhiJi/launch1@2x.png
  • 2-up
  • Swipe
  • Onion skin
ZhiJi/launch1@3x.png
View replaced file @ 14ba157f View file @ 9db1047a
ZhiJi/launch1@3x.png

71.8 KB | W: | H:

ZhiJi/launch1@3x.png

437 KB | W: | H:

ZhiJi/launch1@3x.png
ZhiJi/launch1@3x.png
ZhiJi/launch1@3x.png
ZhiJi/launch1@3x.png
  • 2-up
  • Swipe
  • Onion skin
ZhiJi/launch2@2x.png
View replaced file @ 14ba157f View file @ 9db1047a
ZhiJi/launch2@2x.png

322 KB | W: | H:

ZhiJi/launch2@2x.png

354 KB | W: | H:

ZhiJi/launch2@2x.png
ZhiJi/launch2@2x.png
ZhiJi/launch2@2x.png
ZhiJi/launch2@2x.png
  • 2-up
  • Swipe
  • Onion skin
ZhiJi/zh-Hans.lproj/Localizable.strings
View file @ 9db1047a
......@@ -222,8 +222,7 @@ 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_srart_end_icon";
"map_track_end_icon"="map_track_srart_end_icon";
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