xiongzhu 7 年之前
父节点
当前提交
3187320052
共有 33 个文件被更改,包括 1114 次插入715 次删除
  1. 1 0
      Podfile
  2. 5 1
      Podfile.lock
  3. 5 1
      Pods/Manifest.lock
  4. 555 522
      Pods/Pods.xcodeproj/project.pbxproj
  5. 25 0
      Pods/Target Support Files/Pods-model/Pods-model-acknowledgements.markdown
  6. 31 0
      Pods/Target Support Files/Pods-model/Pods-model-acknowledgements.plist
  7. 4 4
      Pods/Target Support Files/Pods-model/Pods-model.debug.xcconfig
  8. 4 4
      Pods/Target Support Files/Pods-model/Pods-model.release.xcconfig
  9. 15 9
      model.xcodeproj/project.pbxproj
  10. 1 0
      model/Assets.xcassets/mine/jineng/tianjiajineng.imageset/Contents.json
  11. 二进制
      model/Assets.xcassets/mine/jineng/tianjiajineng.imageset/tianjiajineng.png
  12. 二进制
      model/Assets.xcassets/mine/jineng/tianjiajineng.imageset/tianjiajineng@2x.png
  13. 二进制
      model/Assets.xcassets/mine/jineng/tianjiajineng.imageset/tianjiajineng@3x.png
  14. 21 0
      model/Assets.xcassets/share_icon.imageset/Contents.json
  15. 二进制
      model/Assets.xcassets/share_icon.imageset/share_icon.png
  16. 23 0
      model/Assets.xcassets/个人中心/icon_tianjia.imageset/Contents.json
  17. 二进制
      model/Assets.xcassets/个人中心/icon_tianjia.imageset/icon_tianjia.png
  18. 二进制
      model/Assets.xcassets/个人中心/icon_tianjia.imageset/icon_tianjia@2x.png
  19. 二进制
      model/Assets.xcassets/个人中心/icon_tianjia.imageset/icon_tianjia@3x.png
  20. 23 0
      model/Assets.xcassets/个人中心/icon_tianjia_xiao.imageset/Contents.json
  21. 二进制
      model/Assets.xcassets/个人中心/icon_tianjia_xiao.imageset/icon_tianjia_xiao.png
  22. 二进制
      model/Assets.xcassets/个人中心/icon_tianjia_xiao.imageset/icon_tianjia_xiao@2x.png
  23. 二进制
      model/Assets.xcassets/个人中心/icon_tianjia_xiao.imageset/icon_tianjia_xiao@3x.png
  24. 18 0
      model/Classes/Controllers/Controller/MessageVC/MessageListViewController.m
  25. 9 15
      model/Classes/Controllers/Controller/MessageVC/MessageViewController.m
  26. 34 14
      model/Classes/Controllers/Controller/MineVC/MineNewViewController.m
  27. 1 0
      model/Classes/Controllers/Controller/MineVC/MineNewViewController.xib
  28. 18 0
      model/Classes/Controllers/Controller/MineVC/View/ApplyRecommendView.h
  29. 146 0
      model/Classes/Controllers/Controller/MineVC/View/ApplyRecommendView.m
  30. 165 137
      model/Classes/Controllers/Controller/MySkillsVC/PostSkillsController.m
  31. 1 1
      model/Classes/Controllers/Controller/ShareVC/ShareCardController.m
  32. 5 3
      model/Classes/Controllers/Controller/ShareVC/ShareViewController.m
  33. 4 4
      model/ModelHeader.h

+ 1 - 0
Podfile

@@ -16,5 +16,6 @@ pod 'UMCCommon'
 pod 'UMCPush'
 pod 'UMCSecurityPlugins'
 pod 'WechatOpenSDK'
+pod 'WZLBadge'
 end
 

+ 5 - 1
Podfile.lock

@@ -31,6 +31,7 @@ PODS:
     - UMCCommon
   - UMCSecurityPlugins (1.0.6)
   - WechatOpenSDK (1.8.3)
+  - WZLBadge (1.2.6)
 
 DEPENDENCIES:
   - AFNetworking
@@ -48,6 +49,7 @@ DEPENDENCIES:
   - UMCPush
   - UMCSecurityPlugins
   - WechatOpenSDK
+  - WZLBadge
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -66,6 +68,7 @@ SPEC REPOS:
     - UMCPush
     - UMCSecurityPlugins
     - WechatOpenSDK
+    - WZLBadge
 
 SPEC CHECKSUMS:
   AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
@@ -83,7 +86,8 @@ SPEC CHECKSUMS:
   UMCPush: 628b5c61be5a5036cb31eb9b3a3ab8dce7521691
   UMCSecurityPlugins: 0831a08f3988f3cea9f1d3a7626cd9bee4fef150
   WechatOpenSDK: 3117412f8aafde4758cac1e8d20b93c67cafcfef
+  WZLBadge: 9ec779dcfd94c825518b395e8315fccaabff1bfa
 
-PODFILE CHECKSUM: 7e58839ffe157d2b6c5804b6e62aee87276e7548
+PODFILE CHECKSUM: a66e81dcd6973dfd7e7f7eb9e9938690aa0a2d7b
 
 COCOAPODS: 1.5.3

+ 5 - 1
Pods/Manifest.lock

@@ -31,6 +31,7 @@ PODS:
     - UMCCommon
   - UMCSecurityPlugins (1.0.6)
   - WechatOpenSDK (1.8.3)
+  - WZLBadge (1.2.6)
 
 DEPENDENCIES:
   - AFNetworking
@@ -48,6 +49,7 @@ DEPENDENCIES:
   - UMCPush
   - UMCSecurityPlugins
   - WechatOpenSDK
+  - WZLBadge
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -66,6 +68,7 @@ SPEC REPOS:
     - UMCPush
     - UMCSecurityPlugins
     - WechatOpenSDK
+    - WZLBadge
 
 SPEC CHECKSUMS:
   AFNetworking: b6f891fdfaed196b46c7a83cf209e09697b94057
@@ -83,7 +86,8 @@ SPEC CHECKSUMS:
   UMCPush: 628b5c61be5a5036cb31eb9b3a3ab8dce7521691
   UMCSecurityPlugins: 0831a08f3988f3cea9f1d3a7626cd9bee4fef150
   WechatOpenSDK: 3117412f8aafde4758cac1e8d20b93c67cafcfef
+  WZLBadge: 9ec779dcfd94c825518b395e8315fccaabff1bfa
 
-PODFILE CHECKSUM: 7e58839ffe157d2b6c5804b6e62aee87276e7548
+PODFILE CHECKSUM: a66e81dcd6973dfd7e7f7eb9e9938690aa0a2d7b
 
 COCOAPODS: 1.5.3

文件差异内容过多而无法显示
+ 555 - 522
Pods/Pods.xcodeproj/project.pbxproj


+ 25 - 0
Pods/Target Support Files/Pods-model/Pods-model-acknowledgements.markdown

@@ -435,6 +435,31 @@ Copyright 2011 - 2018 umeng.com. All rights reserved.
 Copyright 2011 - 2018 umeng.com. All rights reserved.
 
 
+## WZLBadge
+
+The MIT License (MIT)
+
+Copyright (c) 2015 Zilin Weng
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
 ## WechatOpenSDK
 
 Copyright 2018 tencent.com. All rights reserved.

+ 31 - 0
Pods/Target Support Files/Pods-model/Pods-model-acknowledgements.plist

@@ -530,6 +530,37 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>The MIT License (MIT)
+
+Copyright (c) 2015 Zilin Weng
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+</string>
+			<key>License</key>
+			<string>None</string>
+			<key>Title</key>
+			<string>WZLBadge</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
 		<dict>
 			<key>FooterText</key>
 			<string>Copyright 2018 tencent.com. All rights reserved.

+ 4 - 4
Pods/Target Support Files/Pods-model/Pods-model.debug.xcconfig

@@ -1,9 +1,9 @@
 FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/NIMSDK/NIMSDK" "${PODS_ROOT}/NIMSDK/NIMAVChat" "${PODS_ROOT}/UMCCommon" "${PODS_ROOT}/UMCPush" "${PODS_ROOT}/UMCSecurityPlugins/thirdparties"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/BRPickerView" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/M80AttributedLabel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJExtension" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/NIMSDK" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/TTGTagCollectionView" "${PODS_ROOT}/Headers/Public/Toast" "${PODS_ROOT}/Headers/Public/UMCCommon" "${PODS_ROOT}/Headers/Public/UMCPush" "${PODS_ROOT}/Headers/Public/UMCSecurityPlugins" "${PODS_ROOT}/Headers/Public/WechatOpenSDK"
-LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/BRPickerView" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/M80AttributedLabel" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/TTGTagCollectionView" "${PODS_CONFIGURATION_BUILD_DIR}/Toast" "${PODS_ROOT}/NIMSDK/NIMAVChat/Libs" "${PODS_ROOT}/NIMSDK/NIMSDK/Libs" "${PODS_ROOT}/WechatOpenSDK/WeChatSDK1.8.3"
-OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/BRPickerView" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/M80AttributedLabel" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MJExtension" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/NIMSDK" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/TTGTagCollectionView" -isystem "${PODS_ROOT}/Headers/Public/Toast" -isystem "${PODS_ROOT}/Headers/Public/UMCCommon" -isystem "${PODS_ROOT}/Headers/Public/UMCPush" -isystem "${PODS_ROOT}/Headers/Public/UMCSecurityPlugins" -isystem "${PODS_ROOT}/Headers/Public/WechatOpenSDK"
-OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"BRPickerView" -l"GPUImage" -l"IQKeyboardManager" -l"M80AttributedLabel" -l"MBProgressHUD" -l"MJExtension" -l"MJRefresh" -l"NMCAudioModule" -l"NMCVideoModule" -l"SDWebImage" -l"TTGTagCollectionView" -l"Toast" -l"WeChatSDK" -l"aacplus" -l"c++" -l"crypto" -l"event" -l"nio" -l"nts" -l"nvs" -l"openh264" -l"opus" -l"sqlite3" -l"sqlite3.0" -l"ssl" -l"z" -framework "AVFoundation" -framework "AudioToolbox" -framework "CFNetwork" -framework "CoreGraphics" -framework "CoreMedia" -framework "CoreTelephony" -framework "CoreText" -framework "Foundation" -framework "ImageIO" -framework "MobileCoreServices" -framework "NIMAVChat" -framework "NIMSDK" -framework "QuartzCore" -framework "Security" -framework "SecurityEnvSDK" -framework "SystemConfiguration" -framework "UIKit" -framework "UMCommon" -framework "UMPush" -framework "UTDID" -framework "UserNotifications" -framework "VideoToolbox"
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/BRPickerView" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/M80AttributedLabel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJExtension" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/NIMSDK" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/TTGTagCollectionView" "${PODS_ROOT}/Headers/Public/Toast" "${PODS_ROOT}/Headers/Public/UMCCommon" "${PODS_ROOT}/Headers/Public/UMCPush" "${PODS_ROOT}/Headers/Public/UMCSecurityPlugins" "${PODS_ROOT}/Headers/Public/WZLBadge" "${PODS_ROOT}/Headers/Public/WechatOpenSDK"
+LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/BRPickerView" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/M80AttributedLabel" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/TTGTagCollectionView" "${PODS_CONFIGURATION_BUILD_DIR}/Toast" "${PODS_CONFIGURATION_BUILD_DIR}/WZLBadge" "${PODS_ROOT}/NIMSDK/NIMAVChat/Libs" "${PODS_ROOT}/NIMSDK/NIMSDK/Libs" "${PODS_ROOT}/WechatOpenSDK/WeChatSDK1.8.3"
+OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/BRPickerView" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/M80AttributedLabel" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MJExtension" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/NIMSDK" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/TTGTagCollectionView" -isystem "${PODS_ROOT}/Headers/Public/Toast" -isystem "${PODS_ROOT}/Headers/Public/UMCCommon" -isystem "${PODS_ROOT}/Headers/Public/UMCPush" -isystem "${PODS_ROOT}/Headers/Public/UMCSecurityPlugins" -isystem "${PODS_ROOT}/Headers/Public/WZLBadge" -isystem "${PODS_ROOT}/Headers/Public/WechatOpenSDK"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"BRPickerView" -l"GPUImage" -l"IQKeyboardManager" -l"M80AttributedLabel" -l"MBProgressHUD" -l"MJExtension" -l"MJRefresh" -l"NMCAudioModule" -l"NMCVideoModule" -l"SDWebImage" -l"TTGTagCollectionView" -l"Toast" -l"WZLBadge" -l"WeChatSDK" -l"aacplus" -l"c++" -l"crypto" -l"event" -l"nio" -l"nts" -l"nvs" -l"openh264" -l"opus" -l"sqlite3" -l"sqlite3.0" -l"ssl" -l"z" -framework "AVFoundation" -framework "AudioToolbox" -framework "CFNetwork" -framework "CoreGraphics" -framework "CoreMedia" -framework "CoreTelephony" -framework "CoreText" -framework "Foundation" -framework "ImageIO" -framework "MobileCoreServices" -framework "NIMAVChat" -framework "NIMSDK" -framework "QuartzCore" -framework "Security" -framework "SecurityEnvSDK" -framework "SystemConfiguration" -framework "UIKit" -framework "UMCommon" -framework "UMPush" -framework "UTDID" -framework "UserNotifications" -framework "VideoToolbox"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.

+ 4 - 4
Pods/Target Support Files/Pods-model/Pods-model.release.xcconfig

@@ -1,9 +1,9 @@
 FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/NIMSDK/NIMSDK" "${PODS_ROOT}/NIMSDK/NIMAVChat" "${PODS_ROOT}/UMCCommon" "${PODS_ROOT}/UMCPush" "${PODS_ROOT}/UMCSecurityPlugins/thirdparties"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/BRPickerView" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/M80AttributedLabel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJExtension" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/NIMSDK" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/TTGTagCollectionView" "${PODS_ROOT}/Headers/Public/Toast" "${PODS_ROOT}/Headers/Public/UMCCommon" "${PODS_ROOT}/Headers/Public/UMCPush" "${PODS_ROOT}/Headers/Public/UMCSecurityPlugins" "${PODS_ROOT}/Headers/Public/WechatOpenSDK"
-LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/BRPickerView" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/M80AttributedLabel" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/TTGTagCollectionView" "${PODS_CONFIGURATION_BUILD_DIR}/Toast" "${PODS_ROOT}/NIMSDK/NIMAVChat/Libs" "${PODS_ROOT}/NIMSDK/NIMSDK/Libs" "${PODS_ROOT}/WechatOpenSDK/WeChatSDK1.8.3"
-OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/BRPickerView" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/M80AttributedLabel" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MJExtension" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/NIMSDK" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/TTGTagCollectionView" -isystem "${PODS_ROOT}/Headers/Public/Toast" -isystem "${PODS_ROOT}/Headers/Public/UMCCommon" -isystem "${PODS_ROOT}/Headers/Public/UMCPush" -isystem "${PODS_ROOT}/Headers/Public/UMCSecurityPlugins" -isystem "${PODS_ROOT}/Headers/Public/WechatOpenSDK"
-OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"BRPickerView" -l"GPUImage" -l"IQKeyboardManager" -l"M80AttributedLabel" -l"MBProgressHUD" -l"MJExtension" -l"MJRefresh" -l"NMCAudioModule" -l"NMCVideoModule" -l"SDWebImage" -l"TTGTagCollectionView" -l"Toast" -l"WeChatSDK" -l"aacplus" -l"c++" -l"crypto" -l"event" -l"nio" -l"nts" -l"nvs" -l"openh264" -l"opus" -l"sqlite3" -l"sqlite3.0" -l"ssl" -l"z" -framework "AVFoundation" -framework "AudioToolbox" -framework "CFNetwork" -framework "CoreGraphics" -framework "CoreMedia" -framework "CoreTelephony" -framework "CoreText" -framework "Foundation" -framework "ImageIO" -framework "MobileCoreServices" -framework "NIMAVChat" -framework "NIMSDK" -framework "QuartzCore" -framework "Security" -framework "SecurityEnvSDK" -framework "SystemConfiguration" -framework "UIKit" -framework "UMCommon" -framework "UMPush" -framework "UTDID" -framework "UserNotifications" -framework "VideoToolbox"
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/BRPickerView" "${PODS_ROOT}/Headers/Public/IQKeyboardManager" "${PODS_ROOT}/Headers/Public/M80AttributedLabel" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJExtension" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/NIMSDK" "${PODS_ROOT}/Headers/Public/SDWebImage" "${PODS_ROOT}/Headers/Public/TTGTagCollectionView" "${PODS_ROOT}/Headers/Public/Toast" "${PODS_ROOT}/Headers/Public/UMCCommon" "${PODS_ROOT}/Headers/Public/UMCPush" "${PODS_ROOT}/Headers/Public/UMCSecurityPlugins" "${PODS_ROOT}/Headers/Public/WZLBadge" "${PODS_ROOT}/Headers/Public/WechatOpenSDK"
+LIBRARY_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking" "${PODS_CONFIGURATION_BUILD_DIR}/BRPickerView" "${PODS_CONFIGURATION_BUILD_DIR}/IQKeyboardManager" "${PODS_CONFIGURATION_BUILD_DIR}/M80AttributedLabel" "${PODS_CONFIGURATION_BUILD_DIR}/MBProgressHUD" "${PODS_CONFIGURATION_BUILD_DIR}/MJExtension" "${PODS_CONFIGURATION_BUILD_DIR}/MJRefresh" "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage" "${PODS_CONFIGURATION_BUILD_DIR}/TTGTagCollectionView" "${PODS_CONFIGURATION_BUILD_DIR}/Toast" "${PODS_CONFIGURATION_BUILD_DIR}/WZLBadge" "${PODS_ROOT}/NIMSDK/NIMAVChat/Libs" "${PODS_ROOT}/NIMSDK/NIMSDK/Libs" "${PODS_ROOT}/WechatOpenSDK/WeChatSDK1.8.3"
+OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/BRPickerView" -isystem "${PODS_ROOT}/Headers/Public/IQKeyboardManager" -isystem "${PODS_ROOT}/Headers/Public/M80AttributedLabel" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MJExtension" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/NIMSDK" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage" -isystem "${PODS_ROOT}/Headers/Public/TTGTagCollectionView" -isystem "${PODS_ROOT}/Headers/Public/Toast" -isystem "${PODS_ROOT}/Headers/Public/UMCCommon" -isystem "${PODS_ROOT}/Headers/Public/UMCPush" -isystem "${PODS_ROOT}/Headers/Public/UMCSecurityPlugins" -isystem "${PODS_ROOT}/Headers/Public/WZLBadge" -isystem "${PODS_ROOT}/Headers/Public/WechatOpenSDK"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"BRPickerView" -l"GPUImage" -l"IQKeyboardManager" -l"M80AttributedLabel" -l"MBProgressHUD" -l"MJExtension" -l"MJRefresh" -l"NMCAudioModule" -l"NMCVideoModule" -l"SDWebImage" -l"TTGTagCollectionView" -l"Toast" -l"WZLBadge" -l"WeChatSDK" -l"aacplus" -l"c++" -l"crypto" -l"event" -l"nio" -l"nts" -l"nvs" -l"openh264" -l"opus" -l"sqlite3" -l"sqlite3.0" -l"ssl" -l"z" -framework "AVFoundation" -framework "AudioToolbox" -framework "CFNetwork" -framework "CoreGraphics" -framework "CoreMedia" -framework "CoreTelephony" -framework "CoreText" -framework "Foundation" -framework "ImageIO" -framework "MobileCoreServices" -framework "NIMAVChat" -framework "NIMSDK" -framework "QuartzCore" -framework "Security" -framework "SecurityEnvSDK" -framework "SystemConfiguration" -framework "UIKit" -framework "UMCommon" -framework "UMPush" -framework "UTDID" -framework "UserNotifications" -framework "VideoToolbox"
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_PODFILE_DIR_PATH = ${SRCROOT}/.

+ 15 - 9
model.xcodeproj/project.pbxproj

@@ -354,6 +354,7 @@
 		2FA1AF99212ACDEF005F12CA /* AgreementViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2FA1AF95212ACDEE005F12CA /* AgreementViewController.xib */; };
 		2FA1AF9D212ACDFF005F12CA /* WYWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2FA1AF9C212ACDFF005F12CA /* WYWebView.m */; };
 		3A004A6D21917D4C009A989E /* HobbyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A004A6C21917D4C009A989E /* HobbyViewController.m */; };
+		3A2D2B792192D6420073D975 /* ApplyRecommendView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A2D2B782192D6420073D975 /* ApplyRecommendView.m */; };
 		3A44C12A218A0E7A0021DA3F /* MyModelController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A44C124218A0E790021DA3F /* MyModelController.m */; };
 		3A44C12B218A0E7A0021DA3F /* MyModelController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3A44C125218A0E790021DA3F /* MyModelController.xib */; };
 		3A44C12C218A0E7A0021DA3F /* MyMemberController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A44C126218A0E790021DA3F /* MyMemberController.m */; };
@@ -1133,6 +1134,8 @@
 		2FA1AF9C212ACDFF005F12CA /* WYWebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WYWebView.m; sourceTree = "<group>"; };
 		3A004A6B21917D4C009A989E /* HobbyViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HobbyViewController.h; sourceTree = "<group>"; };
 		3A004A6C21917D4C009A989E /* HobbyViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HobbyViewController.m; sourceTree = "<group>"; };
+		3A2D2B772192D6420073D975 /* ApplyRecommendView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ApplyRecommendView.h; sourceTree = "<group>"; };
+		3A2D2B782192D6420073D975 /* ApplyRecommendView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ApplyRecommendView.m; sourceTree = "<group>"; };
 		3A44C124218A0E790021DA3F /* MyModelController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyModelController.m; sourceTree = "<group>"; };
 		3A44C125218A0E790021DA3F /* MyModelController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MyModelController.xib; sourceTree = "<group>"; };
 		3A44C126218A0E790021DA3F /* MyMemberController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyMemberController.m; sourceTree = "<group>"; };
@@ -2541,6 +2544,8 @@
 				3AE8C7AB218B49890069D147 /* IntroView.h */,
 				3AE8C7AC218B49890069D147 /* IntroView.m */,
 				3AE8C7AE218B49EC0069D147 /* IntroView.xib */,
+				3A2D2B772192D6420073D975 /* ApplyRecommendView.h */,
+				3A2D2B782192D6420073D975 /* ApplyRecommendView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -2652,25 +2657,25 @@
 		9EC8712C20FAE9FA0087746C /* Controller */ = {
 			isa = PBXGroup;
 			children = (
-				EF812F6920FEE30E004A6A35 /* ModelNewFeatureController.h */,
-				EF812F6A20FEE30E004A6A35 /* ModelNewFeatureController.m */,
 				EF4A657820FDC94C00FFCD3C /* MineController.h */,
+				EF812F6920FEE30E004A6A35 /* ModelNewFeatureController.h */,
 				EF4A657920FDC94C00FFCD3C /* MineController.m */,
-				3A5EC75C218707B100A9438E /* PromoteVC */,
-				3A5EC7492186F54E00A9438E /* MyTeamVC */,
-				3AF44FFF2185BD1A00ABEAEB /* SettingsVC */,
-				3AF44FEF21858F1600ABEAEB /* ShareVC */,
-				3AF44FDC21856E5C00ABEAEB /* MineVC */,
+				EF812F6A20FEE30E004A6A35 /* ModelNewFeatureController.m */,
+				2FA1AF8B212AA984005F12CA /* AboutUsVC */,
 				2F4A895C211D9F03006D7DD3 /* ActivityVC */,
-				2F8D24AA21131B3900CD7347 /* PrivateVC */,
 				EF7B0C0C20FC69EE0078781D /* CodeVC */,
+				3AF44FDC21856E5C00ABEAEB /* MineVC */,
 				EF7B0C0A20FC69EE0078781D /* MyOrderVC */,
 				EF7B0C0B20FC69EE0078781D /* MyProfileVC */,
 				EF7B0C1620FC69EF0078781D /* MyRedPacketsVC */,
 				EF7B0C0720FC69EE0078781D /* MySkillsVC */,
+				3A5EC7492186F54E00A9438E /* MyTeamVC */,
 				EF7B0C0D20FC69EF0078781D /* MyWalletVC */,
-				2FA1AF8B212AA984005F12CA /* AboutUsVC */,
+				2F8D24AA21131B3900CD7347 /* PrivateVC */,
+				3A5EC75C218707B100A9438E /* PromoteVC */,
 				3AE8C7B0218B65630069D147 /* RankVC */,
+				3AF44FFF2185BD1A00ABEAEB /* SettingsVC */,
+				3AF44FEF21858F1600ABEAEB /* ShareVC */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -3359,6 +3364,7 @@
 				3A004A6D21917D4C009A989E /* HobbyViewController.m in Sources */,
 				8848C66A210813D300EDB121 /* PhotoCollectionViewCell.m in Sources */,
 				2F8D24A621131B0500CD7347 /* UIScreen+Sports.m in Sources */,
+				3A2D2B792192D6420073D975 /* ApplyRecommendView.m in Sources */,
 				2F8D270E21183D7400CD7347 /* NIMNotificationContentConfig.m in Sources */,
 				2F8D26DA21183D7300CD7347 /* NIMInputAudioRecordIndicatorView.m in Sources */,
 				2F8D253B2114691C00CD7347 /* PGDatePicker+MonthDayHourMinute.m in Sources */,

+ 1 - 0
model/Assets.xcassets/mine/jineng/tianjiajineng.imageset/Contents.json

@@ -2,6 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
+      "filename" : "tianjiajineng.png",
       "scale" : "1x"
     },
     {

二进制
model/Assets.xcassets/mine/jineng/tianjiajineng.imageset/tianjiajineng.png


二进制
model/Assets.xcassets/mine/jineng/tianjiajineng.imageset/tianjiajineng@2x.png


二进制
model/Assets.xcassets/mine/jineng/tianjiajineng.imageset/tianjiajineng@3x.png


+ 21 - 0
model/Assets.xcassets/share_icon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "share_icon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

二进制
model/Assets.xcassets/share_icon.imageset/share_icon.png


+ 23 - 0
model/Assets.xcassets/个人中心/icon_tianjia.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_tianjia.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_tianjia@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_tianjia@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

二进制
model/Assets.xcassets/个人中心/icon_tianjia.imageset/icon_tianjia.png


二进制
model/Assets.xcassets/个人中心/icon_tianjia.imageset/icon_tianjia@2x.png


二进制
model/Assets.xcassets/个人中心/icon_tianjia.imageset/icon_tianjia@3x.png


+ 23 - 0
model/Assets.xcassets/个人中心/icon_tianjia_xiao.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_tianjia_xiao.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_tianjia_xiao@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_tianjia_xiao@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

二进制
model/Assets.xcassets/个人中心/icon_tianjia_xiao.imageset/icon_tianjia_xiao.png


二进制
model/Assets.xcassets/个人中心/icon_tianjia_xiao.imageset/icon_tianjia_xiao@2x.png


二进制
model/Assets.xcassets/个人中心/icon_tianjia_xiao.imageset/icon_tianjia_xiao@3x.png


+ 18 - 0
model/Classes/Controllers/Controller/MessageVC/MessageListViewController.m

@@ -79,6 +79,24 @@
     }];
 }
 
+- (NSInteger)findInsertPlace:(NIMRecentSession *)recentSession{
+    __block NSUInteger matchIdx = 0;
+    __block BOOL find = NO;
+    [self.recentSessions enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+        NIMRecentSession *item = obj;
+        if (item.lastMessage.timestamp <= recentSession.lastMessage.timestamp && ![item.lastMessage.session.sessionId isEqualToString:@"system"]) {
+            *stop = YES;
+            find  = YES;
+            matchIdx = idx;
+        }
+    }];
+    if (find) {
+        return matchIdx;
+    }else{
+        return self.recentSessions.count;
+    }
+}
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.

+ 9 - 15
model/Classes/Controllers/Controller/MessageVC/MessageViewController.m

