iOS Team / CNLiveTripartiteManagement · Commits

Commit 51db7987aa72b25792f556975490767cfac88250

Authored by yinqiaojuan
1 parent 995bc9cb

no message

Inline Side-by-side
Showing 2 changed files with 70 additions and 74 deletions
Example/CNLiveTripartiteManagement.xcodeproj/project.pbxproj
  View file @51db798
@@ -416,7 +416,6 @@ @@ -416,7 +416,6 @@
416 "${BUILT_PRODUCTS_DIR}/Realm/Realm.framework", 416 "${BUILT_PRODUCTS_DIR}/Realm/Realm.framework",
417 "${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework", 417 "${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework",
418 "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework", 418 "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
419 - "${BUILT_PRODUCTS_DIR}/SDCycleScrollView/SDCycleScrollView.framework",  
420 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", 419 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
421 "${BUILT_PRODUCTS_DIR}/SGPagingView/SGPagingView.framework", 420 "${BUILT_PRODUCTS_DIR}/SGPagingView/SGPagingView.framework",
422 "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework", 421 "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
@@ -449,7 +448,6 @@ @@ -449,7 +448,6 @@
449 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework", 448 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
450 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework", 449 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework",
451 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework", 450 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
452 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDCycleScrollView.framework",  
453 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", 451 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
454 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SGPagingView.framework", 452 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SGPagingView.framework",
455 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework", 453 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
@@ -492,7 +490,6 @@ @@ -492,7 +490,6 @@
492 "${BUILT_PRODUCTS_DIR}/Realm/Realm.framework", 490 "${BUILT_PRODUCTS_DIR}/Realm/Realm.framework",
493 "${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework", 491 "${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework",
494 "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework", 492 "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework",
495 - "${BUILT_PRODUCTS_DIR}/SDCycleScrollView/SDCycleScrollView.framework",  
496 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", 493 "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
497 "${BUILT_PRODUCTS_DIR}/SGPagingView/SGPagingView.framework", 494 "${BUILT_PRODUCTS_DIR}/SGPagingView/SGPagingView.framework",
498 "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework", 495 "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
@@ -525,7 +522,6 @@ @@ -525,7 +522,6 @@
525 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework", 522 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
526 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework", 523 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework",
527 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework", 524 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework",
528 - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDCycleScrollView.framework",  
529 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", 525 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
530 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SGPagingView.framework", 526 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SGPagingView.framework",
531 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework", 527 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
Example/Podfile
  View file @51db798
