修复12系统闪退bug，添加注释

yanglingyu
1 parent 75dfe8df
Showing 6 changed files with 71 additions and 29 deletions
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNManager/CNBBASMJumpService.h
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNManager/CNBBASMJumpService.m
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNVideo/CNVideoVC.m
Example/CNLiveBBASMModule.xcodeproj/project.pbxproj
Example/Podfile
Example/Podfile.lock
@@ -11,16 +11,33 @@
 NS_ASSUME_NONNULL_BEGIN
 @protocol CNBBASMJumpProtocol <NSObject,BHServiceProtocol>
-
+/**
+ 注册百度小程序
+ */
 - (void)registerBBASMManager:(NSDictionary *)launchOptions;
+/**
+ 打开百度小程序
+ */
 - (void)openBBASMModule:(NSString *)urlStr;
+/**
+ 支付宝支付回调
+ */
 - (BOOL)cashierHandleOpenUrl:(NSURL *)url;
+/**
+ 退出百度账号登录
+ 
+ */
 - (void)accountLogout;
 @end
 @interface CNBBASMJumpService : NSObject<CNBBASMJumpProtocol>
+/**
+ 分享百度小程序
+ */
 + (void)shareBBASMWithParams:(NSDictionary *)params;
-
+/**
+ 获取Description的zip路径
+ */
 + (NSString *)getPluginDescriptionPath;
 @end
@@ -17,14 +17,20 @@
 @end
 //主要的跳转类型
 static NSString *const CNLiveBBASMRouterWithMainkey = @"com.cnlive.CNLiveNetAdd://call.service.beehive/CNLiveBBASMModuleService.CNliveBBASMModuleProtocol.";
+//分享
 static NSString *const CNLiveBBASMShareMethod = @"shareBBASMWithParams:";
+//获取zip
 static NSString *const CNLiveBBASMGetPluginDesC = @"getPluginDescriptionPath";
+
+//注册协议
 @BeeHiveService(CNBBASMJumpProtocol, CNBBASMJumpService)
 @implementation CNBBASMJumpService
 -(void)modSetUp:(BHContext *)context
 {
+    //增加主工程交互类
     [[BHRouter globalRouter] addPathComponent:@"CNLiveBBASMModuleService" forClass:NSClassFromString(@"CNLiveBBASMModuleService")];
+    //增加组件内交互类
     [[BHRouter globalRouter] addPathComponent:@"CNBBASMJumpService" forClass:NSClassFromString(@"CNBBASMJumpService")];
 }
 - (void)registerBBASMManager:(NSDictionary *)launchOptions
@@ -153,7 +153,7 @@
         NSBundle *bundle = [NSBundle bundleForClass:[self class]];
         NSURL *path = [bundle URLForResource:@"ZFPlayer" withExtension:@"bundle"];
         NSBundle *imageBundle = [NSBundle bundleWithURL:path];
-         [_playBtn setImage:[UIImage imageNamed:@"new_allPlay_44x44_" inBundle:imageBundle withConfiguration:nil] forState:UIControlStateNormal];
+         [_playBtn setImage:[UIImage imageNamed:@"new_allPlay_44x44_" inBundle:imageBundle compatibleWithTraitCollection:NULL] forState:UIControlStateNormal];
         [_playBtn addTarget:self action:@selector(playClick:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _playBtn;
@@ -7,9 +7,9 @@
 	objects = {
 /* Begin PBXBuildFile section */
+		080636B3273BA98500F599E8 /* libPaymentControlMini.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 080636B2273BA98500F599E8 /* libPaymentControlMini.a */; };
 		086F08172730E1F700B9D7EE /* CNLiveBBASMModuleService.m in Sources */ = {isa = PBXBuildFile; fileRef = 086F08162730E1F700B9D7EE /* CNLiveBBASMModuleService.m */; };
 		086F0990273293A100B9D7EE /* BBAPluginDescription.zip in Resources */ = {isa = PBXBuildFile; fileRef = 086F098F273293A100B9D7EE /* BBAPluginDescription.zip */; };
-		08DCFE6D273634E700659A1D /* libPaymentControlMini.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 08DCFE6C273634E700659A1D /* libPaymentControlMini.a */; };
 		08DE2ED3273101B600C3BC16 /* CNAdaptSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08DE2ED2273101B600C3BC16 /* CNAdaptSwift.swift */; };
 		08DE2EDB27310B0500C3BC16 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08DE2EDA27310B0500C3BC16 /* SystemConfiguration.framework */; };
 		08DE2EDD27310B0F00C3BC16 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08DE2EDC27310B0F00C3BC16 /* CoreTelephony.framework */; };
