Drew 6 tahun lalu
induk
melakukan
15cddb8aaf
28 mengubah file dengan 1053 tambahan dan 557 penghapusan
  1. 1 0
      Podfile
  2. 9 3
      Podfile.lock
  3. 9 3
      Pods/Manifest.lock
  4. 507 499
      Pods/Pods.xcodeproj/project.pbxproj
  5. 0 1
      Pods/Target Support Files/AFNetworking/AFNetworking.xcconfig
  6. 0 1
      Pods/Target Support Files/M80AttributedLabel/M80AttributedLabel.xcconfig
  7. 0 1
      Pods/Target Support Files/MBProgressHUD/MBProgressHUD.xcconfig
  8. 0 1
      Pods/Target Support Files/MJRefresh/MJRefresh.xcconfig
  9. 0 1
      Pods/Target Support Files/NIMKit/NIMKit.xcconfig
  10. 0 1
      Pods/Target Support Files/NIMSDK/NIMSDK.xcconfig
  11. 0 1
      Pods/Target Support Files/PGPickerView/PGPickerView.xcconfig
  12. 205 0
      Pods/Target Support Files/Pods-千模/Pods-千模-acknowledgements.markdown
  13. 211 0
      Pods/Target Support Files/Pods-千模/Pods-千模-acknowledgements.plist
  14. 2 0
      Pods/Target Support Files/Pods-千模/Pods-千模-resources.sh
  15. 3 4
      Pods/Target Support Files/Pods-千模/Pods-千模.debug.xcconfig
  16. 3 4
      Pods/Target Support Files/Pods-千模/Pods-千模.release.xcconfig
  17. 0 1
      Pods/Target Support Files/Reachability/Reachability.xcconfig
  18. 0 1
      Pods/Target Support Files/SDCycleScrollView/SDCycleScrollView.xcconfig
  19. 0 1
      Pods/Target Support Files/SDWebImage/SDWebImage.xcconfig
  20. 0 1
      Pods/Target Support Files/TZImagePickerController/TZImagePickerController.xcconfig
  21. 0 1
      Pods/Target Support Files/Toast/Toast.xcconfig
  22. 0 1
      Pods/Target Support Files/WechatOpenSDK/WechatOpenSDK.xcconfig
  23. 6 4
      千模.xcodeproj/project.pbxproj
  24. 18 5
      千模/Main/Actor/ActorListViewController.m
  25. 18 8
      千模/Main/Actor/ActorListViewController.xib
  26. 58 13
      千模/Main/Actor/ChargeViewController.m
  27. 2 0
      千模/Main/Actor/ChargeViewController.xib
  28. 1 1
      千模/SettingHeader.h

+ 1 - 0
Podfile

@@ -6,6 +6,7 @@ target '千模' do
   pod 'PGPickerView'
   pod 'NIMKit/Full'
   pod 'Reachability'
+  pod 'BRPickerView'
 # pod 'UMCCommon'
 # pod 'UMCSecurityPlugins'
 # pod 'UMCShare/UI'

+ 9 - 3
Podfile.lock

@@ -14,6 +14,7 @@ PODS:
   - AFNetworking/Serialization (3.2.1)
   - AFNetworking/UIKit (3.2.1):
     - AFNetworking/NSURLSession
+  - BRPickerView (2.2.1)
   - M80AttributedLabel (1.6.3)
   - MBProgressHUD (1.1.0)
   - MJRefresh (3.1.15.3)
@@ -39,6 +40,7 @@ PODS:
 
 DEPENDENCIES:
   - AFNetworking
+  - BRPickerView
   - MBProgressHUD
   - MJRefresh
   - NIMKit/Full
@@ -48,8 +50,11 @@ DEPENDENCIES:
   - WechatOpenSDK
 
 SPEC REPOS:
-  trunk:
+  https://cdn.cocoapods.org/:
+    - SDWebImage
+  https://github.com/cocoapods/specs.git:
     - AFNetworking
+    - BRPickerView
     - M80AttributedLabel
     - MBProgressHUD
     - MJRefresh
