fix(ios): change sdkVersion variable name , keep compatible with hippy2

Tencent · Nov 8, 2023 · f3d0542 · f3d0542
1 parent a84c3e0
commit f3d0542
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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<footstone::value::HippyValue> domValue = std::make_shared<footstone::value::HippyValue>(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
@@ -146,9 +146,12 @@ HIPPY_EXTERN NSStringEncoding HippyGetStringEncodingFromURLResponse(NSURLRespons
 #pragma mark -
 
 /// 工具类
+/// 注意，类名及方法名禁止修改
 @interface HippyUtils : NSObject
 
-/// SDK版本号
+/// HippySDK版本号
+///
+/// 注意方法名禁止修改，外部可能会动态调用，判断Hippy版本号
 + (NSString *)sdkVersion;
 
 @end