Permalink
Browse files

更新 sdk 版本到 v2.0.0

  • Loading branch information...
huangminlinux committed Feb 23, 2016
1 parent 30f4437 commit da6c0244cc41af2fee69302dc0ba6ff73dd156ad
Showing with 2,570 additions and 18,379 deletions.
  1. +43 −25 JChat.xcodeproj/project.pbxproj
  2. +7 −0 JChat.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  3. +1 −1 JChat.xcworkspace/contents.xcworkspacedata
  4. +2 −2 JChat.xcworkspace/xcshareddata/JChat.xcscmblueprint
  5. +14 −14 JChat/AppDelegate.m
  6. +3 −3 JChat/Common/JCHATStringUtils.m
  7. +2 −4 JChat/Controller/Chat/JCHATConversationListViewController.m
  8. +8 −1 JChat/Controller/Chat/JCHATConversationViewController.m
  9. +0 −3 JChat/Controller/Chat/View/JCHATToolBar.m
  10. +0 −4 JChat/Controller/Chat/View/JCHATToolBar.xib
  11. +2 −4 JChat/Controller/JCHATTabBarViewController.xib
  12. +9 −20 JChat/Controller/Login/JCHATAlreadyLoginViewController.xib
  13. +2 −2 JChat/Controller/PersonInfo/JCHATDebugViewController.m
  14. +1 −3 JChat/Controller/PersonInfo/JCHATPersonViewController.m
  15. +2 −1 JChat/Controller/PersonInfo/JCHATSettingViewController.m
  16. +1 −1 JChat/Controller/PersonInfo/JCHATUpdatePasswordCtl.xib
  17. +1 −1 JChat/Controller/PersonInfo/JCHATUserInfoViewController.m
  18. +2 −10 JChat/Controller/Register/JCHATRegisterViewController.xib
  19. +1 −0 JChat/External/HMPhotoPicker/Controller/JCHATAlbumViewController.m
  20. +12 −17 JChat/External/PreviewPicture/MJPhotoView.m
  21. +1 −1 JChat/Info.plist
  22. BIN JChat/Resources/login/login_19_pre@2x.png
  23. +1 −1 JMESSAGE_VERSION
  24. +0 −1 Podfile
  25. +8 −31 Podfile.lock
  26. +0 −66 Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.h
  27. +0 −206 Pods/AFNetworking/AFNetworking/AFHTTPRequestOperation.m
  28. +0 −323 Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.h
  29. +0 −284 Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.m
  30. +0 −247 Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.h
  31. +0 −321 Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.m
  32. +0 −200 Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.h
  33. +0 −259 Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.m
  34. +0 −44 Pods/AFNetworking/AFNetworking/AFNetworking.h
  35. +0 −142 Pods/AFNetworking/AFNetworking/AFSecurityPolicy.h
  36. +0 −308 Pods/AFNetworking/AFNetworking/AFSecurityPolicy.m
  37. +0 −343 Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.h
  38. +0 −788 Pods/AFNetworking/AFNetworking/AFURLConnectionOperation.m
  39. +0 −467 Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.h
  40. +0 −1,384 Pods/AFNetworking/AFNetworking/AFURLRequestSerialization.m
  41. +0 −309 Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.h
  42. +0 −797 Pods/AFNetworking/AFNetworking/AFURLResponseSerialization.m
  43. +0 −546 Pods/AFNetworking/AFNetworking/AFURLSessionManager.h
  44. +0 −1,156 Pods/AFNetworking/AFNetworking/AFURLSessionManager.m
  45. +0 −19 Pods/AFNetworking/LICENSE
  46. +0 −385 Pods/AFNetworking/README.md
  47. +0 −75 Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.h
  48. +0 −172 Pods/AFNetworking/UIKit+AFNetworking/AFNetworkActivityIndicatorManager.m
  49. +0 −63 Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.h
  50. +0 −96 Pods/AFNetworking/UIKit+AFNetworking/UIActivityIndicatorView+AFNetworking.m
  51. +0 −95 Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.h
  52. +0 −141 Pods/AFNetworking/UIKit+AFNetworking/UIAlertView+AFNetworking.m
  53. +0 −180 Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.h
  54. +0 −293 Pods/AFNetworking/UIKit+AFNetworking/UIButton+AFNetworking.m
  55. +0 −35 Pods/AFNetworking/UIKit+AFNetworking/UIImage+AFNetworking.h
  56. +0 −142 Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.h
  57. +0 −215 Pods/AFNetworking/UIKit+AFNetworking/UIImageView+AFNetworking.m
  58. +0 −38 Pods/AFNetworking/UIKit+AFNetworking/UIKit+AFNetworking.h
  59. +0 −87 Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.h
  60. +0 −182 Pods/AFNetworking/UIKit+AFNetworking/UIProgressView+AFNetworking.m
  61. +0 −64 Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.h
  62. +0 −93 Pods/AFNetworking/UIKit+AFNetworking/UIRefreshControl+AFNetworking.m
  63. +0 −82 Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.h
  64. +0 −159 Pods/AFNetworking/UIKit+AFNetworking/UIWebView+AFNetworking.m
  65. +0 −4 Pods/CocoaLumberjack/Classes/CocoaLumberjack.modulemap
  66. +29 −29 Pods/CocoaLumberjack/Classes/CocoaLumberjack.swift
  67. +17 −1 Pods/CocoaLumberjack/Classes/DDASLLogCapture.h
  68. +1 −1 Pods/CocoaLumberjack/Classes/DDASLLogCapture.m
  69. +6 −2 Pods/CocoaLumberjack/Classes/DDASLLogger.h
  70. +12 −1 Pods/CocoaLumberjack/Classes/DDAbstractDatabaseLogger.h
  71. +159 −63 Pods/CocoaLumberjack/Classes/DDFileLogger.h
  72. +10 −51 Pods/CocoaLumberjack/Classes/DDFileLogger.m
  73. +2 −0 Pods/CocoaLumberjack/Classes/DDLegacyMacros.h
  74. +252 −55 Pods/CocoaLumberjack/Classes/DDLog.h
  75. +31 −25 Pods/CocoaLumberjack/Classes/DDLog.m
  76. +31 −26 Pods/CocoaLumberjack/Classes/DDTTYLogger.h
  77. +14 −13 Pods/CocoaLumberjack/Classes/DDTTYLogger.m
  78. +42 −0 Pods/CocoaLumberjack/Classes/Extensions/DDContextFilterLogFormatter.h
  79. +57 −14 Pods/CocoaLumberjack/Classes/Extensions/DDDispatchQueueLogFormatter.h
  80. +55 −25 Pods/CocoaLumberjack/Classes/Extensions/DDDispatchQueueLogFormatter.m
  81. +15 −1 Pods/CocoaLumberjack/Classes/Extensions/DDMultiFormatter.h
  82. +4 −1 Pods/CocoaLumberjack/Classes/Extensions/DDMultiFormatter.m
  83. +81 −3 Pods/CocoaLumberjack/README.md
  84. +0 −1 Pods/Headers/Private/AFNetworking/AFHTTPRequestOperation.h
  85. +0 −1 Pods/Headers/Private/AFNetworking/AFHTTPRequestOperationManager.h
  86. +0 −1 Pods/Headers/Private/AFNetworking/AFHTTPSessionManager.h
  87. +0 −1 Pods/Headers/Private/AFNetworking/AFNetworkActivityIndicatorManager.h
  88. +0 −1 Pods/Headers/Private/AFNetworking/AFNetworkReachabilityManager.h
  89. +0 −1 Pods/Headers/Private/AFNetworking/AFNetworking.h
  90. +0 −1 Pods/Headers/Private/AFNetworking/AFSecurityPolicy.h
  91. +0 −1 Pods/Headers/Private/AFNetworking/AFURLConnectionOperation.h
  92. +0 −1 Pods/Headers/Private/AFNetworking/AFURLRequestSerialization.h
  93. +0 −1 Pods/Headers/Private/AFNetworking/AFURLResponseSerialization.h
  94. +0 −1 Pods/Headers/Private/AFNetworking/AFURLSessionManager.h
  95. +0 −1 Pods/Headers/Private/AFNetworking/UIActivityIndicatorView+AFNetworking.h
  96. +0 −1 Pods/Headers/Private/AFNetworking/UIAlertView+AFNetworking.h
  97. +0 −1 Pods/Headers/Private/AFNetworking/UIButton+AFNetworking.h
  98. +0 −1 Pods/Headers/Private/AFNetworking/UIImage+AFNetworking.h
  99. +0 −1 Pods/Headers/Private/AFNetworking/UIImageView+AFNetworking.h
  100. +0 −1 Pods/Headers/Private/AFNetworking/UIKit+AFNetworking.h
  101. +0 −1 Pods/Headers/Private/AFNetworking/UIProgressView+AFNetworking.h
  102. +0 −1 Pods/Headers/Private/AFNetworking/UIRefreshControl+AFNetworking.h
  103. +0 −1 Pods/Headers/Private/AFNetworking/UIWebView+AFNetworking.h
  104. +0 −1 Pods/Headers/Private/SDWebImage/NSData+ImageContentType.h
  105. +0 −1 Pods/Headers/Private/SDWebImage/SDImageCache.h
  106. +0 −1 Pods/Headers/Private/SDWebImage/SDWebImageCompat.h
  107. +0 −1 Pods/Headers/Private/SDWebImage/SDWebImageDecoder.h
  108. +0 −1 Pods/Headers/Private/SDWebImage/SDWebImageDownloader.h
  109. +0 −1 Pods/Headers/Private/SDWebImage/SDWebImageDownloaderOperation.h
  110. +0 −1 Pods/Headers/Private/SDWebImage/SDWebImageManager.h
  111. +0 −1 Pods/Headers/Private/SDWebImage/SDWebImageOperation.h
  112. +0 −1 Pods/Headers/Private/SDWebImage/SDWebImagePrefetcher.h
  113. +0 −1 Pods/Headers/Private/SDWebImage/UIButton+WebCache.h
  114. +0 −1 Pods/Headers/Private/SDWebImage/UIImage+GIF.h
  115. +0 −1 Pods/Headers/Private/SDWebImage/UIImage+MultiFormat.h
  116. +0 −1 Pods/Headers/Private/SDWebImage/UIImageView+HighlightedWebCache.h
  117. +0 −1 Pods/Headers/Private/SDWebImage/UIImageView+WebCache.h
  118. +0 −1 Pods/Headers/Private/SDWebImage/UIView+WebCacheOperation.h
  119. +0 −1 Pods/Headers/Public/AFNetworking/AFHTTPRequestOperation.h
  120. +0 −1 Pods/Headers/Public/AFNetworking/AFHTTPRequestOperationManager.h
  121. +0 −1 Pods/Headers/Public/AFNetworking/AFHTTPSessionManager.h
  122. +0 −1 Pods/Headers/Public/AFNetworking/AFNetworkActivityIndicatorManager.h
  123. +0 −1 Pods/Headers/Public/AFNetworking/AFNetworkReachabilityManager.h
  124. +0 −1 Pods/Headers/Public/AFNetworking/AFNetworking.h
  125. +0 −1 Pods/Headers/Public/AFNetworking/AFSecurityPolicy.h
  126. +0 −1 Pods/Headers/Public/AFNetworking/AFURLConnectionOperation.h
  127. +0 −1 Pods/Headers/Public/AFNetworking/AFURLRequestSerialization.h
  128. +0 −1 Pods/Headers/Public/AFNetworking/AFURLResponseSerialization.h
  129. +0 −1 Pods/Headers/Public/AFNetworking/AFURLSessionManager.h
  130. +0 −1 Pods/Headers/Public/AFNetworking/UIActivityIndicatorView+AFNetworking.h
  131. +0 −1 Pods/Headers/Public/AFNetworking/UIAlertView+AFNetworking.h
  132. +0 −1 Pods/Headers/Public/AFNetworking/UIButton+AFNetworking.h
  133. +0 −1 Pods/Headers/Public/AFNetworking/UIImage+AFNetworking.h
  134. +0 −1 Pods/Headers/Public/AFNetworking/UIImageView+AFNetworking.h
  135. +0 −1 Pods/Headers/Public/AFNetworking/UIKit+AFNetworking.h
  136. +0 −1 Pods/Headers/Public/AFNetworking/UIProgressView+AFNetworking.h
  137. +0 −1 Pods/Headers/Public/AFNetworking/UIRefreshControl+AFNetworking.h
  138. +0 −1 Pods/Headers/Public/AFNetworking/UIWebView+AFNetworking.h
  139. +0 −1 Pods/Headers/Public/SDWebImage/NSData+ImageContentType.h
  140. +0 −1 Pods/Headers/Public/SDWebImage/SDImageCache.h
  141. +0 −1 Pods/Headers/Public/SDWebImage/SDWebImageCompat.h
  142. +0 −1 Pods/Headers/Public/SDWebImage/SDWebImageDecoder.h
  143. +0 −1 Pods/Headers/Public/SDWebImage/SDWebImageDownloader.h
  144. +0 −1 Pods/Headers/Public/SDWebImage/SDWebImageDownloaderOperation.h
  145. +0 −1 Pods/Headers/Public/SDWebImage/SDWebImageManager.h
  146. +0 −1 Pods/Headers/Public/SDWebImage/SDWebImageOperation.h
  147. +0 −1 Pods/Headers/Public/SDWebImage/SDWebImagePrefetcher.h
  148. +0 −1 Pods/Headers/Public/SDWebImage/UIButton+WebCache.h
  149. +0 −1 Pods/Headers/Public/SDWebImage/UIImage+GIF.h
  150. +0 −1 Pods/Headers/Public/SDWebImage/UIImage+MultiFormat.h
  151. +0 −1 Pods/Headers/Public/SDWebImage/UIImageView+HighlightedWebCache.h
  152. +0 −1 Pods/Headers/Public/SDWebImage/UIImageView+WebCache.h
  153. +0 −1 Pods/Headers/Public/SDWebImage/UIView+WebCacheOperation.h
  154. +8 −31 Pods/Manifest.lock
  155. +1,604 −2,033 Pods/Pods.xcodeproj/project.pbxproj
  156. +0 −20 Pods/SDWebImage/LICENSE
  157. +0 −315 Pods/SDWebImage/README.md
  158. +0 −26 Pods/SDWebImage/SDWebImage/NSData+ImageContentType.h
  159. +0 −49 Pods/SDWebImage/SDWebImage/NSData+ImageContentType.m
  160. +0 −262 Pods/SDWebImage/SDWebImage/SDImageCache.h
  161. +0 −601 Pods/SDWebImage/SDWebImage/SDImageCache.m
  162. +0 −72 Pods/SDWebImage/SDWebImage/SDWebImageCompat.h
  163. +0 −51 Pods/SDWebImage/SDWebImage/SDWebImageCompat.m
  164. +0 −18 Pods/SDWebImage/SDWebImage/SDWebImageDecoder.h
  165. +0 −72 Pods/SDWebImage/SDWebImage/SDWebImageDecoder.m
  166. +0 −186 Pods/SDWebImage/SDWebImage/SDWebImageDownloader.h
  167. +0 −228 Pods/SDWebImage/SDWebImage/SDWebImageDownloader.m
  168. +0 −78 Pods/SDWebImage/SDWebImage/SDWebImageDownloaderOperation.h
  169. +0 −466 Pods/SDWebImage/SDWebImage/SDWebImageDownloaderOperation.m
  170. +0 −299 Pods/SDWebImage/SDWebImage/SDWebImageManager.h
  171. +0 −354 Pods/SDWebImage/SDWebImage/SDWebImageManager.m
  172. +0 −15 Pods/SDWebImage/SDWebImage/SDWebImageOperation.h
  173. +0 −103 Pods/SDWebImage/SDWebImage/SDWebImagePrefetcher.h
  174. +0 −145 Pods/SDWebImage/SDWebImage/SDWebImagePrefetcher.m
  175. +0 −229 Pods/SDWebImage/SDWebImage/UIButton+WebCache.h
  176. +0 −260 Pods/SDWebImage/SDWebImage/UIButton+WebCache.m
  177. +0 −19 Pods/SDWebImage/SDWebImage/UIImage+GIF.h
  178. +0 −158 Pods/SDWebImage/SDWebImage/UIImage+GIF.m
  179. +0 −15 Pods/SDWebImage/SDWebImage/UIImage+MultiFormat.h
  180. +0 −118 Pods/SDWebImage/SDWebImage/UIImage+MultiFormat.m
  181. +0 −100 Pods/SDWebImage/SDWebImage/UIImageView+HighlightedWebCache.h
  182. +0 −107 Pods/SDWebImage/SDWebImage/UIImageView+HighlightedWebCache.m
  183. +0 −201 Pods/SDWebImage/SDWebImage/UIImageView+WebCache.h
  184. +0 −202 Pods/SDWebImage/SDWebImage/UIImageView+WebCache.m
  185. +0 −36 Pods/SDWebImage/SDWebImage/UIView+WebCacheOperation.h
  186. +0 −55 Pods/SDWebImage/SDWebImage/UIView+WebCacheOperation.m
  187. +0 −6 Pods/Target Support Files/AFNetworking/AFNetworking-Private.xcconfig
  188. +0 −5 Pods/Target Support Files/AFNetworking/AFNetworking-dummy.m
  189. +0 −4 Pods/Target Support Files/AFNetworking/AFNetworking-prefix.pch
  190. +0 −1 Pods/Target Support Files/AFNetworking/AFNetworking.xcconfig
  191. +0 −5 Pods/Target Support Files/CocoaLumberjack/CocoaLumberjack-Private.xcconfig
  192. +4 −0 Pods/Target Support Files/CocoaLumberjack/CocoaLumberjack.xcconfig
  193. +0 −7 Pods/Target Support Files/GPUImage/GPUImage-Private.xcconfig
  194. +6 −2 Pods/Target Support Files/GPUImage/GPUImage.xcconfig
  195. +0 −23 Pods/Target Support Files/Pods/Pods-acknowledgements.markdown
  196. +0 −27 Pods/Target Support Files/Pods/Pods-acknowledgements.plist
  197. +1 −8 Pods/Target Support Files/Pods/Pods-resources.sh
  198. +0 −6 Pods/Target Support Files/Pods/Pods.ad-hoc profile.xcconfig
  199. +3 −3 Pods/Target Support Files/Pods/Pods.debug.xcconfig
  200. +3 −3 Pods/Target Support Files/Pods/Pods.release.xcconfig
  201. +0 −5 Pods/Target Support Files/SDWebImage/SDWebImage-dummy.m
  202. +0 −4 Pods/Target Support Files/SDWebImage/SDWebImage-prefix.pch
  203. +0 −5 Pods/Target Support Files/SDWebImage/SDWebImage.xcconfig
