Commit 777183f1cfc0f6fc1246427c7a1c9b2ea2c9cb8c
1 parent
89401266
0.2.1
Showing
6 changed files
with
77 additions
and
149 deletions
CNLiveCServiceModule.podspec
CNLiveCServiceModule/Classes/ViewController/CNLiveServiceSearchVC.h
| ... | ... | @@ -6,14 +6,19 @@ |
| 6 | 6 | // |
| 7 | 7 | |
| 8 | 8 | #import <UIKit/UIKit.h> |
| 9 | +@class CNLiveSearchModel; | |
| 9 | 10 | |
| 10 | 11 | NS_ASSUME_NONNULL_BEGIN |
| 11 | 12 | |
| 12 | 13 | @interface CNLiveServiceSearchVC : CNCommonViewController |
| 13 | - | |
| 14 | +@property (nonatomic, assign)BOOL fromAllSearch; | |
| 15 | +@property (nonatomic, strong) NSString *searchStr; | |
| 16 | +@property (nonatomic, assign) NSInteger page;//请求页数 | |
| 17 | +@property (nonatomic, strong) NSArray <CNLiveSearchModel *>*dataListArr; | |
| 14 | 18 | @property (nonatomic, strong) NSArray *hots; |
| 15 | 19 | |
| 16 | 20 | + (instancetype)serviceSearchVC:(NSArray *_Nullable)array; |
| 21 | +- (void)searchRequese; | |
| 17 | 22 | @end |
| 18 | 23 | |
| 19 | 24 | NS_ASSUME_NONNULL_END | ... | ... |
CNLiveCServiceModule/Classes/ViewController/CNLiveServiceSearchVC.m
| ... | ... | @@ -20,11 +20,8 @@ |
| 20 | 20 | |
| 21 | 21 | @property (nonatomic, strong) CNLiveMainSearch *searchView;//搜索框 |
| 22 | 22 | @property (nonatomic, strong) UIButton *cancelBtn; //取消按钮 |
| 23 | -@property (nonatomic, assign) NSInteger page;//请求页数 | |
| 24 | -@property (nonatomic, strong) NSString *searchStr; | |
| 25 | 23 | @property (nonatomic, strong) NSArray *histories; |
| 26 | 24 | @property (nonatomic, strong) UITableView *listTableView;//搜索结果列表 |
| 27 | -@property (nonatomic, strong) NSArray <CNLiveSearchModel *>*dataListArr; | |
| 28 | 25 | |
| 29 | 26 | @property (nonatomic, strong) UICollectionView *listCollectionView;//热搜/搜索历史列表 |
| 30 | 27 | @property (nonatomic, strong) NSArray *hDataSources;//包含搜索历史和热搜的数组 |
| ... | ... | @@ -102,68 +99,85 @@ static NSString *HistoryFootID = @"HistoryFootID"; |
| 102 | 99 | } |
| 103 | 100 | - (void)viewDidLoad { |
| 104 | 101 | [super viewDidLoad]; |
| 105 | - NSMutableArray *historSearch = [CNLiveServiceHistorySearch readHistorySearch]; | |
| 106 | - for (id obj in historSearch.copy) { | |
| 107 | - if ([obj isKindOfClass:[NSString class]]) { | |
| 108 | - NSDictionary *dic = @{ | |
| 109 | - @"title":obj, | |
| 110 | - }; | |
| 111 | - NSInteger index = [historSearch indexOfObject:obj]; | |
| 112 | - [historSearch replaceObjectAtIndex:index withObject:dic]; | |
| 102 | + self.view.backgroundColor = kWhiteColor; | |
| 103 | + if (!self.fromAllSearch) { | |
| 104 | + NSMutableArray *historSearch = [CNLiveServiceHistorySearch readHistorySearch]; | |
| 105 | + for (id obj in historSearch.copy) { | |
| 106 | + if ([obj isKindOfClass:[NSString class]]) { | |
| 107 | + NSDictionary *dic = @{ | |
| 108 | + @"title":obj, | |
| 109 | + }; | |
| 110 | + NSInteger index = [historSearch indexOfObject:obj]; | |
| 111 | + [historSearch replaceObjectAtIndex:index withObject:dic]; | |
| 112 | + } | |
| 113 | 113 | } |
| 114 | + self.histories = historSearch.copy; | |
| 115 | + [self dealHotsAndHistories]; | |
| 116 | + [self.view addSubview:self.searchView]; | |
| 117 | + [self.view addSubview:self.cancelBtn]; | |
| 118 | + [self.view addSubview:self.listCollectionView]; | |
| 114 | 119 | } |
| 115 | - self.histories = historSearch.copy; | |
| 116 | - [self dealHotsAndHistories]; | |
| 117 | - self.view.backgroundColor = kWhiteColor; | |
| 118 | - [self.view addSubview:self.searchView]; | |
| 119 | - [self.view addSubview:self.cancelBtn]; | |
| 120 | + | |
| 120 | 121 | [self.view addSubview:self.listTableView]; |
| 121 | - [self.view addSubview:self.listCollectionView]; | |
| 122 | 122 | // Do any additional setup after loading the view. |
| 123 | 123 | } |
| 124 | 124 | - (void)viewDidLayoutSubviews |
| 125 | 125 | { |
| 126 | 126 | [super viewDidLayoutSubviews]; |
| 127 | - [self.cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 128 | - if (self.mas_topLayoutGuide > 0) { | |
| 129 | - make.top.equalTo(self.mas_topLayoutGuide); | |
| 130 | - }else{ | |
| 131 | - make.top.equalTo(self.view).offset(35.5); | |
| 132 | - } | |
| 133 | - make.height.offset(36); | |
| 134 | - make.right.equalTo(self.view).offset(-15); | |
| 135 | - }]; | |
| 136 | - [self.searchView mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 137 | - if (self.mas_topLayoutGuide > 0) { | |
| 138 | - make.top.equalTo(self.mas_topLayoutGuide); | |
| 139 | - }else{ | |
| 140 | - make.top.equalTo(self.view).offset(35.5); | |
| 141 | - } | |
| 142 | - make.left.equalTo(self.view).offset(15); | |
| 143 | - make.right.equalTo(self.cancelBtn.mas_left).offset(-15); | |
| 144 | - make.height.offset(36); | |
| 145 | - }]; | |
| 146 | - [self.listTableView mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 147 | - make.top.equalTo(self.searchView.mas_bottom).offset(10); | |
| 148 | - make.left.right.equalTo(self.view); | |
| 149 | - make.bottom.equalTo(self.mas_bottomLayoutGuide); | |
| 150 | - }]; | |
| 151 | - [self.listCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 152 | - make.top.equalTo(self.searchView.mas_bottom).offset(7); | |
| 153 | - make.left.right.equalTo(self.view); | |
| 154 | - make.bottom.equalTo(self.mas_bottomLayoutGuide); | |
| 155 | - }]; | |
| 127 | + if (self.fromAllSearch) { | |
| 128 | + [self.listTableView mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 129 | + make.top.equalTo(self.view); | |
| 130 | + make.left.right.equalTo(self.view); | |
| 131 | + make.bottom.equalTo(self.mas_bottomLayoutGuide); | |
| 132 | + }]; | |
| 133 | + }else{ | |
| 134 | + [self.cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 135 | + if (self.mas_topLayoutGuide > 0) { | |
| 136 | + make.top.equalTo(self.mas_topLayoutGuide); | |
| 137 | + }else{ | |
| 138 | + make.top.equalTo(self.view).offset(35.5); | |
| 139 | + } | |
| 140 | + make.height.offset(36); | |
| 141 | + make.right.equalTo(self.view).offset(-15); | |
| 142 | + }]; | |
| 143 | + [self.searchView mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 144 | + if (self.mas_topLayoutGuide > 0) { | |
| 145 | + make.top.equalTo(self.mas_topLayoutGuide); | |
| 146 | + }else{ | |
| 147 | + make.top.equalTo(self.view).offset(35.5); | |
| 148 | + } | |
| 149 | + make.left.equalTo(self.view).offset(15); | |
| 150 | + make.right.equalTo(self.cancelBtn.mas_left).offset(-15); | |
| 151 | + make.height.offset(36); | |
| 152 | + }]; | |
| 153 | + [self.listTableView mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 154 | + make.top.equalTo(self.searchView.mas_bottom).offset(10); | |
| 155 | + make.left.right.equalTo(self.view); | |
| 156 | + make.bottom.equalTo(self.mas_bottomLayoutGuide); | |
| 157 | + }]; | |
| 158 | + [self.listCollectionView mas_makeConstraints:^(MASConstraintMaker *make) { | |
| 159 | + make.top.equalTo(self.searchView.mas_bottom).offset(7); | |
| 160 | + make.left.right.equalTo(self.view); | |
| 161 | + make.bottom.equalTo(self.mas_bottomLayoutGuide); | |
| 162 | + }]; | |
| 163 | + } | |
| 164 | + | |
| 156 | 165 | } |
| 157 | 166 | - (void)viewWillAppear:(BOOL)animated |
| 158 | 167 | { |
| 159 | 168 | [super viewWillAppear:animated]; |
| 160 | - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resignActive) name:UIApplicationDidEnterBackgroundNotification object:nil]; | |
| 169 | + if (!self.fromAllSearch) { | |
| 170 | + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(resignActive) name:UIApplicationDidEnterBackgroundNotification object:nil]; | |
| 171 | + } | |
| 172 | + | |
| 161 | 173 | } |
| 162 | 174 | - (void)viewWillDisappear:(BOOL)animated |
| 163 | 175 | { |
| 164 | 176 | [super viewWillDisappear:animated]; |
| 165 | - [[NSNotificationCenter defaultCenter] removeObserver:self]; | |
| 166 | - [CNLiveServiceHistorySearch saveHistorySearch:self.histories.mutableCopy]; | |
| 177 | + if (!self.fromAllSearch) { | |
| 178 | + [[NSNotificationCenter defaultCenter] removeObserver:self]; | |
| 179 | + [CNLiveServiceHistorySearch saveHistorySearch:self.histories.mutableCopy]; | |
| 180 | + } | |
| 167 | 181 | } |
| 168 | 182 | - (BOOL)preferredNavigationBarHidden |
| 169 | 183 | { | ... | ... |
Example/CNLiveCServiceModule.xcodeproj/project.pbxproj
| ... | ... | @@ -240,7 +240,6 @@ |
| 240 | 240 | 6003F587195388D20070C39A /* Frameworks */, |
| 241 | 241 | 6003F588195388D20070C39A /* Resources */, |
| 242 | 242 | 388A34DFF0F9E22583B1B874 /* [CP] Embed Pods Frameworks */, |
| 243 | - C1C41FFB61C3A8767649C16C /* [CP] Copy Pods Resources */, | |
| 244 | 243 | ); |
| 245 | 244 | buildRules = ( |
| 246 | 245 | ); |
| ... | ... | @@ -376,29 +375,14 @@ |
| 376 | 375 | "${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework", |
| 377 | 376 | "${BUILT_PRODUCTS_DIR}/CNLiveNewTripartiteManagement/CNLiveNewTripartiteManagement.framework", |
| 378 | 377 | "${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework", |
| 379 | - "${PODS_ROOT}/CNLiveSDK/CNLiveSDK/Classes/CNLivePaySDK.framework", | |
| 380 | 378 | "${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework", |
| 381 | - "${PODS_ROOT}/DSARModule/DSARModule/Frameworks/DSARModule.framework", | |
| 382 | - "${BUILT_PRODUCTS_DIR}/DSBaseModule/DSBaseModule.framework", | |
| 383 | - "${BUILT_PRODUCTS_DIR}/DSGTMBase64/DSGTMBase64.framework", | |
| 384 | - "${BUILT_PRODUCTS_DIR}/DSToolsModule/DSToolsModule.framework", | |
| 385 | - "${BUILT_PRODUCTS_DIR}/DZNEmptyDataSet/DZNEmptyDataSet.framework", | |
| 386 | - "${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework", | |
| 387 | - "${BUILT_PRODUCTS_DIR}/IQKeyboardManager/IQKeyboardManager.framework", | |
| 388 | - "${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework", | |
| 389 | 379 | "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", |
| 390 | 380 | "${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework", |
| 391 | 381 | "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework", |
| 392 | - "${PODS_ROOT}/PLPlayerKit/Pod/Library/PLPlayerKit.framework", | |
| 393 | 382 | "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework", |
| 394 | - "${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework", | |
| 395 | - "${BUILT_PRODUCTS_DIR}/SAMKeychain/SAMKeychain.framework", | |
| 396 | - "${BUILT_PRODUCTS_DIR}/SDAutoLayout/SDAutoLayout.framework", | |
| 397 | 383 | "${BUILT_PRODUCTS_DIR}/SDCycleScrollView/SDCycleScrollView.framework", |
| 398 | 384 | "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", |
| 399 | 385 | "${BUILT_PRODUCTS_DIR}/TZImagePickerController/TZImagePickerController.framework", |
| 400 | - "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", | |
| 401 | - "${BUILT_PRODUCTS_DIR}/YBImageBrowser/YBImageBrowser.framework", | |
| 402 | 386 | "${BUILT_PRODUCTS_DIR}/YYAsyncLayer/YYAsyncLayer.framework", |
| 403 | 387 | "${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework", |
| 404 | 388 | "${BUILT_PRODUCTS_DIR}/YYCategories/YYCategories.framework", |
| ... | ... | @@ -424,29 +408,14 @@ |
| 424 | 408 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework", |
| 425 | 409 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveNewTripartiteManagement.framework", |
| 426 | 410 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework", |
| 427 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLivePaySDK.framework", | |
| 428 | 411 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework", |
| 429 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DSARModule.framework", | |
| 430 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DSBaseModule.framework", | |
| 431 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DSGTMBase64.framework", | |
| 432 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DSToolsModule.framework", | |
| 433 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DZNEmptyDataSet.framework", | |
| 434 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework", | |
| 435 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IQKeyboardManager.framework", | |
| 436 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework", | |
| 437 | 412 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", |
| 438 | 413 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework", |
| 439 | 414 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework", |
| 440 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PLPlayerKit.framework", | |
| 441 | 415 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework", |
| 442 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework", | |
| 443 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SAMKeychain.framework", | |
| 444 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDAutoLayout.framework", | |
| 445 | 416 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDCycleScrollView.framework", |
| 446 | 417 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", |
| 447 | 418 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TZImagePickerController.framework", |
| 448 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", | |
| 449 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YBImageBrowser.framework", | |
| 450 | 419 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYAsyncLayer.framework", |
| 451 | 420 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework", |
| 452 | 421 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework", |
| ... | ... | @@ -484,66 +453,6 @@ |
| 484 | 453 | shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; |
| 485 | 454 | showEnvVarsInLog = 0; |
| 486 | 455 | }; |
| 487 | - C1C41FFB61C3A8767649C16C /* [CP] Copy Pods Resources */ = { | |
| 488 | - isa = PBXShellScriptBuildPhase; | |
| 489 | - buildActionMask = 2147483647; | |
| 490 | - files = ( | |
| 491 | - ); | |
| 492 | - inputPaths = ( | |
| 493 | - "${PODS_ROOT}/Target Support Files/Pods-CNLiveCServiceModule_Example/Pods-CNLiveCServiceModule_Example-resources.sh", | |
| 494 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSAddressModule.bundle", | |
| 495 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSARModule.bundle", | |
| 496 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSCouponModule.bundle", | |
| 497 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSCultureModule.bundle", | |
| 498 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSDarenModule.bundle", | |
| 499 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSDefaultModule.bundle", | |
| 500 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSExpressModule.bundle", | |
| 501 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSGiftModule.bundle", | |
| 502 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSHappinessModule.bundle", | |
| 503 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSLifeServiceModule.bundle", | |
| 504 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSOldHappinessModule.bundle", | |
| 505 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSOptimizationModule.bundle", | |
| 506 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSPayModule.bundle", | |
| 507 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSPlayerModule.bundle", | |
| 508 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSQrCodeModule.bundle", | |
| 509 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSRefreshModule.bundle", | |
| 510 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSRepastModule.bundle", | |
| 511 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSServiceModule.bundle", | |
| 512 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSShopCartModule.bundle", | |
| 513 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSShopModule.bundle", | |
| 514 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSVideoCModule.bundle", | |
| 515 | - "${PODS_ROOT}/DSCnliveShopSDK/DSCnliveShopSDK/Assets/DSWebViewModule.bundle", | |
| 516 | - ); | |
| 517 | - name = "[CP] Copy Pods Resources"; | |
| 518 | - outputPaths = ( | |
| 519 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSAddressModule.bundle", | |
| 520 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSARModule.bundle", | |
| 521 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSCouponModule.bundle", | |
| 522 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSCultureModule.bundle", | |
| 523 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSDarenModule.bundle", | |
| 524 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSDefaultModule.bundle", | |
| 525 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSExpressModule.bundle", | |
| 526 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSGiftModule.bundle", | |
| 527 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSHappinessModule.bundle", | |
| 528 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSLifeServiceModule.bundle", | |
| 529 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSOldHappinessModule.bundle", | |
| 530 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSOptimizationModule.bundle", | |
| 531 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSPayModule.bundle", | |
| 532 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSPlayerModule.bundle", | |
| 533 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSQrCodeModule.bundle", | |
| 534 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSRefreshModule.bundle", | |
| 535 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSRepastModule.bundle", | |
| 536 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSServiceModule.bundle", | |
| 537 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSShopCartModule.bundle", | |
| 538 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSShopModule.bundle", | |
| 539 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSVideoCModule.bundle", | |
| 540 | - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DSWebViewModule.bundle", | |
| 541 | - ); | |
| 542 | - runOnlyForDeploymentPostprocessing = 0; | |
| 543 | - shellPath = /bin/sh; | |
| 544 | - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveCServiceModule_Example/Pods-CNLiveCServiceModule_Example-resources.sh\"\n"; | |
| 545 | - showEnvVarsInLog = 0; | |
| 546 | - }; | |
| 547 | 456 | /* End PBXShellScriptBuildPhase section */ |
| 548 | 457 | |
| 549 | 458 | /* Begin PBXSourcesBuildPhase section */ | ... | ... |
Example/CNLiveCServiceModule/CNLiveServiceManager.m
| ... | ... | @@ -7,13 +7,13 @@ |
| 7 | 7 | // |
| 8 | 8 | |
| 9 | 9 | #import "CNLiveServiceManager.h" |
| 10 | -#import <DSCnliveShopSDK/DSCnliveShopSDKProtocolUCM.h> | |
| 11 | -#import <DSCnliveShopSDK/DSCnliveShopSDKSkip.h> | |
| 12 | -#import <DSCnliveShopSDK/DSCnliveShopSDKManager.h> | |
| 10 | +//#import <DSCnliveShopSDK/DSCnliveShopSDKProtocolUCM.h> | |
| 11 | +//#import <DSCnliveShopSDK/DSCnliveShopSDKSkip.h> | |
| 12 | +//#import <DSCnliveShopSDK/DSCnliveShopSDKManager.h> | |
| 13 | 13 | |
| 14 | 14 | @implementation CNLiveServiceManager |
| 15 | 15 | + (void)jumpController:(NSString *)servingId type:(NSString *)type to:(NSString *)to shopType:(NSString *)shopType controller:(UIViewController *)controller { |
| 16 | - [DSCnliveShopSDKProtocolUCM uMengCheckCallBackType:DSUMengCheckTypeActionMethod subType:DSUMengCheckSLTypeServiceHPClickItem]; | |
| 16 | +// [DSCnliveShopSDKProtocolUCM uMengCheckCallBackType:DSUMengCheckTypeActionMethod subType:DSUMengCheckSLTypeServiceHPClickItem]; | |
| 17 | 17 | |
| 18 | 18 | if ([type isEqualToString:@"100"]) {//领头雁 |
| 19 | 19 | [controller.navigationController.navigationBar setHidden:YES]; |
| ... | ... | @@ -36,7 +36,7 @@ |
| 36 | 36 | return; |
| 37 | 37 | } |
| 38 | 38 | if ([type isEqualToString:@"21"]||[type isEqualToString:@"50"]) { |
| 39 | - [[DSCnliveShopSDKManager sharedManager].skip skipType:type to:servingId shopType:to currentVC:controller]; | |
| 39 | +// [[DSCnliveShopSDKManager sharedManager].skip skipType:type to:servingId shopType:to currentVC:controller]; | |
| 40 | 40 | return; |
| 41 | 41 | } |
| 42 | 42 | if ([type isEqualToString:@"103"]) { |
| ... | ... | @@ -57,7 +57,7 @@ |
| 57 | 57 | // [CNLiveBBASMModuleService openBBASMModule:spURL]; |
| 58 | 58 | return; |
| 59 | 59 | } |
| 60 | - [[DSCnliveShopSDKManager sharedManager].skip skipType:type to:to shopType:shopType currentVC:controller]; | |
| 60 | +// [[DSCnliveShopSDKManager sharedManager].skip skipType:type to:to shopType:shopType currentVC:controller]; | |
| 61 | 61 | |
| 62 | 62 | } |
| 63 | 63 | ... | ... |
Example/Podfile
| ... | ... | @@ -6,7 +6,7 @@ source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git' |
| 6 | 6 | source 'http://bj.gitlab.cnlive.com/DSIOSTeam/DSSpecRepos.git' |
| 7 | 7 | target 'CNLiveCServiceModule_Example' do |
| 8 | 8 | pod 'CNLiveCServiceModule', :path => '../' |
| 9 | - pod 'DSCnliveShopSDK' | |
| 9 | +# pod 'DSCnliveShopSDK' | |
| 10 | 10 | |
| 11 | 11 | target 'CNLiveCServiceModule_Tests' do |
| 12 | 12 | inherit! :search_paths | ... | ... |