@@ -65,6 +70,7 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
+  BRPickerView: 0590a8c5de9bd98c6b4e4f117a3dff6de287d5b2
   M80AttributedLabel: d06543195d3e451d2ea62ad76d04aa9cea7661d4
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
   MJRefresh: b48380ae2b927b46c4ef000de9adb8dc748e1df7
@@ -78,6 +84,6 @@ SPEC CHECKSUMS:
   TZImagePickerController: 3b9413ae5d049b1fdc5b0c720ad283f35b679a50
   WechatOpenSDK: 676feec516a11173eafd1fe64b10d27babf28701
 
-PODFILE CHECKSUM: b3d604d4ba517f701d4f558e010f6fa130647faf
+PODFILE CHECKSUM: 0797d0f8834c353499dab95a48ddf6167010ae9e
 
-COCOAPODS: 1.8.4
+COCOAPODS: 1.7.5

+ 9 - 3
Pods/Manifest.lock

@@ -14,6 +14,7 @@ PODS:
   - AFNetworking/Serialization (3.2.1)
   - AFNetworking/UIKit (3.2.1):
     - AFNetworking/NSURLSession
+  - BRPickerView (2.2.1)
   - M80AttributedLabel (1.6.3)
   - MBProgressHUD (1.1.0)
   - MJRefresh (3.1.15.3)
@@ -39,6 +40,7 @@ PODS:
 
 DEPENDENCIES:
   - AFNetworking
+  - BRPickerView
   - MBProgressHUD
   - MJRefresh
   - NIMKit/Full
@@ -48,8 +50,11 @@ DEPENDENCIES:
   - WechatOpenSDK
 
 SPEC REPOS:
-  trunk:
+  https://cdn.cocoapods.org/:
+    - SDWebImage
+  https://github.com/cocoapods/specs.git:
     - AFNetworking
+    - BRPickerView
     - M80AttributedLabel
     - MBProgressHUD
     - MJRefresh
@@ -65,6 +70,7 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
+  BRPickerView: 0590a8c5de9bd98c6b4e4f117a3dff6de287d5b2
   M80AttributedLabel: d06543195d3e451d2ea62ad76d04aa9cea7661d4
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
   MJRefresh: b48380ae2b927b46c4ef000de9adb8dc748e1df7
@@ -78,6 +84,6 @@ SPEC CHECKSUMS:
   TZImagePickerController: 3b9413ae5d049b1fdc5b0c720ad283f35b679a50
   WechatOpenSDK: 676feec516a11173eafd1fe64b10d27babf28701
 
-PODFILE CHECKSUM: b3d604d4ba517f701d4f558e010f6fa130647faf
+PODFILE CHECKSUM: 0797d0f8834c353499dab95a48ddf6167010ae9e
 
-COCOAPODS: 1.8.4
+COCOAPODS: 1.7.5

File diff ditekan karena terlalu besar
+ 507 - 499
Pods/Pods.xcodeproj/project.pbxproj


+ 0 - 1
Pods/Target Support Files/AFNetworking/AFNetworking.xcconfig

@@ -7,4 +7,3 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/AFNetworking
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 0 - 1
Pods/Target Support Files/M80AttributedLabel/M80AttributedLabel.xcconfig

@@ -7,4 +7,3 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/M80AttributedLabel
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 0 - 1
Pods/Target Support Files/MBProgressHUD/MBProgressHUD.xcconfig

@@ -7,4 +7,3 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/MBProgressHUD
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 0 - 1
Pods/Target Support Files/MJRefresh/MJRefresh.xcconfig

@@ -7,4 +7,3 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/MJRefresh
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 0 - 1
Pods/Target Support Files/NIMKit/NIMKit.xcconfig

@@ -8,4 +8,3 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/NIMKit
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 0 - 1
Pods/Target Support Files/NIMSDK/NIMSDK.xcconfig

@@ -7,4 +7,3 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/NIMSDK
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 0 - 1
Pods/Target Support Files/PGPickerView/PGPickerView.xcconfig

@@ -7,4 +7,3 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/PGPickerView
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 205 - 0
Pods/Target Support Files/Pods-千模/Pods-千模-acknowledgements.markdown

