Merge branch 'master' of https://git.yishihui.com/iOS/Introduce

Introduce.xcodeproj/project.pbxproj

@@ -18,6 +18,7 @@
 		4A426DFA2754A47700B3733B /* INPhotoVideosController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A426DF92754A47700B3733B /* INPhotoVideosController.swift */; };
 		4A426DFC2754A4B200B3733B /* INIntroduceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A426DFB2754A4B200B3733B /* INIntroduceController.swift */; };
 		4A426DFE2754A4F600B3733B /* INVideoExportController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A426DFD2754A4F600B3733B /* INVideoExportController.swift */; };
+		4AFE6042277DCF500068BB5F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4AFE6040277DCF500068BB5F /* LaunchScreen.storyboard */; };
 		BFC6C47BC8163110D4E205C0 /* Pods_Introduce.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D67E85C017389B87957100F /* Pods_Introduce.framework */; };
 /* End PBXBuildFile section */
 
@@ -38,6 +39,7 @@
 		4A426DF92754A47700B3733B /* INPhotoVideosController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = INPhotoVideosController.swift; sourceTree = "<group>"; };
 		4A426DFB2754A4B200B3733B /* INIntroduceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = INIntroduceController.swift; sourceTree = "<group>"; };
 		4A426DFD2754A4F600B3733B /* INVideoExportController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = INVideoExportController.swift; sourceTree = "<group>"; };
+		4AFE6041277DCF500068BB5F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		F6FE9FC563C2B8CC6005F8C8 /* Pods-Introduce.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Introduce.debug.xcconfig"; path = "Target Support Files/Pods-Introduce/Pods-Introduce.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -87,6 +89,7 @@
 				4A426DF72754A2EE00B3733B /* Message */,
 				4A426DF32754A26600B3733B /* Record */,
 				4A426DE2275484DF00B3733B /* Main.storyboard */,
+				4AFE6040277DCF500068BB5F /* LaunchScreen.storyboard */,
 				4A426DE5275484E000B3733B /* Assets.xcassets */,
 				41A112782766E12C0093BBF0 /* PQConfig.plist */,
 				415C49D12763022900814766 /* Resources.bundle */,
@@ -206,6 +209,7 @@
 				41A112792766E12C0093BBF0 /* PQConfig.plist in Resources */,
 				4A426DE6275484E000B3733B /* Assets.xcassets in Resources */,
 				4A426DE4275484DF00B3733B /* Main.storyboard in Resources */,
+				4AFE6042277DCF500068BB5F /* LaunchScreen.storyboard in Resources */,
 				415C49D22763022900814766 /* Resources.bundle in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -297,6 +301,14 @@
 			name = Main.storyboard;
 			sourceTree = "<group>";
 		};
+		4AFE6040277DCF500068BB5F /* LaunchScreen.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				4AFE6041277DCF500068BB5F /* Base */,
+			);
+			name = LaunchScreen.storyboard;
+			sourceTree = "<group>";
+		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */

Introduce/Base.lproj/LaunchScreen.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -17,13 +17,10 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="开讲" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wp4-ea-cRc">
-                                <rect key="frame" x="138" y="238" width="136" height="96"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="40"/>
-                                <color key="textColor" systemColor="systemOrangeColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4xb-RU-WoQ">
+                                <rect key="frame" x="68" y="243" width="240" height="128"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
@@ -31,15 +28,12 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="52.173913043478265" y="375"/>
+            <point key="canvasLocation" x="30" y="350"/>
         </scene>
     </scenes>
     <resources>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
-        <systemColor name="systemOrangeColor">
-            <color red="1" green="0.58431372549019611" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </systemColor>
     </resources>
 </document>