@@ -23,6 +23,7 @@ NSString *const NIMDemoEventNameCloseSnapPicture = @"NIMDemoEventNameCloseSnapPi
 @property (nonatomic,strong) NTESSessionConfig       *sessionConfig;
 @property (nonatomic,strong) UIView                  * bgblackView;//黑色背景
 @property (nonatomic,strong) UIView                  * bgwhiteView;//下拉选项背景
+@property(nonatomic, assign) BOOL hideTabBarWhenPop;
 
 @end
 
@@ -60,14 +61,6 @@ NSString *const NIMDemoEventNameCloseSnapPicture = @"NIMDemoEventNameCloseSnapPi
     self.navigationItem.rightBarButtonItems = @[rightItem, nagetiveRightSpacer];
 }
 
-- (void)viewWillAppear:(BOOL)animated{
-    self.tabBarController.tabBar.hidden = YES;
-}
-
-- (void)viewWillDisappear:(BOOL)animated{
-    self.tabBarController.tabBar.hidden = NO;
-}
-
 -(void)rightBtnClick{
     
     if (!_bgblackView) {
@@ -461,13 +454,14 @@ NSString *const NIMDemoEventNameCloseSnapPicture = @"NIMDemoEventNameCloseSnapPi
     }
 }
 
-//- (void)viewWillAppear:(BOOL)animated{
-//    self.tabBarController.tabBar.hidden = YES;
-//}
-//
-//- (void)viewWillDisappear:(BOOL)animated{
-//    self.tabBarController.tabBar.hidden = NO;
-//}
+- (void)viewWillAppear:(BOOL)animated {
+    self.hideTabBarWhenPop = self.tabBarController.tabBar.isHidden;
+    self.tabBarController.tabBar.hidden = YES;
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+    self.tabBarController.tabBar.hidden = self.hideTabBarWhenPop;
+}
 
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];

+ 34 - 14
model/Classes/Controllers/Controller/MineVC/MineNewViewController.m

@@ -20,6 +20,8 @@
 #import "IntroView.h"
 #import "ModelCardController.h"
 #import "RankController.h"
+#import "ApplyRecommendView.h"
+#import "WZLBadgeImport.h"
 
 @interface MineNewViewController () {
     BOOL online;
@@ -40,6 +42,7 @@
 @property(weak, nonatomic) IBOutlet UIView *switchView;
 @property(weak, nonatomic) IBOutlet UIView *switchIndicatorView;
 @property(weak, nonatomic) IBOutlet UIView *transformView;
+@property(weak, nonatomic) IBOutlet UIImageView *orderIcon;
 @end
 
 @implementation MineNewViewController
@@ -136,7 +139,7 @@
 
 - (void)getDataFromNetworking {
 //    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
-    NSDictionary *dic = [[NSDictionary alloc] initWithObjectsAndKeys:[ModelUser user].modelpk, @"modelpk", nil];
+    NSDictionary *dic = @{@"modelpk": [ModelUser user].modelpk};
     [YanCNetWorkManager requestPostWithURLStr:Url_refreshLogin(PublicUrl) parameters:dic finish:^(id dataDic) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
 
@@ -156,11 +159,11 @@
             online = user.is_a;
             [self setSwitchState:user.is_a];
 
-//            if ([dataDic[@"data"][@"hasred"] isEqualToString:@"1"]) {
-//                self.notificationView.hidden = NO;
-//            }else{
-//                self.notificationView.hidden = YES;
-//            }
+            if ([dataDic[@"data"][@"hasred"] isEqualToString:@"1"]) {
+                [self.orderIcon clearBadge];
+            } else {
+                [self.orderIcon showBadge];
+            }
 
             [self getIncomeFromNetworking];
         } else {
@@ -173,7 +176,7 @@
 
 - (void)getIncomeFromNetworking {
 
-    NSDictionary *dic = [[NSDictionary alloc] initWithObjectsAndKeys:[ModelUser modelUser].pk, @"memberpk", nil];
+    NSDictionary *dic = @{@"memberpk": [ModelUser modelUser].pk};
     [YanCNetWorkManager requestPostWithURLStr:Url_getIncomeToday(PublicUrl) parameters:dic finish:^(id dataDic) {
         NSString *issuccess = dataDic[@"msg"];
         if ([issuccess isEqualToString:@"success"]) {
@@ -201,10 +204,8 @@
             break;
         }
         case 3: {
-            UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil message:@"确定申请首页推荐展示?" preferredStyle:UIAlertControllerStyleAlert];
-            [alert addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:nil]];
-            [alert addAction:[UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDefault handler:^(UIAlertAction *_Nonnull action) {
-                NSDictionary *dic = [[NSDictionary alloc] initWithObjectsAndKeys:[ModelUser modelUser].modelpk, @"modelpk", nil];
+            [ApplyRecommendView showIntoView:[UIApplication sharedApplication].keyWindow confirm:^{
+                NSDictionary *dic = @{@"modelpk": [ModelUser modelUser].modelpk};
                 [YanCNetWorkManager requestPostWithURLStr:Url_applyRecommend(PublicUrl)
                                                parameters:dic
                                                    finish:^(id res) {
@@ -218,8 +219,27 @@
                                                   enError:^(NSError *error) {
                                                       [MBProgressHUD hideHUDForView:self.view animated:YES];
                                                   }];
-            }]];
-            [self presentViewController:alert animated:YES completion:nil];
+            }];
+            break;
+//            UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil message:@"确定申请首页推荐展示?" preferredStyle:UIAlertControllerStyleAlert];
+//            [alert addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:nil]];
+//            [alert addAction:[UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDefault handler:^(UIAlertAction *_Nonnull action) {
+//                NSDictionary *dic = [[NSDictionary alloc] initWithObjectsAndKeys:[ModelUser modelUser].modelpk, @"modelpk", nil];
+//                [YanCNetWorkManager requestPostWithURLStr:Url_applyRecommend(PublicUrl)
+//                                               parameters:dic
+//                                                   finish:^(id res) {
+//                                                       BOOL success = [res[@"success"] intValue] == 1;
+//                                                       if (success) {
+//                                                           [MBProgressHUD showInfo:@"申请已提交"];
+//                                                       } else {
+//                                                           [MBProgressHUD showInfo:@"请求失败!"];
+//                                                       }
+//                                                   }
+//                                                  enError:^(NSError *error) {
+//                                                      [MBProgressHUD hideHUDForView:self.view animated:YES];
+//                                                  }];
+//            }]];
+//            [self presentViewController:alert animated:YES completion:nil];
         }
         case 4: {
             PromoteController *vc = [[PromoteController alloc] init];
@@ -277,7 +297,7 @@
 
 - (void)updateOnline:(BOOL)state {
     __weak MineNewViewController *this = self;
-    NSDictionary *dic = [[NSDictionary alloc] initWithObjectsAndKeys:[ModelUser modelUser].modelpk, @"modelpk", @(state), @"state", nil];
+    NSDictionary *dic = @{@"modelpk": [ModelUser modelUser].modelpk, @"state": @(state)};
     [YanCNetWorkManager requestPostWithURLStr:Url_setOnline(PublicUrl)
                                    parameters:dic
                                        finish:^(id res) {

+ 1 - 0
model/Classes/Controllers/Controller/MineVC/MineNewViewController.xib

@@ -22,6 +22,7 @@
                 <outlet property="incomeView" destination="kaC-Mh-u3w" id="kyJ-iN-iF8"/>
                 <outlet property="modelCardView" destination="etX-QK-1nU" id="EVQ-7h-fu5"/>
                 <outlet property="nameLabel" destination="tnV-pA-N5a" id="4Yj-BS-G5M"/>
+                <outlet property="orderIcon" destination="paS-9R-vth" id="ydq-Na-iLI"/>
                 <outlet property="skillView" destination="Ac7-NR-8Xp" id="Ven-w6-xmx"/>
                 <outlet property="switchIndicatorView" destination="ETZ-yN-c0i" id="4v1-LO-MNx"/>
                 <outlet property="switchView" destination="wPM-QM-mXD" id="2Et-Fe-rBA"/>

+ 18 - 0
model/Classes/Controllers/Controller/MineVC/View/ApplyRecommendView.h

@@ -0,0 +1,18 @@
+//
+//  ApplyRecommendView.h
+//  model
+//
+//  Created by Drew on 2018/11/7.
+//  Copyright © 2018 Mine. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ApplyRecommendView : UIView
++ (void)showIntoView:(UIView *)view confirm:(void(^)(void))confirmBlock;
+@property(nonatomic, copy) void (^confirmBlock)(void);
+@end
+
+NS_ASSUME_NONNULL_END

+ 146 - 0
model/Classes/Controllers/Controller/MineVC/View/ApplyRecommendView.m

@@ -0,0 +1,146 @@
+//
+//  ApplyRecommendView.m
+//  model
+//
+//  Created by Drew on 2018/11/7.
+//  Copyright © 2018 Mine. All rights reserved.
+//
+
+#import "ApplyRecommendView.h"
+#import "Masonry.h"
+@interface ApplyRecommendView()
+@property(nonatomic, strong) UIView* mask;
+@property(nonatomic, strong) UIView* content;
+@end
+
+@implementation ApplyRecommendView
+- (instancetype)init {
+    if (self = [super init]){
+        [self initView];
+    }
+    return self;
+}
+
+- (void)initView {
+    self.backgroundColor = [UIColor clearColor];
+    UIView* mask = [[UIView alloc] init];
+    mask.backgroundColor = [UIColor clearColor];
+    [self addSubview:mask];
+    [mask mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self);
+    }];
+    self.mask = mask;
+    
+    UIView* content = [[UIView alloc] init];
+    content.backgroundColor = [UIColor whiteColor];
+    content.layer.backgroundColor = [UIColor colorWithRed:255/255.0 green:255/255.0 blue:255/255.0 alpha:1].CGColor;
+    content.layer.cornerRadius = 12;
+    [self addSubview:content];
+    [content mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.mas_left).offset(20);
+        make.right.equalTo(self.mas_right).offset(-20);
+        make.top.equalTo(self.mas_top).offset(68);
+        make.bottom.equalTo(self.mas_bottom).offset(-68);
+    }];
+    content.transform = CGAffineTransformMakeTranslation(0, ScreenHeight);
+    self.content = content;
+    
+    UILabel* title = [[UILabel alloc] init];
+    title.numberOfLines = 0;
+    title.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
+    title.textColor = [UIColor blackColor];
+    title.text = @"申请上推荐位";
+    [content addSubview:title];
+    [title mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.equalTo(content);
+        make.top.equalTo(content).offset(30);
+    }];
+    
+    UILabel* detail = [[UILabel alloc] init];
+    detail.numberOfLines = 0;
+    detail.font = [UIFont systemFontOfSize:13];
+    detail.textColor = [UIColor blackColor];
+    detail.text = @"1、申请上推荐位可在客户端有更多展示机会和更好的展示位置,获取更多商演订单和视频面试订单的经济收益。\n2、申请上推荐位视为与平台签订协议,可额外获得更多现金奖励和境外旅游奖励等。\n3、千模官方商业活动优先推荐“推荐位”的模特参与。\n\n要求及奖励:\n1、每天在线不得低于60分钟或每月累计在线不低于30小时。\n2、每月更新动态不低于15天(次),接听率不低于65%。\n3、月收入超过10000元,额外奖励1000元。\n4、申请上推荐审核后,如时长及接单率未达到标注,平台扣款100元。\n5、每次申请上推荐位的协议周期为一个月,以自然月整月为准,可续签。";
+    [content addSubview:detail];
+    [detail mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(content).offset(15);
+        make.right.equalTo(content).offset(-15);
+        make.top.equalTo(title.mas_bottom).offset(20);
+    }];
+    
+    UIButton* confirmBtn = [[UIButton alloc] init];
+    [confirmBtn setTitle:@"确认申请" forState:UIControlStateNormal];
+    [confirmBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    confirmBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];
+    confirmBtn.layer.backgroundColor = [UIColor colorWithRed:255/255.0 green:64/255.0 blue:149/255.0 alpha:1].CGColor;
+    confirmBtn.layer.cornerRadius = 20;
+    confirmBtn.layer.shadowColor = [UIColor colorWithRed:255/255.0 green:64/255.0 blue:149/255.0 alpha:0.36].CGColor;
+    confirmBtn.layer.shadowOffset = CGSizeMake(0,8);
+    confirmBtn.layer.shadowOpacity = 1;
+    confirmBtn.layer.shadowRadius = 10;
+    [content addSubview:confirmBtn];
+    [confirmBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(180);
+        make.height.mas_equalTo(40);
+        make.centerX.equalTo(content);
+        make.bottom.equalTo(content).offset(-55);
+    }];
+    [confirmBtn addTarget:self action:@selector(confirm) forControlEvents:UIControlEventTouchUpInside];
+    
+    UIButton* cancel = [[UIButton alloc] init];
+    [cancel setTitle:@"取消" forState:UIControlStateNormal];
+    cancel.titleLabel.font = [UIFont systemFontOfSize:14];
+    [cancel setTitleColor:[UIColor colorWithHexString:@"333333"] forState:UIControlStateNormal];
+    [content addSubview:cancel];
+    [cancel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.equalTo(content);
+        make.bottom.equalTo(content).offset(-20);
+        make.height.mas_equalTo(20);
+    }];
+    [cancel addTarget:self action:@selector(dismiss) forControlEvents:UIControlEventTouchUpInside];
+
+}
+
+- (void)show {
+    [UIView animateWithDuration:0.25
+                          delay:0
+                        options:UIViewAnimationOptionCurveEaseOut
+                     animations:^{
+                         self.mask.backgroundColor = [UIColor colorWithHexString:@"#000000" alpha:0.5];
+                         self.content.transform = CGAffineTransformMakeTranslation(0, 0);
+                     }
+                     completion:^(BOOL finished) {
+                         
+                     }];
+}
+
+- (void)dismiss {
+    [UIView animateWithDuration:0.25
+                          delay:0
+                        options:UIViewAnimationOptionCurveEaseOut
+                     animations:^{
+                         self.mask.backgroundColor = [UIColor clearColor];
+                         self.content.transform = CGAffineTransformMakeTranslation(0, ScreenHeight);
+                     }
+                     completion:^(BOOL finished) {
+                         [self removeFromSuperview];
+                     }];
+}
+
+- (void)confirm {
+    [self dismiss];
+    if(self.confirmBlock){
+        self.confirmBlock();
+    }
+}
+
++ (void)showIntoView:(UIView *)view confirm:(void(^)(void))confirmBlock{
+    ApplyRecommendView *recView = [[ApplyRecommendView alloc] init];
+    recView.confirmBlock = confirmBlock;
+    [view addSubview:recView];
+    [recView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(view);
+    }];
+    [recView show];
+}
+@end

