iOS Team / CNliveBBASMModule · Commits

Commit eeabc6360c35511640a76ac54fca51665164ad07

Authored by yanglingyu
1 parent a9554db1

0.1.7

Inline Side-by-side
Showing 9 changed files with 67 additions and 68 deletions
CNLiveBBASMModule.podspec
  View file @eeabc63
... ... @@ -8,7 +8,7 @@
8 8  
9 9 Pod::Spec.new do |s|
10 10 s.name = 'CNLiveBBASMModule'
11   - s.version = '0.0.16'
  11 + s.version = '0.1.7'
12 12 s.summary = 'CNLive-iOS百度小程序接入'
13 13  
14 14 # This description is used to generate tags and improve search results.
... ...
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNConfig/CNBBASMPlatformImpl.m
  View file @eeabc63
... ... @@ -7,7 +7,7 @@
7 7 //
8 8  
9 9 #import "CNBBASMPlatformImpl.h"
10   -#import "BBASMScanViewController.h"
  10 +#import "CNBBASMScanViewController.h"
11 11 #import <CNLiveUserManagement/CNUserInfoManager.h>
12 12 #import "CNBBASMJumpService.h"
13 13  
... ... @@ -16,7 +16,7 @@
16 16 RegisterBBASMAdapter()
17 17  
18 18 + (NSString *)hostConfigFilePath {
19   - NSBundle *bundle = [NSBundle bundleForClass:[BBASMScanViewController class]];
  19 + NSBundle *bundle = [NSBundle bundleForClass:[CNBBASMScanViewController class]];
20 20 NSString *bundlePlistPath = [bundle pathForResource:@"BBASMPyramid" ofType:@"bundle"];
21 21 return [bundlePlistPath stringByAppendingPathComponent:@"union-cfg.json"];
22 22 }
... ...
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/CNBBASMScanCodeImpl.m
  View file @eeabc63
... ... @@ -7,13 +7,13 @@
7 7 //
8 8  
9 9 #import "CNBBASMScanCodeImpl.h"
10   -#import "BBASMScanViewController.h"
  10 +#import "CNBBASMScanViewController.h"
