0.1.7

yanglingyu
1 parent a9554db1
Showing 9 changed files with 67 additions and 68 deletions
CNLiveBBASMModule.podspec
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNConfig/CNBBASMPlatformImpl.m
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/CNBBASMScanCodeImpl.m
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/BBASMScanView.h → CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/CNBBASMScanView.h
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/BBASMScanView.m → CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/CNBBASMScanView.m
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/BBASMScanViewController.h → CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/CNBBASMScanViewController.h
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/BBASMScanViewController.m → CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNScanCode/CNBBASMScanViewController.m
Example/CNLiveBBASMModule/CNLiveBBASMModule/CNLiveBBASMModuleService.m
Example/Podfile.lock
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveBBASMModule'
-  s.version          = '0.0.16'
+  s.version          = '0.1.7'
   s.summary          = 'CNLive-iOS百度小程序接入'
 # This description is used to generate tags and improve search results.
@@ -7,7 +7,7 @@
 //
 #import "CNBBASMPlatformImpl.h"
-#import "BBASMScanViewController.h"
+#import "CNBBASMScanViewController.h"
 #import <CNLiveUserManagement/CNUserInfoManager.h>
 #import "CNBBASMJumpService.h"
@@ -16,7 +16,7 @@
 RegisterBBASMAdapter()
 + (NSString *)hostConfigFilePath {
-    NSBundle *bundle = [NSBundle bundleForClass:[BBASMScanViewController class]];
+    NSBundle *bundle = [NSBundle bundleForClass:[CNBBASMScanViewController class]];
     NSString *bundlePlistPath = [bundle pathForResource:@"BBASMPyramid" ofType:@"bundle"];
     return [bundlePlistPath stringByAppendingPathComponent:@"union-cfg.json"];
 }
@@ -7,13 +7,13 @@
 //
 #import "CNBBASMScanCodeImpl.h"