@@ -24,6 +24,211 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
+## BRPickerView
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
 ## M80AttributedLabel
 
 Copyright (c) 2014 Xiang Wangfeng (http://xiangwangfeng.com)

+ 211 - 0
Pods/Target Support Files/Pods-千模/Pods-千模-acknowledgements.plist

@@ -41,6 +41,217 @@ THE SOFTWARE.
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>BRPickerView</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
 		<dict>
 			<key>FooterText</key>
 			<string>Copyright (c) 2014 Xiang Wangfeng (http://xiangwangfeng.com)

+ 2 - 0
Pods/Target Support Files/Pods-千模/Pods-千模-resources.sh

@@ -97,6 +97,7 @@ EOM
   esac
 }
 if [[ "$CONFIGURATION" == "Debug" ]]; then
+  install_resource "${PODS_ROOT}/BRPickerView/BRPickerView/AddressPickerView/BRPickerView.bundle"
   install_resource "${PODS_ROOT}/MJRefresh/MJRefresh/MJRefresh.bundle"
   install_resource "${PODS_ROOT}/NIMKit/NIMKit/Resources/NIMKitEmoticon.bundle"
   install_resource "${PODS_ROOT}/NIMKit/NIMKit/Resources/NIMKitResource.bundle"
@@ -104,6 +105,7 @@ if [[ "$CONFIGURATION" == "Debug" ]]; then
   install_resource "${PODS_ROOT}/TZImagePickerController/TZImagePickerController/TZImagePickerController/TZImagePickerController.bundle"
 fi
 if [[ "$CONFIGURATION" == "Release" ]]; then
+  install_resource "${PODS_ROOT}/BRPickerView/BRPickerView/AddressPickerView/BRPickerView.bundle"
   install_resource "${PODS_ROOT}/MJRefresh/MJRefresh/MJRefresh.bundle"
   install_resource "${PODS_ROOT}/NIMKit/NIMKit/Resources/NIMKitEmoticon.bundle"
   install_resource "${PODS_ROOT}/NIMKit/NIMKit/Resources/NIMKitResource.bundle"

+ 3 - 4
Pods/Target Support Files/Pods-千模/Pods-千模.debug.xcconfig

@@ -1,11 +1,10 @@
 FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/NIMSDK/NIMAVChat" "${PODS_ROOT}/NIMSDK/NIMSDK"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/M80AttributedLabel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/NIMKit" "${PODS_ROOT}/Headers/Public/PGPickerView" "${PODS_ROOT}/Headers/Public/Reachability" "${PODS_ROOT}/Headers/Public/SDCycleScrollView" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/TZImagePickerController" "${PODS_ROOT}/Headers/Public/Toast" "${PODS_ROOT}/Headers/Public/WechatOpenSDK"
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/BRPickerView" "${PODS_ROOT}/Headers/Public/M80AttributedLabel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/NIMKit" "${PODS_ROOT}/Headers/Public/PGPickerView" "${PODS_ROOT}/Headers/Public/Reachability" "${PODS_ROOT}/Headers/Public/SDCycleScrollView" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/TZImagePickerController" "${PODS_ROOT}/Headers/Public/Toast" "${PODS_ROOT}/Headers/Public/WechatOpenSDK"
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/M80AttributedLabel" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/NIMKit" "${PODS_CONFIGURATION_BUILD_DIR}/PGPickerView" "${PODS_CONFIGURATION_BUILD_DIR}/Reachability" "${PODS_CONFIGURATION_BUILD_DIR}/SDCycleScrollView" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/TZImagePickerController" "${PODS_CONFIGURATION_BUILD_DIR}/Toast" "${PODS_ROOT}/WechatOpenSDK/WechatSDK1.8.2"
-OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"M80AttributedLabel" -l"MBProgressHUD" -l"MJRefresh" -l"NIMKit" -l"PGPickerView" -l"Reachability" -l"SDCycleScrollView" -l"SDWebImage" -l"TZImagePickerController" -l"Toast" -l"WeChatSDK" -l"c++" -l"sqlite3.0" -l"z" -framework "AVFoundation" -framework "AssetsLibrary" -framework "AudioToolbox" -framework "CFNetwork" -framework "CoreGraphics" -framework "CoreMedia" -framework "CoreTelephony" -framework "CoreText" -framework "ImageIO" -framework "MobileCoreServices" -framework "NIMAVChat" -framework "NIMSDK" -framework "NVS" -framework "Photos" -framework "QuartzCore" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -framework "VideoToolbox"
+LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/BRPickerView" "${PODS_CONFIGURATION_BUILD_DIR}/M80AttributedLabel" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/NIMKit" "${PODS_CONFIGURATION_BUILD_DIR}/PGPickerView" "${PODS_CONFIGURATION_BUILD_DIR}/Reachability" "${PODS_CONFIGURATION_BUILD_DIR}/SDCycleScrollView" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/TZImagePickerController" "${PODS_CONFIGURATION_BUILD_DIR}/Toast" "${PODS_ROOT}/WechatOpenSDK/WechatSDK1.8.2"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"BRPickerView" -l"M80AttributedLabel" -l"MBProgressHUD" -l"MJRefresh" -l"NIMKit" -l"PGPickerView" -l"Reachability" -l"SDCycleScrollView" -l"SDWebImage" -l"TZImagePickerController" -l"Toast" -l"WeChatSDK" -l"c++" -l"sqlite3.0" -l"z" -framework "AVFoundation" -framework "AssetsLibrary" -framework "AudioToolbox" -framework "CFNetwork" -framework "CoreGraphics" -framework "CoreMedia" -framework "CoreTelephony" -framework "CoreText" -framework "ImageIO" -framework "MobileCoreServices" -framework "NIMAVChat" -framework "NIMSDK" -framework "NVS" -framework "Photos" -framework "QuartzCore" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -framework "VideoToolbox"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 3 - 4
Pods/Target Support Files/Pods-千模/Pods-千模.release.xcconfig

@@ -1,11 +1,10 @@
 FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/NIMSDK/NIMAVChat" "${PODS_ROOT}/NIMSDK/NIMSDK"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/M80AttributedLabel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/NIMKit" "${PODS_ROOT}/Headers/Public/PGPickerView" "${PODS_ROOT}/Headers/Public/Reachability" "${PODS_ROOT}/Headers/Public/SDCycleScrollView" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/TZImagePickerController" "${PODS_ROOT}/Headers/Public/Toast" "${PODS_ROOT}/Headers/Public/WechatOpenSDK"
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/BRPickerView" "${PODS_ROOT}/Headers/Public/M80AttributedLabel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/NIMKit" "${PODS_ROOT}/Headers/Public/PGPickerView" "${PODS_ROOT}/Headers/Public/Reachability" "${PODS_ROOT}/Headers/Public/SDCycleScrollView" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/TZImagePickerController" "${PODS_ROOT}/Headers/Public/Toast" "${PODS_ROOT}/Headers/Public/WechatOpenSDK"
 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
-LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/M80AttributedLabel" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/NIMKit" "${PODS_CONFIGURATION_BUILD_DIR}/PGPickerView" "${PODS_CONFIGURATION_BUILD_DIR}/Reachability" "${PODS_CONFIGURATION_BUILD_DIR}/SDCycleScrollView" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/TZImagePickerController" "${PODS_CONFIGURATION_BUILD_DIR}/Toast" "${PODS_ROOT}/WechatOpenSDK/WechatSDK1.8.2"
-OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"M80AttributedLabel" -l"MBProgressHUD" -l"MJRefresh" -l"NIMKit" -l"PGPickerView" -l"Reachability" -l"SDCycleScrollView" -l"SDWebImage" -l"TZImagePickerController" -l"Toast" -l"WeChatSDK" -l"c++" -l"sqlite3.0" -l"z" -framework "AVFoundation" -framework "AssetsLibrary" -framework "AudioToolbox" -framework "CFNetwork" -framework "CoreGraphics" -framework "CoreMedia" -framework "CoreTelephony" -framework "CoreText" -framework "ImageIO" -framework "MobileCoreServices" -framework "NIMAVChat" -framework "NIMSDK" -framework "NVS" -framework "Photos" -framework "QuartzCore" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -framework "VideoToolbox"
+LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/BRPickerView" "${PODS_CONFIGURATION_BUILD_DIR}/M80AttributedLabel" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/NIMKit" "${PODS_CONFIGURATION_BUILD_DIR}/PGPickerView" "${PODS_CONFIGURATION_BUILD_DIR}/Reachability" "${PODS_CONFIGURATION_BUILD_DIR}/SDCycleScrollView" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/TZImagePickerController" "${PODS_CONFIGURATION_BUILD_DIR}/Toast" "${PODS_ROOT}/WechatOpenSDK/WechatSDK1.8.2"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"BRPickerView" -l"M80AttributedLabel" -l"MBProgressHUD" -l"MJRefresh" -l"NIMKit" -l"PGPickerView" -l"Reachability" -l"SDCycleScrollView" -l"SDWebImage" -l"TZImagePickerController" -l"Toast" -l"WeChatSDK" -l"c++" -l"sqlite3.0" -l"z" -framework "AVFoundation" -framework "AssetsLibrary" -framework "AudioToolbox" -framework "CFNetwork" -framework "CoreGraphics" -framework "CoreMedia" -framework "CoreTelephony" -framework "CoreText" -framework "ImageIO" -framework "MobileCoreServices" -framework "NIMAVChat" -framework "NIMSDK" -framework "NVS" -framework "Photos" -framework "QuartzCore" -framework "Security" -framework "SystemConfiguration" -framework "UIKit" -framework "VideoToolbox"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
 PODS_ROOT = ${SRCROOT}/Pods
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 0 - 1
Pods/Target Support Files/Reachability/Reachability.xcconfig

@@ -7,4 +7,3 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/Reachability
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 0 - 1
Pods/Target Support Files/SDCycleScrollView/SDCycleScrollView.xcconfig

@@ -7,4 +7,3 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/SDCycleScrollView
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 0 - 1
Pods/Target Support Files/SDWebImage/SDWebImage.xcconfig

@@ -7,4 +7,3 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/SDWebImage
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 0 - 1
Pods/Target Support Files/TZImagePickerController/TZImagePickerController.xcconfig

@@ -7,4 +7,3 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/TZImagePickerController
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 0 - 1
Pods/Target Support Files/Toast/Toast.xcconfig

@@ -7,4 +7,3 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/Toast
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 0 - 1
Pods/Target Support Files/WechatOpenSDK/WechatOpenSDK.xcconfig

@@ -7,4 +7,3 @@ PODS_ROOT = ${SRCROOT}
 PODS_TARGET_SRCROOT = ${PODS_ROOT}/WechatOpenSDK
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES
-USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES

+ 6 - 4
千模.xcodeproj/project.pbxproj

@@ -2876,6 +2876,7 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-千模/Pods-千模-resources.sh",
+				"${PODS_ROOT}/BRPickerView/BRPickerView/AddressPickerView/BRPickerView.bundle",
 				"${PODS_ROOT}/MJRefresh/MJRefresh/MJRefresh.bundle",
 				"${PODS_ROOT}/NIMKit/NIMKit/Resources/NIMKitEmoticon.bundle",
 				"${PODS_ROOT}/NIMKit/NIMKit/Resources/NIMKitResource.bundle",
@@ -2884,6 +2885,7 @@
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/BRPickerView.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MJRefresh.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/NIMKitEmoticon.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/NIMKitResource.bundle",
@@ -3356,7 +3358,7 @@
 				CODE_SIGN_ENTITLEMENTS = "千模/千模.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 99T6ZUAFCD;
 				ENABLE_BITCODE = YES;
 				ENABLE_TESTABILITY = NO;
@@ -3374,7 +3376,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 1.0.9;
+				MARKETING_VERSION = 1.1.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -3399,7 +3401,7 @@
 				CODE_SIGN_ENTITLEMENTS = "千模/千模.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 99T6ZUAFCD;
 				ENABLE_BITCODE = YES;
 				ENABLE_TESTABILITY = NO;
@@ -3417,7 +3419,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 1.0.9;
+				MARKETING_VERSION = 1.1.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-ObjC",

+ 18 - 5
千模/Main/Actor/ActorListViewController.m

@@ -10,10 +10,12 @@
 #import "ActorListViewController.h"
 #import "UITabBarController+HideTabBar.h"
 #import "ActorCell.h"
+#import <BRPickerView.h>
 
 @interface ActorListViewController ()<UITextFieldDelegate>
 {
     NSInteger index;
+    NSString *city;
 }
 
 @property (weak, nonatomic) IBOutlet UIView *headView;
@@ -25,7 +27,8 @@
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *topHeight;
 @property (nonatomic,strong) UIView          *bgSkillView;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *headHeight;
-
+@property (weak, nonatomic) IBOutlet UIButton *btnChooseCity;
+@property (nonatomic, strong) NSString *choosedCity;
 @end
 
 @implementation ActorListViewController
@@ -49,12 +52,13 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-
+    
     self.extendedLayoutIncludesOpaqueBars = YES;
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(hideNavigationBar) name:@"hideNavigationBar" object:nil];
     
     pk = @"";
     index = 1;
