Commit b79db3061ace3dfd5d72387ba702250301849d2f
1 parent
6ea53f34
no message
Showing
4 changed files
with
10 additions
and
12 deletions
CNLiveBaseClass.podspec
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | 8 | ||
| 9 | Pod::Spec.new do |s| | 9 | Pod::Spec.new do |s| |
| 10 | s.name = 'CNLiveBaseClass' | 10 | s.name = 'CNLiveBaseClass' |
| 11 | - s.version = '0.0.4' | 11 | + s.version = '0.0.5' |
| 12 | s.summary = 'CNLiveBaseClass' | 12 | s.summary = 'CNLiveBaseClass' |
| 13 | 13 | ||
| 14 | # This description is used to generate tags and improve search results. | 14 | # This description is used to generate tags and improve search results. |
| @@ -35,7 +35,7 @@ TODO: 网家家-基类. | @@ -35,7 +35,7 @@ TODO: 网家家-基类. | ||
| 35 | # Controller | 35 | # Controller |
| 36 | s.subspec 'Controller' do |ss| | 36 | s.subspec 'Controller' do |ss| |
| 37 | ss.source_files = 'CNLiveBaseClass/Classes/Controller/*' | 37 | ss.source_files = 'CNLiveBaseClass/Classes/Controller/*' |
| 38 | - ss.dependency 'CNLiveTripartiteManagement/WebViewJavascriptBridge' | 38 | +# ss.dependency 'CNLiveTripartiteManagement/WebViewJavascriptBridge' |
| 39 | # 自定义控件 | 39 | # 自定义控件 |
| 40 | ss.dependency 'CNLiveCustomControl' | 40 | ss.dependency 'CNLiveCustomControl' |
| 41 | end | 41 | end |
CNLiveBaseClass/Classes/Controller/CNLiveInteractionWebController.h
| @@ -13,10 +13,10 @@ | @@ -13,10 +13,10 @@ | ||
| 13 | #import "CNLiveBaseWebViewController.h" | 13 | #import "CNLiveBaseWebViewController.h" |
| 14 | 14 | ||
| 15 | NS_ASSUME_NONNULL_BEGIN | 15 | NS_ASSUME_NONNULL_BEGIN |
| 16 | -@class WKWebViewJavascriptBridge; | 16 | +//@class WKWebViewJavascriptBridge; |
| 17 | 17 | ||
| 18 | @interface CNLiveInteractionWebController : CNLiveBaseWebViewController | 18 | @interface CNLiveInteractionWebController : CNLiveBaseWebViewController |
| 19 | -@property (nonatomic, strong) WKWebViewJavascriptBridge *bridge; | 19 | +//@property (nonatomic, strong) WKWebViewJavascriptBridge *bridge; |
| 20 | 20 | ||
| 21 | /* | 21 | /* |
| 22 | 注意:初始化方法 | 22 | 注意:初始化方法 |
CNLiveBaseClass/Classes/Controller/CNLiveInteractionWebController.m
| @@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
| 7 | // | 7 | // |
| 8 | 8 | ||
| 9 | #import "CNLiveInteractionWebController.h" | 9 | #import "CNLiveInteractionWebController.h" |
| 10 | -#import "WKWebViewJavascriptBridge.h" | 10 | +//#import "WKWebViewJavascriptBridge.h" |
| 11 | #import "CNLiveWebView.h" | 11 | #import "CNLiveWebView.h" |
| 12 | 12 | ||
| 13 | @interface CNLiveInteractionWebController () | 13 | @interface CNLiveInteractionWebController () |
| @@ -22,9 +22,9 @@ | @@ -22,9 +22,9 @@ | ||
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | - (void)interaction { | 24 | - (void)interaction { |
| 25 | - [WKWebViewJavascriptBridge enableLogging]; | ||
| 26 | - self.bridge = [WKWebViewJavascriptBridge bridgeForWebView:self.webView.wkWebView]; | ||
| 27 | - [self.bridge setWebViewDelegate:self.webView]; | 25 | +// [WKWebViewJavascriptBridge enableLogging]; |
| 26 | +// self.bridge = [WKWebViewJavascriptBridge bridgeForWebView:self.webView.wkWebView]; | ||
| 27 | +// [self.bridge setWebViewDelegate:self.webView]; | ||
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | #pragma mark - CNLiveWebViewDelegate | 30 | #pragma mark - CNLiveWebViewDelegate |
Example/CNLiveBaseClass.xcodeproj/project.pbxproj
| @@ -207,7 +207,7 @@ | @@ -207,7 +207,7 @@ | ||
| 207 | 6003F586195388D20070C39A /* Sources */, | 207 | 6003F586195388D20070C39A /* Sources */, |
| 208 | 6003F587195388D20070C39A /* Frameworks */, | 208 | 6003F587195388D20070C39A /* Frameworks */, |
| 209 | 6003F588195388D20070C39A /* Resources */, | 209 | 6003F588195388D20070C39A /* Resources */, |
| 210 | - C3FF986BAF1115AB8AC1AA62 /* [CP] Embed Pods Frameworks */, | 210 | + EC80521F3C5593EEA4A478EE /* [CP] Embed Pods Frameworks */, |
| 211 | ); | 211 | ); |
| 212 | buildRules = ( | 212 | buildRules = ( |
| 213 | ); | 213 | ); |
| @@ -320,7 +320,7 @@ | @@ -320,7 +320,7 @@ | ||
| 320 | 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"; | 320 | 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"; |
| 321 | showEnvVarsInLog = 0; | 321 | showEnvVarsInLog = 0; |
| 322 | }; | 322 | }; |
| 323 | - C3FF986BAF1115AB8AC1AA62 /* [CP] Embed Pods Frameworks */ = { | 323 | + EC80521F3C5593EEA4A478EE /* [CP] Embed Pods Frameworks */ = { |
| 324 | isa = PBXShellScriptBuildPhase; | 324 | isa = PBXShellScriptBuildPhase; |
| 325 | buildActionMask = 2147483647; | 325 | buildActionMask = 2147483647; |
| 326 | files = ( | 326 | files = ( |
| @@ -335,7 +335,6 @@ | @@ -335,7 +335,6 @@ | ||
| 335 | "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", | 335 | "${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework", |
| 336 | "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework", | 336 | "${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework", |
| 337 | "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework", | 337 | "${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework", |
| 338 | - "${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework", | ||
| 339 | ); | 338 | ); |
| 340 | name = "[CP] Embed Pods Frameworks"; | 339 | name = "[CP] Embed Pods Frameworks"; |
| 341 | outputPaths = ( | 340 | outputPaths = ( |
| @@ -347,7 +346,6 @@ | @@ -347,7 +346,6 @@ | ||
| 347 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", | 346 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework", |
| 348 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework", | 347 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework", |
| 349 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework", | 348 | "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework", |
| 350 | - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework", | ||
| 351 | ); | 349 | ); |
| 352 | runOnlyForDeploymentPostprocessing = 0; | 350 | runOnlyForDeploymentPostprocessing = 0; |
| 353 | shellPath = /bin/sh; | 351 | shellPath = /bin/sh; |