Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan…

…t into parentassistant # Conflicts: # ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard

Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan…
…t into parentassistant # Conflicts: # ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
Cao yang
2 parents 6f4faf3d c5ebc0e5
Showing 9 changed files with 50 additions and 29 deletions Show diff stats
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
ParentAssistant/ParentAssistant/Classes/controllers/evaluation/EvaluationViewController.swift
ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard
ParentAssistant/ParentAssistant/Classes/controllers/userCenter/BaseCityChooseSchoolViewController.swift
ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
ParentAssistant/ParentAssistant/Supporting Files/Info.plist
ParentAssistant/Pods/Target Support Files/XRCarouselView/Info.plist
ParentAssistant/Pods/XRCarouselView/XRCarouselView/XRCarouselView.m
@@ -172,6 +172,12 @@ class InformationViewController: UIViewController,UISearchBarDelegate {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         getData()
+        if isFirstviewController{
+            addLeftBarBtn()
+        }else{
+            
+        }
+
     }
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
@@ -29,6 +29,7 @@ class EvaluationViewController: UIViewController,CLLocationManagerDelegate,Selec
     override func viewDidLoad() {
         super.viewDidLoad()
         self.navigationItem.title = "慧测慧练"
+        self.navigationController?.navigationBar.tintColor=UIColor.white
         addLeftBarBtn()
         locationAction()
         addBottomBtn()
@@ -218,6 +219,7 @@ class EvaluationViewController: UIViewController,CLLocationManagerDelegate,Selec
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         self.getData()
+        addLeftBarBtn()
     }
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
@@ -589,7 +589,7 @@
                                                 <color key="textColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请设置密码：6-16个字符" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="IOQ-sk-Ckx">
+                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入密码：6-16个字符" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="IOQ-sk-Ckx">
                                                 <rect key="frame" x="8" y="39" width="298" height="30"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="30" id="Idr-wo-mVx"/>