@@ -52,11 +52,11 @@
 /* End PBXContainerItemProxy section */
 /* Begin PBXFileReference section */
+		080636B0273BA98500F599E8 /* UPPaymentControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPaymentControl.h; sourceTree = "<group>"; };
+		080636B2273BA98500F599E8 /* libPaymentControlMini.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libPaymentControlMini.a; sourceTree = "<group>"; };
 		086F08152730E1F700B9D7EE /* CNLiveBBASMModuleService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveBBASMModuleService.h; sourceTree = "<group>"; };
 		086F08162730E1F700B9D7EE /* CNLiveBBASMModuleService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveBBASMModuleService.m; sourceTree = "<group>"; };
 		086F098F273293A100B9D7EE /* BBAPluginDescription.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = BBAPluginDescription.zip; sourceTree = "<group>"; };
-		08DCFE6A273634E700659A1D /* UPPaymentControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPaymentControl.h; sourceTree = "<group>"; };
-		08DCFE6C273634E700659A1D /* libPaymentControlMini.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libPaymentControlMini.a; sourceTree = "<group>"; };
 		08DE2ED1273101B500C3BC16 /* CNLiveBBASMModule_Example-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CNLiveBBASMModule_Example-Bridging-Header.h"; sourceTree = "<group>"; };
 		08DE2ED2273101B600C3BC16 /* CNAdaptSwift.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNAdaptSwift.swift; sourceTree = "<group>"; };
 		08DE2ED827310AEB00C3BC16 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
@@ -122,7 +122,7 @@
 				6003F58E195388D20070C39A /* Foundation.framework in Frameworks */,
 				08DE2EE327310B2B00C3BC16 /* CFNetwork.framework in Frameworks */,
 				F9225E875B57360B1E21CA00 /* Pods_CNLiveBBASMModule_Example.framework in Frameworks */,
-				08DCFE6D273634E700659A1D /* libPaymentControlMini.a in Frameworks */,
+				080636B3273BA98500F599E8 /* libPaymentControlMini.a in Frameworks */,
 				08DE2EDB27310B0500C3BC16 /* SystemConfiguration.framework in Frameworks */,
 				08DE2EDD27310B0F00C3BC16 /* CoreTelephony.framework in Frameworks */,
 				08DE2EF027310B6900C3BC16 /* MobileCoreServices.framework in Frameworks */,
@@ -142,47 +142,46 @@
 /* End PBXFrameworksBuildPhase section */
 /* Begin PBXGroup section */