11 11  
12 12 @implementation CNBBASMScanCodeImpl
13 13 RegisterBBASMAdapter()
14 14  
15 15 + (void)scanCode:(void(^)(NSString *result,TMNPBarcodeType type))callBack{
16   - BBASMScanViewController *ssVC = [[BBASMScanViewController alloc]
  16 + CNBBASMScanViewController *ssVC = [[CNBBASMScanViewController alloc]
17 17 initScanCompleteBlock:^(NSDictionary * _Nullable result,
18 18 NSError * _Nullable error) {
19 19 // 扫描完成，回调传给callBack
... ...
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/BBASMScanView.h renamed to CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/CNBBASMScanView.h
  View file @eeabc63
... ... @@ -10,7 +10,7 @@
10 10  
11 11 NS_ASSUME_NONNULL_BEGIN
12 12  
13   -@interface BBASMScanView : UIView
  13 +@interface CNBBASMScanView : UIView
14 14  
15 15 @end
16 16  
... ...
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/BBASMScanView.m renamed to CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/CNBBASMScanView.m
  View file @eeabc63
... ... @@ -6,11 +6,11 @@
6 6 // Copyright © 2019 baidu. All rights reserved.
7 7 //
8 8  
9   -#import "BBASMScanView.h"
  9 +#import "CNBBASMScanView.h"
10 10  
11 11 #define LeftDistance 60
12 12  
13   -@interface BBASMScanView ()
  13 +@interface CNBBASMScanView ()
14 14  
15 15 @property (nonatomic, assign) NSInteger heightScale;
16 16 @property (nonatomic, assign) BOOL needStop;
... ... @@ -18,7 +18,7 @@
18 18  
19 19 @end
20 20  
21   -@implementation BBASMScanView
  21 +@implementation CNBBASMScanView
22 22  
23 23 -(id)initWithFrame:(CGRect)frame {
24 24 if (self = [super initWithFrame:frame]) {
... ...
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/BBASMScanViewController.h renamed to CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/CNBBASMScanViewController.h
  View file @eeabc63
... ... @@ -10,7 +10,7 @@
10 10  
11 11 NS_ASSUME_NONNULL_BEGIN
12 12  
13   -@interface BBASMScanViewController : UIViewController
  13 +@interface CNBBASMScanViewController : UIViewController
14 14  
15 15 /**
16 16 初始化二维码扫码控制器
... ...
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/BBASMScanViewController.m renamed to CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/CNBBASMScanViewController.m
  View file @eeabc63
... ... @@ -6,15 +6,15 @@
6 6 // Copyright © 2019 baidu. All rights reserved.
7 7 //
8 8  
9   -#import "BBASMScanViewController.h"
  9 +#import "CNBBASMScanViewController.h"
10 10 #import <AssetsLibrary/ALAssetsLibrary.h>
11 11 #import <Photos/PHPhotoLibrary.h>
12 12 #import <AVFoundation/AVFoundation.h>
13   -#import "BBASMScanView.h"
  13 +#import "CNBBASMScanView.h"
14 14  
15   -@interface BBASMScanViewController ()<UINavigationControllerDelegate, UIImagePickerControllerDelegate, AVCaptureMetadataOutputObjectsDelegate, UIGestureRecognizerDelegate>
  15 +@interface CNBBASMScanViewController ()<UINavigationControllerDelegate, UIImagePickerControllerDelegate, AVCaptureMetadataOutputObjectsDelegate, UIGestureRecognizerDelegate>
16 16  
17   -@property (nonatomic, strong) BBASMScanView *scanRectView;
  17 +@property (nonatomic, strong) CNBBASMScanView *scanRectView;
18 18 @property (nonatomic, strong) UILabel *tipTitle; //扫码区域下方提示文字
19 19 @property (nonatomic, strong) UIBarButtonItem *photoItem; //相册按钮
20 20 @property (nonatomic, strong) UIButton *flashBtn; //闪光灯按钮
... ... @@ -30,7 +30,7 @@
30 30  
31 31 @end
32 32  
33   -@implementation BBASMScanViewController
  33 +@implementation CNBBASMScanViewController
34 34  
35 35 - (instancetype)initScanCompleteBlock:(void (^)(NSDictionary *result, NSError *error))scanBlock {
36 36 self = [super init];
... ... @@ -182,7 +182,7 @@
182 182  
183 183 // 绘制扫描区域
184 184 - (void)drawScanView {
185   - _scanRectView = [[BBASMScanView alloc] initWithFrame:self.view.frame];
  185 + _scanRectView = [[CNBBASMScanView alloc] initWithFrame:self.view.frame];
186 186 [self.view addSubview:_scanRectView];
187 187 }
188 188  
... ...
Example/CNLiveBBASMModule/CNLiveBBASMModule/CNLiveBBASMModuleService.m
  View file @eeabc63
... ... @@ -37,11 +37,11 @@ static NSString *const CNLiveAccountLogOut = @&quot;accountLogout&quot;;
37 37 type = CNLiveSharePlatformTypeSina;
38 38 }
39 39 }
40   - [CNLiveShareManager showShareViewWithParamForShareTitle:params[@"title"] ShareUrl:params[@"shareUrl"] ShareDesc:params[@"shareDesc"] ShareImage:params[@"shareImage"] ScreenFull:NO HiddenWjj:NO HiddenQQ:NO HiddenWB:NO HiddenWechat:NO HiddenSafari:NO FormVC:[UIApplication sharedApplication].delegate.window.rootViewController TopImage:nil TopTitles:nil PlatformType:type TouchActionBlock:NULL CompleterBlock:^(CNLiveShareResultType resultType, CNLiveSharePlatformType platformType, NSString *typtString) {
41   - if (resultType == CNLiveShareResultTypeSucc) {
42   - NSLog(@"分享成功");
43   - }
44   - }];
  40 +// [CNLiveShareManager showShareViewWithParamForShareTitle:params[@"title"] ShareUrl:params[@"shareUrl"] ShareDesc:params[@"shareDesc"] ShareImage:params[@"shareImage"] ScreenFull:NO HiddenWjj:NO HiddenQQ:NO HiddenWB:NO HiddenWechat:NO HiddenSafari:NO FormVC:[UIApplication sharedApplication].delegate.window.rootViewController TopImage:nil TopTitles:nil PlatformType:type TouchActionBlock:NULL CompleterBlock:^(CNLiveShareResultType resultType, CNLiveSharePlatformType platformType, NSString *typtString) {
  41 +// if (resultType == CNLiveShareResultTypeSucc) {
  42 +// NSLog(@"分享成功");
  43 +// }
  44 +// }];
45 45 }
46 46 - (NSString *)getPluginDescriptionPath
47 47 {
... ...
Example/Podfile.lock
  View file @eeabc63
... ... @@ -15,24 +15,23 @@ PODS:
15 15 - AFNetworking/UIKit (4.0.0):
16 16 - AFNetworking/NSURLSession
17 17 - AlipaySDK-iOS (15.7.4)
18   - - BBAMNPLib (2.37.0):
  18 + - BBAMNPLib (2.47.0):
19 19 - AFNetworking
20 20 - FLAnimatedImage
21 21 - FMDB
22   - - lottie-ios
23 22 - Masonry
24 23 - MJRefresh
25 24 - MMKV
26 25 - Reachability
27 26 - SDWebImage
28   - - SMGameLib (= 2.37.0)
29   - - SMLibs (= 2.37.0)
  27 + - SMGameLib (= 2.47.0)
  28 + - SMLibs (= 2.47.0)
30 29 - SSZipArchive
31 30 - UBC (= 5.0.0)
32 31 - YYCache
33   - - CNLiveBaseKit (0.1.23):
  32 + - CNLiveBaseKit (0.1.28):
34 33 - CNLiveNewTripartiteManagement/MJExtension
35   - - CNLiveBBASMModule (0.0.15):
  34 + - CNLiveBBASMModule (0.0.16):
36 35 - BBAMNPLib
37 36 - CNLiveBeeHive
38 37 - CNLiveBusinessTools
... ... @@ -44,7 +43,7 @@ PODS:
44 43 - SSDKLightLib
45 44 - WechatOpenSDK
46 45 - CNLiveBeeHive (0.1.9)
47   - - CNLiveBusinessTools (0.1.29):
  46 + - CNLiveBusinessTools (0.1.32):
48 47 - CNLiveBaseKit
49 48 - CNLiveEnvironment
50 49 - CNLiveNewTripartiteManagement/QMUIKit
... ... @@ -63,42 +62,42 @@ PODS:
63 62 - CNLiveCommonCategory/ImageInBundle (= 0.5.2)
64 63 - CNLiveCommonCategory/ARC (0.5.2)
65 64 - CNLiveCommonCategory/ImageInBundle (0.5.2)
66   - - CNLiveEnvironment (0.3.4)
67   - - CNLiveNewTripartiteManagement/AFNetworking (0.2.0.6):
  65 + - CNLiveEnvironment (0.4.4)
  66 + - CNLiveNewTripartiteManagement/AFNetworking (0.2.0.8):
68 67 - AFNetworking (= 4.0.0)
69   - - CNLiveNewTripartiteManagement/AlipaySDK-iOS (0.2.0.6):
  68 + - CNLiveNewTripartiteManagement/AlipaySDK-iOS (0.2.0.8):
70 69 - AlipaySDK-iOS (= 15.7.4)
71   - - CNLiveNewTripartiteManagement/lottie-ios (0.2.0.6):
  70 + - CNLiveNewTripartiteManagement/lottie-ios (0.2.0.8):
72 71 - lottie-ios (= 2.5.0)
73   - - CNLiveNewTripartiteManagement/MJExtension (0.2.0.6):
  72 + - CNLiveNewTripartiteManagement/MJExtension (0.2.0.8):
74 73 - MJExtension (= 3.2.1)
75   - - CNLiveNewTripartiteManagement/QMUIKit (0.2.0.6):
  74 + - CNLiveNewTripartiteManagement/QMUIKit (0.2.0.8):
76 75 - QMUIKit (= 4.2.1)
77   - - CNLiveNewTripartiteManagement/SDWebImage (0.2.0.6):
  76 + - CNLiveNewTripartiteManagement/SDWebImage (0.2.0.8):
78 77 - SDWebImage (= 5.2.3)
79   - - CNLiveNewTripartiteManagement/WechatOpenSDK (0.2.0.6):
  78 + - CNLiveNewTripartiteManagement/WechatOpenSDK (0.2.0.8):
80 79 - WechatOpenSDK (= 1.8.7.1)
81   - - CNLiveNewTripartiteManagement/WeiboSDK (0.2.0.6):
  80 + - CNLiveNewTripartiteManagement/WeiboSDK (0.2.0.8):
82 81 - Weibo_SDK (= 3.2.7)
83   - - CNLiveNewTripartiteManagement/YYAsyncLayer (0.2.0.6):
  82 + - CNLiveNewTripartiteManagement/YYAsyncLayer (0.2.0.8):
84 83 - YYAsyncLayer (= 1.0)
85   - - CNLiveNewTripartiteManagement/YYCache (0.2.0.6):
  84 + - CNLiveNewTripartiteManagement/YYCache (0.2.0.8):
86 85 - YYCache (= 1.0.4)
87   - - CNLiveNewTripartiteManagement/YYCategories (0.2.0.6):
  86 + - CNLiveNewTripartiteManagement/YYCategories (0.2.0.8):
88 87 - YYCategories (= 1.0.4)
89   - - CNLiveNewTripartiteManagement/YYDispatchQueuePool (0.2.0.6):
  88 + - CNLiveNewTripartiteManagement/YYDispatchQueuePool (0.2.0.8):
90 89 - YYDispatchQueuePool (= 1.0)
91   - - CNLiveNewTripartiteManagement/YYImage (0.2.0.6):
  90 + - CNLiveNewTripartiteManagement/YYImage (0.2.0.8):
92 91 - YYImage (= 1.0.4)
93   - - CNLiveNewTripartiteManagement/YYModel (0.2.0.6):
  92 + - CNLiveNewTripartiteManagement/YYModel (0.2.0.8):
94 93 - YYModel (= 1.0.4)
95   - - CNLiveNewTripartiteManagement/YYText (0.2.0.6):
  94 + - CNLiveNewTripartiteManagement/YYText (0.2.0.8):
96 95 - YYText (= 1.0.7)
97   - - CNLiveNewTripartiteManagement/YYWebImage (0.2.0.6):
  96 + - CNLiveNewTripartiteManagement/YYWebImage (0.2.0.8):
98 97 - YYWebImage (= 1.0.5)
99 98 - CNLiveRequestBastKit (0.2.5.7):
100 99 - AFNetworking
101   - - CNLiveShareToolKit (0.4.0):
  100 + - CNLiveShareToolKit (0.4.4):
102 101 - CNLiveCommonCategory
103 102 - CNLiveEnvironment
104 103 - CNLiveNewTripartiteManagement/AFNetworking
... ... @@ -122,9 +121,9 @@ PODS:
122 121 - MBProgressHUD (1.2.0)
123 122 - MJExtension (3.2.1)
124 123 - MJRefresh (3.7.5)
125   - - MMKV (1.2.11):
126   - - MMKVCore (~> 1.2.11)
127   - - MMKVCore (1.2.11)
  124 + - MMKV (1.2.13):
  125 + - MMKVCore (~> 1.2.13)
  126 + - MMKVCore (1.2.13)
128 127 - QMUIKit (4.2.1):
129 128 - QMUIKit/QMUIComponents (= 4.2.1)
130 129 - QMUIKit/QMUICore (= 4.2.1)
... ... @@ -446,8 +445,8 @@ PODS:
446 445 - SDWebImage (5.2.3):
447 446 - SDWebImage/Core (= 5.2.3)
448 447 - SDWebImage/Core (5.2.3)
449   - - SMGameLib (2.37.0)
450   - - SMLibs (2.37.0):
  448 + - SMGameLib (2.47.0)
  449 + - SMLibs (2.47.0):
451 450 - AFNetworking
452 451 - FLAnimatedImage
453 452 - FMDB
... ... @@ -455,9 +454,9 @@ PODS:
455 454 - MJRefresh
456 455 - Reachability
457 456 - SDWebImage
458   - - SMLibs/brotli (= 2.37.0)
  457 + - SMLibs/brotli (= 2.47.0)
459 458 - YYCache
460   - - SMLibs/brotli (2.37.0):
  459 + - SMLibs/brotli (2.47.0):
461 460 - AFNetworking
462 461 - FLAnimatedImage
463 462 - FMDB
... ... @@ -466,8 +465,8 @@ PODS:
466 465 - Reachability
467 466 - SDWebImage
468 467 - YYCache
469   - - SSDKLightLib (1.1.0)
470   - - SSZipArchive (2.4.2)
  468 + - SSDKLightLib (1.2.0)
  469 + - SSZipArchive (2.4.3)
471 470 - UBC (5.0.0)
472 471 - WechatOpenSDK (1.8.7.1)
473 472 - Weibo_SDK (3.2.7)
... ... @@ -546,16 +545,16 @@ EXTERNAL SOURCES:
546 545 SPEC CHECKSUMS:
547 546 AFNetworking: d9fdf484a3c723ec3c558a41cc5754c7e845ee77
548 547 AlipaySDK-iOS: 8659cdb4403de7e5f26ad8b699864a9cbe53384c
549   - BBAMNPLib: 26e7e4a046d98755ef467a9f3fd8f5ff4fa5cef9
550   - CNLiveBaseKit: 44e5fc573cbca78a86b704cf77c886ef53889807
551   - CNLiveBBASMModule: ee798e5e35fa3b6ffa0abcd2f9feec13c16ae921
  548 + BBAMNPLib: 441d8edbc4193db7cfe52d670a782aab0e566fed
  549 + CNLiveBaseKit: 22b123f4c1b21e3f4ca7862922b428003cc89fee
  550 + CNLiveBBASMModule: 92972005fa02ec765463036df259832a6408dd83
552 551 CNLiveBeeHive: 1e105b15b6ccaad546258fcf91231563beb853d4
553   - CNLiveBusinessTools: fee9f935c2ef25ceeaa9605e8e0d490057906d0f
  552 + CNLiveBusinessTools: 67358bb3f6e914ee32b8572cc2fdf0122ad95094
554 553 CNLiveCommonCategory: 22c9842b31f2087803ae69e983b2c944fb80eae1
555   - CNLiveEnvironment: 48ba0f934399fd25fc54dc3239009754bcc1ddb3
556   - CNLiveNewTripartiteManagement: 29ddb2d23ee77bcd42ba5eaf5f1322ed37db5baa
  554 + CNLiveEnvironment: cacc0efa17a48cd91cca0f18df0ba89fca47db0e
  555 + CNLiveNewTripartiteManagement: 8cb5eb9c78bf45ce75d505c9ad6cf72d257df2c3
557 556 CNLiveRequestBastKit: 9fe28913b94a0a072298eba3356f17b98ef0b6cd
558   - CNLiveShareToolKit: 580f19c7e5121b57730bff09b228890900d13198
  557 + CNLiveShareToolKit: f910a6cb6bac6038e27d582dd7e0b8c41ca4778f
559 558 CNLiveTencentopenapi: d7c4cea634f51cae6aa61286dc3847193246dc6d
560 559 CNLiveUserManagement: ead053f2d701b01ea8fb5f1da572be788f2dd3cf
561 560 FLAnimatedImage: 8f3e854ebf9680b71f0b6e700939687fc4d82b4b
... ... @@ -565,15 +564,15 @@ SPEC CHECKSUMS:
565 564 MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
566 565 MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545
567 566 MJRefresh: fdf5e979eb406a0341468932d1dfc8b7f9fce961
568   - MMKV: 217b643c181c3d2f71983206ca1972d0a6e99881
569   - MMKVCore: f9e4f56742fdebbd042f7a273e278927f182cee7
  567 + MMKV: aac95d817a100479445633f2b3ed8961b4ac5043
  568 + MMKVCore: 3388952ded307e41b3ed8a05892736a236ed1b8e
570 569 QMUIKit: 15294d6a350466e4a6f4df0333eac5bff474f995
571 570 Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
572 571 SDWebImage: 46a7f73228f84ce80990c786e4372cf4db5875ce
573   - SMGameLib: fed3f2586141b768aaafbf1904dc3efd48144c8e
574   - SMLibs: e63cc07c7789a05a6c4b5306b027ec61c26afe67
575   - SSDKLightLib: ca6f701209bb266666dd2464ac18c20298a0bb4f
576   - SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2
  572 + SMGameLib: 84162acd7f9c3efbf092de9297fb9cd144d0f1dc
  573 + SMLibs: 1863912f8dd61ca09505f5270e3220c9f6bc0d4b
  574 + SSDKLightLib: d26e957acacd551a59fc02792d442f3237b3e259
  575 + SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
577 576 UBC: 83c7c10bd28e7b4679b342fed92fdfa163748a86
578 577 WechatOpenSDK: 6a4d1436c15b3b5fe2a0bd383f3046010186da44
579 578 Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
... ...