+    self.choosedCity=@"全国";
     self.tableView.tableHeaderView = self.headView;
     self.tableView.showsVerticalScrollIndicator = NO;
     self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(refreshList)];
@@ -62,6 +66,7 @@
     _searchText.delegate = self;
     [self getFigure];
     [self getList];
+    
 }
 
 -(void)hideNavigationBar{
@@ -102,6 +107,14 @@
     [super viewWillAppear:animated];
 }
 
+- (IBAction)chooseCity:(id)sender {
+    [BRStringPickerView showStringPickerWithTitle:@"请选择地区" dataSource:@[@"全国", @"烟台"] defaultSelValue:nil resultBlock:^(id selectValue) {
+        self.btnChooseCity.titleLabel.text = selectValue;
+        self.choosedCity = selectValue;
+        [self refreshList];
+    }];
+}
+
 - (IBAction)clickSiftButton:(UIButton *)sender {
     
     if (!_bgblackView) {
@@ -197,10 +210,10 @@
     
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     NSString *indexStr = [NSString stringWithFormat:@"%zd",index];
-    NSString *str = [NSString stringWithFormat:@"%@modelInfo?action=doqryskillmodel&SkillPK=%@&memberpk=%@&index=%@&size=%@",webURL,pk,[Helper sharedAccount].accid,indexStr,@"10"];
+    NSString *str = [NSString stringWithFormat:@"%@modelInfo?action=doqryskillmodel&SkillPK=%@&memberpk=%@&index=%@&size=%@&area=%@",webURL,pk,[Helper sharedAccount].accid,indexStr,@"10",self.choosedCity];
     
     NSLog(@"url=====%@",str);
-    [[AHHttpManager sharedManager]POST:str parameters:nil success:^(id responseObject) {
+    [[AHHttpManager sharedManager]POST:[str stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] parameters:nil success:^(id responseObject) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
         NSLog(@"%@",responseObject);
         
@@ -235,7 +248,7 @@
     
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     NSString *indexStr = [NSString stringWithFormat:@"%zd",index];
-    NSString *str = [NSString stringWithFormat:@"%@modelInfo?action=dogetQueryModel&LikeName=%@&memberpk=%@&index=%@&size=%@",webURL,_searchText.text,[Helper sharedAccount].accid,indexStr,@"10"];
+    NSString *str = [NSString stringWithFormat:@"%@modelInfo?action=dogetQueryModel&LikeName=%@&memberpk=%@&index=%@&size=%@&area=%@",webURL,_searchText.text,[Helper sharedAccount].accid,indexStr,@"10",self.choosedCity];
     [[AHHttpManager sharedManager]POST:[str stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] parameters:nil success:^(id responseObject) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
         NSLog(@"%@",responseObject);

+ 18 - 8
千模/Main/Actor/ActorListViewController.xib

@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ActorListViewController">
             <connections>
+                <outlet property="btnChooseCity" destination="aeN-9s-IdK" id="8rv-Ex-Gm3"/>
                 <outlet property="headHeight" destination="FQC-GC-rUG" id="MGQ-k8-pVv"/>
                 <outlet property="headView" destination="Z0O-A2-ffm" id="nk9-wl-WT5"/>
                 <outlet property="searchBtn" destination="xr2-4y-GUo" id="sDb-fG-K4Q"/>
@@ -70,7 +69,7 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="输入艺人信息" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="LAT-jY-DOS">
-                            <rect key="frame" x="32" y="16" width="184" height="20"/>
+                            <rect key="frame" x="32" y="15" width="184" height="21"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="184" id="aIe-c5-3jU"/>
                             </constraints>
@@ -91,6 +90,17 @@
                                 <action selector="clickSiftButton:" destination="-1" eventType="touchUpInside" id="wnf-To-UQ4"/>
                             </connections>
                         </button>
+                        <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aeN-9s-IdK">
+                            <rect key="frame" x="29" y="53" width="31" height="30"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                            <state key="normal" title="全国">
+                                <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            </state>
+                            <connections>
+                                <action selector="chooseCity:" destination="-1" eventType="touchUpInside" id="gqn-Me-AaH"/>
+                            </connections>
+                        </button>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
@@ -125,7 +135,7 @@
         </view>
     </objects>
     <resources>
-        <image name="shurukuang" width="236" height="30"/>
-        <image name="sousuokuang" width="81" height="30"/>
+        <image name="shurukuang" width="236.5" height="30"/>
+        <image name="sousuokuang" width="81.5" height="30"/>
     </resources>
 </document>

+ 58 - 13
千模/Main/Actor/ChargeViewController.m

@@ -23,6 +23,8 @@
 @property (weak, nonatomic) IBOutlet UIButton *zhifubaoBtn;
 @property (weak, nonatomic) IBOutlet UIButton *weixinBtn;
 @property (weak, nonatomic) IBOutlet UIButton *rechargeBtn;
+@property (weak, nonatomic) IBOutlet UIView *thirdPayView;
+@property (weak, nonatomic) IBOutlet UILabel *titleLabel;
 @property (weak, nonatomic) IBOutlet RechargeItemView *btn50;
 @property (weak, nonatomic) IBOutlet RechargeItemView *btn100;
 @property (weak, nonatomic) IBOutlet RechargeItemView *btn200;
@@ -45,7 +47,7 @@
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(alipayResult:) name:AlipayNotificationName object:nil];
     
-    paytype = 1;
+    paytype = 0;
 
     UIBarButtonItem *leftItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"icon_back"] style:UIBarButtonItemStylePlain target:self action:@selector(backClick)];
     self.navigationItem.leftBarButtonItem = leftItem;
@@ -60,6 +62,43 @@
     self.rechargeBtn.layer.shadowRadius = 10;
     
     [[SKPaymentQueue defaultQueue] addTransactionObserver: self];
+    
+    NSString *str = [NSString stringWithFormat:@"%@memberInfo?action=auditStatus", webURL];
+    [[AHHttpManager sharedManager]
+            POST:str
+      parameters:nil
+         success:^(id responseObject) {
+             NSLog(@"%@", responseObject);
+             if ([[responseObject objectForKey:@"msg"] isEqualToString:@"success"]) {
+                 NSString *data = responseObject[@"data"];
+                 if([@"true" isEqualToString: data]){
+                     self.titleLabel.hidden = NO;
+                     self.thirdPayView.hidden = NO;
+                     paytype = 1;
+                 } else {
+                     self.btn100.amount = @"98";
+                     self.btn100.tag = 98;
+                     self.btn200.amount = @"198";
+                     self.btn200.tag = 198;
+                     self.btn500.amount = @"488";
+                     self.btn500.tag = 488;
+                     self.btn1000.amount = @"998";
+                     self.btn1000.tag = 998;
+                     self.btn2000.amount = @"1998";
+                     self.btn2000.tag = 1998;
+                     self.btn3000.amount = @"2998";
+                     self.btn3000.tag = 2998;
+                     self.btn5000.amount = @"4998";
+                     self.btn5000.tag = 4998;
+                     self.btn10000.amount = @"6498";
+                     self.btn10000.tag = 6498;
+                 }
+             }
+         }
+         failure:^(NSError *error) {
+             NSLog(@"error = %@", error);
+             [MBProgressHUD showTextHUD:@"超时" inView:self.view hideAfterDelay:1];
+         }];
 }
 
 -(void)alipayResult:(NSNotification *)dic{
@@ -131,14 +170,13 @@
         [MBProgressHUD showTextHUD:@"请选择充值金额" inView:self.view hideAfterDelay:1];
         return;
     }
-    if([@[@"1",@"2",@"3",@"4",@"5"] containsObject:[NSString stringWithFormat:@"%d", amount]]){
-    }
-    if (paytype == 0) {
-        [MBProgressHUD showTextHUD:@"请选择充值方式" inView:self.view hideAfterDelay:1];
-        return;
+
+    if(paytype == 0) {
+        [self requestProductData:[NSString stringWithFormat:@"com.thmodel.%dm", amount]];
+    } else if(paytype == 1) {
+        [self getOrderStr];
     }
-//    [self getOrderStr];
-    [self requestProductData:@"com.thmodel.50m"];
+    
 }
 
 //去苹果服务器请求商品
@@ -170,13 +208,20 @@
         NSLog(@"%@", [pro price]);
         NSLog(@"%@", [pro productIdentifier]);
         
-        if([pro.productIdentifier isEqualToString: @"com.thmodel.50m"]){
+        if([pro.productIdentifier isEqualToString: [NSString stringWithFormat:@"com.thmodel.%dm", amount]]){
             p = pro;
+            break;
         }
     }
-    SKPayment *payment = [SKPayment paymentWithProduct:p];
-    NSLog(@"发送购买请求");
-    [[SKPaymentQueue defaultQueue] addPayment:payment];
+    if(p) {
+        SKPayment *payment = [SKPayment paymentWithProduct:p];
+        NSLog(@"发送购买请求");
+        [[SKPaymentQueue defaultQueue] addPayment:payment];
+    } else {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [MBProgressHUD showTextHUD:@"查找不到商品信息" inView:self.view hideAfterDelay:1];
+        });
+    }
 }
 
 //请求失败