-		086F08142730E10F00B9D7EE /* CNLiveBBASMModule */ = {
+		080636AE273BA98500F599E8 /* UPPay */ = {
 			isa = PBXGroup;
 			children = (
-				086F08152730E1F700B9D7EE /* CNLiveBBASMModuleService.h */,
-				086F08162730E1F700B9D7EE /* CNLiveBBASMModuleService.m */,
+				080636AF273BA98500F599E8 /* inc */,
+				080636B1273BA98500F599E8 /* libs */,
 			);
-			path = CNLiveBBASMModule;
+			path = UPPay;
 			sourceTree = "<group>";
 		};
-		086F0829273236C300B9D7EE /* Resources */ = {
+		080636AF273BA98500F599E8 /* inc */ = {
 			isa = PBXGroup;
 			children = (
-				086F098F273293A100B9D7EE /* BBAPluginDescription.zip */,
+				080636B0273BA98500F599E8 /* UPPaymentControl.h */,
 			);
-			path = Resources;
+			path = inc;
 			sourceTree = "<group>";
 		};
-		08DCFE68273634E700659A1D /* UPPay */ = {
+		080636B1273BA98500F599E8 /* libs */ = {
 			isa = PBXGroup;
 			children = (
-				08DCFE69273634E700659A1D /* inc */,
-				08DCFE6B273634E700659A1D /* libs */,
+				080636B2273BA98500F599E8 /* libPaymentControlMini.a */,
 			);
-			name = UPPay;
-			path = ../../../../cnlive/Desktop/CNLibrary/UPPay;
+			path = libs;
 			sourceTree = "<group>";
 		};
-		08DCFE69273634E700659A1D /* inc */ = {
+		086F08142730E10F00B9D7EE /* CNLiveBBASMModule */ = {
 			isa = PBXGroup;
 			children = (
-				08DCFE6A273634E700659A1D /* UPPaymentControl.h */,
+				086F08152730E1F700B9D7EE /* CNLiveBBASMModuleService.h */,
+				086F08162730E1F700B9D7EE /* CNLiveBBASMModuleService.m */,
 			);
-			path = inc;
+			path = CNLiveBBASMModule;
 			sourceTree = "<group>";
 		};
-		08DCFE6B273634E700659A1D /* libs */ = {
+		086F0829273236C300B9D7EE /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				08DCFE6C273634E700659A1D /* libPaymentControlMini.a */,
+				086F098F273293A100B9D7EE /* BBAPluginDescription.zip */,
 			);
-			path = libs;
+			path = Resources;
 			sourceTree = "<group>";
 		};
 		6003F581195388D10070C39A = {
@@ -211,7 +210,7 @@
 		6003F58C195388D20070C39A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				08DCFE68273634E700659A1D /* UPPay */,
+				080636AE273BA98500F599E8 /* UPPay */,
 				08DE2EEF27310B6900C3BC16 /* MobileCoreServices.framework */,
 				08DE2EED27310B6200C3BC16 /* AddressBook.framework */,
 				08DE2EEB27310B5A00C3BC16 /* AddressBookUI.framework */,
@@ -26,3 +26,23 @@ target &#39;CNLiveBBASMModule_Example&#39; do
   end
 end
+
+
+# 描述表收集脚本，如果期望每次pod install都自动收集描述表，则添加如下代码
+post_install do |installer|
+    root_path = File.dirname(__FILE__)
+    # 其中'/Resources/SwanResource'为描述表要输出的目录，宿主可以指定自己的目录
+    scheme_desc_path = "#{root_path}/Resources"
+    unless File::exist?(scheme_desc_path) then
+        puts "⚠️ 描述表保存路径 scheme_desc_path 不正确，请在Podfile中修正 ⚠️"
+    else
+        # 在末尾加 --diff 参数, 可以在更新描述表并时输出 diff 文件
+        output = `python Script/scheme_desc_collector.py #{root_path} #{scheme_desc_path}`
+        if $?.to_i != 0
+            puts "⚠️ 收集端能力描述表失败：⚠️\n#{output}"
+        else
+            puts "-------收集端能力描述表成功!-------"
+            puts "保存在目录：#{scheme_desc_path}"
+        end
+    end
+end
@@ -31,7 +31,7 @@ PODS:
     - SMLibs (= 2.34.0)
     - SSZipArchive
     - YYCache
-  - CNLiveBBASMModule (0.0.8):
+  - CNLiveBBASMModule (0.0.10):
     - BBAMNPLib (~> 2.34.0)
     - CNLiveBeeHive
     - CNLiveEnvironment
@@ -494,7 +494,7 @@ SPEC CHECKSUMS:
   AlipaySDK-iOS: 8659cdb4403de7e5f26ad8b699864a9cbe53384c
   BaiduBCE: ca933eadbccac8f8254976c9181ca5f45ded948b
   BBAMNPLib: 070a935319cfd816f29d00c88012a496f7448229
-  CNLiveBBASMModule: d7fd9bfd6db7c2a1b390356ca79ab4f3f76f6b8c
+  CNLiveBBASMModule: 4d1d625a503967002066603a7cb3f831faa99205
   CNLiveBeeHive: 1e105b15b6ccaad546258fcf91231563beb853d4
   CNLiveCommonCategory: 11c736c733ab9c3ea27426d2fafff31a92f0286e
   CNLiveEnvironment: 6af0a2f332b704ffdec67106b4ba044c7f8da371
@@ -523,6 +523,6 @@ SPEC CHECKSUMS:
   Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
   YYCache: 8105b6638f5e849296c71f331ff83891a4942952
-PODFILE CHECKSUM: 9cdcda91661964c8692e6f2a81afe7a99b215d88
+PODFILE CHECKSUM: e374a9d58690aca136da7013d46a36df8f29a9ab
 COCOAPODS: 1.11.2