@@ -3,41 +3,41 @@ @@ -3,41 +3,41 @@
3 platform :ios, '9.0' 3 platform :ios, '9.0'
4 4
5 target 'CNLiveTripartiteManagement_Example' do 5 target 'CNLiveTripartiteManagement_Example' do
6 -# pod 'AFNetworking', '3.2.1'  
7 -# pod 'YYKit', '1.0.9'  
8 -# pod 'MJRefresh', '3.2.0'  
9 -# pod 'Masonry', '1.0.2'  
10 -# pod 'Realm', '3.14.2'  
11 -# pod 'FMDB', '2.7.5'  
12 -# pod 'QMUIKit', '3.1.7'  
13 -# pod 'tingyunApp', '2.13.1'  
14 -# pod 'WebViewJavascriptBridge', '6.0.3'  
15 -# pod 'Ks3SDK', '2.1.2'  
16 -# pod 'RSKImageCropper', '2.2.1'  
17 -# pod 'libksygpulive_ks3', '3.0.4'  
18 -# pod 'PGDatePicker', '2.6.9'  
19 -# pod 'SGPagingView', '1.6.1'  
20 -# pod 'PLShortVideoKit','2.0.0'  
21 -# pod 'PLPlayerKit','3.4.1'  
22 -# pod 'SSZipArchive','2.1.5'  
23 -# pod 'TXLiteAVSDK_TRTC','6.3.7088'  
24 -# pod 'MJExtension','3.0.17'  
25 -# pod 'SAMKeychain','1.5.3'  
26 -# pod 'MBProgressHUD','1.1.0'  
27 -# pod 'AMap3DMap-NO-IDFA', '6.8.1'  
28 -# pod 'AMapSearch-NO-IDFA', '6.6.0'  
29 -# pod 'AMapLocation-NO-IDFA', '2.6.2'  
30 -# pod 'FLAnimatedImage', '1.0.12'  
31 -# pod 'GPUImage', '0.1.7'  
32 -# pod 'SDAutoLayout', '2.2.1'  
33 -# pod 'SDCycleScrollView','1.75'  
34 -# #七牛  
35 -# pod 'Qiniu', '7.2.5'  
36 -# pod 'lottie-ios','2.5.0'  
37 -# pod 'SDWebImage','4.4.6'  
38 -# pod 'SDWebImage/WebP'  
39 -# pod 'SDWebImage/GIF'  
40 -# pod 'WechatOpenSDK'#_NoPay 6 + pod 'AFNetworking', '3.2.1'
  7 + pod 'YYKit', '1.0.9'
  8 + pod 'MJRefresh', '3.2.0'
  9 + pod 'Masonry', '1.0.2'
  10 + pod 'Realm', '3.14.2'
  11 + pod 'FMDB', '2.7.5'
  12 + pod 'QMUIKit', '3.1.7'
  13 + pod 'tingyunApp', '2.13.1'
  14 + pod 'WebViewJavascriptBridge', '6.0.3'
  15 + pod 'Ks3SDK', '2.1.2'
  16 + pod 'RSKImageCropper', '2.2.1'
  17 + pod 'libksygpulive_ks3', '3.0.4'
  18 + pod 'PGDatePicker', '2.6.9'
  19 + pod 'SGPagingView', '1.6.1'
  20 + pod 'PLShortVideoKit','2.0.0'
  21 + pod 'PLPlayerKit','3.4.1'
  22 + pod 'SSZipArchive','2.1.5'
  23 + pod 'TXLiteAVSDK_TRTC','6.3.7088'
  24 + pod 'MJExtension','3.0.17'
  25 + pod 'SAMKeychain','1.5.3'
  26 + pod 'MBProgressHUD','1.1.0'
  27 + pod 'AMap3DMap-NO-IDFA', '6.8.1'
  28 + pod 'AMapSearch-NO-IDFA', '6.6.0'
  29 + pod 'AMapLocation-NO-IDFA', '2.6.2'
  30 + pod 'FLAnimatedImage', '1.0.12'
  31 + pod 'GPUImage', '0.1.7'
  32 + pod 'SDAutoLayout', '2.2.1'
  33 + # pod 'SDCycleScrollView','~> 1.75'
  34 + #七牛
  35 + pod 'Qiniu', '7.2.5'
  36 + pod 'lottie-ios','2.5.0'
  37 + # pod 'SDWebImage','~> 4.4.6'
  38 + pod 'SDWebImage/WebP'
  39 + pod 'SDWebImage/GIF'
  40 + pod 'WechatOpenSDK'#_NoPay