@@ -214,7 +259,7 @@
         NSDictionary *dataDic = [NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers |NSJSONReadingMutableLeaves error:nil];
         NSLog(@"%@", dataDic);
         [MBProgressHUD hideHUDForView:self.view animated:YES];
-        [MBProgressHUD showTextHUD:@"支付成功" inView:self.view hideAfterDelay:1];
+        [MBProgressHUD showTextHUD:@"充值成功" inView:self.view hideAfterDelay:1];
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
         NSLog(@"error ===== %@", error);
         [MBProgressHUD hideHUDForView:self.view animated:YES];

+ 2 - 0
千模/Main/Actor/ChargeViewController.xib

@@ -20,6 +20,8 @@
                 <outlet property="btn500" destination="LgI-aF-WqU" id="GJw-Sb-pMP"/>
                 <outlet property="btn5000" destination="UhQ-9d-30m" id="hjN-gf-Xf1"/>
                 <outlet property="rechargeBtn" destination="zDY-6N-RkZ" id="DdQ-hS-iZF"/>
+                <outlet property="thirdPayView" destination="Vzt-Uc-862" id="aQj-LR-0Xz"/>
+                <outlet property="titleLabel" destination="Sa1-p2-UUC" id="Sl5-Jo-JfK"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
                 <outlet property="weixinBtn" destination="o8r-Ip-yTc" id="lbB-6Q-Y7K"/>
                 <outlet property="zhifubaoBtn" destination="hAl-yE-NVg" id="YIr-8r-waN"/>

+ 1 - 1
千模/SettingHeader.h

@@ -130,7 +130,7 @@ alpha:alphaValue]
 
 #define imageURl @"http://thmodel.izouma.com/thmodel/"
 //#define webURL @"http://thmodel.izouma.com/thmodel/"
-#define webURL @"http://192.168.50.38:8080/thmodel/"
+#define webURL @"http://192.168.50.132:8080/thmodel/"
 #define apnsCernameStr @"pushMember"
 
 

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini