Commit 9571367f7f3659362978b9b3dd96ff7d5bef68be
1 parent
79394633
Exists in
parentassistant
no message
Showing
3 changed files
with
28 additions
and
21 deletions
Show diff stats
ParentAssistant/ParentAssistant/Classes/controllers/userCenter/BaseCityChooseSchoolViewController.swift
| @@ -51,6 +51,7 @@ class BaseCityChooseSchoolViewController: UIViewController,UISearchBarDelegate { | @@ -51,6 +51,7 @@ class BaseCityChooseSchoolViewController: UIViewController,UISearchBarDelegate { | ||
| 51 | 51 | ||
| 52 | //对给定的学校分组 | 52 | //对给定的学校分组 |
| 53 | func sortData(_ array:[School]){ | 53 | func sortData(_ array:[School]){ |
| 54 | + schoolDic = [:] | ||
| 54 | for letter in firstLetterArr { | 55 | for letter in firstLetterArr { |
| 55 | var arr:[School] = [] | 56 | var arr:[School] = [] |
| 56 | for school in array{ | 57 | for school in array{ |
ParentAssistant/Pods/Target Support Files/XRCarouselView/Info.plist
| @@ -2,25 +2,30 @@ | @@ -2,25 +2,30 @@ | ||
| 2 | <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | 2 | <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> |
| 3 | <plist version="1.0"> | 3 | <plist version="1.0"> |
| 4 | <dict> | 4 | <dict> |
| 5 | - <key>CFBundleDevelopmentRegion</key> | ||
| 6 | - <string>en</string> | ||
| 7 | - <key>CFBundleExecutable</key> | ||
| 8 | - <string>${EXECUTABLE_NAME}</string> | ||
| 9 | - <key>CFBundleIdentifier</key> | ||
| 10 | - <string>${PRODUCT_BUNDLE_IDENTIFIER}</string> | ||
| 11 | - <key>CFBundleInfoDictionaryVersion</key> | ||
| 12 | - <string>6.0</string> | ||
| 13 | - <key>CFBundleName</key> | ||
| 14 | - <string>${PRODUCT_NAME}</string> | ||
| 15 | - <key>CFBundlePackageType</key> | ||
| 16 | - <string>FMWK</string> | ||
| 17 | - <key>CFBundleShortVersionString</key> | ||
| 18 | - <string>2.5.6</string> | ||
| 19 | - <key>CFBundleSignature</key> | ||
| 20 | - <string>????</string> | ||
| 21 | - <key>CFBundleVersion</key> | ||
| 22 | - <string>${CURRENT_PROJECT_VERSION}</string> | ||
| 23 | - <key>NSPrincipalClass</key> | ||
| 24 | - <string></string> | 5 | + <key>CFBundleDevelopmentRegion</key> |
| 6 | + <string>en</string> | ||
| 7 | + <key>NSAppTransportSecurity</key> | ||
| 8 | + <dict> | ||
| 9 | + <key>NSAllowsArbitraryLoads</key> | ||
| 10 | + <true/> | ||
| 11 | + </dict> | ||
| 12 | + <key>CFBundleExecutable</key> | ||
| 13 | + <string>${EXECUTABLE_NAME}</string> | ||
| 14 | + <key>CFBundleIdentifier</key> | ||
| 15 | + <string>${PRODUCT_BUNDLE_IDENTIFIER}</string> | ||
| 16 | + <key>CFBundleInfoDictionaryVersion</key> | ||
| 17 | + <string>6.0</string> | ||
| 18 | + <key>CFBundleName</key> | ||
| 19 | + <string>${PRODUCT_NAME}</string> | ||
| 20 | + <key>CFBundlePackageType</key> | ||
| 21 | + <string>FMWK</string> | ||
| 22 | + <key>CFBundleShortVersionString</key> | ||
| 23 | + <string>2.5.6</string> | ||
| 24 | + <key>CFBundleSignature</key> | ||
| 25 | + <string>????</string> | ||
| 26 | + <key>CFBundleVersion</key> | ||
| 27 | + <string>${CURRENT_PROJECT_VERSION}</string> | ||
| 28 | + <key>NSPrincipalClass</key> | ||
| 29 | + <string></string> | ||
| 25 | </dict> | 30 | </dict> |
| 26 | </plist> | 31 | </plist> |
ParentAssistant/Pods/XRCarouselView/XRCarouselView/XRCarouselView.m
| @@ -344,7 +344,8 @@ static NSString *cache; | @@ -344,7 +344,8 @@ static NSString *cache; | ||
| 344 | } | 344 | } |
| 345 | //下载图片 | 345 | //下载图片 |
| 346 | NSBlockOperation *download = [NSBlockOperation blockOperationWithBlock:^{ | 346 | NSBlockOperation *download = [NSBlockOperation blockOperationWithBlock:^{ |
| 347 | - NSData *data = [NSData dataWithContentsOfURL:[NSURL URLWithString:urlString]]; | 347 | + NSString * string = [urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; |
| 348 | + NSData *data = [NSData dataWithContentsOfURL:[NSURL URLWithString:string]]; | ||
| 348 | if (!data) return; | 349 | if (!data) return; |
| 349 | UIImage *image = getImageWithData(data); | 350 | UIImage *image = getImageWithData(data); |
| 350 | //取到的data有可能不是图片 | 351 | //取到的data有可能不是图片 |