+ 165 - 137
model/Classes/Controllers/Controller/MySkillsVC/PostSkillsController.m

@@ -7,20 +7,20 @@
 //  发布技能
 
 #import "PostSkillsController.h"
+#import "Masonry.h"
 
-@interface PostSkillsController ()<UITextFieldDelegate, UIImagePickerControllerDelegate,UINavigationControllerDelegate>
-{
+@interface PostSkillsController () <UITextFieldDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate> {
     NSString *skillPk;
 }
-@property (nonatomic, strong) UIScrollView *bgScrollView;
-@property (nonatomic, strong) UITextField *workTypeTF;   //工作类型
-@property (nonatomic, strong) UIImageView *workPicView;  //工作照片
-@property (nonatomic, strong) UITextField *priceTF; //价格
-@property (nonatomic, strong) UIButton *selectedWorkTypeBtn;  //选中支付方式按钮
+@property(nonatomic, strong) UIScrollView *bgScrollView;
+@property(nonatomic, strong) UITextField *workTypeTF;   //工作类型
+@property(nonatomic, strong) UIImageView *workPicView;  //工作照片
+@property(nonatomic, strong) UITextField *priceTF; //价格
+@property(nonatomic, strong) UIButton *selectedWorkTypeBtn;  //选中支付方式按钮
 //
-@property (nonatomic, copy) NSString *imageStr; //图片url
-@property (nonatomic, strong) UIView      *bgSkillView;//技能标签背景
-@property (strong, nonatomic) NSMutableArray *skillArray;
+@property(nonatomic, copy) NSString *imageStr; //图片url
+@property(nonatomic, strong) UIView *bgSkillView;//技能标签背景
+@property(strong, nonatomic) NSMutableArray *skillArray;
 
 @end
 
@@ -41,29 +41,39 @@
     [self getSkillFromNetworking];
 }
 
