From 9571367f7f3659362978b9b3dd96ff7d5bef68be Mon Sep 17 00:00:00 2001
From: 左丞 <Manger@zuochengdeMac-mini.local>
Date: Mon, 26 Mar 2018 10:44:09 +0800
Subject: [PATCH] no message

---
 ParentAssistant/ParentAssistant/Classes/controllers/userCenter/BaseCityChooseSchoolViewController.swift |  1 +
 ParentAssistant/Pods/Target Support Files/XRCarouselView/Info.plist                                     | 45 +++++++++++++++++++++++++--------------------
 ParentAssistant/Pods/XRCarouselView/XRCarouselView/XRCarouselView.m                                     |  3 ++-
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/userCenter/BaseCityChooseSchoolViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/userCenter/BaseCityChooseSchoolViewController.swift
index 01f2ae8..1930e7b 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/userCenter/BaseCityChooseSchoolViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/userCenter/BaseCityChooseSchoolViewController.swift
@@ -51,6 +51,7 @@ class BaseCityChooseSchoolViewController: UIViewController,UISearchBarDelegate {
 
     //对给定的学校分组
     func sortData(_ array:[School]){
+        schoolDic = [:]
         for letter in firstLetterArr {
             var arr:[School] = []
             for school in array{
diff --git a/ParentAssistant/Pods/Target Support Files/XRCarouselView/Info.plist b/ParentAssistant/Pods/Target Support Files/XRCarouselView/Info.plist
index 19f44c5..9739cc1 100644
--- a/ParentAssistant/Pods/Target Support Files/XRCarouselView/Info.plist
+++ b/ParentAssistant/Pods/Target Support Files/XRCarouselView/Info.plist
@@ -2,25 +2,30 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
-  <key>CFBundleExecutable</key>
-  <string>${EXECUTABLE_NAME}</string>
-  <key>CFBundleIdentifier</key>
-  <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>${PRODUCT_NAME}</string>
-  <key>CFBundlePackageType</key>
-  <string>FMWK</string>
-  <key>CFBundleShortVersionString</key>
-  <string>2.5.6</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>${CURRENT_PROJECT_VERSION}</string>
-  <key>NSPrincipalClass</key>
-  <string></string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.5.6</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>${CURRENT_PROJECT_VERSION}</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
 </dict>
 </plist>
diff --git a/ParentAssistant/Pods/XRCarouselView/XRCarouselView/XRCarouselView.m b/ParentAssistant/Pods/XRCarouselView/XRCarouselView/XRCarouselView.m
index 9b70346..7fd2f29 100644
--- a/ParentAssistant/Pods/XRCarouselView/XRCarouselView/XRCarouselView.m
+++ b/ParentAssistant/Pods/XRCarouselView/XRCarouselView/XRCarouselView.m
@@ -344,7 +344,8 @@ static NSString *cache;
     }
     //下载图片
     NSBlockOperation *download = [NSBlockOperation blockOperationWithBlock:^{
-        NSData *data = [NSData dataWithContentsOfURL:[NSURL URLWithString:urlString]];
+        NSString * string = [urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+        NSData *data = [NSData dataWithContentsOfURL:[NSURL URLWithString:string]];
         if (!data) return;
         UIImage *image = getImageWithData(data);
         //取到的data有可能不是图片
--
libgit2 0.21.0