Merge branch 'master' into dev

* master:
  feat:framework 构建

HBuilder-Hello/HBuilder-Hello.xcodeproj/project.pbxproj

@@ -1385,6 +1385,7 @@
 				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = HBuilder/HBuilder.entitlements;
@@ -1456,6 +1457,7 @@
 				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = HBuilder/HBuilder.entitlements;

HBuilder-Hello/Podfile

@@ -1,5 +1,5 @@
 # Uncomment the next line to define a global platform for your project
-platform :ios, '12.0'
+platform :ios, '13.0'
 inhibit_all_warnings!
 
  # 禁用 Bitcode
@@ -20,7 +20,8 @@ target 'HBuilder' do
   pod 'Masonry'
   pod 'MJExtension'
   pod 'OpenSSL', :git => 'https://github.com/isee15/OpenSSL.git'
-  pod 'PBSDK', :git => 'http://106.54.229.239:3000/chenmin/playBall.git', :commit => '4d1ae0e'
+  pod 'PBSDK', :path => '../../playBall/PBSDK_framework'
+  #pod 'PBSDK', :git => 'http://106.54.229.239:3000/chenmin/playBall.git', :commit => '4d1ae0e'
   pod 'WQPlayBallLiveQiu', :path => '../WQPlayBallLiveQiu'
   # Pods for HBuilder
 

HBuilder-uniPluginDemo/HBuilder-uniPlugin.xcodeproj/project.pbxproj

@@ -1537,7 +1537,6 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-HBuilder/Pods-HBuilder-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
-				"${BUILT_PRODUCTS_DIR}/BlocksKit/BlocksKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework",
 				"${BUILT_PRODUCTS_DIR}/HXPhotoPickerObjC/HXPhotoPickerObjC.framework",
 				"${BUILT_PRODUCTS_DIR}/JXCategoryView/JXCategoryView.framework",
@@ -1551,6 +1550,7 @@
 				"${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
 				"${BUILT_PRODUCTS_DIR}/SVGAPlayer-iOS/SVGAPlayer_iOS.framework",
 				"${BUILT_PRODUCTS_DIR}/SVProgressHUD/SVProgressHUD.framework",
+				"${BUILT_PRODUCTS_DIR}/YDBlockKit/YDBlockKit.framework",
 				"${BUILT_PRODUCTS_DIR}/YYModel/YYModel.framework",
 				"${BUILT_PRODUCTS_DIR}/YYText/YYText.framework",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AgoraInfra_iOS/aosl.framework/aosl",
@@ -1583,7 +1583,6 @@
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BlocksKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HXPhotoPickerObjC.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JXCategoryView.framework",
@@ -1597,6 +1596,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SVGAPlayer_iOS.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SVProgressHUD.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YDBlockKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYModel.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/aosl.framework",

HBuilder-uniPluginDemo/Podfile

@@ -1,5 +1,5 @@
 # Uncomment the next line to define a global platform for your project
- platform :ios, '12.0'
+ platform :ios, '13.0'
 inhibit_all_warnings!
 
  # 禁用 Bitcode
@@ -19,8 +19,10 @@ target 'HBuilder' do
   use_frameworks!
   
   pod 'MJExtension'
-  pod 'OpenSSL', :git => 'https://github.com/isee15/OpenSSL.git'
-  pod 'PBSDK', :path => '../../playBall'
+  pod 'OpenSSL', :git => 'http://106.54.229.239:3000/hello/OpenSSL.git'
+  #pod 'PBSDK', :path => '../../playBall'
+  pod 'PBSDK', :path => '../../playBall/PBSDK_framework'
+
   pod 'WQPlayBallLiveQiu', :path => '../WQPlayBallLiveQiu'
   pod 'LookinServer', :configurations => ['Debug']
   # Pods for HBuilder

WQPlayBallLiveQiu/WQPlayBallLiveQiu/Classes/LiveListComponent.m

@@ -8,7 +8,7 @@
 
 #import "LiveListComponent.h"
 #import "DCUni/DCUniConvert.h"
-#import "PBHomeViewController.h"
+#import <PBSDK/PBHomeViewController.h>
 
 @interface LiveListComponent () 
 

WQPlayBallLiveQiu/WQPlayBallLiveQiu/Classes/LiveModule.m

@@ -10,8 +10,8 @@
 #import "WQOptions.h"
 #import <MJExtension/MJExtension.h>
 #import <PBSDK/PBSDK.h>
-#import "PBUser.h"
-#import "TokenManager.h"
+#import <PBSDK/PBUser.h>
+#import <PBSDK/TokenManager.h>
 
 @implementation LiveModule
 - (instancetype)init{