@@ -350,6 +350,7 @@
624B63961C1802B30034D670 /* JCHATAlertToSendImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 624B63951C1802B30034D670 /* JCHATAlertToSendImage.m */; };
624B63981C1953E10034D670 /* AlertViewtextFieldBackgroupImage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 624B63971C1953E10034D670 /* AlertViewtextFieldBackgroupImage@2x.png */; };
624E8E2F1BE8C1E9006E2709 /* JCHATMessageContentView.m in Sources */ = {isa = PBXBuildFile; fileRef = 624E8E2E1BE8C1E8006E2709 /* JCHATMessageContentView.m */; };
625940051C4F53F2004E7C59 /* login_19_pre@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 625940041C4F53F2004E7C59 /* login_19_pre@2x.png */; };
626863A61C3A61DC00D5B1F9 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 626863A51C3A61DC00D5B1F9 /* AssetsLibrary.framework */; };
627302341C294EBA00D80CC3 /* JCHATSelectImgCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 627302331C294EBA00D80CC3 /* JCHATSelectImgCollectionView.m */; };
6280EFB81BE0ABB500EBE345 /* ChatBubbleLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6280EFB51BE0ABB500EBE345 /* ChatBubbleLayer.m */; };
@@ -381,9 +382,9 @@
62DC25811C0D77780054BA74 /* JCHATAlbumModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 62DC25801C0D77780054BA74 /* JCHATAlbumModel.m */; };
62EF28611BE6F18E0036699E /* JCHATTimeOutManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 62EF28601BE6F18E0036699E /* JCHATTimeOutManager.m */; };
62F4F4BC1BDA351400CD3AB7 /* JCHATLoadMessageTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 62F4F4BB1BDA351400CD3AB7 /* JCHATLoadMessageTableViewCell.m */; };
833BC88D94A9C251216EB422 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56935E972E8DA4EBADF6032 /* libPods.a */; };
8FF149FB1AFBA11800D13F2E /* MBProgressHUD.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8FF149F81AFBA11800D13F2E /* MBProgressHUD.bundle */; };
8FF149FC1AFBA11800D13F2E /* MBProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FF149FA1AFBA11800D13F2E /* MBProgressHUD.m */; };
9C979D9E5AD8492296E1A3D3 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E5FD764EC422CFC7BB8C437 /* libPods.a */; };
AA4D05A91B43917B007D7B78 /* JCHATAboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AA4D05A71B43917B007D7B78 /* JCHATAboutViewController.m */; };
AA4D05AA1B43917B007D7B78 /* JCHATAboutViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = AA4D05A81B43917B007D7B78 /* JCHATAboutViewController.xib */; };
/* End PBXBuildFile section */
@@ -675,7 +676,7 @@
18AB9C8C1A43BCB7007B2A04 /* JChat.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JChat.app; sourceTree = BUILT_PRODUCTS_DIR; };
18B8FDA81B3D23DB00538C00 /* receiveFail@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "receiveFail@2x.png"; sourceTree = "<group>"; };
18B8FDAA1B3D240500538C00 /* receiveFail@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "receiveFail@3x.png"; sourceTree = "<group>"; };
2E5FD764EC422CFC7BB8C437 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
37640D8E13D3DF1A66B344C0 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
443304A81B5F37A500430840 /* CExpandHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CExpandHeader.h; sourceTree = "<group>"; };
443304A91B5F37A500430840 /* CExpandHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CExpandHeader.m; sourceTree = "<group>"; };
443E40F51B53BD6C00F46651 /* JCHATMessageTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JCHATMessageTableViewCell.h; sourceTree = "<group>"; };
@@ -864,6 +865,7 @@
624B63971C1953E10034D670 /* AlertViewtextFieldBackgroupImage@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "AlertViewtextFieldBackgroupImage@2x.png"; sourceTree = "<group>"; };
624E8E2D1BE8C1E8006E2709 /* JCHATMessageContentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JCHATMessageContentView.h; sourceTree = "<group>"; };
624E8E2E1BE8C1E8006E2709 /* JCHATMessageContentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JCHATMessageContentView.m; sourceTree = "<group>"; };
625940041C4F53F2004E7C59 /* login_19_pre@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "login_19_pre@2x.png"; sourceTree = "<group>"; };
626863A51C3A61DC00D5B1F9 /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework; sourceTree = SDKROOT; };
627302321C294EBA00D80CC3 /* JCHATSelectImgCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JCHATSelectImgCollectionView.h; sourceTree = "<group>"; };
627302331C294EBA00D80CC3 /* JCHATSelectImgCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JCHATSelectImgCollectionView.m; sourceTree = "<group>"; };
@@ -911,16 +913,15 @@
62EF28601BE6F18E0036699E /* JCHATTimeOutManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JCHATTimeOutManager.m; sourceTree = "<group>"; };
62F4F4BA1BDA351400CD3AB7 /* JCHATLoadMessageTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JCHATLoadMessageTableViewCell.h; sourceTree = "<group>"; };
62F4F4BB1BDA351400CD3AB7 /* JCHATLoadMessageTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JCHATLoadMessageTableViewCell.m; sourceTree = "<group>"; };
874850B7D556DA69C1D98C6B /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
8F8840A71B159E7500BDC126 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8FF149F81AFBA11800D13F2E /* MBProgressHUD.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = MBProgressHUD.bundle; sourceTree = "<group>"; };
8FF149F91AFBA11800D13F2E /* MBProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBProgressHUD.h; sourceTree = "<group>"; };
8FF149FA1AFBA11800D13F2E /* MBProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBProgressHUD.m; sourceTree = "<group>"; };
AA4D05A61B43917B007D7B78 /* JCHATAboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JCHATAboutViewController.h; sourceTree = "<group>"; };
AA4D05A71B43917B007D7B78 /* JCHATAboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JCHATAboutViewController.m; sourceTree = "<group>"; };
AA4D05A81B43917B007D7B78 /* JCHATAboutViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = JCHATAboutViewController.xib; sourceTree = "<group>"; };
B8B54727AA73AD3FB615786C /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
DC57155E308472729B329A1B /* Pods.ad-hoc profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods.ad-hoc profile.xcconfig"; path = "Pods/Target Support Files/Pods/Pods.ad-hoc profile.xcconfig"; sourceTree = "<group>"; };
E78CC7C67314E62543E96F04 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
F56935E972E8DA4EBADF6032 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -946,7 +947,7 @@
183983371AFC914900AC8280 /* Security.framework in Frameworks */,
183983351AFC914100AC8280 /* libz.dylib in Frameworks */,
62408B4E1C08506000EB873B /* JMessage.framework in Frameworks */,
9C979D9E5AD8492296E1A3D3 /* libPods.a in Frameworks */,
833BC88D94A9C251216EB422 /* libPods.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1349,6 +1350,7 @@
187182801AFB80C000FB3168 /* login */ = {
isa = PBXGroup;
children = (
625940041C4F53F2004E7C59 /* login_19_pre@2x.png */,
44C3E9701B7096BC00D3D825 /* login_19_pre@3x.png */,
187182821AFB80C000FB3168 /* login_01@2x.png */,
187182831AFB80C000FB3168 /* login_01@3x.png */,
@@ -1439,7 +1441,7 @@
8F8840A51B159E7500BDC126 /* JChat Tests */,
18AB9C8D1A43BCB7007B2A04 /* Products */,
18AB9CF41A43BD28007B2A04 /* Frameworks */,
BCBAFCA78C2C29219712FDA3 /* Pods */,
8626A8EE5026E526D715D8E6 /* Pods */,
);
sourceTree = "<group>";
};
@@ -1454,8 +1456,8 @@
18AB9CF41A43BD28007B2A04 /* Frameworks */ = {
isa = PBXGroup;
children = (
626863A51C3A61DC00D5B1F9 /* AssetsLibrary.framework */,
62408B4D1C08506000EB873B /* JMessage.framework */,
626863A51C3A61DC00D5B1F9 /* AssetsLibrary.framework */,
62BD8A541BEC3E5200EC807E /* Photos.framework */,
44B60EAD1B7B43EA00AE828D /* OpenGLES.framework */,
44B60EAB1B7B43DF00AE828D /* CoreVideo.framework */,
@@ -1475,7 +1477,7 @@
183983381AFC915C00AC8280 /* CoreAudio.framework */,
183983361AFC914900AC8280 /* Security.framework */,
183983341AFC914100AC8280 /* libz.dylib */,
2E5FD764EC422CFC7BB8C437 /* libPods.a */,
F56935E972E8DA4EBADF6032 /* libPods.a */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -1779,6 +1781,15 @@
path = View;
sourceTree = "<group>";
};
8626A8EE5026E526D715D8E6 /* Pods */ = {
isa = PBXGroup;
children = (
37640D8E13D3DF1A66B344C0 /* Pods.debug.xcconfig */,
874850B7D556DA69C1D98C6B /* Pods.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
8F8840A51B159E7500BDC126 /* JChat Tests */ = {
isa = PBXGroup;
children = (
@@ -1796,30 +1807,21 @@
name = "Supporting Files";
sourceTree = "<group>";
};
BCBAFCA78C2C29219712FDA3 /* Pods */ = {
isa = PBXGroup;
children = (
B8B54727AA73AD3FB615786C /* Pods.debug.xcconfig */,
E78CC7C67314E62543E96F04 /* Pods.release.xcconfig */,
DC57155E308472729B329A1B /* Pods.ad-hoc profile.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
18AB9C8B1A43BCB7007B2A04 /* JChat */ = {
isa = PBXNativeTarget;
buildConfigurationList = 18AB9CAF1A43BCB7007B2A04 /* Build configuration list for PBXNativeTarget "JChat" */;
buildPhases = (
1521C511772D2DA06EEEBD1E /* Check Pods Manifest.lock */,
B507677551EC3B8916ECCC8E /* Check Pods Manifest.lock */,
18AB9C881A43BCB7007B2A04 /* Sources */,
18AB9C891A43BCB7007B2A04 /* Frameworks */,
18AB9C8A1A43BCB7007B2A04 /* Resources */,
AAC65A4A1AF76DA000BBFCF9 /* Embed Frameworks */,
88C5AB6D7EBDFD8C083FAB3F /* Copy Pods Resources */,
8F7E5CAD1C06A12F005E9788 /* ShellScript */,
814143BBBCAE1F1C3FE484C7 /* Embed Pods Frameworks */,
);
buildRules = (
);
@@ -2053,6 +2055,7 @@
187184091AFB80C000FB3168 /* loginOut_17@2x.png in Resources */,
187183F31AFB80C000FB3168 /* RecordingSignal001@2x.png in Resources */,
187184101AFB80C000FB3168 /* wo@3x.png in Resources */,
625940051C4F53F2004E7C59 /* login_19_pre@2x.png in Resources */,
187183461AFB80C000FB3168 /* JCHATAddViewController.xib in Resources */,
187183D71AFB80C000FB3168 /* menu_12@2x.png in Resources */,
187183BA1AFB80C000FB3168 /* login_04@3x.png in Resources */,
@@ -2120,19 +2123,19 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
1521C511772D2DA06EEEBD1E /* Check Pods Manifest.lock */ = {
814143BBBCAE1F1C3FE484C7 /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
88C5AB6D7EBDFD8C083FAB3F /* Copy Pods Resources */ = {
@@ -2163,6 +2166,21 @@
shellPath = /bin/sh;
shellScript = "echo \"Execute a script to check jmessage version\"\n\n\"${PROJECT_DIR}\"/check_jmessage_version.sh\n\n";
};
B507677551EC3B8916ECCC8E /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@@ -2401,7 +2419,7 @@
};
18AB9CB01A43BCB7007B2A04 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = B8B54727AA73AD3FB615786C /* Pods.debug.xcconfig */;
baseConfigurationReference = 37640D8E13D3DF1A66B344C0 /* Pods.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -2445,7 +2463,7 @@
};
18AB9CB11A43BCB7007B2A04 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = E78CC7C67314E62543E96F04 /* Pods.release.xcconfig */;
baseConfigurationReference = 874850B7D556DA69C1D98C6B /* Pods.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -9,7 +9,7 @@
"edda36ef-85a5-004d-9115-9a14e77ad9fc++5282" : 0,
"92EA2C4B34B798E9CDB9C82DDA8DE56F1A7EB254" : 0
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "7CC404CF-6B62-4A74-BD7F-13A07CFA183E",
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "AF7AAE68-D415-463C-A1FB-48B33FD20FB0",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"edda36ef-85a5-004d-9115-9a14e77ad9fc++5282" : "client-team\/ios-chat-app\/JChat\/External\/MBProgressHUD\/",
"92EA2C4B34B798E9CDB9C82DDA8DE56F1A7EB254" : "client-team\/"
@@ -19,7 +19,7 @@
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "ios-chat-app\/JChat.xcworkspace",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "ssh-gitlab.jpushoa.com:sdk\/client-team.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "ssh-gitlab.jpushoa.com:huangmin\/client-team.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "92EA2C4B34B798E9CDB9C82DDA8DE56F1A7EB254"
},
View
@@ -157,19 +157,19 @@ - (void)initLogger {
[fileLogger setLogFormatter:formatter];
[DDLog addLogger:fileLogger];
[[DDTTYLogger sharedInstance] setForegroundColor:DDMakeColor(255, 0, 0)
backgroundColor:nil
forFlag:LOG_FLAG_ERROR];
[[DDTTYLogger sharedInstance] setForegroundColor:DDMakeColor(255, 215, 0)
backgroundColor:nil
forFlag:LOG_FLAG_WARN];
[[DDTTYLogger sharedInstance] setForegroundColor:DDMakeColor(0, 255, 0)
backgroundColor:nil
forFlag:LOG_FLAG_DEBUG];
[[DDTTYLogger sharedInstance] setForegroundColor:DDMakeColor(0, 0, 255)
backgroundColor:nil
forFlag:LOG_FLAG_INFO];
[[DDTTYLogger sharedInstance] setColorsEnabled:YES];
// [[DDTTYLogger sharedInstance] setForegroundColor:DDMakeColor(255, 0, 0)
// backgroundColor:nil
// forFlag:LOG_FLAG_ERROR];
// [[DDTTYLogger sharedInstance] setForegroundColor:DDMakeColor(255, 215, 0)
// backgroundColor:nil
// forFlag:LOG_FLAG_WARN];
// [[DDTTYLogger sharedInstance] setForegroundColor:DDMakeColor(0, 255, 0)
// backgroundColor:nil
// forFlag:LOG_FLAG_DEBUG];
// [[DDTTYLogger sharedInstance] setForegroundColor:DDMakeColor(0, 0, 255)
// backgroundColor:nil
// forFlag:LOG_FLAG_INFO];
// [[DDTTYLogger sharedInstance] setColorsEnabled:YES];
}
// notification from JPush
@@ -314,7 +314,7 @@ - (void)application:(UIApplication *)application
fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
DDLogDebug(@"Action - didReceiveRemoteNotification:fetchCompletionHandler");
[JPUSHService handleRemoteNotification:userInfo];
DDLogVerbose(@"收到通知 - %@", [JCHATStringUtils dictionary2String:userInfo]);
NSLog(@"收到通知 - %@", userInfo);
completionHandler(UIBackgroundFetchResultNewData);
}
@@ -158,9 +158,9 @@ + (NSString *)errorAlert:(NSError *)error {
case kJMSGErrorHttpServerResponseTimeout:
errorAlert = @"服务器端响应超时";
break;
// case kJMSGErrorNetworkUserNotRegistered:
// errorAlert = @"用户名还没有被注册过";
// break;
case kJMSGErrorTcpUserNotRegistered:
errorAlert = @"用户名还没有被注册过";
break;
case kJMSGErrorTcpUserPasswordError:
errorAlert = @"密码错误";
break;
Oops, something went wrong.

0 comments on commit da6c024

Please sign in to comment.