diff --git a/framework/examples/ios-demo/HippyDemo/HomePage/HomePageViewController.mm b/framework/examples/ios-demo/HippyDemo/HomePage/HomePageViewController.mm index d2d479ec842..4a5f3900393 100644 --- a/framework/examples/ios-demo/HippyDemo/HomePage/HomePageViewController.mm +++ b/framework/examples/ios-demo/HippyDemo/HomePage/HomePageViewController.mm @@ -45,7 +45,7 @@ - (void)viewDidLoad { self.imageView.image = [UIImage imageFromIconName:@"first_page_logo"]; - self.verLabel.text = [NSString stringWithFormat:@"Ver:%@", HippySDKVersion]; + self.verLabel.text = [NSString stringWithFormat:@"Ver:%@", _HippySDKVersion]; self.buttonView.layer.shadowColor = [UIColor grayColor].CGColor; self.buttonView.layer.shadowOffset = CGSizeMake(0, -1); diff --git a/framework/ios/base/bridge/HippyBridge.h b/framework/ios/base/bridge/HippyBridge.h index 4be77018336..27ed97e07b6 100644 --- a/framework/ios/base/bridge/HippyBridge.h +++ b/framework/ios/base/bridge/HippyBridge.h @@ -54,8 +54,9 @@ NS_ASSUME_NONNULL_BEGIN /** * Indicate hippy sdk version + * 注意:为兼容2.0版本,保持的相同的下划线前缀命名,不可修改 */ -HIPPY_EXTERN NSString *const HippySDKVersion; +HIPPY_EXTERN NSString *const _HippySDKVersion; /** * This notification triggers a reload of all bridges currently running. * Deprecated, use HippyBridge::requestReload instead. diff --git a/framework/ios/base/bridge/HippyBridge.mm b/framework/ios/base/bridge/HippyBridge.mm index 7c50ae56740..b367da495f5 100644 --- a/framework/ios/base/bridge/HippyBridge.mm +++ b/framework/ios/base/bridge/HippyBridge.mm @@ -79,7 +79,7 @@ NSString *const HippyJavaScriptDidLoadNotification = @"HippyJavaScriptDidLoadNotification"; NSString *const HippyJavaScriptDidFailToLoadNotification = @"HippyJavaScriptDidFailToLoadNotification"; NSString *const HippyDidInitializeModuleNotification = @"HippyDidInitializeModuleNotification"; -NSString *const HippySDKVersion = @HIPPY_STR(HIPPY_VERSION); +NSString *const _HippySDKVersion = @HIPPY_STR(HIPPY_VERSION); static NSString *const HippyNativeGlobalKeyOS = @"OS"; @@ -513,7 +513,7 @@ - (void)innerLoadInstanceForRootView:(NSNumber *)rootTag withProperties:(NSDicti NSDictionary *param = @{@"name": _moduleName, @"id": rootTag, @"params": props ?: @{}, - @"version": HippySDKVersion}; + @"version": _HippySDKVersion}; footstone::value::HippyValue value = [param toHippyValue]; std::shared_ptr domValue = std::make_shared(value); self.javaScriptExecutor.pScope->LoadInstance(domValue); @@ -991,7 +991,7 @@ - (NSDictionary *)genRawDeviceInfoDict { [deviceInfo setValue:@"ios" forKey:HippyNativeGlobalKeyOS]; [deviceInfo setValue:iosVersion forKey:HippyNativeGlobalKeyOSVersion]; [deviceInfo setValue:deviceModel forKey:HippyNativeGlobalKeyDevice]; - [deviceInfo setValue:HippySDKVersion forKey:HippyNativeGlobalKeySDKVersion]; + [deviceInfo setValue:_HippySDKVersion forKey:HippyNativeGlobalKeySDKVersion]; NSString *appVer = [[NSBundle.mainBundle infoDictionary] objectForKey:@"CFBundleShortVersionString"]; if (appVer) { diff --git a/modules/ios/base/HippyUtils.h b/modules/ios/base/HippyUtils.h index 9d99648761f..7267de0c790 100644 --- a/modules/ios/base/HippyUtils.h +++ b/modules/ios/base/HippyUtils.h @@ -146,9 +146,12 @@ HIPPY_EXTERN NSStringEncoding HippyGetStringEncodingFromURLResponse(NSURLRespons #pragma mark - /// 工具类 +/// 注意,类名及方法名禁止修改 @interface HippyUtils : NSObject -/// SDK版本号 +/// HippySDK版本号 +/// +/// 注意方法名禁止修改,外部可能会动态调用,判断Hippy版本号 + (NSString *)sdkVersion; @end