Commit 51202f14 authored by lmj_521aiau@163.com's avatar lmj_521aiau@163.com

Merge branch 'branch_new' into branch_new_googleMap_new

# Conflicts:
#	.DS_Store
#	ZhiJi.xcodeproj/project.pbxproj
parents a973179a 9a3e2830
No preview for this file type
This diff is collapsed.
......@@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "686A7C932487644600C7200C"
BuildableName = "Family Mapp.app"
BuildableName = "Caring Map.app"
BlueprintName = "ZhiJi"
ReferencedContainer = "container:ZhiJi.xcodeproj">
</BuildableReference>
......@@ -45,7 +45,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "686A7C932487644600C7200C"
BuildableName = "Family Mapp.app"
BuildableName = "Caring Map.app"
BlueprintName = "ZhiJi"
ReferencedContainer = "container:ZhiJi.xcodeproj">
</BuildableReference>
......@@ -66,7 +66,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "686A7C932487644600C7200C"
BuildableName = "Family Mapp.app"
BuildableName = "Caring Map.app"
BlueprintName = "ZhiJi"
ReferencedContainer = "container:ZhiJi.xcodeproj">
</BuildableReference>
......
......@@ -49,7 +49,7 @@
"size" : "60x60"
},
{
"filename" : "appicon-9.png",
"filename" : "appicon-6.png",
"idiom" : "ios-marketing",
"scale" : "1x",
"size" : "1024x1024"
......
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "矢量智能对象@2x(1).png",
"filename" : "icon-test@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "矢量智能对象@3x(1).png",
"filename" : "icon-test@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
......@@ -9,7 +9,7 @@
"scale" : "2x"
},
{
"filename" : "271594001232_.pic_hd.jpg",
"filename" : "1、大@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
......@@ -9,7 +9,7 @@
"scale" : "2x"
},
{
"filename" : "281594001235_.pic_hd.jpg",
"filename" : "2、大@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
......@@ -9,7 +9,7 @@
"scale" : "2x"
},
{
"filename" : "291594001238_.pic_hd.jpg",
"filename" : "3、大@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
......@@ -9,7 +9,7 @@
"scale" : "2x"
},
{
"filename" : "301594001240_.pic_hd.jpg",
"filename" : "4、大@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "按钮。。。。@2x.png",
"filename" : "编组 5@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "按钮。。。。@3x.png",
"filename" : "编组 5@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
......@@ -9,7 +9,7 @@
"scale" : "2x"
},
{
"filename" : "361594036386_.pic_hd.jpg",
"filename" : "4、小@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
......@@ -9,7 +9,7 @@
"scale" : "2x"
},
{
"filename" : "371594036389_.pic_hd.jpg",
"filename" : "2、小@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
......@@ -9,7 +9,7 @@
"scale" : "2x"
},
{
"filename" : "381594036392_.pic_hd.jpg",
"filename" : "3、小@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
......@@ -9,7 +9,7 @@
"scale" : "2x"
},
{
"filename" : "391594036394_.pic_hd.jpg",
"filename" : "4、小@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "tt_titlebar_close_drawable@2x.png",
"filename" : "形状结合@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "tt_titlebar_close_drawable@3x.png",
"filename" : "形状结合@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "编组@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "编组@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "iPhone 8备份@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "iPhone 8备份@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : " @2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : " @3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "支付页面。@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "支付页面。@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "矩形 3@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
......@@ -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"
}
......
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "location_find_seleted_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
......@@ -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"
}
......
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "site_btn_default@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "Bitmap备份 2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "形状 2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
......@@ -5,7 +5,6 @@
"scale" : "1x"
},
{
"filename" : "打开@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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