-#pragma mark -- 收起键盘
--(void)keyboardHide:(UITapGestureRecognizer*)tap{
-    [self.view endEditing:YES];
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    [self.navigationController.navigationBar setBarTintColor:[UIColor colorWithHexString:@"#F2F4F5"]];
+    [self.navigationController.navigationBar setBackgroundColor:[UIColor colorWithHexString:@"#F2F4F5"]];
+
+    [self.navigationController.navigationBar setShadowImage:[UIImage new]];
 }
 
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
+- (void)viewWillDisappear:(BOOL)animated {
+    [super viewWillDisappear:animated];
+    [self.navigationController.navigationBar setBarTintColor:nil];
+    [self.navigationController.navigationBar setShadowImage:nil];
+}
+
+#pragma mark -- 收起键盘
+
+- (void)keyboardHide:(UITapGestureRecognizer *)tap {
+    [self.view endEditing:YES];
 }
 
 - (void)creatNavBar {
     self.title = @"发布技能";
-    //
-    UIButton * btn = [UIButton buttonWithType:UIButtonTypeCustom];
+    UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
     btn.frame = CGRectMake(0, 0, 40, 40);
     [btn setImage:[UIImage imageNamed:@"fanhui2"] forState:UIControlStateNormal];
-    btn.imageEdgeInsets =  UIEdgeInsetsMake(0, -20, 0, 0);
+    btn.imageEdgeInsets = UIEdgeInsetsMake(0, -20, 0, 0);
     [btn addTarget:self action:@selector(backClick) forControlEvents:UIControlEventTouchUpInside];
     UIBarButtonItem *leftItem = [[UIBarButtonItem alloc] initWithCustomView:btn];
-    UIBarButtonItem *nagetiveSpacer = [[UIBarButtonItem alloc]initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
-    
-    //    nagetiveSpacer.width = -12;//这个值可以根据自己需要自己调整
+    UIBarButtonItem *nagetiveSpacer = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
+
     self.navigationItem.leftBarButtonItems = @[nagetiveSpacer, leftItem];
+
+    self.view.backgroundColor = [UIColor colorWithHexString:@"#F2F4F5"];
 }
 
 - (void)backClick {
@@ -75,19 +85,19 @@
     UIScrollView *scrollView = [[UIScrollView alloc] init];
     scrollView.frame = self.view.bounds;
     scrollView.showsVerticalScrollIndicator = NO;
-    scrollView.backgroundColor = [UIColor whiteColor];
-    CGFloat height = ScreenHeight < 667 ? 697 : ScreenHeight;
+    scrollView.backgroundColor = [UIColor clearColor];
+    CGFloat height = 945;
     scrollView.contentSize = CGSizeMake(ScreenWidth, height);
     [self.view addSubview:scrollView];
     self.bgScrollView = scrollView;
-    
+
     //
     UILabel *workTypeTitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(20, 20, 80, 15)];
     workTypeTitleLabel.text = @"工作类型:";
     workTypeTitleLabel.font = [UIFont systemFontOfSize:15];
     workTypeTitleLabel.textColor = RGBValueColor(0x333333, 1.0);
     [scrollView addSubview:workTypeTitleLabel];
-    
+
     UITextField *workTypeTF = [[UITextField alloc] initWithFrame:CGRectMake(CGRectGetMaxX(workTypeTitleLabel.frame), 20, ScreenWidth / 2, 15)];
     workTypeTF.placeholder = @"选择您的工作类型";
     workTypeTF.userInteractionEnabled = NO;
@@ -95,19 +105,19 @@
     workTypeTF.textColor = RGBValueColor(0x333333, 1.0);
     [scrollView addSubview:workTypeTF];
     self.workTypeTF = workTypeTF;
-    
-    self.bgSkillView = [[UIView alloc]initWithFrame:CGRectMake(0, CGRectGetMaxY(workTypeTitleLabel.frame) + 20, ScreenWidth, ((self.skillArray.count-1)/3+1)*50)];
-    self.bgSkillView.backgroundColor = [UIColor whiteColor];
+
+    self.bgSkillView = [[UIView alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(workTypeTitleLabel.frame) + 20, ScreenWidth, ((self.skillArray.count - 1) / 3 + 1) * 54)];
+    self.bgSkillView.backgroundColor = [UIColor clearColor];
     [scrollView addSubview:self.bgSkillView];
-    
-    int width = (ScreenWidth-120)/3;
-    
-    for (int i=0; i<self.skillArray.count; i++) {
-        
+
+    int width = (ScreenWidth - 70) / 3;
+
+    for (int i = 0; i < self.skillArray.count; i++) {
+
         int m = i % 3;
         int n = i / 3;
-        
-        UIButton *skillButton = [[UIButton alloc]initWithFrame:CGRectMake(20+(width+40)*m, 50*n, width, 35)];
+
+        UIButton *skillButton = [[UIButton alloc] initWithFrame:CGRectMake(20 + (width + 15) * m, 54 * n, width, 44)];
         skillButton.titleLabel.lineBreakMode = NSLineBreakByTruncatingTail;
         [skillButton setTitle:[self.skillArray[i] objectForKey:@"name"] forState:UIControlStateNormal];
         [skillButton setTitleColor:RGB(50, 50, 50) forState:UIControlStateNormal];
@@ -120,87 +130,98 @@
         [skillButton addTarget:self action:@selector(selectedAmountBtnAction:) forControlEvents:UIControlEventTouchUpInside];
         [self.bgSkillView addSubview:skillButton];
     }
-    
+
     scrollView.contentSize = CGSizeMake(ScreenWidth, self.bgSkillView.frame.size.height + 400);
-    
-    //
-    UIView *upLineView = [[UIView alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(self.bgSkillView.frame), ScreenWidth, 0.5)];
-    upLineView.backgroundColor = RGBValueColor(0xdfdfdf, 1.0);
-    [scrollView addSubview:upLineView];
-    
-    UILabel *workPicTitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(20, CGRectGetMaxY(upLineView.frame) + 20, 80, 15)];
+
+    UILabel *workPicTitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(20, CGRectGetMaxY(self.bgSkillView.frame) + 20, 80, 15)];
     workPicTitleLabel.text = @"工作照片:";
-    workPicTitleLabel.font = [UIFont systemFontOfSize:15];
-    workPicTitleLabel.textColor = RGBValueColor(0x333333, 1.0);
+    workPicTitleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];
+    workPicTitleLabel.textColor = [UIColor blackColor];
     [scrollView addSubview:workPicTitleLabel];
-    
-    self.workPicView = [[UIImageView alloc] initWithFrame:CGRectMake(CGRectGetMaxX(workPicTitleLabel.frame), CGRectGetMaxY(upLineView.frame) + 20, 80, 80)];
+
+    self.workPicView = [[UIImageView alloc] initWithFrame:CGRectMake(CGRectGetMaxX(workPicTitleLabel.frame), CGRectGetMaxY(self.bgSkillView.frame) + 20, 80, 80)];
     self.workPicView.image = [UIImage imageNamed:@"tianjiajineng"];
     [scrollView addSubview:self.workPicView];
-    
-    UIButton *addPicBtn = [[UIButton alloc] initWithFrame:CGRectMake(CGRectGetMaxX(workPicTitleLabel.frame), CGRectGetMaxY(upLineView.frame) + 20, 80, 80)];
+
+    UIButton *addPicBtn = [[UIButton alloc] initWithFrame:CGRectMake(CGRectGetMaxX(workPicTitleLabel.frame), CGRectGetMaxY(self.bgSkillView.frame) + 20, 80, 80)];
     addPicBtn.backgroundColor = [UIColor clearColor];
     [addPicBtn addTarget:self action:@selector(addPicBtnAction) forControlEvents:UIControlEventTouchUpInside];
     [scrollView addSubview:addPicBtn];
-    
-    UIView *downLineView = [[UIView alloc] initWithFrame:CGRectMake(0, CGRectGetMaxY(self.workPicView.frame) + 20, ScreenWidth, 0.5)];
-    downLineView.backgroundColor = RGBValueColor(0xdfdfdf, 1.0);
-    [scrollView addSubview:downLineView];
-    
-    //
-    UILabel *priceTitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(20, CGRectGetMaxY(downLineView.frame) + 20, 50, 15)];
-    priceTitleLabel.text = @"价格:";
-    priceTitleLabel.font = [UIFont systemFontOfSize:15];
-    priceTitleLabel.textColor = RGBValueColor(0x333333, 1.0);
-    [scrollView addSubview:priceTitleLabel];
-    
-    UITextField *priceTF = [[UITextField alloc] initWithFrame:CGRectMake(CGRectGetMaxX(priceTitleLabel.frame), CGRectGetMaxY(downLineView.frame) + 20, 100, 15)];
+
+
+    UIView *priceContainer = [[UIView alloc] initWithFrame:CGRectMake(20, CGRectGetMaxY(self.workPicView.frame) + 20, ScreenWidth - 40, 60)];
+    priceContainer.layer.backgroundColor = [UIColor colorWithRed:255 / 255.0 green:255 / 255.0 blue:255 / 255.0 alpha:1].CGColor;
+    priceContainer.layer.cornerRadius = 8;
+    [scrollView addSubview:priceContainer];
+
+
+    UITextField *priceTF = [[UITextField alloc] init];
     priceTF.textAlignment = NSTextAlignmentLeft;
     priceTF.keyboardType = UIKeyboardTypeDecimalPad;
-    priceTF.font = [UIFont systemFontOfSize:15];
-    priceTF.textColor = RGBValueColor(0x333333, 1.0);
-    priceTF.placeholder = @"请填写价格";
+    priceTF.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
+    priceTF.textColor = [UIColor blackColor];
+
+    NSAttributedString *attrString = [[NSAttributedString alloc] initWithString:@"请输入占位文字"
+                                                                     attributes:@{NSForegroundColorAttributeName: [UIColor colorWithHexString:@"#999999"], NSFontAttributeName: [UIFont systemFontOfSize:14]}];
+    priceTF.attributedPlaceholder = attrString;
     priceTF.tag = 700;
     priceTF.delegate = self;
-    [scrollView addSubview:priceTF];
+    [priceContainer addSubview:priceTF];
+    [priceTF mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(priceContainer).offset(20);
+        make.right.equalTo(priceContainer).offset(-120);
+        make.centerY.equalTo(priceContainer);
+        make.height.equalTo(priceContainer);
+    }];
     self.priceTF = priceTF;
-    
-    UILabel *unitLabel = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(self.priceTF.frame), CGRectGetMaxY(downLineView.frame) + 20, 100, 15)];
-    unitLabel.textAlignment = NSTextAlignmentLeft;
+
+    UILabel *unitLabel = [[UILabel alloc] init];
+    unitLabel.textAlignment = NSTextAlignmentCenter;
     unitLabel.text = @"元/小时";
