Commit f84f437fe9bbe5dfc95ca8417f91a47e7418433f
Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/CNLiveBusinessTools
# Conflicts: # CNLiveBusinessTools.podspec # CNLiveBusinessTools/Classes/CNLiveNetBusinessTools.m
Showing
3 changed files
with
10 additions
and
38 deletions
.gitignore
| 1 | -# OS X | |
| 1 | +*~ | |
| 2 | 2 | .DS_Store |
| 3 | +*.xcuserstate | |
| 4 | +*.xcworkspace | |
| 5 | +xcuserdata | |
| 6 | +Products/ | |
| 7 | +*.lock | |
| 8 | +Pods | |
| 3 | 9 | |
| 4 | -# Xcode | |
| 5 | -build/ | |
| 6 | -Products/ | |
| 7 | -*.pbxuser | |
| 8 | -!default.pbxuser | |
| 9 | -*.mode1v3 | |
| 10 | -!default.mode1v3 | |
| 11 | -*.mode2v3 | |
| 12 | -!default.mode2v3 | |
| 13 | -*.perspectivev3 | |
| 14 | -!default.perspectivev3 | |
| 15 | -xcuserdata/ | |
| 16 | -*.xccheckout | |
| 17 | -profile | |
| 18 | -*.moved-aside | |
| 19 | -DerivedData | |
| 20 | -*.hmap | |
| 21 | -*.ipa | |
| 22 | - | |
| 23 | -# Bundler | |
| 24 | -.bundle | |
| 25 | - | |
| 26 | -# Add this line if you want to avoid checking in source code from Carthage dependencies. | |
| 27 | -# Carthage/Checkouts | |
| 28 | - | |
| 29 | -Carthage/Build | |
| 30 | - | |
| 31 | -# We recommend against adding the Pods directory to your .gitignore. However | |
| 32 | -# you should judge for yourself, the pros and cons are mentioned at: | |
| 33 | -# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control | |
| 34 | -# | |
| 35 | -# Note: if you ignore the Pods directory, make sure to uncomment | |
| 36 | -# `pod install` in .travis.yml | |
| 37 | -# | |
| 38 | -# Pods/ | ... | ... |
CNLiveBusinessTools.podspec
CNLiveBusinessTools/Classes/CNLiveNetBusinessTools.m
| ... | ... | @@ -271,7 +271,8 @@ |
| 271 | 271 | } |
| 272 | 272 | + (CNFileType)isReadedFileByType:(NSString *)suffixType |
| 273 | 273 | { |
| 274 | - if ([[CNLiveNetBusinessTools fileTypeDic] objectForKey:[NSString stringWithFormat:@".%@",suffixType]]) { | |
| 274 | + suffixType = [NSString stringWithFormat:@"%@",[suffixType lowercaseString]]; | |
| 275 | + if ([[CNLiveBusinessTools fileTypeDic] objectForKey:[NSString stringWithFormat:@".%@",suffixType]]) { | |
| 275 | 276 | return CNFileTypeReadAndLook; |
| 276 | 277 | } |
| 277 | 278 | else if ([[CNLiveNetBusinessTools onlyReadFileType] objectForKey:[NSString stringWithFormat:@".%@",suffixType]]) | ... | ... |