@@ -51,6 +51,7 @@ class BaseCityChooseSchoolViewController: UIViewController,UISearchBarDelegate {
  
     //对给定的学校分组
     func sortData(_ array:[School]){
+        schoolDic = [:]
         for letter in firstLetterArr {
             var arr:[School] = []
             for school in array{
@@ -160,7 +161,10 @@ class BaseCityChooseSchoolViewController: UIViewController,UISearchBarDelegate {
         self.getData()
     }
  
-    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        citySelectbtn.text = AccountManager.shared.address
+    }
     /*
     // MARK: - Navigation
  
@@ -281,7 +281,7 @@
                                                                 </state>
                                                             </button>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LRo-YD-6S6">
-                                                                <rect key="frame" x="8" y="113.5" width="61.5" height="18"/>
+                                                                <rect key="frame" x="8" y="113.5" width="160" height="18"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                                 <nil key="highlightedColor"/>
@@ -300,6 +300,7 @@
                                                             <constraint firstItem="O7r-js-8BI" firstAttribute="top" secondItem="LRo-YD-6S6" secondAttribute="bottom" constant="8" id="6hq-9D-QOl"/>
                                                             <constraint firstAttribute="width" secondItem="kkx-lN-sfK" secondAttribute="height" multiplier="1:1" id="HW0-lf-ojc"/>
                                                             <constraint firstItem="Jql-zY-Zqo" firstAttribute="leading" secondItem="kkx-lN-sfK" secondAttribute="leading" id="Jyr-dl-P9R"/>
+                                                            <constraint firstAttribute="trailing" secondItem="LRo-YD-6S6" secondAttribute="trailing" constant="8" id="K6d-Nh-GuN"/>
                                                             <constraint firstAttribute="trailing" secondItem="Jql-zY-Zqo" secondAttribute="trailing" id="MEc-va-pgf"/>
                                                             <constraint firstItem="Xml-PN-wWh" firstAttribute="leading" secondItem="kkx-lN-sfK" secondAttribute="leading" id="X1z-gM-jWu"/>
                                                             <constraint firstItem="Jql-zY-Zqo" firstAttribute="top" secondItem="kkx-lN-sfK" secondAttribute="top" id="Zi5-eI-CED"/>
@@ -333,7 +334,7 @@
                                                                 </state>
                                                             </button>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HzZ-gc-k6q">
-                                                                <rect key="frame" x="8" y="21.5" width="61.5" height="18"/>
+                                                                <rect key="frame" x="8" y="21.5" width="160" height="18"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                                 <nil key="highlightedColor"/>
@@ -347,6 +348,7 @@
                                                         </subviews>
                                                         <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <constraints>
+                                                            <constraint firstAttribute="trailing" secondItem="HzZ-gc-k6q" secondAttribute="trailing" constant="8" id="0B8-zV-Tar"/>
                                                             <constraint firstItem="zvf-dA-6kr" firstAttribute="leading" secondItem="6YE-Yx-A8r" secondAttribute="leading" id="8NH-AH-kf2"/>
                                                             <constraint firstItem="qMv-R9-Qa3" firstAttribute="top" secondItem="6YE-Yx-A8r" secondAttribute="top" id="Dxq-Iz-iMF"/>
                                                             <constraint firstAttribute="bottom" secondItem="Uk9-TJ-dgw" secondAttribute="bottom" constant="8" id="HH3-Em-feP"/>
@@ -370,7 +372,7 @@
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nTE-Oc-4PW">
                                                         <rect key="frame" x="184" y="0.0" width="176" height="84"/>
                                                         <subviews>
-                                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite2" translatesAutoresizingMaskIntoConstraints="NO" id="P7A-gb-DMF">
+                                                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite3" translatesAutoresizingMaskIntoConstraints="NO" id="P7A-gb-DMF">
                                                                 <rect key="frame" x="0.0" y="0.0" width="175.5" height="84"/>
                                                             </imageView>
                                                             <button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l93-Wh-xSB">
@@ -384,7 +386,7 @@
                                                                 </state>
                                                             </button>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IlG-SR-47u">
-                                                                <rect key="frame" x="8" y="22" width="61.5" height="18"/>
+                                                                <rect key="frame" x="8" y="22" width="160" height="18"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                                 <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                                 <nil key="highlightedColor"/>
@@ -405,6 +407,7 @@
                                                             <constraint firstAttribute="trailing" secondItem="P7A-gb-DMF" secondAttribute="trailing" id="RXm-NJ-H9Z"/>
                                                             <constraint firstAttribute="bottom" secondItem="P7A-gb-DMF" secondAttribute="bottom" id="UDc-4Y-4Df"/>
                                                             <constraint firstAttribute="trailing" secondItem="YIw-qU-3V5" secondAttribute="trailing" id="WjU-kd-7cK"/>
+                                                            <constraint firstAttribute="trailing" secondItem="IlG-SR-47u" secondAttribute="trailing" constant="8" id="Zng-vi-Gsu"/>
                                                             <constraint firstAttribute="bottom" secondItem="YIw-qU-3V5" secondAttribute="bottom" id="dlT-rW-fLJ"/>
                                                             <constraint firstItem="YIw-qU-3V5" firstAttribute="leading" secondItem="nTE-Oc-4PW" secondAttribute="leading" id="g3m-Eg-Sph"/>
                                                             <constraint firstItem="l93-Wh-xSB" firstAttribute="top" secondItem="IlG-SR-47u" secondAttribute="bottom" constant="8" id="ofC-a7-KtM"/>
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>7</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -28,7 +28,7 @@
 		<true/>
 	</dict>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>&quot;需要您的同意,才能在使用期间访问位置&quot;</string>
+	<string>"需要您的同意,才能在使用期间访问位置"</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>访问麦克风</string>
 	<key>NSPhotoLibraryUsageDescription</key>
@@ -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>
@@ -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有可能不是图片
...	...	@@ -172,6 +172,12 @@ class InformationViewController: UIViewController,UISearchBarDelegate {
172	172	override func viewWillAppear(_ animated: Bool) {
173	173	super.viewWillAppear(animated)
174	174	getData()
	175	+ if isFirstviewController{
	176	+ addLeftBarBtn()
	177	+ }else{
	178	+
	179	+ }
	180	+
175	181	}
176	182	override func didReceiveMemoryWarning() {
177	183	super.didReceiveMemoryWarning()
...	...
...	...	@@ -29,6 +29,7 @@ class EvaluationViewController: UIViewController,CLLocationManagerDelegate,Selec
29	29	override func viewDidLoad() {
30	30	super.viewDidLoad()
31	31	self.navigationItem.title = "慧测慧练"
	32	+ self.navigationController?.navigationBar.tintColor=UIColor.white
32	33	addLeftBarBtn()
33	34	locationAction()
34	35	addBottomBtn()
...	...	@@ -218,6 +219,7 @@ class EvaluationViewController: UIViewController,CLLocationManagerDelegate,Selec
218	219	override func viewWillAppear(_ animated: Bool) {
219	220	super.viewWillAppear(animated)
220	221	self.getData()
	222	+ addLeftBarBtn()
221	223	}
222	224	override func didReceiveMemoryWarning() {
223	225	super.didReceiveMemoryWarning()
...	...
...	...	@@ -589,7 +589,7 @@
589	589	<color key="textColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
590	590	<nil key="highlightedColor"/>
591	591	</label>
592		- <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请设置密码：6-16个字符" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="IOQ-sk-Ckx">
	592	+ <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入密码：6-16个字符" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="IOQ-sk-Ckx">
593	593	<rect key="frame" x="8" y="39" width="298" height="30"/>
594	594	<constraints>
595	595	<constraint firstAttribute="height" constant="30" id="Idr-wo-mVx"/>
...	...
...	...	@@ -51,6 +51,7 @@ class BaseCityChooseSchoolViewController: UIViewController,UISearchBarDelegate {
51	51
52	52	//对给定的学校分组
53	53	func sortData(_ array:[School]){
	54	+ schoolDic = [:]
54	55	for letter in firstLetterArr {
55	56	var arr:[School] = []
56	57	for school in array{
...	...	@@ -160,7 +161,10 @@ class BaseCityChooseSchoolViewController: UIViewController,UISearchBarDelegate {
160	161	self.getData()
161	162	}
162	163
163		-
	164	+ override func viewWillAppear(_ animated: Bool) {
	165	+ super.viewWillAppear(animated)
	166	+ citySelectbtn.text = AccountManager.shared.address
	167	+ }
164	168	/*
165	169	// MARK: - Navigation
166	170
...	...
...	...	@@ -281,7 +281,7 @@
281	281	</state>
282	282	</button>
283	283	<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LRo-YD-6S6">
284		- <rect key="frame" x="8" y="113.5" width="61.5" height="18"/>
	284	+ <rect key="frame" x="8" y="113.5" width="160" height="18"/>
285	285	<fontDescription key="fontDescription" type="system" pointSize="15"/>
286	286	<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
287	287	<nil key="highlightedColor"/>
...	...	@@ -300,6 +300,7 @@
300	300	<constraint firstItem="O7r-js-8BI" firstAttribute="top" secondItem="LRo-YD-6S6" secondAttribute="bottom" constant="8" id="6hq-9D-QOl"/>
301	301	<constraint firstAttribute="width" secondItem="kkx-lN-sfK" secondAttribute="height" multiplier="1:1" id="HW0-lf-ojc"/>
302	302	<constraint firstItem="Jql-zY-Zqo" firstAttribute="leading" secondItem="kkx-lN-sfK" secondAttribute="leading" id="Jyr-dl-P9R"/>
	303	+ <constraint firstAttribute="trailing" secondItem="LRo-YD-6S6" secondAttribute="trailing" constant="8" id="K6d-Nh-GuN"/>
303	304	<constraint firstAttribute="trailing" secondItem="Jql-zY-Zqo" secondAttribute="trailing" id="MEc-va-pgf"/>
304	305	<constraint firstItem="Xml-PN-wWh" firstAttribute="leading" secondItem="kkx-lN-sfK" secondAttribute="leading" id="X1z-gM-jWu"/>
305	306	<constraint firstItem="Jql-zY-Zqo" firstAttribute="top" secondItem="kkx-lN-sfK" secondAttribute="top" id="Zi5-eI-CED"/>
...	...	@@ -333,7 +334,7 @@
333	334	</state>
334	335	</button>
335	336	<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HzZ-gc-k6q">
336		- <rect key="frame" x="8" y="21.5" width="61.5" height="18"/>
	337	+ <rect key="frame" x="8" y="21.5" width="160" height="18"/>
337	338	<fontDescription key="fontDescription" type="system" pointSize="15"/>
338	339	<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
339	340	<nil key="highlightedColor"/>
...	...	@@ -347,6 +348,7 @@
347	348	</subviews>
348	349	<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
349	350	<constraints>
	351	+ <constraint firstAttribute="trailing" secondItem="HzZ-gc-k6q" secondAttribute="trailing" constant="8" id="0B8-zV-Tar"/>
350	352	<constraint firstItem="zvf-dA-6kr" firstAttribute="leading" secondItem="6YE-Yx-A8r" secondAttribute="leading" id="8NH-AH-kf2"/>
351	353	<constraint firstItem="qMv-R9-Qa3" firstAttribute="top" secondItem="6YE-Yx-A8r" secondAttribute="top" id="Dxq-Iz-iMF"/>
352	354	<constraint firstAttribute="bottom" secondItem="Uk9-TJ-dgw" secondAttribute="bottom" constant="8" id="HH3-Em-feP"/>
...	...	@@ -370,7 +372,7 @@
370	372	<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nTE-Oc-4PW">
371	373	<rect key="frame" x="184" y="0.0" width="176" height="84"/>
372	374	<subviews>
373		- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite2" translatesAutoresizingMaskIntoConstraints="NO" id="P7A-gb-DMF">
	375	+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="evaluation_icon_activite3" translatesAutoresizingMaskIntoConstraints="NO" id="P7A-gb-DMF">
374	376	<rect key="frame" x="0.0" y="0.0" width="175.5" height="84"/>
375	377	</imageView>
376	378	<button opaque="NO" tag="3001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l93-Wh-xSB">
...	...	@@ -384,7 +386,7 @@
384	386	</state>
385	387	</button>
386	388	<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门课程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IlG-SR-47u">
387		- <rect key="frame" x="8" y="22" width="61.5" height="18"/>
	389	+ <rect key="frame" x="8" y="22" width="160" height="18"/>
388	390	<fontDescription key="fontDescription" type="system" pointSize="15"/>
389	391	<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
390	392	<nil key="highlightedColor"/>
...	...	@@ -405,6 +407,7 @@
405	407	<constraint firstAttribute="trailing" secondItem="P7A-gb-DMF" secondAttribute="trailing" id="RXm-NJ-H9Z"/>
406	408	<constraint firstAttribute="bottom" secondItem="P7A-gb-DMF" secondAttribute="bottom" id="UDc-4Y-4Df"/>
407	409	<constraint firstAttribute="trailing" secondItem="YIw-qU-3V5" secondAttribute="trailing" id="WjU-kd-7cK"/>
	410	+ <constraint firstAttribute="trailing" secondItem="IlG-SR-47u" secondAttribute="trailing" constant="8" id="Zng-vi-Gsu"/>
408	411	<constraint firstAttribute="bottom" secondItem="YIw-qU-3V5" secondAttribute="bottom" id="dlT-rW-fLJ"/>
409	412	<constraint firstItem="YIw-qU-3V5" firstAttribute="leading" secondItem="nTE-Oc-4PW" secondAttribute="leading" id="g3m-Eg-Sph"/>
410	413	<constraint firstItem="l93-Wh-xSB" firstAttribute="top" secondItem="IlG-SR-47u" secondAttribute="bottom" constant="8" id="ofC-a7-KtM"/>
...	...
...	...	@@ -19,7 +19,7 @@
19	19	<key>CFBundleShortVersionString</key>
20	20	<string>1.0.0</string>
21	21	<key>CFBundleVersion</key>
22		- <string>5</string>
	22	+ <string>7</string>
23	23	<key>LSRequiresIPhoneOS</key>
24	24	<true/>
25	25	<key>NSAppTransportSecurity</key>
...	...	@@ -28,7 +28,7 @@
28	28	<true/>
29	29	</dict>
30	30	<key>NSLocationWhenInUseUsageDescription</key>
31		- <string>"需要您的同意,才能在使用期间访问位置"</string>
	31	+ <string>"需要您的同意,才能在使用期间访问位置"</string>
32	32	<key>NSMicrophoneUsageDescription</key>
33	33	<string>访问麦克风</string>
34	34	<key>NSPhotoLibraryUsageDescription</key>
...	...
...	...	@@ -2,25 +2,30 @@
2	2	<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3	3	<plist version="1.0">
4	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	30	</dict>
26	31	</plist>
...	...
...	...	@@ -344,7 +344,8 @@ static NSString *cache;
344	344	}
345	345	//下载图片
346	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	349	if (!data) return;
349	350	UIImage *image = getImageWithData(data);
350	351	//取到的data有可能不是图片
...	...