Skip to content

Commit

Permalink
V1.0.0 AppStore Version
Browse files Browse the repository at this point in the history
  • Loading branch information
ferrisxie committed Apr 18, 2016
1 parent ba0a5db commit 43742da
Show file tree
Hide file tree
Showing 7 changed files with 79 additions and 32 deletions.
7 changes: 7 additions & 0 deletions SIMObjc.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@
TargetAttributes = {
ED70F0041CB3F86F00CE8B55 = {
CreatedOnToolsVersion = 6.4;
DevelopmentTeam = 57EP4P69NV;
};
ED70F01D1CB3F86F00CE8B55 = {
CreatedOnToolsVersion = 6.4;
Expand Down Expand Up @@ -505,12 +506,15 @@
baseConfigurationReference = 9E9CE38E73A224D506DC4F4F /* Pods.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Distribution: Ferris Xie (57EP4P69NV)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Ferris Xie (57EP4P69NV)";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = SIMObjc/PrefixHeader.pch;
INFOPLIST_FILE = SIMObjc/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "312793bb-9bb4-4bca-b77a-599e88b9745a";
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -520,12 +524,15 @@
baseConfigurationReference = C5C6635883309D0621E14B4A /* Pods.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Distribution: Ferris Xie (57EP4P69NV)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Ferris Xie (57EP4P69NV)";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = SIMObjc/PrefixHeader.pch;
INFOPLIST_FILE = SIMObjc/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "312793bb-9bb4-4bca-b77a-599e88b9745a";
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down
7 changes: 2 additions & 5 deletions SIMObjc/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ @implementation AppDelegate

#pragma mark - application cycle
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {

self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
SIMMasterViewController* masterController = [SIMMasterViewController new];

Expand All @@ -39,12 +38,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
NSUserDefaults* userDefault = [NSUserDefaults standardUserDefaults];
if (![[userDefault objectForKey:@"firstFlag"] boolValue]) {
//是第一次 执行初始化操作
MBProgressHUD* progress = [[MBProgressHUD alloc] initWithWindow:self.window];
dispatch_async(dispatch_get_main_queue(), ^{
progress.labelFont = mainFont;
MBProgressHUD* progress = [MBProgressHUD showHUDAddedTo:masterController.view animated:YES];
progress.labelFont = [mainFont fontWithSize:15.0f];
progress.labelText = @"初始化...";
[progress show:YES];
});
[[SIMDBHandler shareDBHandler] createTableOnFirstLoadWithComletitionHandler:^(BOOL success, NSError *error) {
if (success) {
[progress hide:YES];
Expand Down
62 changes: 44 additions & 18 deletions SIMObjc/Base.lproj/LaunchScreen.xib
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,66 @@
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2016年 Ferris. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
<rect key="frame" x="20" y="439" width="441" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launchIcon" translatesAutoresizingMaskIntoConstraints="NO" id="tI4-Bq-ZaS">
<rect key="frame" x="120" y="127" width="135" height="135"/>
<constraints>
<constraint firstAttribute="width" constant="135" id="0lZ-ke-M6B"/>
<constraint firstAttribute="height" constant="135" id="t9o-VL-It1"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="iOS上的objc.io" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K86-VJ-7Xp">
<rect key="frame" x="0.0" y="270" width="375" height="34"/>
<fontDescription key="fontDescription" type="system" weight="thin" pointSize="28"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="objc.io on iOS" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="140" width="441" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) xferris.me. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1IX-7P-yD9">
<rect key="frame" x="0.0" y="617" width="375" height="27"/>
<constraints>
<constraint firstAttribute="height" constant="27" id="ycs-Pz-cde"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="thin" pointSize="15"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="感谢objc.io中国" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QVZ-aw-96z">
<rect key="frame" x="0.0" y="640" width="375" height="27"/>
<constraints>
<constraint firstAttribute="height" constant="27" id="pUa-kG-VUc"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="thin" pointSize="15"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
<constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
<constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
<constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
<constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
<constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
<constraint firstAttribute="bottom" secondItem="QVZ-aw-96z" secondAttribute="bottom" id="9Lc-de-WEL"/>
<constraint firstAttribute="trailing" secondItem="QVZ-aw-96z" secondAttribute="trailing" id="Afu-Bk-Uk1"/>
<constraint firstItem="K86-VJ-7Xp" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="EfV-Up-zT7"/>
<constraint firstAttribute="centerY" secondItem="tI4-Bq-ZaS" secondAttribute="centerY" constant="139" id="FfR-dZ-uT2"/>
<constraint firstItem="1IX-7P-yD9" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="KpV-LB-S0u"/>
<constraint firstAttribute="trailing" secondItem="K86-VJ-7Xp" secondAttribute="trailing" id="MaR-ft-MWU"/>
<constraint firstAttribute="bottom" secondItem="1IX-7P-yD9" secondAttribute="bottom" constant="23" id="c9t-o1-L8Q"/>
<constraint firstItem="K86-VJ-7Xp" firstAttribute="top" secondItem="tI4-Bq-ZaS" secondAttribute="bottom" constant="8" id="chs-hA-AAI"/>
<constraint firstAttribute="centerX" secondItem="tI4-Bq-ZaS" secondAttribute="centerX" id="g0Z-6f-DTc"/>
<constraint firstAttribute="trailing" secondItem="1IX-7P-yD9" secondAttribute="trailing" id="i5b-hw-7X9"/>
<constraint firstItem="QVZ-aw-96z" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="wA2-IY-CDN"/>
</constraints>
<nil key="simulatedStatusBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="548" y="455"/>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
<point key="canvasLocation" x="547.5" y="454.5"/>
</view>
</objects>
<resources>
<image name="launchIcon" width="1028" height="1028"/>
</resources>
</document>
21 changes: 21 additions & 0 deletions SIMObjc/Images.xcassets/launchIcon.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "launchIcon.jpg"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions SIMObjc/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,20 @@
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>objc.io</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>cn.simapps.$(PRODUCT_NAME:rfc1034identifier)</string>
<string>me.xferris.simobjc</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>1.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
8 changes: 1 addition & 7 deletions UtilsMacro.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,7 @@
#define HEXCOLOR(c) [UIColor colorWithRed:((c>>16)&0xFF)/255.0 green:((c>>8)&0xFF)/255.0 blue:(c&0xFF)/255.0 alpha:1.0]
// RGB颜色转换(16进制->10进制)
#define UIColorFromRGB(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
//core data
#define CoreDataContactEntityName @"Contact"
#define CoreDataSelfEntityName @"LocalUser"
#define CoreDataKeyRemark @"remark"
#define CoreDataKeyName @"name"
#define CoreDataKeyPhoneNum @"phoneNum"
#define CoreDataKeyStatus @"status"

#define CoreDataKeyChangeDate @"changeDate"
#define mainThemeColor [UIColor colorWithRed:98.0f/255.0f green:173.0f/255.0f blue:237.0f/255.0f alpha:1.0f]

Expand Down

0 comments on commit 43742da

Please sign in to comment.