-    unitLabel.font = [UIFont systemFontOfSize:15];
-    unitLabel.textColor = RGBValueColor(0x333333, 1.0);
-    [scrollView addSubview:unitLabel];
-    
-    //
-    UIButton *postBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-    postBtn.frame = CGRectMake(20, CGRectGetMaxY(priceTitleLabel.frame) + 70, ScreenWidth - 40, 45);
-    [postBtn setBackgroundImage:[UIImage imageNamed:@"anniu"] forState:UIControlStateNormal];
+    unitLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
+    unitLabel.textColor = [UIColor blackColor];
+    [priceContainer addSubview:unitLabel];
+    [unitLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.equalTo(priceContainer);
+        make.centerY.equalTo(priceContainer);
+        make.width.mas_equalTo(100);
+    }];
+
+    UILabel *remark = [[UILabel alloc] initWithFrame:CGRectMake(20, CGRectGetMaxY(priceContainer.frame) + 20, ScreenWidth - 40, 184)];
+    remark.numberOfLines = 0;
+    remark.font = [UIFont systemFontOfSize:13];
+    remark.textColor = [UIColor colorWithHexString:@"#808080"];
+    remark.text = @"说明:\n模特技能价格自行定价,可通过与顾客视频面试协商后及时修改;\n商演结束,模特提取定价金额的70%;\n模特接单后,如用户出现临时取消或修改等,模特可得到订单金额的20%作为补偿。\n如出现商演迟到、未达到用户要求等争议问题,接受协商解决。";
+    [scrollView addSubview:remark];
+
+    UIButton *postBtn = [[UIButton alloc] initWithFrame:CGRectMake(20, CGRectGetMaxY(remark.frame) + 70, ScreenWidth - 40, 44)];
+    postBtn.layer.backgroundColor = [UIColor colorWithRed:255 / 255.0 green:64 / 255.0 blue:149 / 255.0 alpha:1].CGColor;
+    postBtn.layer.cornerRadius = 22;
+    postBtn.layer.shadowColor = [UIColor colorWithRed:255 / 255.0 green:64 / 255.0 blue:149 / 255.0 alpha:0.36].CGColor;
+    postBtn.layer.shadowOffset = CGSizeMake(0, 8);
+    postBtn.layer.shadowOpacity = 1;
+    postBtn.layer.shadowRadius = 10;
+    postBtn.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
     [postBtn setTitle:@"确认发布" forState:UIControlStateNormal];
     [postBtn setTitleColor:RGBValueColor(0xffffff, 1.0) forState:UIControlStateNormal];
     [postBtn addTarget:self action:@selector(postBtnAction) forControlEvents:UIControlEventTouchUpInside];
     [scrollView addSubview:postBtn];
-    
-    //
-    UILabel *instructionsLabel = [[UILabel alloc] initWithFrame:CGRectMake(20, CGRectGetMaxY(postBtn.frame) + 16, ScreenWidth - 40, 12)];
-    instructionsLabel.text = @"说明:请勿发布违反国家法规的内容";
-    instructionsLabel.font = [UIFont systemFontOfSize:12];
-    instructionsLabel.textColor = RGBValueColor(0x333333, 1.0);
-    [scrollView addSubview:instructionsLabel];
 }
 
 #pragma mark -- 选中的工作方式
+
 - (void)selectedAmountBtnAction:(UIButton *)sender {
-    
+
     skillPk = [self.skillArray[sender.tag] objectForKey:@"pk"];
     self.workTypeTF.text = sender.currentTitle;
-    
+
     self.selectedWorkTypeBtn.selected = NO;
     sender.selected = !sender.selected;
     self.selectedWorkTypeBtn = sender;
 }
 
 #pragma mark -- 确认发布
+
 - (void)postBtnAction {
     NSLog(@"确认发布");
     if (self.workTypeTF.text.length == 0) {
@@ -219,13 +240,14 @@
 }
 
 #pragma mark -- 获取技能标签
--(void)getSkillFromNetworking{
+
+- (void)getSkillFromNetworking {
     // 获取技能标签
     [YanCNetWorkManager requestGETWithURLStr:Url_getSkill(PublicUrl) parameters:nil finish:^(id dataDic) {
-        
+
         NSString *issuccess = dataDic[@"msg"];
         if ([issuccess isEqualToString:@"success"]) {
-            
+
             self.skillArray = dataDic[@"data"];
             //设置子试图
             [self creatSubViews];
@@ -233,14 +255,15 @@
             [MBProgressHUD hideHUDForView:self.view animated:YES];
             [MBProgressHUD showInfo:@"请求失败!"];
         }
-    } enError:^(NSError *error) {
+    }                                enError:^(NSError *error) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
     }];
 }
 
 #pragma mark -- 发布技能
+
 - (void)postDataFromNetworking {
-    
+
     ModelUser *modelUser = [ModelUser user];
     NSString *price = [NSString stringWithFormat:@"%@", self.priceTF.text];
     NSMutableDictionary *parameterDic = [NSMutableDictionary dictionaryWithCapacity:0];
@@ -249,7 +272,7 @@
     [parameterDic setObject:skillPk forKey:@"skillpk"];
     [parameterDic setObject:price forKey:@"price"];
     [parameterDic setObject:@"元/小时" forKey:@"unit"];
-    
+
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     [YanCNetWorkManager requestPostWithURLStr:Url_addskill(PublicUrl) parameters:parameterDic finish:^(id dataDic) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
@@ -257,18 +280,19 @@
         NSString *issuccess = dataDic[@"msg"];
         if ([issuccess isEqualToString:@"success"]) {
             [MBProgressHUD showInfo:@"发布成功!"];
-            
+
             [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(backClick) userInfo:nil repeats:NO];
         } else {
             [MBProgressHUD showInfo:@"请求失败!"];
         }
-    } enError:^(NSError *error) {
+    }                                 enError:^(NSError *error) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
         NSLog(@"error = %@", error);
     }];
 }
 
 #pragma mark -- 添加工作照
