Commit 75b250fa authored by Sandy's avatar Sandy

tabbar 菜单修改、占位图演示版修改

parent 8b27616c
......@@ -215,6 +215,8 @@
72F9D4881BA8065500795A00 /* PurchaseNoticeListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 72F9D4871BA8065500795A00 /* PurchaseNoticeListCell.m */; };
72F9D48B1BA8582100795A00 /* NoticeBoltView.m in Sources */ = {isa = PBXBuildFile; fileRef = 72F9D48A1BA8582100795A00 /* NoticeBoltView.m */; };
871F9F047CDDAC523E4358DC /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 86D33EC280C440156ED1B976 /* libPods.a */; };
8F67988A1DB8CC9400348267 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F6798891DB8CC9400348267 /* WebKit.framework */; };
8F67988C1DB8CC9E00348267 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F67988B1DB8CC9E00348267 /* WebKit.framework */; };
8FEE25DB1DB60B570099B596 /* GXFFunctionDB.m in Sources */ = {isa = PBXBuildFile; fileRef = 35A1C3571B8F09D2004AC9F7 /* GXFFunctionDB.m */; };
8FEE25DC1DB60B570099B596 /* IBTTableViewSectionInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = C15918251AC062460013B391 /* IBTTableViewSectionInfo.m */; };
8FEE25DD1DB60B570099B596 /* ICRAppViewControllerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C15918841AC460BC0013B391 /* ICRAppViewControllerManager.m */; };
......@@ -1228,6 +1230,8 @@
72F9D48A1BA8582100795A00 /* NoticeBoltView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NoticeBoltView.m; sourceTree = "<group>"; };
7DDFB1D460448C3B45118195 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
86D33EC280C440156ED1B976 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
8F6798891DB8CC9400348267 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/PrivateFrameworks/WebKit.framework; sourceTree = SDKROOT; };
8F67988B1DB8CC9E00348267 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
8FEE27391DB60B570099B596 /* XFFruit copy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "XFFruit copy.app"; sourceTree = BUILT_PRODUCTS_DIR; };
8FEE273A1DB60B570099B596 /* XFFruit copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "XFFruit copy-Info.plist"; path = "/Users/Javen/Documents/MyProject/xffruit/XFFruit copy-Info.plist"; sourceTree = "<absolute>"; };
ABFA26041C87D38800274481 /* JavenImages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavenImages.h; sourceTree = "<group>"; };
......@@ -1548,6 +1552,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
8F67988A1DB8CC9400348267 /* WebKit.framework in Frameworks */,
8FEE271A1DB60B570099B596 /* CoreGraphics.framework in Frameworks */,
8FEE271B1DB60B570099B596 /* SystemConfiguration.framework in Frameworks */,
8FEE271C1DB60B570099B596 /* CoreTelephony.framework in Frameworks */,
......@@ -1566,6 +1571,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
8F67988C1DB8CC9E00348267 /* WebKit.framework in Frameworks */,
35C3C0AE1AE9560E0035AC8A /* CoreGraphics.framework in Frameworks */,
35C3C0B01AE9561E0035AC8A /* SystemConfiguration.framework in Frameworks */,
35A57A0B1BE08823008F3818 /* CoreTelephony.framework in Frameworks */,
......@@ -2284,6 +2290,8 @@
8CDB3C30A601E08F91ED44F8 /* Frameworks */ = {
isa = PBXGroup;
children = (
8F67988B1DB8CC9E00348267 /* WebKit.framework */,
8F6798891DB8CC9400348267 /* WebKit.framework */,
35A57A0A1BE08823008F3818 /* CoreTelephony.framework */,
35A57A081BE08819008F3818 /* CoreFoundation.framework */,
35A57A061BE0880C008F3818 /* CFNetwork.framework */,
......@@ -3235,6 +3243,9 @@
LastUpgradeCheck = 0620;
ORGANIZATIONNAME = Xummer;
TargetAttributes = {
8FEE25D81DB60B570099B596 = {
DevelopmentTeam = 4WRSWKXL27;
};
C1F696021AB870B400F9F5DD = {
CreatedOnToolsVersion = 6.2;
DevelopmentTeam = W54V2VB863;
......@@ -4252,11 +4263,15 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 1B0B22845F5CD40B5CF655F2 /* Pods.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-1";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPYING_PRESERVES_HFS_DATA = NO;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
);
GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = Demonstrate;
INFOPLIST_FILE = "XFFruit copy-Info.plist";
......@@ -4269,7 +4284,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE = "e2cec26c-3666-4512-9b9a-cdb4cd9da56d";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
name = Debug;
......@@ -4278,11 +4293,15 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 7DDFB1D460448C3B45118195 /* Pods.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer: jie zhang (9V9955H2BK)";
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-1";
CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: jie zhang (9V9955H2BK)";
COPYING_PRESERVES_HFS_DATA = NO;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
);
GCC_PREFIX_HEADER = "XFFruit/XFFruit-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = Demonstrate;
INFOPLIST_FILE = "XFFruit copy-Info.plist";
......@@ -4295,7 +4314,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE = "e2cec26c-3666-4512-9b9a-cdb4cd9da56d";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
name = Release;
......
......@@ -15,13 +15,15 @@
selectedImage:(UIImage *)selectedImage
{
UITabBarItem *tabBarItem = nil;
if (IBT_IOS7_OR_LATER) {
// if (IBT_IOS7_OR_LATER) {
tabBarItem = [[UITabBarItem alloc] initWithTitle:title image:image selectedImage:selectedImage];
}
else {
tabBarItem = [[UITabBarItem alloc] initWithTitle:title image:nil tag:0];
[tabBarItem setFinishedSelectedImage:selectedImage withFinishedUnselectedImage:image];
}
tabBarItem.selectedImage = [tabBarItem.selectedImage imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
// }
// else {
// tabBarItem = [[UITabBarItem alloc] initWithTitle:title image:nil tag:0];
// [tabBarItem setFinishedSelectedImage:selectedImage withFinishedUnselectedImage:image];
// }
return tabBarItem;
}
......
......@@ -10,7 +10,11 @@
#import "ICRCheckBox.h"
#define LOGIN_ICON_WIDTH (156)
#ifdef Demonstrate
#define LOGIN_ICON_HEIGHT (60)
#else
#define LOGIN_ICON_HEIGHT (44)
#endif
#define LOGIN_INNER_GAP (20)
#define LOGIN_INPUT_HEIGHT (50)
......@@ -218,8 +222,12 @@
#pragma mark - Private Method
- (void)initSubviews {
self.m_iconView = [[UIImageView alloc] init];
self.m_iconView.contentMode = UIViewContentModeScaleAspectFill;
#ifdef Demonstrate
_m_iconView.image = [UIImage imageNamed:@"demo_logo"];//[IBTCommon appIcon];
#else
_m_iconView.image = [UIImage imageNamed:@"logo"];//[IBTCommon appIcon];
#endif
[self addSubview:_m_iconView];
self.m_titleLabel = [[IBTUILabel alloc] init];
......
{
"images" : [
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-Small.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-Small@2x.png",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-Small@3x.png",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Icon-Spotlight-40@2x.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Icon-Spotlight-40@3x.png",
"scale" : "3x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "Icon.png",
"scale" : "1x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "Icon@2x.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "Icon-60@2x.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "Icon-60@3x.png",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "Icon-Small.png",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "Icon-Small@2x.png",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "ipad",
"filename" : "Icon-Spotlight-40.png",
"scale" : "1x"
},
{
"size" : "40x40",
"idiom" : "ipad",
"filename" : "Icon-Spotlight-40@2x.png",
"scale" : "2x"
},
{
"size" : "50x50",
"idiom" : "ipad",
"filename" : "Icon-Small-50.png",
"scale" : "1x"
},
{
"size" : "50x50",
"idiom" : "ipad",
"filename" : "Icon-Small-50@2x.png",
"scale" : "2x"
},
{
"size" : "72x72",
"idiom" : "ipad",
"filename" : "Icon-72.png",
"scale" : "1x"
},
{
"size" : "72x72",
"idiom" : "ipad",
"filename" : "Icon-72@2x.png",
"scale" : "2x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "Icon-76.png",
"scale" : "1x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "Icon-76@2x.png",
"scale" : "2x"
},
{
"size" : "83.5x83.5",
"idiom" : "ipad",
"filename" : "Icon-83.5@2x.png",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "AttachCamera@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "AttachDisplay@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "AttachHide@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "AttachmentAddBtn@3x.png"
}
],
"info" : {
......
......@@ -2,7 +2,8 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
"scale" : "1x",
"filename" : "CellCustomArrow.png"
},
{
"idiom" : "universal",
......@@ -11,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "CellCustomArrow@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "GrayCheckBox@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "RecordIcon@3x.png"
}
],
"info" : {
......
......@@ -2,7 +2,8 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
"scale" : "1x",
"filename" : "attachment_delete_btn.png"
},
{
"idiom" : "universal",
......@@ -11,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "attachment_delete_btn@3x.png"
}
],
"info" : {
......
......@@ -2,7 +2,8 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
"scale" : "1x",
"filename" : "icon_task_default.png"
},
{
"idiom" : "universal",
......@@ -11,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "icon_task_default@3x.png"
}
],
"info" : {
......
......@@ -2,7 +2,8 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
"scale" : "1x",
"filename" : "icon_voice.png"
},
{
"idiom" : "universal",
......@@ -11,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "icon_voice@3x.png"
}
],
"info" : {
......
......@@ -2,7 +2,8 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
"scale" : "1x",
"filename" : "recorder_animation_01.png"
},
{
"idiom" : "universal",
......@@ -11,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "recorder_animation_01@3x.png"
}
],
"info" : {
......
......@@ -2,7 +2,8 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
"scale" : "1x",
"filename" : "recorder_animation_02.png"
},
{
"idiom" : "universal",
......@@ -11,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "recorder_animation_02@3x.png"
}
],
"info" : {
......
......@@ -2,7 +2,8 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
"scale" : "1x",
"filename" : "recorder_animation_03.png"
},
{
"idiom" : "universal",
......@@ -11,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "recorder_animation_03@3x.png"
}
],
"info" : {
......
......@@ -2,7 +2,8 @@
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
"scale" : "1x",
"filename" : "recorder_animation_04.png"
},
{
"idiom" : "universal",
......@@ -11,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "recorder_animation_04@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "xf_camera_add_pic@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "xf_camera_no_pic@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "xf_delete_pic@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "AnnounceTitleBG@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "HomeDisplayImage@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "PriorityTagGreen@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "PriorityTagGrey@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "PriorityTagOrange@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "PriorityTagRed@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "AnnouncementIcon@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "CreateNewTaskIcon@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "HandleTaskIcon@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "LeaveStoreIcon@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "MyStoreIcon@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "NavigateIcon@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "PatrolPlanIcon@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "SignUpIcon@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "TaskIcon@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "TaskManageIcon@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "LoginBG@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "LoginCheckBox@3x.png"
}
],
"info" : {
......
......@@ -12,7 +12,8 @@
},
{
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "LoginCheckMark@3x.png"
}
],
"info" : {
......
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.
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.
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