41 # pod 'BaiduMapKit', '~> 4.3.2' 41 # pod 'BaiduMapKit', '~> 4.3.2'
42 # pod 'BMKLocationKit', '~> 1.6.0' 42 # pod 'BMKLocationKit', '~> 1.6.0'
43 #依赖三方私有库,如果里面有.a的时候加上这个 43 #依赖三方私有库,如果里面有.a的时候加上这个
@@ -46,41 +46,41 @@ target 'CNLiveTripartiteManagement_Example' do @@ -46,41 +46,41 @@ target 'CNLiveTripartiteManagement_Example' do
46 46
47 target 'CNLiveTripartiteManagement_Tests' do 47 target 'CNLiveTripartiteManagement_Tests' do
48 inherit! :search_paths 48 inherit! :search_paths
49 -# pod 'AFNetworking', '3.2.1'  
50 -# pod 'YYKit', '1.0.9'  
51 -# pod 'MJRefresh', '3.2.0'  
52 -# pod 'Masonry', '1.0.2'  
53 -# pod 'Realm', '3.14.2'  
54 -# pod 'FMDB', '2.7.5'  
55 -# pod 'QMUIKit', '3.1.7'  
56 -# pod 'tingyunApp', '2.13.1'  
57 -# pod 'WebViewJavascriptBridge', '6.0.3'  
58 -# pod 'Ks3SDK', '2.1.2'  
59 -# pod 'RSKImageCropper', '2.2.1'  
60 -# pod 'libksygpulive_ks3', '3.0.4'  
61 -# pod 'PGDatePicker', '2.6.9'  
62 -# pod 'SGPagingView', '1.6.1'  
63 -# pod 'PLShortVideoKit','2.0.0'  
64 -# pod 'PLPlayerKit','3.4.1'  
65 -# pod 'SSZipArchive','2.1.5'  
66 -# pod 'TXLiteAVSDK_TRTC','6.3.7088'  
67 -# pod 'MJExtension','3.0.17'  
68 -# pod 'SAMKeychain','1.5.3'  
69 -# pod 'MBProgressHUD','1.1.0'  
70 -# pod 'AMap3DMap-NO-IDFA', '6.8.1'  
71 -# pod 'AMapSearch-NO-IDFA', '6.6.0'  
72 -# pod 'AMapLocation-NO-IDFA', '2.6.2'  
73 -# pod 'FLAnimatedImage', '1.0.12'  
74 -# pod 'GPUImage', '0.1.7'  
75 -# pod 'SDAutoLayout', '2.2.1'  
76 -# pod 'SDCycleScrollView','1.75'  
77 -# #七牛  
78 -# pod 'Qiniu', '7.2.5'  
79 -# pod 'lottie-ios','2.5.0'  
80 -# pod 'SDWebImage','4.4.6'  
81 -# pod 'SDWebImage/WebP'  
82 -# pod 'SDWebImage/GIF'  
83 -# pod 'WechatOpenSDK'#_NoPay 49 + pod 'AFNetworking', '3.2.1'
  50 + pod 'YYKit', '1.0.9'
  51 + pod 'MJRefresh', '3.2.0'
  52 + pod 'Masonry', '1.0.2'
  53 + pod 'Realm', '3.14.2'
  54 + pod 'FMDB', '2.7.5'
  55 + pod 'QMUIKit', '3.1.7'
  56 + pod 'tingyunApp', '2.13.1'
  57 + pod 'WebViewJavascriptBridge', '6.0.3'
  58 + pod 'Ks3SDK', '2.1.2'
  59 + pod 'RSKImageCropper', '2.2.1'
  60 + pod 'libksygpulive_ks3', '3.0.4'
  61 + pod 'PGDatePicker', '2.6.9'
  62 + pod 'SGPagingView', '1.6.1'
  63 + pod 'PLShortVideoKit','2.0.0'
  64 + pod 'PLPlayerKit','3.4.1'
  65 + pod 'SSZipArchive','2.1.5'
  66 + pod 'TXLiteAVSDK_TRTC','6.3.7088'
  67 + pod 'MJExtension','3.0.17'
  68 + pod 'SAMKeychain','1.5.3'
  69 + pod 'MBProgressHUD','1.1.0'
  70 + pod 'AMap3DMap-NO-IDFA', '6.8.1'
  71 + pod 'AMapSearch-NO-IDFA', '6.6.0'
  72 + pod 'AMapLocation-NO-IDFA', '2.6.2'
  73 + pod 'FLAnimatedImage', '1.0.12'
  74 + pod 'GPUImage', '0.1.7'
  75 + pod 'SDAutoLayout', '2.2.1'
  76 + #pod 'SDCycleScrollView','~> 1.75'
  77 + #七牛
  78 + pod 'Qiniu', '7.2.5'
  79 + pod 'lottie-ios','2.5.0'
  80 + # pod 'SDWebImage','~> 4.4.6'
  81 + pod 'SDWebImage/WebP'
  82 + pod 'SDWebImage/GIF'
  83 + pod 'WechatOpenSDK'#_NoPay
84 # pod 'BaiduMapKit', '~> 4.3.2' 84 # pod 'BaiduMapKit', '~> 4.3.2'
85 # pod 'BMKLocationKit', '~> 1.6.0' 85 # pod 'BMKLocationKit', '~> 1.6.0'
86 pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {} 86 pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}