-#import "BBASMScanViewController.h"
+#import "CNBBASMScanViewController.h"
 @implementation CNBBASMScanCodeImpl
 RegisterBBASMAdapter()
 + (void)scanCode:(void(^)(NSString *result,TMNPBarcodeType type))callBack{
-    BBASMScanViewController *ssVC = [[BBASMScanViewController alloc]
+    CNBBASMScanViewController *ssVC = [[CNBBASMScanViewController alloc]
                                      initScanCompleteBlock:^(NSDictionary * _Nullable result,
                                                              NSError * _Nullable error) {
         // 扫描完成，回调传给callBack
@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
-@interface BBASMScanView : UIView
+@interface CNBBASMScanView : UIView
 @end
@@ -6,11 +6,11 @@
 //  Copyright © 2019 baidu. All rights reserved.
 //
-#import "BBASMScanView.h"
+#import "CNBBASMScanView.h"
 #define LeftDistance 60
-@interface BBASMScanView ()
+@interface CNBBASMScanView ()
 @property (nonatomic, assign) NSInteger heightScale;
 @property (nonatomic, assign) BOOL needStop;
@@ -18,7 +18,7 @@
 @end
-@implementation BBASMScanView
+@implementation CNBBASMScanView
 -(id)initWithFrame:(CGRect)frame {
     if (self = [super initWithFrame:frame]) {
@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
-@interface BBASMScanViewController : UIViewController
+@interface CNBBASMScanViewController : UIViewController
 /**
  初始化二维码扫码控制器
@@ -6,15 +6,15 @@
 //  Copyright © 2019 baidu. All rights reserved.
 //
-#import "BBASMScanViewController.h"
+#import "CNBBASMScanViewController.h"
 #import <AssetsLibrary/ALAssetsLibrary.h>
 #import <Photos/PHPhotoLibrary.h>
 #import <AVFoundation/AVFoundation.h>
-#import "BBASMScanView.h"
+#import "CNBBASMScanView.h"
-@interface BBASMScanViewController ()<UINavigationControllerDelegate, UIImagePickerControllerDelegate, AVCaptureMetadataOutputObjectsDelegate, UIGestureRecognizerDelegate>
+@interface CNBBASMScanViewController ()<UINavigationControllerDelegate, UIImagePickerControllerDelegate, AVCaptureMetadataOutputObjectsDelegate, UIGestureRecognizerDelegate>
-@property (nonatomic, strong) BBASMScanView *scanRectView;
+@property (nonatomic, strong) CNBBASMScanView *scanRectView;
 @property (nonatomic, strong) UILabel *tipTitle;  //扫码区域下方提示文字
 @property (nonatomic, strong) UIBarButtonItem *photoItem;   //相册按钮
 @property (nonatomic, strong) UIButton *flashBtn; //闪光灯按钮
@@ -30,7 +30,7 @@
 @end
-@implementation BBASMScanViewController
+@implementation CNBBASMScanViewController
 - (instancetype)initScanCompleteBlock:(void (^)(NSDictionary *result, NSError *error))scanBlock {
     self = [super init];
@@ -182,7 +182,7 @@
 // 绘制扫描区域
 - (void)drawScanView {
-    _scanRectView = [[BBASMScanView alloc] initWithFrame:self.view.frame];
+    _scanRectView = [[CNBBASMScanView alloc] initWithFrame:self.view.frame];
     [self.view addSubview:_scanRectView];
 }
@@ -37,11 +37,11 @@ static NSString *const CNLiveAccountLogOut = @&quot;accountLogout&quot;;
             type = CNLiveSharePlatformTypeSina;
         }
     }
-    [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) {
-        if (resultType == CNLiveShareResultTypeSucc) {
-            NSLog(@"分享成功");
-        }
-    }];
+//    [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) {
+//        if (resultType == CNLiveShareResultTypeSucc) {
+//            NSLog(@"分享成功");
+//        }
+//    }];
 }
 - (NSString *)getPluginDescriptionPath
 {
@@ -15,24 +15,23 @@ PODS:
   - AFNetworking/UIKit (4.0.0):
     - AFNetworking/NSURLSession
   - AlipaySDK-iOS (15.7.4)
-  - BBAMNPLib (2.37.0):
+  - BBAMNPLib (2.47.0):
     - AFNetworking
     - FLAnimatedImage
     - FMDB
-    - lottie-ios
     - Masonry
     - MJRefresh
     - MMKV
     - Reachability
     - SDWebImage
-    - SMGameLib (= 2.37.0)
-    - SMLibs (= 2.37.0)
+    - SMGameLib (= 2.47.0)
+    - SMLibs (= 2.47.0)
     - SSZipArchive
     - UBC (= 5.0.0)
     - YYCache
-  - CNLiveBaseKit (0.1.23):
+  - CNLiveBaseKit (0.1.28):
     - CNLiveNewTripartiteManagement/MJExtension
-  - CNLiveBBASMModule (0.0.15):
+  - CNLiveBBASMModule (0.0.16):
     - BBAMNPLib
     - CNLiveBeeHive
     - CNLiveBusinessTools
@@ -44,7 +43,7 @@ PODS:
     - SSDKLightLib
     - WechatOpenSDK
   - CNLiveBeeHive (0.1.9)
-  - CNLiveBusinessTools (0.1.29):
+  - CNLiveBusinessTools (0.1.32):
     - CNLiveBaseKit
     - CNLiveEnvironment
     - CNLiveNewTripartiteManagement/QMUIKit
@@ -63,42 +62,42 @@ PODS:
     - CNLiveCommonCategory/ImageInBundle (= 0.5.2)
   - CNLiveCommonCategory/ARC (0.5.2)
   - CNLiveCommonCategory/ImageInBundle (0.5.2)
-  - CNLiveEnvironment (0.3.4)
-  - CNLiveNewTripartiteManagement/AFNetworking (0.2.0.6):
+  - CNLiveEnvironment (0.4.4)
+  - CNLiveNewTripartiteManagement/AFNetworking (0.2.0.8):
     - AFNetworking (= 4.0.0)
-  - CNLiveNewTripartiteManagement/AlipaySDK-iOS (0.2.0.6):
+  - CNLiveNewTripartiteManagement/AlipaySDK-iOS (0.2.0.8):
     - AlipaySDK-iOS (= 15.7.4)
-  - CNLiveNewTripartiteManagement/lottie-ios (0.2.0.6):
+  - CNLiveNewTripartiteManagement/lottie-ios (0.2.0.8):
     - lottie-ios (= 2.5.0)
-  - CNLiveNewTripartiteManagement/MJExtension (0.2.0.6):
+  - CNLiveNewTripartiteManagement/MJExtension (0.2.0.8):
     - MJExtension (= 3.2.1)
-  - CNLiveNewTripartiteManagement/QMUIKit (0.2.0.6):
+  - CNLiveNewTripartiteManagement/QMUIKit (0.2.0.8):
     - QMUIKit (= 4.2.1)
-  - CNLiveNewTripartiteManagement/SDWebImage (0.2.0.6):
+  - CNLiveNewTripartiteManagement/SDWebImage (0.2.0.8):
     - SDWebImage (= 5.2.3)
-  - CNLiveNewTripartiteManagement/WechatOpenSDK (0.2.0.6):
+  - CNLiveNewTripartiteManagement/WechatOpenSDK (0.2.0.8):
     - WechatOpenSDK (= 1.8.7.1)
-  - CNLiveNewTripartiteManagement/WeiboSDK (0.2.0.6):
+  - CNLiveNewTripartiteManagement/WeiboSDK (0.2.0.8):
     - Weibo_SDK (= 3.2.7)
-  - CNLiveNewTripartiteManagement/YYAsyncLayer (0.2.0.6):
+  - CNLiveNewTripartiteManagement/YYAsyncLayer (0.2.0.8):
     - YYAsyncLayer (= 1.0)
-  - CNLiveNewTripartiteManagement/YYCache (0.2.0.6):
+  - CNLiveNewTripartiteManagement/YYCache (0.2.0.8):
     - YYCache (= 1.0.4)
-  - CNLiveNewTripartiteManagement/YYCategories (0.2.0.6):
+  - CNLiveNewTripartiteManagement/YYCategories (0.2.0.8):
     - YYCategories (= 1.0.4)
-  - CNLiveNewTripartiteManagement/YYDispatchQueuePool (0.2.0.6):
+  - CNLiveNewTripartiteManagement/YYDispatchQueuePool (0.2.0.8):
     - YYDispatchQueuePool (= 1.0)
-  - CNLiveNewTripartiteManagement/YYImage (0.2.0.6):
+  - CNLiveNewTripartiteManagement/YYImage (0.2.0.8):
     - YYImage (= 1.0.4)
-  - CNLiveNewTripartiteManagement/YYModel (0.2.0.6):
+  - CNLiveNewTripartiteManagement/YYModel (0.2.0.8):
     - YYModel (= 1.0.4)
-  - CNLiveNewTripartiteManagement/YYText (0.2.0.6):
+  - CNLiveNewTripartiteManagement/YYText (0.2.0.8):
     - YYText (= 1.0.7)
-  - CNLiveNewTripartiteManagement/YYWebImage (0.2.0.6):
+  - CNLiveNewTripartiteManagement/YYWebImage (0.2.0.8):
     - YYWebImage (= 1.0.5)
   - CNLiveRequestBastKit (0.2.5.7):
     - AFNetworking
-  - CNLiveShareToolKit (0.4.0):
+  - CNLiveShareToolKit (0.4.4):
     - CNLiveCommonCategory
     - CNLiveEnvironment
     - CNLiveNewTripartiteManagement/AFNetworking
@@ -122,9 +121,9 @@ PODS:
   - MBProgressHUD (1.2.0)
   - MJExtension (3.2.1)
   - MJRefresh (3.7.5)
-  - MMKV (1.2.11):
-    - MMKVCore (~> 1.2.11)
-  - MMKVCore (1.2.11)
+  - MMKV (1.2.13):
+    - MMKVCore (~> 1.2.13)
+  - MMKVCore (1.2.13)
   - QMUIKit (4.2.1):
     - QMUIKit/QMUIComponents (= 4.2.1)
     - QMUIKit/QMUICore (= 4.2.1)
@@ -446,8 +445,8 @@ PODS:
   - SDWebImage (5.2.3):
     - SDWebImage/Core (= 5.2.3)
   - SDWebImage/Core (5.2.3)
-  - SMGameLib (2.37.0)
-  - SMLibs (2.37.0):
+  - SMGameLib (2.47.0)
+  - SMLibs (2.47.0):
     - AFNetworking
     - FLAnimatedImage
     - FMDB
@@ -455,9 +454,9 @@ PODS:
     - MJRefresh
     - Reachability
     - SDWebImage
-    - SMLibs/brotli (= 2.37.0)
+    - SMLibs/brotli (= 2.47.0)
     - YYCache
-  - SMLibs/brotli (2.37.0):
+  - SMLibs/brotli (2.47.0):
     - AFNetworking
     - FLAnimatedImage
     - FMDB
@@ -466,8 +465,8 @@ PODS:
     - Reachability
     - SDWebImage
     - YYCache
-  - SSDKLightLib (1.1.0)
-  - SSZipArchive (2.4.2)
+  - SSDKLightLib (1.2.0)
+  - SSZipArchive (2.4.3)
   - UBC (5.0.0)
   - WechatOpenSDK (1.8.7.1)
   - Weibo_SDK (3.2.7)
@@ -546,16 +545,16 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   AFNetworking: d9fdf484a3c723ec3c558a41cc5754c7e845ee77
   AlipaySDK-iOS: 8659cdb4403de7e5f26ad8b699864a9cbe53384c
-  BBAMNPLib: 26e7e4a046d98755ef467a9f3fd8f5ff4fa5cef9
-  CNLiveBaseKit: 44e5fc573cbca78a86b704cf77c886ef53889807
-  CNLiveBBASMModule: ee798e5e35fa3b6ffa0abcd2f9feec13c16ae921
+  BBAMNPLib: 441d8edbc4193db7cfe52d670a782aab0e566fed
+  CNLiveBaseKit: 22b123f4c1b21e3f4ca7862922b428003cc89fee
+  CNLiveBBASMModule: 92972005fa02ec765463036df259832a6408dd83
   CNLiveBeeHive: 1e105b15b6ccaad546258fcf91231563beb853d4
-  CNLiveBusinessTools: fee9f935c2ef25ceeaa9605e8e0d490057906d0f
+  CNLiveBusinessTools: 67358bb3f6e914ee32b8572cc2fdf0122ad95094
   CNLiveCommonCategory: 22c9842b31f2087803ae69e983b2c944fb80eae1
-  CNLiveEnvironment: 48ba0f934399fd25fc54dc3239009754bcc1ddb3
-  CNLiveNewTripartiteManagement: 29ddb2d23ee77bcd42ba5eaf5f1322ed37db5baa
+  CNLiveEnvironment: cacc0efa17a48cd91cca0f18df0ba89fca47db0e
+  CNLiveNewTripartiteManagement: 8cb5eb9c78bf45ce75d505c9ad6cf72d257df2c3
   CNLiveRequestBastKit: 9fe28913b94a0a072298eba3356f17b98ef0b6cd
-  CNLiveShareToolKit: 580f19c7e5121b57730bff09b228890900d13198
+  CNLiveShareToolKit: f910a6cb6bac6038e27d582dd7e0b8c41ca4778f
   CNLiveTencentopenapi: d7c4cea634f51cae6aa61286dc3847193246dc6d
   CNLiveUserManagement: ead053f2d701b01ea8fb5f1da572be788f2dd3cf
   FLAnimatedImage: 8f3e854ebf9680b71f0b6e700939687fc4d82b4b
@@ -565,15 +564,15 @@ SPEC CHECKSUMS:
   MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
   MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545
   MJRefresh: fdf5e979eb406a0341468932d1dfc8b7f9fce961
-  MMKV: 217b643c181c3d2f71983206ca1972d0a6e99881
-  MMKVCore: f9e4f56742fdebbd042f7a273e278927f182cee7
+  MMKV: aac95d817a100479445633f2b3ed8961b4ac5043
+  MMKVCore: 3388952ded307e41b3ed8a05892736a236ed1b8e
   QMUIKit: 15294d6a350466e4a6f4df0333eac5bff474f995
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SDWebImage: 46a7f73228f84ce80990c786e4372cf4db5875ce
-  SMGameLib: fed3f2586141b768aaafbf1904dc3efd48144c8e
-  SMLibs: e63cc07c7789a05a6c4b5306b027ec61c26afe67
-  SSDKLightLib: ca6f701209bb266666dd2464ac18c20298a0bb4f
-  SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2
+  SMGameLib: 84162acd7f9c3efbf092de9297fb9cd144d0f1dc
+  SMLibs: 1863912f8dd61ca09505f5270e3220c9f6bc0d4b
+  SSDKLightLib: d26e957acacd551a59fc02792d442f3237b3e259
+  SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
   UBC: 83c7c10bd28e7b4679b342fed92fdfa163748a86
   WechatOpenSDK: 6a4d1436c15b3b5fe2a0bd383f3046010186da44
   Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089