diff --git a/Ash_AWord.xcodeproj/project.pbxproj b/Ash_AWord.xcodeproj/project.pbxproj index 6e3b2f0..08c5c48 100644 --- a/Ash_AWord.xcodeproj/project.pbxproj +++ b/Ash_AWord.xcodeproj/project.pbxproj @@ -191,6 +191,7 @@ A9E2711B1ADB97ED000B1542 /* Default-568h.png in Resources */ = {isa = PBXBuildFile; fileRef = A9E271191ADB97ED000B1542 /* Default-568h.png */; }; A9E2711C1ADB97ED000B1542 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = A9E2711A1ADB97ED000B1542 /* Default.png */; }; A9E2711E1ADBB25C000B1542 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9E2711D1ADBB25C000B1542 /* AVFoundation.framework */; }; + A9EA14C31B02E88300357529 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9EA14C21B02E88300357529 /* LaunchScreen.xib */; }; A9FAD4221AC922A5007ADC10 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9FAD4201AC922A5007ADC10 /* MainViewController.m */; }; A9FAD4231AC922A5007ADC10 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9FAD4211AC922A5007ADC10 /* MainViewController.xib */; }; A9FAD4271AC922BE007ADC10 /* NoteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9FAD4251AC922BE007ADC10 /* NoteViewController.m */; }; @@ -482,6 +483,7 @@ A9E271191ADB97ED000B1542 /* Default-568h.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h.png"; sourceTree = ""; }; A9E2711A1ADB97ED000B1542 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; A9E2711D1ADBB25C000B1542 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + A9EA14C21B02E88300357529 /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = ""; }; A9FAD41F1AC922A5007ADC10 /* MainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainViewController.h; sourceTree = ""; }; A9FAD4201AC922A5007ADC10 /* MainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = ""; }; A9FAD4211AC922A5007ADC10 /* MainViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainViewController.xib; sourceTree = ""; }; @@ -572,6 +574,7 @@ A95510971AC39E6A0006D16F /* ViewController.m */, A95510991AC39E6A0006D16F /* Main.storyboard */, A955109C1AC39E6A0006D16F /* Images.xcassets */, + A9EA14C21B02E88300357529 /* LaunchScreen.xib */, A955108F1AC39E6A0006D16F /* Supporting Files */, ); path = Ash_AWord; @@ -1250,6 +1253,7 @@ A9FAD4321AC923FC007ADC10 /* MyViewController.xib in Resources */, A93441FF1ACA919F00A6B233 /* tabbarVoice@2x.png in Resources */, A968627E1ACCF46E00DDAA6B /* cellmorebtnclickN@2x.png in Resources */, + A9EA14C31B02E88300357529 /* LaunchScreen.xib in Resources */, A93441FA1ACA919500A6B233 /* tabbarQuotation-dark@2x.png in Resources */, A97559D01ACBF0BC004ADA42 /* btn_share_clicked@2x.png in Resources */, A90BA01F1AD606AE00728393 /* voice-record-icon@2x.png in Resources */, @@ -1566,6 +1570,7 @@ baseConfigurationReference = 93C9ED3E7E1041224C33AED5 /* Pods.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "LaunchImage-2"; CODE_SIGN_IDENTITY = "iPhone Developer: wu ShengHua (E2D99JSE7J)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: wu ShengHua (E2D99JSE7J)"; FRAMEWORK_SEARCH_PATHS = ( @@ -1595,6 +1600,7 @@ baseConfigurationReference = AD3C5DED2445FC2F0892A525 /* Pods.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "LaunchImage-2"; CODE_SIGN_IDENTITY = "iPhone Developer: wu ShengHua (E2D99JSE7J)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index c22ad98..3934387 100644 --- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -1081,11 +1081,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewModels/Note/NoteViewModel.m" - timestampString = "450684279.512898" + timestampString = "452659532.264373" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "118" - endingLineNumber = "118" + startingLineNumber = "123" + endingLineNumber = "123" landmarkName = "+requireShareWithRecordId:" landmarkType = "5"> diff --git a/Ash_AWord/Images.xcassets/LaunchImage-2.launchimage/Contents.json b/Ash_AWord/Images.xcassets/LaunchImage-2.launchimage/Contents.json new file mode 100644 index 0000000..888748c --- /dev/null +++ b/Ash_AWord/Images.xcassets/LaunchImage-2.launchimage/Contents.json @@ -0,0 +1,41 @@ +{ + "images" : [ + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default-568h@2x.png", + "minimum-system-version" : "7.0", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "scale" : "1x", + "orientation" : "portrait" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default@2x.png", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default-568h@2x.png", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default@2x.png", + "minimum-system-version" : "7.0", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ash_AWord/Images.xcassets/LaunchImage-2.launchimage/Default-568h@2x.png b/Ash_AWord/Images.xcassets/LaunchImage-2.launchimage/Default-568h@2x.png new file mode 100644 index 0000000..2726765 Binary files /dev/null and b/Ash_AWord/Images.xcassets/LaunchImage-2.launchimage/Default-568h@2x.png differ diff --git a/Ash_AWord/Images.xcassets/LaunchImage-2.launchimage/Default@2x.png b/Ash_AWord/Images.xcassets/LaunchImage-2.launchimage/Default@2x.png new file mode 100644 index 0000000..59f5e9e Binary files /dev/null and b/Ash_AWord/Images.xcassets/LaunchImage-2.launchimage/Default@2x.png differ diff --git a/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Contents.json b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Contents.json new file mode 100644 index 0000000..888748c --- /dev/null +++ b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -0,0 +1,41 @@ +{ + "images" : [ + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default-568h@2x.png", + "minimum-system-version" : "7.0", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "scale" : "1x", + "orientation" : "portrait" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default@2x.png", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default-568h@2x.png", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default@2x.png", + "minimum-system-version" : "7.0", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png new file mode 100644 index 0000000..2726765 Binary files /dev/null and b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png differ diff --git a/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default@2x.png b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default@2x.png new file mode 100644 index 0000000..59f5e9e Binary files /dev/null and b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default@2x.png differ diff --git a/Ash_AWord/Info.plist b/Ash_AWord/Info.plist index 0900d31..c92aab9 100644 --- a/Ash_AWord/Info.plist +++ b/Ash_AWord/Info.plist @@ -65,6 +65,8 @@ 5 LSRequiresIPhoneOS + UILaunchStoryboardName + LaunchScreen UIMainStoryboardFile Main UIRequiredDeviceCapabilities diff --git a/Ash_AWord/LaunchScreen.xib b/Ash_AWord/LaunchScreen.xib new file mode 100644 index 0000000..d2cfff8 --- /dev/null +++ b/Ash_AWord/LaunchScreen.xib @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ash_AWord/ViewControllers/Login/RegistAccountViewController.m b/Ash_AWord/ViewControllers/Login/RegistAccountViewController.m index 969fa1c..108c267 100644 --- a/Ash_AWord/ViewControllers/Login/RegistAccountViewController.m +++ b/Ash_AWord/ViewControllers/Login/RegistAccountViewController.m @@ -95,7 +95,7 @@ [MBProgressHUD errorHudWithView:nil label:@"用户名不合法" hidesAfter:1.0]; return; } - if (_firstPassWordTextField.text.length<6 && _firstPassWordTextField.text.length<20){ + if (_firstPassWordTextField.text.length<6 || _firstPassWordTextField.text.length>20){ [MBProgressHUD errorHudWithView:nil label:@"密码长度应在6-20" hidesAfter:1.0]; return; }