GithubStar/Hippy
1
0
Fork 0
mirror of https://github.com/Tencent/Hippy.git synced 2026-10-20 23:56:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(ios): remove unused code in scope and update demo (#4013)

Browse Source
This commit is contained in:
wwwcg
2024-09-03 11:06:05 +08:00
committed by wwwcg
parent cc825e1490
commit be8a66934d
3 changed files with 23 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
driver/js/include/driver/scope.h
-9
View File
@@ -304,14 +304,6 @@ class Scope : public std::enable_shared_from_this<Scope> {
inline std::weak_ptr<DomManager> GetDomManager() { return dom_manager_; }
inline void SetRenderManager(std::shared_ptr<RenderManager> render_manager) {
render_manager_ = render_manager;
}
inline std::weak_ptr<RenderManager> GetRenderManager() {
return render_manager_;
}
inline std::weak_ptr<RootNode> GetRootNode() {
return root_node_;
}
@@ -493,7 +485,6 @@ class Scope : public std::enable_shared_from_this<Scope> {
std::unique_ptr<ScopeWrapper> wrapper_;
std::weak_ptr<UriLoader> loader_;
std::weak_ptr<DomManager> dom_manager_;
std::weak_ptr<RenderManager> render_manager_;
std::weak_ptr<RootNode> root_node_;
std::unordered_map<std::string, std::shared_ptr<ModuleBase>> module_object_map_;
std::unordered_map<string_view , std::shared_ptr<CtxValue>> javascript_class_map_;
framework/examples/ios-demo/HippyDemo/RenderPage/HippyDemoViewController.m
+10 -15
View File
@@ -34,11 +34,6 @@
@interface HippyDemoViewController () <HippyMethodInterceptorProtocol, HippyBridgeDelegate, HippyRootViewDelegate> {
DriverType _driverType;
RenderType _renderType;
BOOL _isDebugMode;
NSURL *_debugURL;
HippyBridge *_hippyBridge;
HippyRootView *_hippyRootView;
BOOL _fromCache;
@@ -57,7 +52,7 @@
_driverType = driverType;
_renderType = renderType;
_debugURL = debugURL;
_isDebugMode = isDebugMode;
_debugMode = isDebugMode;
}
return self;
}
@@ -68,7 +63,7 @@
_driverType = pageCache.driverType;
_renderType = pageCache.renderType;
_debugURL = pageCache.debugURL;
_isDebugMode = pageCache.isDebugMode;
_debugMode = pageCache.isDebugMode;
_hippyRootView = pageCache.rootView;
_hippyBridge = pageCache.hippyBridge;
_fromCache = YES;
@@ -111,12 +106,12 @@
- (void)runHippyDemo {
// Necessary configuration:
NSString *moduleName = @"Demo";
NSDictionary *launchOptions = @{ @"DebugMode": @(_isDebugMode) };
NSDictionary *launchOptions = @{ @"DebugMode": @(_debugMode) };
NSDictionary *initialProperties = @{ @"isSimulator": @(TARGET_OS_SIMULATOR) };
HippyBridge *bridge = nil;
HippyRootView *rootView = nil;
if (_isDebugMode) {
if (_debugMode) {
bridge = [[HippyBridge alloc] initWithDelegate:self
bundleURL:_debugURL
moduleProvider:nil
@@ -129,11 +124,11 @@
} else {
NSURL *vendorBundleURL = [self vendorBundleURL];
NSURL *indexBundleURL = [self indexBundleURL];
HippyBridge *bridge = [[HippyBridge alloc] initWithDelegate:self
bundleURL:vendorBundleURL
moduleProvider:nil
launchOptions:launchOptions
executorKey:nil];
bridge = [[HippyBridge alloc] initWithDelegate:self
bundleURL:vendorBundleURL
moduleProvider:nil
launchOptions:launchOptions
executorKey:moduleName];
rootView = [[HippyRootView alloc] initWithBridge:bridge
businessURL:indexBundleURL
moduleName:moduleName
@@ -191,7 +186,7 @@
pageCache.driverType = _driverType;
pageCache.renderType = _renderType;
pageCache.debugURL = _debugURL;
pageCache.debugMode = _isDebugMode;
pageCache.debugMode = _debugMode;
UIGraphicsBeginImageContextWithOptions(_hippyRootView.bounds.size, NO, [UIScreen mainScreen].scale);
[_hippyRootView drawViewHierarchyInRect:_hippyRootView.bounds afterScreenUpdates:YES];
UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
framework/ios/base/bridge/HippyBridge.mm
+13 -18
View File
@@ -1025,24 +1025,19 @@ dispatch_queue_t HippyBridgeQueue() {
- (void)setupDomManager:(std::shared_ptr<hippy::DomManager>)domManager
rootNode:(std::weak_ptr<hippy::RootNode>)rootNode {
__weak HippyBridge *weakSelf = self;
dispatch_block_t block = ^(void){
HippyBridge *strongSelf = weakSelf;
HippyAssertParam(domManager);
if (!strongSelf || !domManager) {
return;
}
strongSelf.javaScriptExecutor.pScope->SetDomManager(domManager);
strongSelf.javaScriptExecutor.pScope->SetRootNode(rootNode);
#ifdef ENABLE_INSPECTOR
auto devtools_data_source = strongSelf->_javaScriptExecutor.pScope->GetDevtoolsDataSource();
if (devtools_data_source) {
strongSelf->_javaScriptExecutor.pScope->GetDevtoolsDataSource()->Bind(domManager);
devtools_data_source->SetRootNode(rootNode);
}
#endif
};
block();
HippyAssertParam(domManager);
if (!domManager) {
return;
}
self.javaScriptExecutor.pScope->SetDomManager(domManager);
self.javaScriptExecutor.pScope->SetRootNode(rootNode);
#ifdef ENABLE_INSPECTOR
auto devtools_data_source = self.javaScriptExecutor.pScope->GetDevtoolsDataSource();
if (devtools_data_source) {
self.javaScriptExecutor.pScope->GetDevtoolsDataSource()->Bind(domManager);
devtools_data_source->SetRootNode(rootNode);
}
#endif
}
- (BOOL)isValid {