Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix bug #12

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix bug #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added ...odeproj/project.xcworkspace/xcuserdata/DogWang.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
101 changes: 101 additions & 0 deletions PhotoBrowser.xcodeproj/xcuserdata/DogWang.xcuserdatad/xcschemes/PhotoBrowser.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "89CA44421B7F96030061FEFC"
BuildableName = "PhotoBrowser.app"
BlueprintName = "PhotoBrowser"
ReferencedContainer = "container:PhotoBrowser.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "89CA44571B7F96030061FEFC"
BuildableName = "PhotoBrowserTests.xctest"
BlueprintName = "PhotoBrowserTests"
ReferencedContainer = "container:PhotoBrowser.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "89CA44421B7F96030061FEFC"
BuildableName = "PhotoBrowser.app"
BlueprintName = "PhotoBrowser"
ReferencedContainer = "container:PhotoBrowser.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "89CA44421B7F96030061FEFC"
BuildableName = "PhotoBrowser.app"
BlueprintName = "PhotoBrowser"
ReferencedContainer = "container:PhotoBrowser.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "89CA44421B7F96030061FEFC"
BuildableName = "PhotoBrowser.app"
BlueprintName = "PhotoBrowser"
ReferencedContainer = "container:PhotoBrowser.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
27 changes: 27 additions & 0 deletions PhotoBrowser.xcodeproj/xcuserdata/DogWang.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>PhotoBrowser.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>89CA44421B7F96030061FEFC</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>89CA44571B7F96030061FEFC</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
7 changes: 4 additions & 3 deletions PhotoBrowser/PhotoBrowser/Controller/PhotoBrowser+HUD.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ extension PhotoBrowser{

if autoDismiss == -1 {return}

dispatch_after(dispatch_time(DISPATCH_TIME_NOW,Int64(autoDismiss * Double(NSEC_PER_SEC))), dispatch_get_main_queue(), {[unowned self] () -> Void in

self.dismissHUD()
dispatch_after(dispatch_time(DISPATCH_TIME_NOW,Int64(autoDismiss * Double(NSEC_PER_SEC))), dispatch_get_main_queue(), {[weak self] () -> Void in
if self != nil {
self!.dismissHUD()
}
})
}

Expand Down
6 changes: 2 additions & 4 deletions PhotoBrowser/PhotoBrowser/Controller/PhotoBrowser+Main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,10 @@ extension PhotoBrowser{

if (didFinishSavingWithError as NSError?) == nil {
showHUD("保存失败", autoDismiss: 2)
}
else{
showHUD("保存成功", autoDismiss: 2)

//记录
photoArchiverArr.append(page)
}else{
showHUD("保存失败", autoDismiss: 2)
}
}

Expand Down