+
 - (void)addPicBtnAction {
     NSLog(@"添加工作照");
     [self changeHeaderPicture];
@@ -276,20 +300,21 @@
 
 #pragma mark -- 获取图片
 #pragma mark - 更换头像的方法
+
 - (void)changeHeaderPicture {
-    
+
     UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"温馨提示" message:nil preferredStyle:(UIAlertControllerStyleActionSheet)];
     // 设置按钮
-    UIAlertAction *action1 = [UIAlertAction actionWithTitle:@"从相册中选择" style:(UIAlertActionStyleDefault) handler:^(UIAlertAction * _Nonnull action) {
+    UIAlertAction *action1 = [UIAlertAction actionWithTitle:@"从相册中选择" style:(UIAlertActionStyleDefault) handler:^(UIAlertAction *_Nonnull action) {
         NSLog(@"选择相册");
         [self pickerPictureFromPhotoLibrary];
     }];
-    
-    UIAlertAction *action2 = [UIAlertAction actionWithTitle:@"使用相机拍摄" style:(UIAlertActionStyleDefault) handler:^(UIAlertAction * _Nonnull action) {
+
+    UIAlertAction *action2 = [UIAlertAction actionWithTitle:@"使用相机拍摄" style:(UIAlertActionStyleDefault) handler:^(UIAlertAction *_Nonnull action) {
         NSLog(@"请选择相机");
         [self pickerPictureFromCamera];
     }];
-    
+
     UIAlertAction *action3 = [UIAlertAction actionWithTitle:@"取消" style:(UIAlertActionStyleCancel) handler:nil];
     [alertController addAction:action1];
     [alertController addAction:action2];
@@ -307,7 +332,7 @@
     pickerVC.allowsEditing = YES;
     // 设置代理
     pickerVC.delegate = self;
-    
+
     [self presentViewController:pickerVC animated:YES completion:nil];
 }
 
@@ -327,18 +352,19 @@
     pickerVC.allowsEditing = YES;
     // 设置代理
     pickerVC.delegate = self;
-    
+
     [self presentViewController:pickerVC animated:YES completion:nil];
 }
 
 #pragma mark - UIImagePickerControllerDelegate的代理方法
-- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary<NSString *,id> *)info {
+
+- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary<NSString *, id> *)info {
     //    // info存储的是我们要的图片, 而图片是编辑后要得到的, 所以使用UIImagePickerControllerEditedImage
     //先要把头像上传,若上传成功了,就把这个图片给显示出来
-    
+
     //先要把头像上传,若上传成功了,就把这个图片给显示出来
     [self dismissViewControllerAnimated:YES completion:^{
-        
+
         NSString *mediaType = info[UIImagePickerControllerMediaType];
         if ([mediaType isEqualToString:@"public.image"]) {
             NSLog(@"image...");
@@ -350,14 +376,14 @@
             imagesize.height = 100;
             //对图片大小进行压缩
             UIImage *newImg = [self imageWithImage:original scaledToSize:imagesize];
-            NSData *imageData = UIImageJPEGRepresentation(newImg,1);
-            
+            NSData *imageData = UIImageJPEGRepresentation(newImg, 1);
+
 
             //            UIImage *selectImg = [[UIImage alloc] init];
             UIImage *selectImg = [UIImage imageWithData:imageData];
 //            NSLog(@"selectImg:%@",selectImg);
             self.workPicView.image = selectImg;
-     
+
             [self postPicDataWithNetworkingWith:newImg];
         }
     }];
@@ -366,9 +392,9 @@
 //用户取消退出picker时候调用
 
 - (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
-    NSLog(@"picker = %@",picker);
+    NSLog(@"picker = %@", picker);
     [self dismissViewControllerAnimated:YES completion:^{
-        
+
     }];
 }
 
@@ -376,36 +402,37 @@
 - (UIImage *)imageWithImage:(UIImage *)image scaledToSize:(CGSize)newSize {
     // Create a graphics image context
     UIGraphicsBeginImageContext(newSize);
-    
+
     // Tell the old image to draw in this new context, with the desired
     // new size
-    [image drawInRect:CGRectMake(0,0,newSize.width,newSize.height)];
-    
+    [image drawInRect:CGRectMake(0, 0, newSize.width, newSize.height)];
+
     // Get the new image from the context
-    UIImage* newImage = UIGraphicsGetImageFromCurrentImageContext();
-    
+    UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
+
     // End the context
     UIGraphicsEndImageContext();
-    
+
     // Return the new image.
     return newImage;
 }
 
 #pragma mark -- 上传图片
+
 - (void)postPicDataWithNetworkingWith:(UIImage *)image {
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
-    
+
     [YanCNetWorkManager requestPostWithURLStr:Url_skillphoto(PublicUrl) fileData:image name:@"skillImage" fileName:@"111.png" mimeType:@"image/jpg/png" parameters:nil finish:^(id dataDic) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
 
         NSString *issuccess = dataDic[@"msg"];
         if ([issuccess isEqualToString:@"success"]) {
             self.imageStr = [NSString stringWithFormat:@"%@", dataDic[@"img"]];
-            
+
         } else {
             [MBProgressHUD showInfo:@"请求失败!"];
         }
-    } enError:^(NSError *error) {
+    }                                 enError:^(NSError *error) {
         [MBProgressHUD hideHUDForView:self.view animated:YES];
     }];
 }
@@ -417,14 +444,15 @@
  }
  */
 #pragma mark ----- UITextFieldDelegate
+
 - (void)textFieldDidEndEditing:(UITextField *)textField {
     NSLog(@"textField.text = %@", textField.text);
 }
 
 - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string {
     if (textField.tag == 700) {
-        if(![self isValidAboutInputText:textField shouldChangeCharactersInRange:range replacementString:string decimalNumber:2]) {
-            
+        if (![self isValidAboutInputText:textField shouldChangeCharactersInRange:range replacementString:string decimalNumber:2]) {
+
             return NO;
         }
     }
@@ -434,46 +462,46 @@
 //输入框中只能输入数字和小数点,且小数点只能输入一位,参数number 可以设置小数的位数,该函数在-(BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string调用;
 
 - (BOOL)isValidAboutInputText:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string decimalNumber:(NSInteger)number {
-    
-    NSScanner      *scanner    = [NSScanner scannerWithString:string];
+
+    NSScanner *scanner = [NSScanner scannerWithString:string];
     NSCharacterSet *numbers;
-    NSRange         pointRange = [textField.text rangeOfString:@"."];
-    if ( (pointRange.length > 0) && (pointRange.location < range.location  || pointRange.location > range.location + range.length) ){
+    NSRange pointRange = [textField.text rangeOfString:@"."];
+    if ((pointRange.length > 0) && (pointRange.location < range.location || pointRange.location > range.location + range.length)) {
         numbers = [NSCharacterSet characterSetWithCharactersInString:@"0123456789"];
-    }else{
+    } else {
         numbers = [NSCharacterSet characterSetWithCharactersInString:@"0123456789."];
     }
-    if ( [textField.text isEqualToString:@""] && [string isEqualToString:@"."] ){
+    if ([textField.text isEqualToString:@""] && [string isEqualToString:@"."]) {
         return NO;
     }
     short remain = number; //保留 number位小数
     NSString *tempStr = [textField.text stringByAppendingString:string];
     NSUInteger strlen = [tempStr length];
-    if(pointRange.length > 0 && pointRange.location > 0){ //判断输入框内是否含有“.”。
-        if([string isEqualToString:@"."]){ //当输入框内已经含有“.”时,如果再输入“.”则被视为无效。
+    if (pointRange.length > 0 && pointRange.location > 0) { //判断输入框内是否含有“.”。
+        if ([string isEqualToString:@"."]) { //当输入框内已经含有“.”时,如果再输入“.”则被视为无效。
             return NO;
         }
-        if(strlen > 0 && (strlen - pointRange.location) > remain+1){ //当输入框内已经含有“.”,当字符串长度减去小数点前面的字符串长度大于需要要保留的小数点位数,则视当次输入无效。
+        if (strlen > 0 && (strlen - pointRange.location) > remain + 1) { //当输入框内已经含有“.”,当字符串长度减去小数点前面的字符串长度大于需要要保留的小数点位数,则视当次输入无效。
             return NO;
         }
     }
     NSRange zeroRange = [textField.text rangeOfString:@"0"];
-    if(zeroRange.length == 1 && zeroRange.location == 0){ //判断输入框第一个字符是否为“0”
-        if(![string isEqualToString:@"0"] && ![string isEqualToString:@"."] && [textField.text length] == 1){ //当输入框只有一个字符并且字符为“0”时,再输入不为“0”或者“.”的字符时,则将此输入替换输入框的这唯一字符。
+    if (zeroRange.length == 1 && zeroRange.location == 0) { //判断输入框第一个字符是否为“0”
+        if (![string isEqualToString:@"0"] && ![string isEqualToString:@"."] && [textField.text length] == 1) { //当输入框只有一个字符并且字符为“0”时,再输入不为“0”或者“.”的字符时,则将此输入替换输入框的这唯一字符。
             textField.text = string;
             return NO;
-        }else{
-            if(pointRange.length == 0 && pointRange.location > 0){ //当输入框第一个字符为“0”时,并且没有“.”字符时,如果当此输入的字符为“0”,则视当此输入无效。
-                if([string isEqualToString:@"0"]){
+        } else {
+            if (pointRange.length == 0 && pointRange.location > 0) { //当输入框第一个字符为“0”时,并且没有“.”字符时,如果当此输入的字符为“0”,则视当此输入无效。
+                if ([string isEqualToString:@"0"]) {
                     return NO;
                 }
             }
         }
     }
     NSString *buffer;
-    if ( ![scanner scanCharactersFromSet:numbers intoString:&buffer] && ([string length] != 0) ){
+    if (![scanner scanCharactersFromSet:numbers intoString:&buffer] && ([string length] != 0)) {
         return NO;
-    }else{
+    } else {
         return YES;
     }
 }

+ 1 - 1
model/Classes/Controllers/Controller/ShareVC/ShareCardController.m

@@ -72,7 +72,7 @@
     WXMediaMessage *urlMessage = [WXMediaMessage message];
     urlMessage.title = title;
     urlMessage.description = description;
-    [urlMessage setThumbImage:[UIImage imageNamed:@"AppIcon"]];
+    [urlMessage setThumbImage:[UIImage imageNamed:@"share_icon"]];
     WXWebpageObject *webObj = [WXWebpageObject object];
     webObj.webpageUrl = url;
     urlMessage.mediaObject = webObj;

+ 5 - 3
model/Classes/Controllers/Controller/ShareVC/ShareViewController.m

@@ -114,11 +114,13 @@
 }
 
 - (void)shareWxSession {
-    [self shareToWechat:WXSceneSession withTitle:@"千模" description:@"千模" url:shareUrl(@(self.type), [[NSUserDefaults standardUserDefaults] objectForKey:@"qrcode"])];
+    NSString *description = self.type == 1 ? @"找模特、艺人做商演;找空姐、校花做朋友。" : @"更多商演订单,视频面试可收取佣金,小姐妹们快来注册。";
+    [self shareToWechat:WXSceneSession withTitle:@"千模" description:description url:shareUrl(@(self.type), [[NSUserDefaults standardUserDefaults] objectForKey:@"qrcode"])];
 }
 
 - (void)shareWxTimeline {
-    [self shareToWechat:WXSceneTimeline withTitle:@"千模" description:@"千模" url:shareUrl(@(self.type), [[NSUserDefaults standardUserDefaults] objectForKey:@"qrcode"])];
+    NSString *description = self.type == 1 ? @"找模特、艺人做商演;找空姐、校花做朋友。" : @"更多商演订单,视频面试可收取佣金,小姐妹们快来注册。";
+    [self shareToWechat:WXSceneTimeline withTitle:@"千模" description:description url:shareUrl(@(self.type), [[NSUserDefaults standardUserDefaults] objectForKey:@"qrcode"])];
 }
 
 - (void)shareToWechat:(enum WXScene)scene withTitle:(NSString *)title description:(NSString *)description url:(NSString *)url {
@@ -128,7 +130,7 @@
     WXMediaMessage *urlMessage = [WXMediaMessage message];
     urlMessage.title = title;
     urlMessage.description = description;
-    [urlMessage setThumbImage:[UIImage imageNamed:@"AppIcon"]];
+    [urlMessage setThumbImage:[UIImage imageNamed:@"share_icon"]];
     WXWebpageObject *webObj = [WXWebpageObject object];
     webObj.webpageUrl = url;
     urlMessage.mediaObject = webObj;

+ 4 - 4
model/ModelHeader.h

@@ -13,19 +13,19 @@
 ///公共url
 //#define PublicUrl @"http://118.190.49.85/thmodel"
 //#define imageURl @"http://118.190.49.85/thmodel/"
-//#define apnsCernameStr @"chmoModelPush"
+//#define apnsCernameStr @"model"
 
 #define PublicUrl @"http://118.190.49.85:8080/thmodel"
 #define imageURl @"http://118.190.49.85:8080/thmodel/"
-#define apnsCernameStr @"chmoModelTest"
+#define apnsCernameStr @"modelDev"
 
 //#define PublicUrl @"http://192.168.50.132:8081"
 //#define imageURl @"http://192.168.50.132:8081/"
-//#define apnsCernameStr @"chmoMemberTest"
+//#define apnsCernameStr @"modelDev"
 
 //#define PublicUrl @"http://192.168.123.90:8080"
 //#define imageURl @"http://192.168.123.90:8080/"
-//#define apnsCernameStr @"chmoMemberTest"
+//#define apnsCernameStr @"modelDev"
 
 #define shareUrl(type,code) [NSString stringWithFormat:@"%@/share.jsp?type=%@&code=%@", PublicUrl, type, code]
 

部分文件因为文件数量过多而无法显示