From: AceVest Date: Fri, 11 Mar 2016 08:26:38 +0000 (+0800) Subject: ... X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=9c5aa3474287a4cf3f1358fe65c10a84bcc8d69b;p=acecode.git ... --- diff --git a/tools/AceBox/AceBox.xcodeproj/project.pbxproj b/tools/AceBox/AceBox.xcodeproj/project.pbxproj index 792eba5..e373c87 100644 --- a/tools/AceBox/AceBox.xcodeproj/project.pbxproj +++ b/tools/AceBox/AceBox.xcodeproj/project.pbxproj @@ -27,7 +27,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 50A4F2751AF2154100DB7E36 /* AceBox.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AceBox.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 50A4F2751AF2154100DB7E36 /* Ace.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Ace.app; sourceTree = BUILT_PRODUCTS_DIR; }; 50A4F2791AF2154100DB7E36 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 50A4F27A1AF2154100DB7E36 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 50A4F27C1AF2154100DB7E36 /* FirstViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirstViewController.swift; sourceTree = ""; }; @@ -70,7 +70,7 @@ 50A4F2761AF2154100DB7E36 /* Products */ = { isa = PBXGroup; children = ( - 50A4F2751AF2154100DB7E36 /* AceBox.app */, + 50A4F2751AF2154100DB7E36 /* Ace.app */, 50A4F28C1AF2154100DB7E36 /* AceBoxTests.xctest */, ); name = Products; @@ -132,7 +132,7 @@ ); name = AceBox; productName = AceBox; - productReference = 50A4F2751AF2154100DB7E36 /* AceBox.app */; + productReference = 50A4F2751AF2154100DB7E36 /* Ace.app */; productType = "com.apple.product-type.application"; }; 50A4F28B1AF2154100DB7E36 /* AceBoxTests */ = { @@ -352,7 +352,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.tencent.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = Ace; }; name = Debug; }; @@ -364,7 +364,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.tencent.$(PRODUCT_NAME:rfc1034identifier)"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = Ace; }; name = Release; }; diff --git a/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 5765ce0..e7a5ca4 100644 --- a/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:/Users/Ace/workspace/acecode/tools/AceBox/AceBox.xcodeproj"> diff --git a/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate b/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate index 49bb482..6cd4597 100644 Binary files a/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate and b/tools/AceBox/AceBox.xcodeproj/project.xcworkspace/xcuserdata/Ace.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/tools/AceBox/AceBox/Base.lproj/Main.storyboard b/tools/AceBox/AceBox/Base.lproj/Main.storyboard index 43bf3aa..b4035b0 100644 --- a/tools/AceBox/AceBox/Base.lproj/Main.storyboard +++ b/tools/AceBox/AceBox/Base.lproj/Main.storyboard @@ -8,7 +8,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/tools/AceBox/AceBox/Images.xcassets/Contacts.imageset/Contents.json b/tools/AceBox/AceBox/Images.xcassets/Contacts.imageset/Contents.json new file mode 100644 index 0000000..52118b3 --- /dev/null +++ b/tools/AceBox/AceBox/Images.xcassets/Contacts.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "tabbar_contacts@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "tabbar_contacts@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/tools/AceBox/AceBox/Images.xcassets/Contacts.imageset/tabbar_contacts@2x.png b/tools/AceBox/AceBox/Images.xcassets/Contacts.imageset/tabbar_contacts@2x.png new file mode 100644 index 0000000..0a748f5 Binary files /dev/null and b/tools/AceBox/AceBox/Images.xcassets/Contacts.imageset/tabbar_contacts@2x.png differ diff --git a/tools/AceBox/AceBox/Images.xcassets/Contacts.imageset/tabbar_contacts@3x.png b/tools/AceBox/AceBox/Images.xcassets/Contacts.imageset/tabbar_contacts@3x.png new file mode 100644 index 0000000..d17dc5c Binary files /dev/null and b/tools/AceBox/AceBox/Images.xcassets/Contacts.imageset/tabbar_contacts@3x.png differ diff --git a/tools/AceBox/AceBox/Images.xcassets/ContactsHL.imageset/Contents.json b/tools/AceBox/AceBox/Images.xcassets/ContactsHL.imageset/Contents.json new file mode 100644 index 0000000..b4d5baa --- /dev/null +++ b/tools/AceBox/AceBox/Images.xcassets/ContactsHL.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "tabbar_contactsHL@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "tabbar_contactsHL@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/tools/AceBox/AceBox/Images.xcassets/ContactsHL.imageset/tabbar_contactsHL@2x.png b/tools/AceBox/AceBox/Images.xcassets/ContactsHL.imageset/tabbar_contactsHL@2x.png new file mode 100644 index 0000000..e26fc53 Binary files /dev/null and b/tools/AceBox/AceBox/Images.xcassets/ContactsHL.imageset/tabbar_contactsHL@2x.png differ diff --git a/tools/AceBox/AceBox/Images.xcassets/ContactsHL.imageset/tabbar_contactsHL@3x.png b/tools/AceBox/AceBox/Images.xcassets/ContactsHL.imageset/tabbar_contactsHL@3x.png new file mode 100644 index 0000000..90b448d Binary files /dev/null and b/tools/AceBox/AceBox/Images.xcassets/ContactsHL.imageset/tabbar_contactsHL@3x.png differ diff --git a/tools/AceBox/AceBox/Images.xcassets/Discover.imageset/Contents.json b/tools/AceBox/AceBox/Images.xcassets/Discover.imageset/Contents.json new file mode 100644 index 0000000..368dc03 --- /dev/null +++ b/tools/AceBox/AceBox/Images.xcassets/Discover.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "tabbar_discover@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "tabbar_discover@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/tools/AceBox/AceBox/Images.xcassets/Discover.imageset/tabbar_discover@2x.png b/tools/AceBox/AceBox/Images.xcassets/Discover.imageset/tabbar_discover@2x.png new file mode 100644 index 0000000..09e772a Binary files /dev/null and b/tools/AceBox/AceBox/Images.xcassets/Discover.imageset/tabbar_discover@2x.png differ diff --git a/tools/AceBox/AceBox/Images.xcassets/Discover.imageset/tabbar_discover@3x.png b/tools/AceBox/AceBox/Images.xcassets/Discover.imageset/tabbar_discover@3x.png new file mode 100644 index 0000000..54c49fc Binary files /dev/null and b/tools/AceBox/AceBox/Images.xcassets/Discover.imageset/tabbar_discover@3x.png differ diff --git a/tools/AceBox/AceBox/Images.xcassets/DiscoverHL.imageset/Contents.json b/tools/AceBox/AceBox/Images.xcassets/DiscoverHL.imageset/Contents.json new file mode 100644 index 0000000..8cea966 --- /dev/null +++ b/tools/AceBox/AceBox/Images.xcassets/DiscoverHL.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "tabbar_discoverHL@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "tabbar_discoverHL@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/tools/AceBox/AceBox/Images.xcassets/DiscoverHL.imageset/tabbar_discoverHL@2x.png b/tools/AceBox/AceBox/Images.xcassets/DiscoverHL.imageset/tabbar_discoverHL@2x.png new file mode 100644 index 0000000..672123b Binary files /dev/null and b/tools/AceBox/AceBox/Images.xcassets/DiscoverHL.imageset/tabbar_discoverHL@2x.png differ diff --git a/tools/AceBox/AceBox/Images.xcassets/DiscoverHL.imageset/tabbar_discoverHL@3x.png b/tools/AceBox/AceBox/Images.xcassets/DiscoverHL.imageset/tabbar_discoverHL@3x.png new file mode 100644 index 0000000..b1323d6 Binary files /dev/null and b/tools/AceBox/AceBox/Images.xcassets/DiscoverHL.imageset/tabbar_discoverHL@3x.png differ diff --git a/tools/AceBox/AceBox/Images.xcassets/GO.imageset/Contents.json b/tools/AceBox/AceBox/Images.xcassets/HeadHL.imageset/Contents.json similarity index 76% rename from tools/AceBox/AceBox/Images.xcassets/GO.imageset/Contents.json rename to tools/AceBox/AceBox/Images.xcassets/HeadHL.imageset/Contents.json index 17dd500..9cddfb6 100644 --- a/tools/AceBox/AceBox/Images.xcassets/GO.imageset/Contents.json +++ b/tools/AceBox/AceBox/Images.xcassets/HeadHL.imageset/Contents.json @@ -2,15 +2,16 @@ "images" : [ { "idiom" : "universal", - "filename" : "frontpage.png", "scale" : "1x" }, { "idiom" : "universal", + "filename" : "tabbar_meHL@2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "tabbar_meHL@3x.png", "scale" : "3x" } ], diff --git a/tools/AceBox/AceBox/Images.xcassets/HeadHL.imageset/tabbar_meHL@2x.png b/tools/AceBox/AceBox/Images.xcassets/HeadHL.imageset/tabbar_meHL@2x.png new file mode 100644 index 0000000..f96e68e Binary files /dev/null and b/tools/AceBox/AceBox/Images.xcassets/HeadHL.imageset/tabbar_meHL@2x.png differ diff --git a/tools/AceBox/AceBox/Images.xcassets/HeadHL.imageset/tabbar_meHL@3x.png b/tools/AceBox/AceBox/Images.xcassets/HeadHL.imageset/tabbar_meHL@3x.png new file mode 100644 index 0000000..5c95a65 Binary files /dev/null and b/tools/AceBox/AceBox/Images.xcassets/HeadHL.imageset/tabbar_meHL@3x.png differ diff --git a/tools/AceBox/AceBox/Images.xcassets/HeadImg.imageset/IMG_4358 copy.JPG b/tools/AceBox/AceBox/Images.xcassets/HeadImg.imageset/IMG_4358 copy.JPG new file mode 100644 index 0000000..2b2c063 Binary files /dev/null and b/tools/AceBox/AceBox/Images.xcassets/HeadImg.imageset/IMG_4358 copy.JPG differ diff --git a/tools/AceBox/AceBox/Images.xcassets/MsgBubble.imageset/Contents.json b/tools/AceBox/AceBox/Images.xcassets/MsgBubble.imageset/Contents.json new file mode 100644 index 0000000..a123bd9 --- /dev/null +++ b/tools/AceBox/AceBox/Images.xcassets/MsgBubble.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "tabbar_mainframe@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "tabbar_mainframe@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/tools/AceBox/AceBox/Images.xcassets/MsgBubble.imageset/tabbar_mainframe@2x.png b/tools/AceBox/AceBox/Images.xcassets/MsgBubble.imageset/tabbar_mainframe@2x.png new file mode 100644 index 0000000..5be00b9 Binary files /dev/null and b/tools/AceBox/AceBox/Images.xcassets/MsgBubble.imageset/tabbar_mainframe@2x.png differ diff --git a/tools/AceBox/AceBox/Images.xcassets/MsgBubble.imageset/tabbar_mainframe@3x.png b/tools/AceBox/AceBox/Images.xcassets/MsgBubble.imageset/tabbar_mainframe@3x.png new file mode 100644 index 0000000..b97e00a Binary files /dev/null and b/tools/AceBox/AceBox/Images.xcassets/MsgBubble.imageset/tabbar_mainframe@3x.png differ diff --git a/tools/AceBox/AceBox/Images.xcassets/MsgBubbleHL.imageset/Contents.json b/tools/AceBox/AceBox/Images.xcassets/MsgBubbleHL.imageset/Contents.json new file mode 100644 index 0000000..88d11c0 --- /dev/null +++ b/tools/AceBox/AceBox/Images.xcassets/MsgBubbleHL.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "tabbar_mainframeHL@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "tabbar_mainframeHL@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/tools/AceBox/AceBox/Images.xcassets/MsgBubbleHL.imageset/tabbar_mainframeHL@2x.png b/tools/AceBox/AceBox/Images.xcassets/MsgBubbleHL.imageset/tabbar_mainframeHL@2x.png new file mode 100644 index 0000000..0c62fd0 Binary files /dev/null and b/tools/AceBox/AceBox/Images.xcassets/MsgBubbleHL.imageset/tabbar_mainframeHL@2x.png differ diff --git a/tools/AceBox/AceBox/Images.xcassets/MsgBubbleHL.imageset/tabbar_mainframeHL@3x.png b/tools/AceBox/AceBox/Images.xcassets/MsgBubbleHL.imageset/tabbar_mainframeHL@3x.png new file mode 100644 index 0000000..57e72cd Binary files /dev/null and b/tools/AceBox/AceBox/Images.xcassets/MsgBubbleHL.imageset/tabbar_mainframeHL@3x.png differ diff --git a/tools/AceBox/AceBox/Images.xcassets/head.imageset/tabbar_me@2x.png b/tools/AceBox/AceBox/Images.xcassets/head.imageset/tabbar_me@2x.png new file mode 100644 index 0000000..de8f888 Binary files /dev/null and b/tools/AceBox/AceBox/Images.xcassets/head.imageset/tabbar_me@2x.png differ diff --git a/tools/AceBox/AceBox/Images.xcassets/head.imageset/tabbar_me@3x.png b/tools/AceBox/AceBox/Images.xcassets/head.imageset/tabbar_me@3x.png new file mode 100644 index 0000000..0d7e046 Binary files /dev/null and b/tools/AceBox/AceBox/Images.xcassets/head.imageset/tabbar_me@3x.png differ