Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
YiZi committed Jun 20, 2016
1 parent 2b60169 commit f2e4d5c
Show file tree
Hide file tree
Showing 5 changed files with 99 additions and 94 deletions.
16 changes: 8 additions & 8 deletions DFTimelineView.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ Pod::Spec.new do |s|

s.requires_arc = true

s.dependency 'DFCommon', '~> 1.3.7'
s.dependency 'AFNetworking', '~> 2.6.0'
s.dependency 'SDWebImage', '~> 3.7.3'
s.dependency 'FMDB', '~> 2.5'
s.dependency 'DFCommon', '~> 1.4.3'
s.dependency 'AFNetworking', '~> 3.1.0'
s.dependency 'SDWebImage', '~> 3.8.1'
s.dependency 'FMDB', '~> 2.6.2'
s.dependency 'MBProgressHUD', '~> 0.9.1'
s.dependency 'MLLabel', '~> 1.7'
s.dependency 'MLLabel', '~> 1.9.1'

s.dependency 'MJRefresh', '~> 2.4.11'
s.dependency 'MJRefresh', '~> 3.1.7'
s.dependency 'ODRefreshControl', '~> 1.2'
s.dependency 'MJPhotoBrowser', '~> 1.0.2'
s.dependency 'MMPopupView'
s.dependency 'TZImagePickerController'
s.dependency 'MMPopupView', '~> 1.7.2'
s.dependency 'TZImagePickerController', '~> 1.4.5'

