merge

liuyu5211 · Mar 21, 2017 · 79e81d3 · 79e81d3
1 parent a8ebc9a
commit 79e81d3
Show file tree

Hide file tree

Showing 102 changed files with 6,338 additions and 20,501 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Podfile b/Podfile
@@ -1,4 +1,5 @@
 platform :ios, '7.0'
+target :TLChat do
 pod 'AFNetworking', '~> 3.0.4'
 pod 'SDWebImage', '~> 3.7.4'
 pod 'CocoaAsyncSocket', '~> 7.4.2'
@@ -13,3 +14,4 @@ pod 'CocoaLumberjack', '~> 2.2.0'
 pod 'MJRefresh', '~> 3.1.0'
 pod 'BlocksKit', '~> 2.2.5'
 pod 'MWPhotoBrowser', '~> 2.1.1'
+end
diff --git a/Podfile.lock b/Podfile.lock
@@ -50,9 +50,9 @@ PODS:
   - FMDB/standard (2.6.2)
   - Masonry (0.6.4)
   - MBProgressHUD (0.9.2)
-  - MJExtension (3.0.10)
-  - MJRefresh (3.1.0)
-  - MWPhotoBrowser (2.1.1):
+  - MJExtension (3.0.13)
+  - MJRefresh (3.1.12)
+  - MWPhotoBrowser (2.1.2):
     - DACircularProgress (~> 2.3)
     - MBProgressHUD (~> 0.9)
     - SDWebImage (!= 3.7.2, ~> 3.7)
@@ -63,10 +63,10 @@ PODS:
   - ReactiveCocoa/no-arc (2.5)
   - ReactiveCocoa/UI (2.5):
     - ReactiveCocoa/Core
-  - SDWebImage (3.7.5):
-    - SDWebImage/Core (= 3.7.5)
-  - SDWebImage/Core (3.7.5)
-  - SVProgressHUD (2.0.3)
+  - SDWebImage (3.7.6):
+    - SDWebImage/Core (= 3.7.6)
+  - SDWebImage/Core (3.7.6)
+  - SVProgressHUD (2.1.2)
   - UMengAnalytics (3.6.6)
 
 DEPENDENCIES:
@@ -93,12 +93,14 @@ SPEC CHECKSUMS:
   FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
   Masonry: 281802d04d787ea2973179ee8bcb50500579ede2
   MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
-  MJExtension: d86aacb740c87519d20e3cca55b6fa4be6cc7548
-  MJRefresh: 743e6404967d1c2c688472ea3ecfde247d872db4
-  MWPhotoBrowser: ba0d0c09ffda3a7ea10093518738c502c1c7141c
+  MJExtension: 5932755f451458eefa24239358817f8d291240c7
+  MJRefresh: b96cdb21c4aa75a7b07654311ab2f315c497e806
+  MWPhotoBrowser: 5836d7aa041dc05a13de380c246826578adc5ea5
   ReactiveCocoa: e2db045570aa97c695e7aa97c2bcab222ae51f4a
-  SDWebImage: 69c6303e3348fba97e03f65d65d4fbc26740f461
-  SVProgressHUD: b0830714205bea1317ea1a2ebc71e5633af334d4
+  SDWebImage: c325cf02c30337336b95beff20a13df489ec0ec9
+  SVProgressHUD: c404a55d78acbeb7ebb78b76d3faf986475a6994
   UMengAnalytics: 4bf831415146b9c57cb10be65fbd43462ef8cf65
 
-COCOAPODS: 0.39.0
+PODFILE CHECKSUM: 1d0f289c5dd3d2f9073e4299d70f21f199b1c22b
+
+COCOAPODS: 1.2.0
diff --git a/Pods/BlocksKit/BlocksKit/UIKit/UIAlertView+BlocksKit.m b/Pods/BlocksKit/BlocksKit/UIKit/UIAlertView+BlocksKit.m
diff --git a/Pods/Headers/Private/MJRefresh/NSBundle+MJRefresh.h b/Pods/Headers/Private/MJRefresh/NSBundle+MJRefresh.h
diff --git a/Pods/Headers/Public/MJRefresh/NSBundle+MJRefresh.h b/Pods/Headers/Public/MJRefresh/NSBundle+MJRefresh.h
diff --git a/Pods/MJExtension/MJExtension/MJProperty.m b/Pods/MJExtension/MJExtension/MJProperty.m
diff --git a/Pods/MJExtension/MJExtension/MJPropertyType.m b/Pods/MJExtension/MJExtension/MJPropertyType.m
diff --git a/Pods/MJExtension/MJExtension/NSObject+MJClass.m b/Pods/MJExtension/MJExtension/NSObject+MJClass.m
diff --git a/Pods/MJExtension/MJExtension/NSObject+MJKeyValue.h b/Pods/MJExtension/MJExtension/NSObject+MJKeyValue.h
diff --git a/Pods/MJExtension/MJExtension/NSObject+MJKeyValue.m b/Pods/MJExtension/MJExtension/NSObject+MJKeyValue.m
diff --git a/Pods/MJExtension/MJExtension/NSObject+MJProperty.h b/Pods/MJExtension/MJExtension/NSObject+MJProperty.h
diff --git a/Pods/MJExtension/MJExtension/NSObject+MJProperty.m b/Pods/MJExtension/MJExtension/NSObject+MJProperty.m
diff --git a/Pods/MJExtension/MJExtension/NSString+MJExtension.m b/Pods/MJExtension/MJExtension/NSString+MJExtension.m
diff --git a/Pods/MJRefresh/MJRefresh/Base/MJRefreshAutoFooter.h b/Pods/MJRefresh/MJRefresh/Base/MJRefreshAutoFooter.h
diff --git a/Pods/MJRefresh/MJRefresh/Base/MJRefreshAutoFooter.m b/Pods/MJRefresh/MJRefresh/Base/MJRefreshAutoFooter.m
diff --git a/Pods/MJRefresh/MJRefresh/Base/MJRefreshBackFooter.m b/Pods/MJRefresh/MJRefresh/Base/MJRefreshBackFooter.m
diff --git a/Pods/MJRefresh/MJRefresh/Base/MJRefreshComponent.h b/Pods/MJRefresh/MJRefresh/Base/MJRefreshComponent.h