rn-newarch-svga-player 1.1.6 → 1.1.16

package/README.md

@@ -27,6 +27,55 @@ npm install rn-newarch-svga-player
 
 ```bash
 yarn add rn-newarch-svga-player
+
+```
+
+> 若想更改库的别名 react-native-svga-player 来导入。你则需要把 rn-newarch-svga-player 库修改下，重新 yarn 执行
+
+```diff
++  "dependencies": {
+    "@react-native-oh/react-native-harmony": "0.72.48",
+    "patch-package": "^8.0.0",
+    "postinstall-postinstall": "^2.1.0",
+    "react": "18.2.0",
+    "react-native": "0.72.5",
+-    "rn-newarch-svga-player":"^latest"
++   "react-native-svga-player":"npm:rn-newarch-svga-player@latest"
+  },
+```
+
+android 需要
+
+```bash
+ ./gradlew generateCodegenArtifactsFromSchema
+```
+
+ios 需要
+
+```bash
+  cd ios
+  bundle install && bundle exec pod install
+```
+
+### ios react-native 0.76 以上 AppDelegate.mm 需要显示注册该组件
+
+```diff
+#import "AppDelegate.h"
+#import "RCTSvgaPlayer.h"
+#import <React/RCTBundleURLProvider.h>
+#import <React/RCTBridge+Private.h>
+
+@implementation AppDelegate
+// ...
+
++ - (NSDictionary<NSString *,Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents
++ {
++  NSMutableDictionary * dictionary = [super thirdPartyFabricComponents].mutableCopy;
++  dictionary[@"RNSvgaPlayer"] = [RCTSvgaPlayer class];
++  return dictionary;
++ }
+
+@end
 ```
 
 ## API 参考
@@ -55,20 +104,6 @@ yarn add rn-newarch-svga-player
 | `stepToFrame(frame, andPlay)`                        | 跳转到指定帧，可选择是否从该帧开始播放          |
 | `stepToPercentage(percentage, andPlay)`              | 跳转到指定百分比位置 (0.0-1.0)，可选择是否播放  |
 
