fix(ios): fixed an issue where some part of devtools were not available

Tencent · Dec 21, 2023 · 276d26e · 276d26e
1 parent 9f5e50b
commit 276d26e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/framework/examples/ios-demo/HippyDemo/RenderPage/HippyDemoViewController.mm b/framework/examples/ios-demo/HippyDemo/RenderPage/HippyDemoViewController.mm
@@ -148,8 +148,6 @@ - (void)runHippyDemo {
                                           moduleProvider:nil
                                            launchOptions:launchOptions
                                              executorKey:uniqueEngineKey];
-    _hippyBridge.contextName = uniqueEngineKey;
-    _hippyBridge.moduleName = @"Demo";
     _hippyBridge.methodInterceptor = self;
 
     [_hippyBridge setInspectable:YES];

diff --git a/framework/ios/base/bridge/HippyBridge.h b/framework/ios/base/bridge/HippyBridge.h
@@ -139,7 +139,7 @@ HIPPY_EXTERN NSString *HippyBridgeModuleNameForClass(Class bridgeModuleClass);
  * @discussion Context name will be shown on safari development menu.
  * only for JSC engine
  */
-@property(nonatomic, copy)NSString *contextName;
+@property (nonatomic, copy) NSString *contextName;
 
 /**
  * Set module name

diff --git a/framework/ios/base/executors/HippyJSExecutor.mm b/framework/ios/base/executors/HippyJSExecutor.mm
@@ -363,10 +363,14 @@ - (void)setContextName:(NSString *)contextName {
     if (!contextName) {
         return;
     }
-    WeakCtxPtr weak_ctx = self.pScope->GetContext();
+    __weak __typeof(self)weakSelf = self;
     [self executeBlockOnJavaScriptQueue:^{
         @autoreleasepool {
-            SharedCtxPtr context = weak_ctx.lock();
+            __strong __typeof(weakSelf)strongSelf = weakSelf;
+            if (!strongSelf.pScope) {
+                return;
+            }
+            SharedCtxPtr context = strongSelf.pScope->GetContext();
             if (!context) {
                 return;
             }

diff --git a/framework/ios/debug/devtools/HippyDevInfo.m b/framework/ios/debug/devtools/HippyDevInfo.m
@@ -63,7 +63,7 @@ - (void)parseWsURLWithURLQuery:(NSString *)query {
     _wsURL = [debugWsURL substringFromIndex:range.location + range.length];
 }
 
-- (NSString *)assembleFullWSURLWithClientId:(NSString *)clientId contextName:(NSString *) contextName{
+- (NSString *)assembleFullWSURLWithClientId:(NSString *)clientId contextName:(NSString *)contextName {
   if (self.port.length <= 0) {
     self.port = [self.scheme isEqualToString:HippyDevWebSocketSchemeWs] ? @"80" : @"443";
   }

diff --git a/renderer/native/ios/renderer/HippyRootView.mm b/renderer/native/ios/renderer/HippyRootView.mm
@@ -100,6 +100,9 @@ - (instancetype)initWithBridge:(HippyBridge *)bridge
         if (!_bridge.moduleName) {
             _bridge.moduleName = moduleName;
         }
+        if (!_bridge.contextName) {
+            _bridge.contextName = moduleName;
+        }
         _moduleName = moduleName;
         _appProperties = [initialProperties copy];
         _delegate = delegate;