end
64 changes: 32 additions & 32 deletions DFTimelineView.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
11E157981BC0293900F2F99A /* DFFaceManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 11E157971BC0293900F2F99A /* DFFaceManager.m */; };
11E157CF1BC8F6E500F2F99A /* CommentInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 11E157CE1BC8F6E500F2F99A /* CommentInputView.m */; };
11F07F9E1BCF9BBE0084DAA3 /* DFBaseTimeLineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11F07F9D1BCF9BBE0084DAA3 /* DFBaseTimeLineViewController.m */; };
FDBBC1BA891E2AED5A17C223 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA7388AAC42C4B4A3183F925 /* libPods.a */; };
F6EC3B07A280F7A8DCB045F3 /* libPods-DFTimelineView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AEB4208C75F9B47EAAE19E80 /* libPods-DFTimelineView.a */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -139,31 +139,23 @@
11E157CE1BC8F6E500F2F99A /* CommentInputView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommentInputView.m; sourceTree = "<group>"; };
11F07F9C1BCF9BBD0084DAA3 /* DFBaseTimeLineViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DFBaseTimeLineViewController.h; sourceTree = "<group>"; };
11F07F9D1BCF9BBE0084DAA3 /* DFBaseTimeLineViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DFBaseTimeLineViewController.m; sourceTree = "<group>"; };
22443A8775E23D18891FEAC9 /* 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>"; };
A2A89A39EA353891C22903B7 /* 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>"; };
DA7388AAC42C4B4A3183F925 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
56800185CF8887378A48754C /* Pods-DFTimelineView.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DFTimelineView.debug.xcconfig"; path = "Pods/Target Support Files/Pods-DFTimelineView/Pods-DFTimelineView.debug.xcconfig"; sourceTree = "<group>"; };
9959D93D9FA03E08D9405FAE /* Pods-DFTimelineView.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DFTimelineView.release.xcconfig"; path = "Pods/Target Support Files/Pods-DFTimelineView/Pods-DFTimelineView.release.xcconfig"; sourceTree = "<group>"; };
AEB4208C75F9B47EAAE19E80 /* libPods-DFTimelineView.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-DFTimelineView.a"; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
11D7581D1BB7D43B00F554D7 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
FDBBC1BA891E2AED5A17C223 /* libPods.a in Frameworks */,
F6EC3B07A280F7A8DCB045F3 /* libPods-DFTimelineView.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
021C283331FA8D983A6E3F5E /* Frameworks */ = {
isa = PBXGroup;
children = (
DA7388AAC42C4B4A3183F925 /* libPods.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
1173E51D1C71B1F5004C9979 /* Plugin */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -223,8 +215,8 @@
children = (
11D758221BB7D43B00F554D7 /* DFTimelineView */,
11D758211BB7D43B00F554D7 /* Products */,
80C4F7CEF958C1F2DD0212BC /* Pods */,
021C283331FA8D983A6E3F5E /* Frameworks */,
782F5666067D60162A8625C3 /* Pods */,
60FE8DAF80C297CC9F9C0A95 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -413,11 +405,19 @@
path = CommentInputView;
sourceTree = "<group>";
};
80C4F7CEF958C1F2DD0212BC /* Pods */ = {
60FE8DAF80C297CC9F9C0A95 /* Frameworks */ = {
isa = PBXGroup;
children = (
AEB4208C75F9B47EAAE19E80 /* libPods-DFTimelineView.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
782F5666067D60162A8625C3 /* Pods */ = {
isa = PBXGroup;
children = (
22443A8775E23D18891FEAC9 /* Pods.debug.xcconfig */,
A2A89A39EA353891C22903B7 /* Pods.release.xcconfig */,
56800185CF8887378A48754C /* Pods-DFTimelineView.debug.xcconfig */,
9959D93D9FA03E08D9405FAE /* Pods-DFTimelineView.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
Expand All @@ -429,12 +429,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 11D758431BB7D43B00F554D7 /* Build configuration list for PBXNativeTarget "DFTimelineView" */;
buildPhases = (
CECD82DF1D64CDDB82FD3095 /* Check Pods Manifest.lock */,
3D5EAD5575F1E26AAADA7327 /* [CP] Check Pods Manifest.lock */,
11D7581C1BB7D43B00F554D7 /* Sources */,
11D7581D1BB7D43B00F554D7 /* Frameworks */,
11D7581E1BB7D43B00F554D7 /* Resources */,
6A1052A6E20C121109657E9F /* Embed Pods Frameworks */,
0ACED8F3A15A266D50EC8E68 /* Copy Pods Resources */,
39E29928AEEDFE14FE3EE46B /* [CP] Embed Pods Frameworks */,
F1AE01A8EA3D2760D4CEDFB0 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -507,49 +507,49 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
0ACED8F3A15A266D50EC8E68 /* Copy Pods Resources */ = {
39E29928AEEDFE14FE3EE46B /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-DFTimelineView/Pods-DFTimelineView-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
6A1052A6E20C121109657E9F /* Embed Pods Frameworks */ = {
3D5EAD5575F1E26AAADA7327 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
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;
};
CECD82DF1D64CDDB82FD3095 /* Check Pods Manifest.lock */ = {
F1AE01A8EA3D2760D4CEDFB0 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
name = "[CP] Copy Pods Resources";
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-DFTimelineView/Pods-DFTimelineView-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -677,7 +677,7 @@
};
11D758441BB7D43B00F554D7 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 22443A8775E23D18891FEAC9 /* Pods.debug.xcconfig */;
baseConfigurationReference = 56800185CF8887378A48754C /* Pods-DFTimelineView.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
Expand All @@ -693,7 +693,7 @@
};
11D758451BB7D43B00F554D7 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = A2A89A39EA353891C22903B7 /* Pods.release.xcconfig */;
baseConfigurationReference = 9959D93D9FA03E08D9405FAE /* Pods-DFTimelineView.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
Expand Down
5 changes: 1 addition & 4 deletions DFTimelineView/UserViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@ -(void)viewDidLoad
[self initData];

[self setHeader];

}



}

-(void) setHeader
{
Expand Down
5 changes: 4 additions & 1 deletion Podfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
platform :ios, '7.0'

pod 'DFCommon', '~> 1.3.9'
target :DFTimelineView do
# pod 'DFTimelineView', :path => '../DFTimelineView'
pod 'DFCommon', :git => 'https://github.com/chn-lyzhi/DFCommon.git'
end
103 changes: 54 additions & 49 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,74 +1,79 @@
PODS:
- AFNetworking (2.6.3):
- AFNetworking/NSURLConnection (= 2.6.3)
- AFNetworking/NSURLSession (= 2.6.3)
- AFNetworking/Reachability (= 2.6.3)
- AFNetworking/Security (= 2.6.3)
- AFNetworking/Serialization (= 2.6.3)
- AFNetworking/UIKit (= 2.6.3)
- AFNetworking/NSURLConnection (2.6.3):
- AFNetworking (3.1.0):
- AFNetworking/NSURLSession (= 3.1.0)
- AFNetworking/Reachability (= 3.1.0)
- AFNetworking/Security (= 3.1.0)
- AFNetworking/Serialization (= 3.1.0)
- AFNetworking/UIKit (= 3.1.0)
- AFNetworking/NSURLSession (3.1.0):
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- AFNetworking/NSURLSession (2.6.3):
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- AFNetworking/Reachability (2.6.3)
- AFNetworking/Security (2.6.3)
- AFNetworking/Serialization (2.6.3)
- AFNetworking/UIKit (2.6.3):
- AFNetworking/NSURLConnection
- AFNetworking/Reachability (3.1.0)
- AFNetworking/Security (3.1.0)
- AFNetworking/Serialization (3.1.0)
- AFNetworking/UIKit (3.1.0):
- AFNetworking/NSURLSession
- DFCommon (1.3.9):
- AFNetworking (~> 2.6.0)
- FMDB (~> 2.5)
- DFCommon (1.4.4):
- AFNetworking (~> 3.1.0)
- FMDB (~> 2.6.2)
- MBProgressHUD (~> 0.9.1)
- MJPhotoBrowser (~> 1.0.2)
- MJRefresh (~> 2.4.11)
- MLLabel (~> 1.7)
- MMPopupView
- MJRefresh (~> 3.1.7)
- MLLabel (~> 1.9.1)
- MMPopupView (~> 1.7.2)
- ODRefreshControl (~> 1.2)
- SDWebImage (~> 3.7.3)
- TZImagePickerController
- FMDB (2.6):
- FMDB/standard (= 2.6)
- FMDB/standard (2.6)
- Masonry (0.6.4)
- SDWebImage (~> 3.8.1)
- TZImagePickerController (~> 1.4.5)
- FMDB (2.6.2):
- FMDB/standard (= 2.6.2)
- FMDB/standard (2.6.2)
- Masonry (1.0.1)
- MBProgressHUD (0.9.2)
- MJPhotoBrowser (1.0.2):
- SDWebImage
- SVProgressHUD
- YLGIFImage
- MJRefresh (2.4.12)
- MLLabel (1.9.0)
- MMPopupView (1.6):
- MJRefresh (3.1.7)
- MLLabel (1.9.1)
- MMPopupView (1.7.2):
- Masonry
- ODRefreshControl (1.2)
- SDWebImage (3.7.5):
- SDWebImage/Core (= 3.7.5)
- SDWebImage/Core (3.7.5)
- SVProgressHUD (1.1.3)
- TZImagePickerController (1.1.0)
- SDWebImage (3.8.1):
- SDWebImage/Core (= 3.8.1)
- SDWebImage/Core (3.8.1)
- SVProgressHUD (2.0.3)
- TZImagePickerController (1.4.5)
- YLGIFImage (0.11)

DEPENDENCIES:
- DFCommon (~> 1.3.9)
- DFCommon (from `https://github.com/chn-lyzhi/DFCommon.git`)

EXTERNAL SOURCES:
DFCommon:
:git: https://github.com/chn-lyzhi/DFCommon.git

CHECKOUT OPTIONS:
DFCommon:
:commit: bb925ac72371c2b7d332f56530f8454ca2ba67a5
:git: https://github.com/chn-lyzhi/DFCommon.git

SPEC CHECKSUMS:
AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
DFCommon: 4ed8395c63a40852bd071d33cb4a298e86399b66
FMDB: c1968bab3ab0aed38f66cb778ae1e7fa9a652b6e
Masonry: 281802d04d787ea2973179ee8bcb50500579ede2
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
DFCommon: 4b0d981313438eff32b3f0a7824385953c653d34
FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
Masonry: a1a931a0d08870ed8ae415a2ea5ea68ebcac77df
MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
MJPhotoBrowser: f55e8490231f44a78ca6455105a1c798a142c95f
MJRefresh: ca8e9589895977df32d379d46e6b8a5450b3ff44
MLLabel: 9d4575d4bcf686462eeaf29c1990988f748f85fd
MMPopupView: 49c06ca9600256baf263ee5e67d97334735db262
MJRefresh: f67f0750d57a4e4ae433da549359ca53b52cdc7d
MLLabel: 086ecaa4101505c166950cff986a3edcbcfb1c27
MMPopupView: fe1dd010824029dfb632fdf1a531db5dd5386020
ODRefreshControl: 907e6149d72dde488d5917ccfabee5bd8d711a20
SDWebImage: 69c6303e3348fba97e03f65d65d4fbc26740f461
SVProgressHUD: 748080e4f36e603f6c02aec292664239df5279c1
TZImagePickerController: 6113439851cdf6e8db242e16217e5f46851d12ad
SDWebImage: 35f9627a3e44b4f292a8a8ce6a531fa488239b91
SVProgressHUD: b0830714205bea1317ea1a2ebc71e5633af334d4
TZImagePickerController: 046f172ad54add0ce358dfae932d9183b7fafd03
YLGIFImage: c0ae132fe80e5282b2762a97d14e23ba71a748ae

COCOAPODS: 0.39.0
PODFILE CHECKSUM: 0ffe27b493b237ad473f21c86a413ee793587f3d

COCOAPODS: 1.0.1

0 comments on commit f2e4d5c

Please sign in to comment.