-> 若想更改库的别名 react-native-svga-player 来导入。你则需要把 rn-newarch-svga-player 库修改下，重新 yarn 执行
-
-```diff
-+  "dependencies": {
-    "@react-native-oh/react-native-harmony": "0.72.48",
-    "patch-package": "^8.0.0",
-    "postinstall-postinstall": "^2.1.0",
-    "react": "18.2.0",
-    "react-native": "0.72.5",
--    "rn-newarch-svga-player":"^1.1.6"
-+   "react-native-svga-player":"npm:rn-newarch-svga-player@1.1.6"
-  },
-```
-
 下面的代码展示了这个库的基本使用场景：
 
 ```js

package/android/build.gradle

@@ -1,8 +1,8 @@
+import java.nio.file.Paths
 buildscript {
-  ext.getExtOrDefault = {name ->
-    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['SvgaPlayer_' + name]
-  }
-
+     ext.safeExtGet = {prop ->
+        rootProject.ext.has(prop) ? rootProject.ext.get(prop) : project.properties['SvgaPlayer_' + prop]
+    }
   repositories {
     // 使用阿里云镜像源
     maven { url 'https://maven.aliyun.com/repository/google' }
@@ -15,9 +15,10 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:7.3.1"
+    classpath "com.android.tools.build:gradle:7.0.4"
     // noinspection DifferentKotlinGradleVersion
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion')}")
+
   }
 }
 
@@ -29,6 +30,17 @@ apply plugin: "com.facebook.react"
 def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["SvgaPlayer_" + name]).toInteger()
 }
+static def findNodeModulePath(baseDir, packageName) {
+    def basePath = baseDir.toPath().normalize()
+    while (basePath) {
+        def candidatePath = Paths.get(basePath.toString(), "node_modules", packageName)
+        if (candidatePath.toFile().exists()) {
+            return candidatePath.toString()
+        }
+        basePath = basePath.getParent()
+    }
+    return null
+}
 
 android {
   namespace "com.svgaplayer"
@@ -39,59 +51,19 @@ android {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
   }
-
-  buildFeatures {
-    buildConfig true
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled false
-    }
-  }
-
-  lintOptions {
-    disable "GradleCompatible"
-  }
-
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
-
-  sourceSets {
-    main {
-      java.srcDirs += [
-        "generated/java",
-        "generated/jni"
-      ]
-    }
-  }
 }
+def reactNativePath = findNodeModulePath(projectDir, "react-native")
 
 repositories {
-  // 使用阿里云镜像源
-  maven { url 'https://maven.aliyun.com/repository/google' }
-  maven { url 'https://maven.aliyun.com/repository/central' }
-  maven { url 'https://maven.aliyun.com/repository/jcenter' }
-  maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
-  // 添加 JitPack 仓库（用于 GitHub 依赖）
-  maven { url 'https://jitpack.io' }
-  // 备用官方源
-  mavenCentral()
-  google()
+   maven {
+        url "${reactNativePath}/android"
+    }
+    mavenCentral()
+    google()
 }
 
-def kotlin_version = getExtOrDefault("kotlinVersion")
-
 dependencies {
   implementation "com.facebook.react:react-android"
-  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:${safeExtGet('kotlinVersion')}"
   implementation "com.github.yyued:SVGAPlayer-Android:2.6.1"
 }
-
-react {
-  jsRootDir = file("../src/")
-  libraryName = "RNSvgaPlayer"
-  codegenJavaPackageName = "com.svgaplayer"
-}

package/android/gradle.properties

@@ -1,5 +1,4 @@
-# SvgaPlayer_kotlinVersion=2.0.21
-# SvgaPlayer_minSdkVersion=24
-# SvgaPlayer_targetSdkVersion=34
-# SvgaPlayer_compileSdkVersion=35
-# SvgaPlayer_ndkVersion=27.1.12297006
+SvgaPlayer_kotlinVersion=1.6.0
+SvgaPlayer_minSdkVersion=21
+SvgaPlayer_targetSdkVersion=31
+SvgaPlayer_compileSdkVersion=31

package/android/src/main/java/com/svgaplayer/RNSvgaPlayerManager.kt

@@ -4,7 +4,6 @@ import android.util.Log
 import android.widget.ImageView
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableArray
-import com.facebook.react.common.MapBuilder
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.SimpleViewManager
 import com.facebook.react.uimanager.ThemedReactContext
@@ -158,29 +157,51 @@ class RNSvgaPlayerManager() : SimpleViewManager<RNSvgaPlayer>(), RNSvgaPlayerMan
     view.stopAnimation(view.clearsAfterStop)
   }
 
-//  override fun getExportedCustomBubblingEventTypeConstants(): Map<String, Any>? {
+//  override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any>? {
 //    val export = super.getExportedCustomDirectEventTypeConstants()?.toMutableMap()
 //      ?: mutableMapOf<String, Any>()
-//
 //    export[TopErrorEvent.EVENT_NAME] = mapOf("registrationName" to "onError")
 //    export[TopFinishedEvent.EVENT_NAME] = mapOf("registrationName" to "onFinished")
 //    export[TopLoadedEvent.EVENT_NAME] = mapOf("registrationName" to "onLoaded")
 //    export[TopFrameEvent.EVENT_NAME] = mapOf("registrationName" to "onFrameChanged")
 //    export[TopPercentageEvent.EVENT_NAME] = mapOf("registrationName" to "onPercentageChanged")
-//
 //    return export
 //  }
-  override fun getExportedCustomBubblingEventTypeConstants(): MutableMap<String, Any>? {
-  val map = MapBuilder.builder<String, Any>()
-    .put("topError", MapBuilder.of("registrationName", "onError"))
-    .put("topFinished", MapBuilder.of("registrationName", "onFinished"))
-    .put("topLoaded", MapBuilder.of("registrationName", "onLoaded"))
-    .put("topFrameChanged", MapBuilder.of("registrationName", "onFrameChanged"))
-    .put("topPercentageChanged", MapBuilder.of("registrationName", "onPercentageChanged"))
-    .build()
-  return map
+override fun getExportedCustomBubblingEventTypeConstants(): MutableMap<String, Any> {
+  val map: MutableMap<String, Any> = HashMap()
+  map["onError"] = createBubblingEventConfig(
+    bubbledName = "onError",
+    capturedName = "onErrorCapture"
+  )
+  map["onFinished"] = createBubblingEventConfig(
+    bubbledName = "onFinished",
+    capturedName = "onFinishedCapture"
+  )
+  map["onLoaded"] = createBubblingEventConfig(
+    bubbledName = "onLoaded",
+    capturedName = "onLoadedCapture"
+  )
+  map["onFrameChanged"] = createBubblingEventConfig(
+    bubbledName = "onFrameChanged",
+    capturedName = "onFrameChangedCapture"
+  )
+  map["onPercentageChanged"] = createBubblingEventConfig(
+    bubbledName = "onPercentageChanged",
+    capturedName = "onPercentageChangedCapture"
+  )
+  return map;
+}
+  private fun createBubblingEventConfig(
+    bubbledName: String,
+    capturedName: String
+  ): Map<String, Any> {
+    return mapOf(
+      "phasedRegistrationNames" to mapOf(
+        "bubbled" to bubbledName,
+        "captured" to capturedName
+      )
+    )
   }
-
   override fun pauseAnimation(view: RNSvgaPlayer?) {
     view?.pauseAnimation()
   }

package/ios/RCTSvgaPlayer.mm

@@ -1,5 +1,4 @@
 #import "RCTSvgaPlayer.h"
-
 #import <react/renderer/components/RNSvgaPlayerSpec/ComponentDescriptors.h>
 #import <react/renderer/components/RNSvgaPlayerSpec/EventEmitters.h>
 #import <react/renderer/components/RNSvgaPlayerSpec/Props.h>
@@ -16,6 +15,7 @@ using namespace facebook::react;
 
 @end
 
+
 @implementation RCTSvgaPlayer {
     SVGAPlayer * _svgaPlayer;
     NSString * _currentSource;
@@ -35,11 +35,9 @@ using namespace facebook::react;
 {
     return concreteComponentDescriptorProvider<RNSvgaPlayerComponentDescriptor>();
 }
-
-
 Class<RCTComponentViewProtocol> RNSvgaPlayerCls(void)
 {
-   return RCTSvgaPlayer.class;
+  return RCTSvgaPlayer.class;
 }
 - (instancetype)initWithFrame:(CGRect)frame
 {
@@ -141,8 +139,10 @@ Class<RCTComponentViewProtocol> RNSvgaPlayerCls(void)
     [_svgaPlayer clear];
     _currentVideoItem = nil;
     
-    RNSvgaPlayerEventEmitter::OnError result = RNSvgaPlayerEventEmitter::OnError{RNSvgaPlayerEventEmitter::OnError( [errorMessage UTF8String] )};
-self.eventEmitter.onError(result);
+    if(_eventEmitter!= nullptr) {
+        RNSvgaPlayerEventEmitter::OnError result = RNSvgaPlayerEventEmitter::OnError{RNSvgaPlayerEventEmitter::OnError( [errorMessage UTF8String] )};
+        self.eventEmitter.onError(result);
+    }
 
 //    if (_eventEmitter != nullptr) {
 //        std::dynamic_pointer_cast<const facebook::react::RNSvgaPlayerEventEmitter>(_eventEmitter)
@@ -157,10 +157,12 @@ self.eventEmitter.onError(result);
 //    if (_eventEmitter != nullptr) {
 //        std::dynamic_pointer_cast<const facebook::react::RNSvgaPlayerEventEmitter>(_eventEmitter)
 //            ->onLoaded(facebook::react::RNSvgaPlayerEventEmitter::OnLoaded{});
-//        
+//
 //    }
-    RNSvgaPlayerEventEmitter::OnLoaded result = RNSvgaPlayerEventEmitter::OnLoaded{RNSvgaPlayerEventEmitter::OnLoaded( {} )};
-self.eventEmitter.onLoaded(result);
+    if(_eventEmitter != nullptr) {
+        RNSvgaPlayerEventEmitter::OnLoaded result = RNSvgaPlayerEventEmitter::OnLoaded{RNSvgaPlayerEventEmitter::OnLoaded( {} )};
+        self.eventEmitter.onLoaded(result);
+    }
 }
 
 // 辅助方法：处理文件路径
@@ -438,10 +440,14 @@ self.eventEmitter.onLoaded(result);
     if (!_svgaPlayer || _svgaPlayer.delegate != self) {
         return;
     }
-    RNSvgaPlayerEventEmitter::OnFrameChanged result = RNSvgaPlayerEventEmitter::OnFrameChanged{RNSvgaPlayerEventEmitter::OnFrameChanged( frame )};
-self.eventEmitter.onFrameChanged(result);
+    if(_eventEmitter!= nullptr) {
+        
+        RNSvgaPlayerEventEmitter::OnFrameChanged result = RNSvgaPlayerEventEmitter::OnFrameChanged{RNSvgaPlayerEventEmitter::OnFrameChanged( frame )};
+        self.eventEmitter.onFrameChanged(result);
+    }
 //    std::dynamic_pointer_cast<const RNSvgaPlayerEventEmitter>(_eventEmitter)
 //    ->onFrameChanged(RNSvgaPlayerEventEmitter::OnFrameChanged{.value=(float)frame});
+        
     
 }
 -(void) svgaPlayerDidAnimatedToPercentage:(CGFloat)percentage{
@@ -449,9 +455,11 @@ self.eventEmitter.onFrameChanged(result);
     if (!_svgaPlayer || _svgaPlayer.delegate != self) {
         return;
     }
-
-          RNSvgaPlayerEventEmitter::OnPercentageChanged result = RNSvgaPlayerEventEmitter::OnPercentageChanged{RNSvgaPlayerEventEmitter::OnPercentageChanged( percentage )};
-    self.eventEmitter.onPercentageChanged(result);
+    if(_eventEmitter != nullptr) {
+        
+        RNSvgaPlayerEventEmitter::OnPercentageChanged result = RNSvgaPlayerEventEmitter::OnPercentageChanged{RNSvgaPlayerEventEmitter::OnPercentageChanged( percentage )};
+        self.eventEmitter.onPercentageChanged(result);
+    }
     //直接事件
 //    std::dynamic_pointer_cast<const RNSvgaPlayerEventEmitter>(_eventEmitter)
 //    ->onFrameChanged(RNSvgaPlayerEventEmitter::OnFrameChanged{.value=(float)percentage});
@@ -464,9 +472,12 @@ self.eventEmitter.onFrameChanged(result);
     if (!_svgaPlayer || player != _svgaPlayer) {
         return;
     }
-    // 检查事件发送器是否还有效
-    RNSvgaPlayerEventEmitter::OnFinished result = RNSvgaPlayerEventEmitter::OnFinished{RNSvgaPlayerEventEmitter::OnFinished( true )};
-self.eventEmitter.onFinished(result);
+    if(_eventEmitter != nullptr) {
+        
+        // 检查事件发送器是否还有效
+        RNSvgaPlayerEventEmitter::OnFinished result = RNSvgaPlayerEventEmitter::OnFinished{RNSvgaPlayerEventEmitter::OnFinished( true )};
+        self.eventEmitter.onFinished(result);
+    }
 //    std::dynamic_pointer_cast<const facebook::react::RNSvgaPlayerEventEmitter>(_eventEmitter)
 //        ->onFinished(facebook::react::RNSvgaPlayerEventEmitter::OnFinished{
 //            .finished = true
@@ -552,5 +563,8 @@ self.eventEmitter.onFinished(result);
     _currentSource = nil;
 }
 
+
+
 @end
 
+

package/package.json

@@ -53,5 +53,5 @@
   "scripts": {
     "codegen-lib": "react-native codegen-lib-harmony --no-safety-check --npm-package-name react-native-ohos-svgaplayer --cpp-output-path ../../harmony/svgaplayer/src/main/cpp/generated --ets-output-path ../../harmony/svgaplayer/src/main/ets/generated --turbo-modules-spec-paths ./src  --arkts-components-spec-paths ./src"
   },
-  "version": "1.1.6"
+  "version": "1.1.16"
 }