From 14201f6e4b98f5078d01bdd89c2bf33313072893 Mon Sep 17 00:00:00 2001 From: wuya_smile Date: Fri, 19 Apr 2024 11:44:44 +0800 Subject: [PATCH 01/16] =?UTF-8?q?react-native-image-sequence=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0harmony=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “leehom6666” --- android/build.gradle | 41 --- android/gradle.properties | 6 - android/gradle/wrapper/gradle-wrapper.jar | Bin 54329 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 - android/gradlew | 172 ------------ android/gradlew.bat | 84 ------ android/src/main/AndroidManifest.xml | 3 - .../RCTImageSequenceManager.java | 89 ------ .../RCTImageSequencePackage.java | 29 -- .../imageSequence/RCTImageSequenceView.java | 265 ------------------ .../RCTResourceDrawableIdHelper.java | 51 ---- harmony/image_sequence/.gitignore | 6 + harmony/image_sequence/Index.ets | 1 + harmony/image_sequence/build-profile.json5 | 28 ++ harmony/image_sequence/consumer-rules.txt | 0 harmony/image_sequence/hvigorfile.ts | 1 + harmony/image_sequence/obfuscation-rules.txt | 18 ++ harmony/image_sequence/oh-package-lock.json5 | 13 + harmony/image_sequence/oh-package.json5 | 14 + .../src/main/cpp/CMakeLists.txt | 8 + .../src/main/cpp/ComponentDescriptors.h | 21 ++ .../src/main/cpp/EventEmitters.cpp | 17 ++ .../src/main/cpp/EventEmitters.h | 25 ++ .../src/main/cpp/ImageSequenceJSIBinder.h | 17 ++ .../src/main/cpp/ImageSequenceNapiBinder.h | 31 ++ .../src/main/cpp/ImageSequencePackage.h | 24 ++ .../cpp/ImageSequenceSpecsJSI-generated.cpp | 19 ++ .../src/main/cpp/ImageSequenceSpecsJSI.h | 21 ++ harmony/image_sequence/src/main/cpp/Props.cpp | 30 ++ harmony/image_sequence/src/main/cpp/Props.h | 34 +++ .../src/main/cpp/ShadowNodes.cpp | 20 ++ .../image_sequence/src/main/cpp/ShadowNodes.h | 34 +++ .../image_sequence/src/main/cpp/States.cpp | 18 ++ harmony/image_sequence/src/main/cpp/States.h | 36 +++ .../src/main/ets/RNImageSequence.ets | 155 ++++++++++ harmony/image_sequence/src/main/module.json5 | 11 + .../main/resources/base/element/string.json | 8 + .../main/resources/en_US/element/string.json | 8 + .../main/resources/zh_CN/element/string.json | 8 + harmony/image_sequence/src/test/List.test.ets | 5 + .../src/test/LocalUnit.test.ets | 33 +++ index.js | 61 ---- index.tsx | 52 ++++ .../project.pbxproj | 262 ----------------- .../RCTImageSequenceManager.h | 11 - .../RCTImageSequenceManager.m | 23 -- ios/RCTImageSequence/RCTImageSequenceView.h | 11 - ios/RCTImageSequence/RCTImageSequenceView.m | 140 --------- package.json | 53 ++-- .../ImageSequenceNativeComponent.ts | 31 +- 50 files changed, 770 insertions(+), 1284 deletions(-) delete mode 100644 android/build.gradle delete mode 100644 android/gradle.properties delete mode 100644 android/gradle/wrapper/gradle-wrapper.jar delete mode 100644 android/gradle/wrapper/gradle-wrapper.properties delete mode 100755 android/gradlew delete mode 100644 android/gradlew.bat delete mode 100644 android/src/main/AndroidManifest.xml delete mode 100644 android/src/main/java/dk/madslee/imageSequence/RCTImageSequenceManager.java delete mode 100644 android/src/main/java/dk/madslee/imageSequence/RCTImageSequencePackage.java delete mode 100644 android/src/main/java/dk/madslee/imageSequence/RCTImageSequenceView.java delete mode 100644 android/src/main/java/dk/madslee/imageSequence/RCTResourceDrawableIdHelper.java create mode 100644 harmony/image_sequence/.gitignore create mode 100644 harmony/image_sequence/Index.ets create mode 100644 harmony/image_sequence/build-profile.json5 create mode 100644 harmony/image_sequence/consumer-rules.txt create mode 100644 harmony/image_sequence/hvigorfile.ts create mode 100644 harmony/image_sequence/obfuscation-rules.txt create mode 100644 harmony/image_sequence/oh-package-lock.json5 create mode 100644 harmony/image_sequence/oh-package.json5 create mode 100644 harmony/image_sequence/src/main/cpp/CMakeLists.txt create mode 100644 harmony/image_sequence/src/main/cpp/ComponentDescriptors.h create mode 100644 harmony/image_sequence/src/main/cpp/EventEmitters.cpp create mode 100644 harmony/image_sequence/src/main/cpp/EventEmitters.h create mode 100644 harmony/image_sequence/src/main/cpp/ImageSequenceJSIBinder.h create mode 100644 harmony/image_sequence/src/main/cpp/ImageSequenceNapiBinder.h create mode 100644 harmony/image_sequence/src/main/cpp/ImageSequencePackage.h create mode 100644 harmony/image_sequence/src/main/cpp/ImageSequenceSpecsJSI-generated.cpp create mode 100644 harmony/image_sequence/src/main/cpp/ImageSequenceSpecsJSI.h create mode 100644 harmony/image_sequence/src/main/cpp/Props.cpp create mode 100644 harmony/image_sequence/src/main/cpp/Props.h create mode 100644 harmony/image_sequence/src/main/cpp/ShadowNodes.cpp create mode 100644 harmony/image_sequence/src/main/cpp/ShadowNodes.h create mode 100644 harmony/image_sequence/src/main/cpp/States.cpp create mode 100644 harmony/image_sequence/src/main/cpp/States.h create mode 100644 harmony/image_sequence/src/main/ets/RNImageSequence.ets create mode 100644 harmony/image_sequence/src/main/module.json5 create mode 100644 harmony/image_sequence/src/main/resources/base/element/string.json create mode 100644 harmony/image_sequence/src/main/resources/en_US/element/string.json create mode 100644 harmony/image_sequence/src/main/resources/zh_CN/element/string.json create mode 100644 harmony/image_sequence/src/test/List.test.ets create mode 100644 harmony/image_sequence/src/test/LocalUnit.test.ets delete mode 100644 index.js create mode 100644 index.tsx delete mode 100644 ios/RCTImageSequence.xcodeproj/project.pbxproj delete mode 100644 ios/RCTImageSequence/RCTImageSequenceManager.h delete mode 100644 ios/RCTImageSequence/RCTImageSequenceManager.m delete mode 100644 ios/RCTImageSequence/RCTImageSequenceView.h delete mode 100644 ios/RCTImageSequence/RCTImageSequenceView.m rename typings/index.d.ts => src/ImageSequenceNativeComponent.ts (47%) diff --git a/android/build.gradle b/android/build.gradle deleted file mode 100644 index 77c1891..0000000 --- a/android/build.gradle +++ /dev/null @@ -1,41 +0,0 @@ -buildscript { - repositories { - google() - jcenter() - } - - dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' - } -} - -def getExtOrDefault(name, fallback) { - return rootProject.ext.has(name) ? rootProject.ext.get(name) : fallback -} - -apply plugin: 'com.android.library' - -android { - compileSdkVersion getExtOrDefault('compileSdkVersion', 28) - buildToolsVersion getExtOrDefault('buildToolsVersion', "28.0.3") - - defaultConfig { - minSdkVersion 16 - targetSdkVersion getExtOrDefault('targetSdkVersion', 28) - versionCode 1 - versionName "1.0" - } - lintOptions { - abortOnError false - } -} - -repositories { - google() - jcenter() - mavenCentral() -} - -dependencies { - api 'com.facebook.react:react-native:+' -} diff --git a/android/gradle.properties b/android/gradle.properties deleted file mode 100644 index 289b49d..0000000 --- a/android/gradle.properties +++ /dev/null @@ -1,6 +0,0 @@ -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -# Automatically convert third-party libraries to use AndroidX -android.enableJetifier=true \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 01b8bf6b1f99cad9213fc495b33ad5bbab8efd20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54329 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

<5G2M1WZP5 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 \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat deleted file mode 100644 index e95643d..0000000 --- a/android/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml deleted file mode 100644 index 6d68eae..0000000 --- a/android/src/main/AndroidManifest.xml +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/android/src/main/java/dk/madslee/imageSequence/RCTImageSequenceManager.java b/android/src/main/java/dk/madslee/imageSequence/RCTImageSequenceManager.java deleted file mode 100644 index 06000e2..0000000 --- a/android/src/main/java/dk/madslee/imageSequence/RCTImageSequenceManager.java +++ /dev/null @@ -1,89 +0,0 @@ -package dk.madslee.imageSequence; - -import com.facebook.react.bridge.ReadableArray; -import com.facebook.react.bridge.ReadableMap; -import com.facebook.react.uimanager.SimpleViewManager; -import com.facebook.react.uimanager.ThemedReactContext; -import com.facebook.react.uimanager.annotations.ReactProp; - -import java.util.ArrayList; - - -public class RCTImageSequenceManager extends SimpleViewManager { - @Override - public String getName() { - return "RCTImageSequence"; - } - - @Override - protected RCTImageSequenceView createViewInstance(ThemedReactContext reactContext) { - return new RCTImageSequenceView(reactContext); - } - - /** - * sets the speed of the animation. - * - * @param view - * @param framesPerSecond - */ - @ReactProp(name = "framesPerSecond") - public void setFramesPerSecond(final RCTImageSequenceView view, Integer framesPerSecond) { - view.setFramesPerSecond(framesPerSecond); - } - - /** - * @param view - * @param images an array of ReadableMap's {uri: "http://...."} return value of the resolveAssetSource(....) - */ - @ReactProp(name = "images") - public void setImages(final RCTImageSequenceView view, ReadableArray images) { - ArrayList uris = new ArrayList<>(); - for (int index = 0; index < images.size(); index++) { - ReadableMap map = images.getMap(index); - uris.add(map.getString("uri")); - } - - view.setImages(uris); - } - - /** - * sets if animations is looped indefinitely. - * - * @param view - * @param loop - */ - @ReactProp(name = "loop") - public void setLoop(final RCTImageSequenceView view, Boolean loop) { - view.setLoop(loop); - } - - /** - * sets if the animation is currently playing or not - */ - @ReactProp(name = "animate") - public void setAnimate(final RCTImageSequenceView view, Boolean animate) { - view.setAnimate(animate); - } - - /** - * sets the width for optional downsampling. - * - * @param view - * @param downsampleWidth - */ - @ReactProp(name = "downsampleWidth") - public void setDownsampleWidth(final RCTImageSequenceView view, Integer downsampleWidth) { - view.setDownsampleWidth(downsampleWidth); - } - - /** - * sets the height for optional downsampling. - * - * @param view - * @param downsampleHeight - */ - @ReactProp(name = "downsampleHeight") - public void setDownsampleHeight(final RCTImageSequenceView view, Integer downsampleHeight) { - view.setDownsampleHeight(downsampleHeight); - } -} diff --git a/android/src/main/java/dk/madslee/imageSequence/RCTImageSequencePackage.java b/android/src/main/java/dk/madslee/imageSequence/RCTImageSequencePackage.java deleted file mode 100644 index 7f9c9e2..0000000 --- a/android/src/main/java/dk/madslee/imageSequence/RCTImageSequencePackage.java +++ /dev/null @@ -1,29 +0,0 @@ -package dk.madslee.imageSequence; - -import com.facebook.react.ReactPackage; -import com.facebook.react.bridge.JavaScriptModule; -import com.facebook.react.bridge.NativeModule; -import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.uimanager.ViewManager; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -public class RCTImageSequencePackage implements ReactPackage { - - @Override - public List createNativeModules(ReactApplicationContext reactContext) { - return Collections.emptyList(); - } - - // Deprecated RN 0.47 - public List> createJSModules() { - return Collections.emptyList(); - } - - @Override - public List createViewManagers(ReactApplicationContext reactContext) { - return Arrays.asList(new RCTImageSequenceManager()); - } -} diff --git a/android/src/main/java/dk/madslee/imageSequence/RCTImageSequenceView.java b/android/src/main/java/dk/madslee/imageSequence/RCTImageSequenceView.java deleted file mode 100644 index 5fc79c9..0000000 --- a/android/src/main/java/dk/madslee/imageSequence/RCTImageSequenceView.java +++ /dev/null @@ -1,265 +0,0 @@ -package dk.madslee.imageSequence; - -import android.content.Context; -import android.content.res.Resources; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.drawable.AnimationDrawable; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.Drawable; -import android.util.Log; -import android.os.AsyncTask; -import android.os.Handler; -import android.util.SparseArray; - -import java.io.File; -import java.io.InputStream; -import java.net.URI; -import java.net.URL; -import java.util.ArrayList; -import java.util.concurrent.RejectedExecutionException; -import androidx.appcompat.widget.AppCompatImageView; - - -public class RCTImageSequenceView extends AppCompatImageView { - private static final String TAG = RCTImageSequenceView.class.getName(); - - private final Handler handler = new Handler(); - - private Integer framesPerSecond = 24; - private Boolean loop = true; - private Integer downsampleWidth = -1; - private Integer downsampleHeight = -1; - private ArrayList activeTasks = null; - private SparseArray bitmaps = null; - private RCTResourceDrawableIdHelper resourceDrawableIdHelper; - private Boolean animate = true; - - public RCTImageSequenceView(Context context) { - super(context); - - resourceDrawableIdHelper = new RCTResourceDrawableIdHelper(); - } - - private class DownloadImageTask extends AsyncTask { - private final Integer index; - private final String uri; - private final Context context; - - public DownloadImageTask(Integer index, String uri, Context context) { - this.index = index; - this.uri = uri; - this.context = context; - } - - @Override - protected Bitmap doInBackground(String... params) { - try { - if (this.uri.startsWith("http")) { - return this.loadBitmapByExternalURL(this.uri); - } else if (this.uri.startsWith("file://")) { - File file = new File(new URI(this.uri)); - return BitmapFactory.decodeFile(file.getAbsolutePath()); - } - - return this.loadBitmapByLocalResource(this.uri); - } catch (Exception e) { - - } - return null; - } - - private Bitmap loadBitmapByLocalResource(String uri) { - Resources res = this.context.getResources(); - int resId = resourceDrawableIdHelper.getResourceDrawableId(this.context, uri); - - if (downsampleWidth <= 0 || downsampleHeight <= 0) { - // Downsampling is not set so just decode normally - return BitmapFactory.decodeResource(res, resId); - } - - // First decode with inJustDecodeBounds=true to check dimensions - final BitmapFactory.Options options = new BitmapFactory.Options(); - options.inJustDecodeBounds = true; - BitmapFactory.decodeResource(res, resId, options); - - // Calculate inSampleSize - options.inSampleSize = RCTImageSequenceView.calculateInSampleSize(options, downsampleWidth, downsampleHeight); - - // Decode bitmap with inSampleSize set - options.inJustDecodeBounds = false; - return BitmapFactory.decodeResource(res, resId, options); - } - - private Bitmap loadBitmapByExternalURL(String uri) { - Bitmap bitmap = null; - InputStream in = null; - - try { - in = new URL(uri).openStream(); - bitmap = BitmapFactory.decodeStream(in); - } catch (Exception e) { - e.printStackTrace(); - } finally { - try { - if (in != null) { - in.close(); - } - } catch (Exception e) { - } - } - - return bitmap; - } - - @Override - protected void onPostExecute(Bitmap bitmap) { - if (!isCancelled() && bitmap != null) { - onTaskCompleted(this, index, bitmap); - } - } - } - - private void onTaskCompleted(DownloadImageTask downloadImageTask, Integer index, Bitmap bitmap) { - if (index == 0) { - // first image should be displayed as soon as possible. - this.setImageBitmap(bitmap); - } - - bitmaps.put(index, bitmap); - activeTasks.remove(downloadImageTask); - - if (activeTasks.isEmpty()) { - setupAnimationDrawable(); - } - } - - public static int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) { - // Raw height and width of image - final int height = options.outHeight; - final int width = options.outWidth; - int inSampleSize = 1; - - if (height > reqHeight || width > reqWidth) { - final int halfHeight = height / 2; - final int halfWidth = width / 2; - - // Calculate the largest inSampleSize value that is a power of 2 and keeps both - // height and width larger than the requested height and width. - while ((halfHeight / inSampleSize) >= reqHeight - && (halfWidth / inSampleSize) >= reqWidth) { - inSampleSize *= 2; - } - } - - return inSampleSize; - } - - public void setImages(final ArrayList uris) { - // Cancel any previously queued Runnables - handler.removeCallbacksAndMessages(null); - - Drawable drawable = getDrawable(); - if(drawable instanceof AnimationDrawable){ - ((AnimationDrawable)drawable).stop(); - } - - if (isLoading()) { - // Cancel ongoing tasks (if still loading previous images) - for (int index = 0; index < activeTasks.size(); index++) { - activeTasks.get(index).cancel(true); - } - } - - activeTasks = null; - bitmaps = null; - - final Runnable r = new Runnable() { - public void run() { - activeTasks = new ArrayList<>(uris.size()); - bitmaps = new SparseArray<>(uris.size()); - - for (int index = 0; index < uris.size(); index++) { - DownloadImageTask task = new DownloadImageTask(index, uris.get(index), getContext()); - activeTasks.add(task); - - try { - task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - } catch (RejectedExecutionException e){ - Log.e(TAG, "DownloadImageTask failed" + e.getMessage()); - break; - } - } - } - }; - - // Delay for 1ms to make sure that all the props have been set properly before starting processing - final boolean added = handler.postDelayed(r, 1); - if (!added) { - Log.e(TAG, "Failed to place Runnable in to the message queue"); - } - } - - public void setFramesPerSecond(Integer framesPerSecond) { - this.framesPerSecond = framesPerSecond; - - // updating frames per second, results in building a new AnimationDrawable (because we cant alter frame duration) - if (isLoaded()) { - setupAnimationDrawable(); - } - } - - public void setLoop(Boolean loop) { - this.loop = loop; - - // updating looping, results in building a new AnimationDrawable - if (isLoaded()) { - setupAnimationDrawable(); - } - } - - public void setDownsampleWidth(Integer downsampleWidth) { - this.downsampleWidth = downsampleWidth; - } - - public void setDownsampleHeight(Integer downsampleHeight) { - this.downsampleHeight = downsampleHeight; - } - - public void setAnimate(Boolean animate) { - Drawable drawable = getDrawable(); - if(drawable instanceof AnimationDrawable){ - AnimationDrawable animationDrawable = (AnimationDrawable)drawable; - if (animate && !animationDrawable.isRunning()) { - animationDrawable.start(); - } else if (!animate && animationDrawable.isRunning()) { - animationDrawable.stop(); - animationDrawable.selectDrawable(0); - } - } - this.animate = animate; - } - - private boolean isLoaded() { - return !isLoading() && bitmaps != null && bitmaps.size() > 0; - } - - private boolean isLoading() { - return activeTasks != null && !activeTasks.isEmpty(); - } - - private void setupAnimationDrawable() { - AnimationDrawable animationDrawable = new AnimationDrawable(); - for (int index = 0; index < bitmaps.size(); index++) { - BitmapDrawable drawable = new BitmapDrawable(this.getResources(), bitmaps.get(index)); - animationDrawable.addFrame(drawable, 1000 / framesPerSecond); - } - - animationDrawable.setOneShot(!this.loop); - - this.setImageDrawable(animationDrawable); - if (this.animate) { - animationDrawable.start(); - } - } -} diff --git a/android/src/main/java/dk/madslee/imageSequence/RCTResourceDrawableIdHelper.java b/android/src/main/java/dk/madslee/imageSequence/RCTResourceDrawableIdHelper.java deleted file mode 100644 index f3b12a0..0000000 --- a/android/src/main/java/dk/madslee/imageSequence/RCTResourceDrawableIdHelper.java +++ /dev/null @@ -1,51 +0,0 @@ -package dk.madslee.imageSequence; - -import android.content.Context; -import android.graphics.drawable.Drawable; -import android.net.Uri; -import androidx.core.content.ContextCompat; - -import java.util.HashMap; -import java.util.Map; -import javax.annotation.Nullable; - -import com.facebook.common.util.UriUtil; - - -public class RCTResourceDrawableIdHelper { - - private Map mResourceDrawableIdMap; - - public RCTResourceDrawableIdHelper() { - mResourceDrawableIdMap = new HashMap<>(); - } - - public int getResourceDrawableId(Context context, @Nullable String name) { - if (name == null || name.isEmpty()) { - return 0; - } - name = name.toLowerCase().replace("-", "_"); - if (mResourceDrawableIdMap.containsKey(name)) { - return mResourceDrawableIdMap.get(name); - } - int id = context.getResources().getIdentifier( - name, - "drawable", - context.getPackageName()); - mResourceDrawableIdMap.put(name, id); - return id; - } - - public @Nullable Drawable getResourceDrawable(Context context, @Nullable String name) { - int resId = getResourceDrawableId(context, name); - return resId > 0 ? ContextCompat.getDrawable(context, resId) : null; - } - - public Uri getResourceDrawableUri(Context context, @Nullable String name) { - int resId = getResourceDrawableId(context, name); - return resId > 0 ? new Uri.Builder() - .scheme(UriUtil.LOCAL_RESOURCE_SCHEME) - .path(String.valueOf(resId)) - .build() : Uri.EMPTY; - } -} diff --git a/harmony/image_sequence/.gitignore b/harmony/image_sequence/.gitignore new file mode 100644 index 0000000..e2713a2 --- /dev/null +++ b/harmony/image_sequence/.gitignore @@ -0,0 +1,6 @@ +/node_modules +/oh_modules +/.preview +/build +/.cxx +/.test \ No newline at end of file diff --git a/harmony/image_sequence/Index.ets b/harmony/image_sequence/Index.ets new file mode 100644 index 0000000..d4b69c8 --- /dev/null +++ b/harmony/image_sequence/Index.ets @@ -0,0 +1 @@ +export * from './src/main/ets/RNImageSequence' diff --git a/harmony/image_sequence/build-profile.json5 b/harmony/image_sequence/build-profile.json5 new file mode 100644 index 0000000..312d38e --- /dev/null +++ b/harmony/image_sequence/build-profile.json5 @@ -0,0 +1,28 @@ +{ + "apiType": "stageMode", + "buildOption": { + }, + "buildOptionSet": [ + { + "name": "release", + "arkOptions": { + "obfuscation": { + "ruleOptions": { + "enable": true, + "files": [ + "./obfuscation-rules.txt" + ] + }, + "consumerFiles": [ + "./consumer-rules.txt" + ] + } + }, + }, + ], + "targets": [ + { + "name": "default" + } + ] +} diff --git a/harmony/image_sequence/consumer-rules.txt b/harmony/image_sequence/consumer-rules.txt new file mode 100644 index 0000000..e69de29 diff --git a/harmony/image_sequence/hvigorfile.ts b/harmony/image_sequence/hvigorfile.ts new file mode 100644 index 0000000..43bd551 --- /dev/null +++ b/harmony/image_sequence/hvigorfile.ts @@ -0,0 +1 @@ +import { harTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/harmony/image_sequence/obfuscation-rules.txt b/harmony/image_sequence/obfuscation-rules.txt new file mode 100644 index 0000000..985b2ae --- /dev/null +++ b/harmony/image_sequence/obfuscation-rules.txt @@ -0,0 +1,18 @@ +# Define project specific obfuscation rules here. +# You can include the obfuscation configuration files in the current module's build-profile.json5. +# +# For more details, see +# https://gitee.com/openharmony/arkcompiler_ets_frontend/blob/master/arkguard/README.md + +# Obfuscation options: +# -disable-obfuscation: disable all obfuscations +# -enable-property-obfuscation: obfuscate the property names +# -enable-toplevel-obfuscation: obfuscate the names in the global scope +# -compact: remove unnecessary blank spaces and all line feeds +# -remove-log: remove all console.* statements +# -print-namecache: print the name cache that contains the mapping from the old names to new names +# -apply-namecache: reuse the given cache file + +# Keep options: +# -keep-property-name: specifies property names that you want to keep +# -keep-global-name: specifies names that you want to keep in the global scope \ No newline at end of file diff --git a/harmony/image_sequence/oh-package-lock.json5 b/harmony/image_sequence/oh-package-lock.json5 new file mode 100644 index 0000000..5948273 --- /dev/null +++ b/harmony/image_sequence/oh-package-lock.json5 @@ -0,0 +1,13 @@ +{ + "lockfileVersion": 3, + "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", + "specifiers": { + "rnoh@../rnoh": "rnoh@../rnoh" + }, + "packages": { + "rnoh@../rnoh": { + "mtime": "1708999669308.7947", + "resolved": "../rnoh" + } + } +} \ No newline at end of file diff --git a/harmony/image_sequence/oh-package.json5 b/harmony/image_sequence/oh-package.json5 new file mode 100644 index 0000000..8c4668e --- /dev/null +++ b/harmony/image_sequence/oh-package.json5 @@ -0,0 +1,14 @@ +{ + "name": "rnoh_image_sequence", + "version": "1.0.0", + "description": "Please describe the basic information.", + "main": "Index.ets", + "author": "", + "license": "Apache-2.0", + "dependencies": { + "@rnoh/react-native-openharmony": "file:../react_native_openharmony" + }, + "overrides": { + "@rnoh/react-native-openharmony": "file:../react_native_openharmony" + } +} diff --git a/harmony/image_sequence/src/main/cpp/CMakeLists.txt b/harmony/image_sequence/src/main/cpp/CMakeLists.txt new file mode 100644 index 0000000..6bedddf --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/CMakeLists.txt @@ -0,0 +1,8 @@ +# the minimum version of CMake +cmake_minimum_required(VERSION 3.13) +set(CMAKE_VERBOSE_MAKEFILE on) + +file(GLOB rnoh_image_sequence_SRC CONFIGURE_DEPENDS *.cpp) +add_library(rnoh_image_sequence SHARED ${rnoh_image_sequence_SRC}) +target_include_directories(rnoh_image_sequence PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(rnoh_image_sequence PUBLIC rnoh) \ No newline at end of file diff --git a/harmony/image_sequence/src/main/cpp/ComponentDescriptors.h b/harmony/image_sequence/src/main/cpp/ComponentDescriptors.h new file mode 100644 index 0000000..1c4ede4 --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/ComponentDescriptors.h @@ -0,0 +1,21 @@ + +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GenerateComponentDescriptorH.js + */ + +#pragma once +#include "ShadowNodes.h" +#include + +namespace facebook { +namespace react { + +using ImageSequenceComponentDescriptor = ConcreteComponentDescriptor; + +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/EventEmitters.cpp b/harmony/image_sequence/src/main/cpp/EventEmitters.cpp new file mode 100644 index 0000000..74b7928 --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/EventEmitters.cpp @@ -0,0 +1,17 @@ + +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GenerateEventEmitterCpp.js + */ + +#include "EventEmitters.h" + +namespace facebook { +namespace react { + +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/EventEmitters.h b/harmony/image_sequence/src/main/cpp/EventEmitters.h new file mode 100644 index 0000000..982f60f --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/EventEmitters.h @@ -0,0 +1,25 @@ + +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GenerateEventEmitterH.js + */ +#pragma once + +#include + + +namespace facebook { +namespace react { +class ImageSequenceEventEmitter : public ViewEventEmitter { + public: + using ViewEventEmitter::ViewEventEmitter; + + + +}; +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/ImageSequenceJSIBinder.h b/harmony/image_sequence/src/main/cpp/ImageSequenceJSIBinder.h new file mode 100644 index 0000000..c591ef3 --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/ImageSequenceJSIBinder.h @@ -0,0 +1,17 @@ +#include "RNOHCorePackage/ComponentBinders/ViewComponentJSIBinder.h" + +namespace rnoh { + +class ImageSequenceJSIBinder : public ViewComponentJSIBinder { + facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override { + auto object = ViewComponentJSIBinder::createNativeProps(rt); + object.setProperty(rt, "loop", "boolean"); + object.setProperty(rt, "images", "array"); + object.setProperty(rt, "startFrameIndex", "int"); + object.setProperty(rt, "framesPerSecond", "int"); + object.setProperty(rt, "downsampleWidth", "int"); + object.setProperty(rt, "downsampleHeight", "int"); + return object; + } +}; +} // namespace rnoh \ No newline at end of file diff --git a/harmony/image_sequence/src/main/cpp/ImageSequenceNapiBinder.h b/harmony/image_sequence/src/main/cpp/ImageSequenceNapiBinder.h new file mode 100644 index 0000000..e4c9dee --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/ImageSequenceNapiBinder.h @@ -0,0 +1,31 @@ +#include "RNOHCorePackage/ComponentBinders/ViewComponentNapiBinder.h" +#include "Props.h" + +namespace rnoh { + +class ImageSequenceNapiBinder : public ViewComponentNapiBinder { +public: + napi_value createProps(napi_env env, facebook::react::ShadowView const shadowView) override { + napi_value napiViewProps = ViewComponentNapiBinder::createProps(env, shadowView); + if (auto props = std::dynamic_pointer_cast(shadowView.props)) { + auto images = std::vector(); + auto imageRaw = props->images; + for (auto imagesItem : imageRaw) { + auto imagesItemInt = ArkJS(env).createString(imagesItem); + images.push_back(imagesItemInt); + } + auto viewBoxArray = ArkJS(env).createArray(images); + return ArkJS(env) + .getObjectBuilder(napiViewProps) + .addProperty("images", viewBoxArray) + .addProperty("loop", props->loop) + .addProperty("startFrameIndex", props->startFrameIndex) + .addProperty("framesPerSecond", props->framesPerSecond) + .addProperty("downsampleWidth", props->downsampleWidth) + .addProperty("downsampleHeight", props->downsampleHeight) + .build(); + } + return napiViewProps; + }; +}; +} //namespace rnoh \ No newline at end of file diff --git a/harmony/image_sequence/src/main/cpp/ImageSequencePackage.h b/harmony/image_sequence/src/main/cpp/ImageSequencePackage.h new file mode 100644 index 0000000..3b6d49e --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/ImageSequencePackage.h @@ -0,0 +1,24 @@ +#include "RNOH/Package.h" +#include "ComponentDescriptors.h" +#include "ImageSequenceJSIBinder.h" +#include "ImageSequenceNapiBinder.h" + +namespace rnoh { + +class ImageSequencePackage : public Package { +public: + ImageSequencePackage(Package::Context ctx) : Package(ctx) {} + + std::vector createComponentDescriptorProviders() override { + return {facebook::react::concreteComponentDescriptorProvider()}; + } + + ComponentNapiBinderByString createComponentNapiBinderByName() override { + return {{"ImageSequenceView", std::make_shared()}}; + } + + ComponentJSIBinderByString createComponentJSIBinderByName() override { + return {{"ImageSequenceView", std::make_shared()}}; + } +}; +} // namespace rnoh \ No newline at end of file diff --git a/harmony/image_sequence/src/main/cpp/ImageSequenceSpecsJSI-generated.cpp b/harmony/image_sequence/src/main/cpp/ImageSequenceSpecsJSI-generated.cpp new file mode 100644 index 0000000..397d300 --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/ImageSequenceSpecsJSI-generated.cpp @@ -0,0 +1,19 @@ +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GenerateModuleCpp.js + */ + +#include "ImageSequenceSpecsJSI.h" + +namespace facebook { +namespace react { + + + + +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/ImageSequenceSpecsJSI.h b/harmony/image_sequence/src/main/cpp/ImageSequenceSpecsJSI.h new file mode 100644 index 0000000..b301476 --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/ImageSequenceSpecsJSI.h @@ -0,0 +1,21 @@ +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GenerateModuleH.js + */ + +#pragma once + +#include +#include + +namespace facebook { +namespace react { + + + +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/Props.cpp b/harmony/image_sequence/src/main/cpp/Props.cpp new file mode 100644 index 0000000..916afa4 --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/Props.cpp @@ -0,0 +1,30 @@ + +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GeneratePropsCpp.js + */ + +#include "Props.h" +#include +#include + +namespace facebook { +namespace react { + + ImageSequenceProps::ImageSequenceProps(const PropsParserContext &context, const ImageSequenceProps &sourceProps, + const RawProps &rawProps) + : ViewProps(context, sourceProps, rawProps), + + loop(convertRawProp(context, rawProps, "loop", sourceProps.loop, {true})), + startFrameIndex(convertRawProp(context, rawProps, "startFrameIndex", sourceProps.startFrameIndex, {0})), + framesPerSecond(convertRawProp(context, rawProps, "framesPerSecond", sourceProps.framesPerSecond, {24})), + downsampleWidth(convertRawProp(context, rawProps, "downsampleWidth", sourceProps.downsampleWidth, {-1})), + downsampleHeight(convertRawProp(context, rawProps, "downsampleHeight", sourceProps.downsampleHeight, {-1})), + images(convertRawProp(context, rawProps, "images", sourceProps.images, {})) {} + +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/Props.h b/harmony/image_sequence/src/main/cpp/Props.h new file mode 100644 index 0000000..d13aeb2 --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/Props.h @@ -0,0 +1,34 @@ + +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GeneratePropsH.js + */ +#pragma once + +#include +#include + +namespace facebook { +namespace react { + +class ImageSequenceProps final : public ViewProps { + public: + ImageSequenceProps() = default; + ImageSequenceProps(const PropsParserContext& context, const ImageSequenceProps &sourceProps, const RawProps &rawProps); + +#pragma mark - Props + + std::vector images{}; + bool loop{true}; + int startFrameIndex{0}; + int framesPerSecond{24}; + int downsampleWidth{-1}; + int downsampleHeight{-1}; +}; + +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/ShadowNodes.cpp b/harmony/image_sequence/src/main/cpp/ShadowNodes.cpp new file mode 100644 index 0000000..305c8ca --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/ShadowNodes.cpp @@ -0,0 +1,20 @@ + +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GenerateShadowNodeCpp.js + */ + +#include "Props.h" +#include "ShadowNodes.h" + +namespace facebook { +namespace react { + +extern const char ImageSequenceComponentName[] = "ImageSequenceView"; + +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/ShadowNodes.h b/harmony/image_sequence/src/main/cpp/ShadowNodes.h new file mode 100644 index 0000000..144aefd --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/ShadowNodes.h @@ -0,0 +1,34 @@ + +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GenerateShadowNodeH.js + */ + +#pragma once + +#include "EventEmitters.h" +#include "Props.h" +#include "States.h" +#include +#include + +namespace facebook { +namespace react { + +JSI_EXPORT extern const char ImageSequenceComponentName[]; + +/* + * `ShadowNode` for component. + */ +using ImageSequenceShadowNode = ConcreteViewShadowNode< + ImageSequenceComponentName, + ImageSequenceProps, + ImageSequenceEventEmitter, + ImageSequenceState>; + +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/States.cpp b/harmony/image_sequence/src/main/cpp/States.cpp new file mode 100644 index 0000000..62a093d --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/States.cpp @@ -0,0 +1,18 @@ + +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GenerateStateCpp.js + */ +#include "States.h" + +namespace facebook { +namespace react { + + + +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/States.h b/harmony/image_sequence/src/main/cpp/States.h new file mode 100644 index 0000000..315f60c --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/States.h @@ -0,0 +1,36 @@ +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GenerateStateH.js + */ +#pragma once + +#ifdef ANDROID +#include +#include +#include +#endif + +namespace facebook { +namespace react { + +class ImageSequenceState { +public: + ImageSequenceState() = default; + +#ifdef ANDROID + ImageSequenceState(ImageSequenceState const &previousState, folly::dynamic data){}; + folly::dynamic getDynamic() const { + return {}; + }; + MapBuffer getMapBuffer() const { + return MapBufferBuilder::EMPTY(); + }; +#endif +}; + +} // namespace react +} // namespace facebook \ No newline at end of file diff --git a/harmony/image_sequence/src/main/ets/RNImageSequence.ets b/harmony/image_sequence/src/main/ets/RNImageSequence.ets new file mode 100644 index 0000000..865df67 --- /dev/null +++ b/harmony/image_sequence/src/main/ets/RNImageSequence.ets @@ -0,0 +1,155 @@ +import { Descriptor, ComponentBuilderContext, ViewRawrawProps, Tag } from '@rnoh/react-native-openharmony'; +import { RNComponentFactory, RNOHContext, RNViewBase } from '@rnoh/react-native-openharmony'; +// import { ImageLoaderTurboModule } from '@rnoh/react-native-openharmony/src/main/ets/RNOHCorePackage/turboModules'; +import image from '@ohos.multimedia.image'; +import resourceManager from '@ohos.resourceManager'; +import { BusinessError } from '@ohos.base'; + +export const IMAGE_SEQUENCE_TYPE: string = "ImageSequenceView" + +export interface ImageSequencerawProps extends ViewRawrawProps { + loop: boolean, + images: Array, + startFrameIndex: number, + framesPerSecond: number, + downsampleWidth: number, + downsampleHeight: number +} + +// export type ImageSequenceDescriptor = Descriptor<"ImageSequenceView", ImageSequencerawProps> +export type ImageSequenceDescriptor = Descriptor<"ImageSequenceView", ViewRawrawProps, [], ImageSequencerawProps> +export interface ImageData { + src: string | Resource, + width: number +} + +const context: Context = getContext(this); +const resourceMgr: resourceManager.ResourceManager = context.resourceManager; + +@Component +export struct RNImageSequence { + ctx!: RNOHContext; + tag: number = 0; + @BuilderParam buildCustomComponent: (componentBuilderContext: ComponentBuilderContext) => void; + @State descriptor: ImageSequenceDescriptor = {} as ImageSequenceDescriptor; + private unregisterDescriptorChangesListener?: () => void = undefined; + @State ImageList: (Resource | string | PixelMap)[] = []; + @State duration: number = 0; + @State timer: number = 0; + @State num: number = 0; + @State isLocalResource: boolean = false; + @State finishCount: number = 0; + @State localIndex: number[] = []; + + aboutToAppear() { + this.descriptor = this.ctx.descriptorRegistry.getDescriptor(this.tag); + this.unregisterDescriptorChangesListener = this.ctx.descriptorRegistry.subscribeToDescriptorChanges(this.tag, + (newDescriptor) => { + this.descriptor = (newDescriptor as ImageSequenceDescriptor) + } + ) + + this.duration = 1000 / this.descriptor.rawProps.framesPerSecond; + const sourceList = this.descriptor.rawProps.images; + this.ImageList.length = sourceList.length; + + sourceList.forEach((item, index)=>{ + if (item.startsWith("asset://")) { + this.getRawFileContent(item.replace("asset://", "assets/"), index) + } else { + this.ImageList[index] = this.getSource(item); + this.finishCount +=1 + } + }) + if (this.descriptor.rawProps.loop) { + this.num = 0; + this.timer = setInterval(()=>{ + this.num++; + if (this.num > this.ImageList.length) { + this.num = 0; + } + },this.duration) + } else { + this.num = 0; + clearInterval(this.timer); + } + } + + getRawFileContent(img:string, index:number) { + resourceMgr.getRawFileContent(img).then((fileData: Uint8Array) => { + const buffer = fileData.buffer.slice(0); + this.imageEdit(buffer, index); + }).catch((err: BusinessError) => { + console.error(`getRawFileContent failed: ${err.code}`) + }) + } + + getSource(source:string) { + if (source.startsWith("asset://")) { + return $rawfile(source.replace("asset://", "assets/")) + } + if (source.startsWith("file://assets/src/assets/")) { + return $rawfile(source.replace("file://assets/src/assets/", "assets/")); + } + // const filePath = this.ctx.rnInstance.getTurboModule("ImageLoader").getCachedImage(source); + // return filePath ?? source; + return source; + } + + calculateInSampleSize(width: number, height: number):number { + let inSampleSize = 1; + let reqWidth: number = this.descriptor.rawProps.downsampleWidth; + let reqHeight: number = this.descriptor.rawProps.downsampleHeight; + + if (height > reqHeight || width > reqWidth) { + let halfHeight = height / 2; + let halWidth = width/ 2; + while ((halfHeight / inSampleSize) >= reqHeight && (halWidth / inSampleSize) >= reqWidth) { + inSampleSize *= 2; + } + } + return inSampleSize; + } + + async imageEdit(imageData:ArrayBuffer, index:number) { + let imageSourceApi:image.ImageSource = image.createImageSource(imageData); + let pixelMap = await imageSourceApi.createPixelMap(); + const imageInfo = await pixelMap.getImageInfo(); + const width = imageInfo.size.width; + const height = imageInfo.size.height; + const sampleSize = this.calculateInSampleSize(width, height); + const decodeOptions:image.DecodingOptions = { + desiredSize: { + width: width / sampleSize, + height: height / sampleSize + } + } + + pixelMap = await imageSourceApi.createPixelMap(decodeOptions); + this.isLocalResource = true; + this.ImageList[index] = pixelMap; + this.finishCount +=1; + this.localIndex.push(index); + imageSourceApi.release(); + } + aboutToDisappear() { + this.unregisterDescriptorChangesListener?.() + clearInterval(this.timer); + if (this.isLocalResource) { + this.localIndex.forEach(lIndex => { + const item: PixelMap = this.ImageList[lIndex] as PixelMap; + item.release(); + }) + } + } + + build() { + RNViewBase({ctx: this.ctx, tag: this.tag}) { + if (this.finishCount === this.ImageList.length) { + Image(this.ImageList[this.num]).objectFit(ImageFit.Fill).draggable(false).width('100%').height('100%').onComplete(()=>{ + console.log(`加载完成：${new Date().getTime()}`) + }) + } + } + } +} \ No newline at end of file diff --git a/harmony/image_sequence/src/main/module.json5 b/harmony/image_sequence/src/main/module.json5 new file mode 100644 index 0000000..72cc27f --- /dev/null +++ b/harmony/image_sequence/src/main/module.json5 @@ -0,0 +1,11 @@ +{ + "module": { + "name": "image_sequence", + "type": "har", + "deviceTypes": [ + "default", + "tablet", + "2in1" + ] + } +} diff --git a/harmony/image_sequence/src/main/resources/base/element/string.json b/harmony/image_sequence/src/main/resources/base/element/string.json new file mode 100644 index 0000000..f51a9c8 --- /dev/null +++ b/harmony/image_sequence/src/main/resources/base/element/string.json @@ -0,0 +1,8 @@ +{ + "string": [ + { + "name": "page_show", + "value": "page from package" + } + ] +} diff --git a/harmony/image_sequence/src/main/resources/en_US/element/string.json b/harmony/image_sequence/src/main/resources/en_US/element/string.json new file mode 100644 index 0000000..f51a9c8 --- /dev/null +++ b/harmony/image_sequence/src/main/resources/en_US/element/string.json @@ -0,0 +1,8 @@ +{ + "string": [ + { + "name": "page_show", + "value": "page from package" + } + ] +} diff --git a/harmony/image_sequence/src/main/resources/zh_CN/element/string.json b/harmony/image_sequence/src/main/resources/zh_CN/element/string.json new file mode 100644 index 0000000..f51a9c8 --- /dev/null +++ b/harmony/image_sequence/src/main/resources/zh_CN/element/string.json @@ -0,0 +1,8 @@ +{ + "string": [ + { + "name": "page_show", + "value": "page from package" + } + ] +} diff --git a/harmony/image_sequence/src/test/List.test.ets b/harmony/image_sequence/src/test/List.test.ets new file mode 100644 index 0000000..bb5b5c3 --- /dev/null +++ b/harmony/image_sequence/src/test/List.test.ets @@ -0,0 +1,5 @@ +import localUnitTest from './LocalUnit.test'; + +export default function testsuite() { + localUnitTest(); +} \ No newline at end of file diff --git a/harmony/image_sequence/src/test/LocalUnit.test.ets b/harmony/image_sequence/src/test/LocalUnit.test.ets new file mode 100644 index 0000000..ed22d4d --- /dev/null +++ b/harmony/image_sequence/src/test/LocalUnit.test.ets @@ -0,0 +1,33 @@ +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; + +export default function localUnitTest() { + describe('localUnitTest',() => { + // Defines a test suite. Two parameters are supported: test suite name and test suite function. + beforeAll(() => { + // Presets an action, which is performed only once before all test cases of the test suite start. + // This API supports only one parameter: preset action function. + }); + beforeEach(() => { + // Presets an action, which is performed before each unit test case starts. + // The number of execution times is the same as the number of test cases defined by **it**. + // This API supports only one parameter: preset action function. + }); + afterEach(() => { + // Presets a clear action, which is performed after each unit test case ends. + // The number of execution times is the same as the number of test cases defined by **it**. + // This API supports only one parameter: clear action function. + }); + afterAll(() => { + // Presets a clear action, which is performed after all test cases of the test suite end. + // This API supports only one parameter: clear action function. + }); + it('assertContain', 0, () => { + // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function. + let a = 'abc'; + let b = 'b'; + // Defines a variety of assertion methods, which are used to declare expected boolean conditions. + expect(a).assertContain(b); + expect(a).assertEqual(a); + }); + }); +} \ No newline at end of file diff --git a/index.js b/index.js deleted file mode 100644 index 3180e5c..0000000 --- a/index.js +++ /dev/null @@ -1,61 +0,0 @@ -import React, { Component } from 'react'; -import { requireNativeComponent } from 'react-native'; -import { ViewPropTypes } from 'deprecated-react-native-prop-types'; -import { bool, string, number, array, shape, arrayOf } from 'prop-types'; -import resolveAssetSource from 'react-native/Libraries/Image/resolveAssetSource'; - -class ImageSequence extends Component { - render() { - const { - startFrameIndex, - images, - ...otherProps - } = this.props; - - let normalized = images.map(resolveAssetSource); - - // reorder elements if start-index is different from 0 (beginning) - if (startFrameIndex !== 0) { - normalized = [...normalized.slice(startFrameIndex), ...normalized.slice(0, startFrameIndex)]; - } - - return ( - - ); - } -} - -ImageSequence.defaultProps = { - startFrameIndex: 0, - framesPerSecond: 24, - loop: true, - downsampleWidth: -1, - downsampleHeight: -1 -}; - -ImageSequence.propTypes = { - ...ViewPropTypes, - startFrameIndex: number, - images: array.isRequired, - framesPerSecond: number, - loop: bool, - downsampleWidth: number, - downsampleHeight: number -}; - -const RCTImageSequence = requireNativeComponent('RCTImageSequence', { - propTypes: { - ...ViewPropTypes, - images: arrayOf(shape({ - uri: string.isRequired - })).isRequired, - framesPerSecond: number, - loop: bool, - downsampleWidth: number, - downsampleHeight: number - }, -}); - -export default ImageSequence; diff --git a/index.tsx b/index.tsx new file mode 100644 index 0000000..369a16d --- /dev/null +++ b/index.tsx @@ -0,0 +1,52 @@ +import { forwardRef, memo } from 'react'; +import { View, Image } from 'react-native'; +import ImagesequenceView, { NativeProps } from './src/ImageSequenceNativeComponent' +function ImageSequenceBase({ + images, + startFrameIndex, + framesPerSecond, + loop, + downsampleHeight, + downsampleWidth, + forwardRef, + style, + ...props +}: NativeProps & { forwardRef: React.Ref }) { + let images2: any[] = []; + images.forEach(item => { + if (item.uri) { + images2.push(item); + } else { + let resolvedSource = Image.resolveAssetSource(item); + images.push(resolvedSource.uri); + } + }) + if (startFrameIndex !== 0) { + images2 = [...images2.slice(startFrameIndex), ...images2.slice(0, startFrameIndex)]; + } + return ( + + + + ) +} + +const ImageSequenceMemo = memo(ImageSequenceBase) + +const ImageSequenceComponent: React.ComponentType = forwardRef( + (props: NativeProps, ref: React.Ref) => ( + + ), +) +ImageSequenceComponent.displayName = 'ImageSequence'; +const ImageSequence: React.ComponentType = ImageSequenceComponent as any; +export default ImageSequence; \ No newline at end of file diff --git a/ios/RCTImageSequence.xcodeproj/project.pbxproj b/ios/RCTImageSequence.xcodeproj/project.pbxproj deleted file mode 100644 index dc841d6..0000000 --- a/ios/RCTImageSequence.xcodeproj/project.pbxproj +++ /dev/null @@ -1,262 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - C75D3D5D1D3671B500B6F44B /* RCTImageSequenceView.m in Sources */ = {isa = PBXBuildFile; fileRef = C75D3D591D3671B500B6F44B /* RCTImageSequenceView.m */; }; - C75D3D5E1D3671B500B6F44B /* RCTImageSequenceManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C75D3D5B1D3671B500B6F44B /* RCTImageSequenceManager.m */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - C75D3D4B1D36714700B6F44B /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - C75D3D4D1D36714700B6F44B /* libRCTImageSequence.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTImageSequence.a; sourceTree = BUILT_PRODUCTS_DIR; }; - C75D3D591D3671B500B6F44B /* RCTImageSequenceView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageSequenceView.m; sourceTree = ""; }; - C75D3D5A1D3671B500B6F44B /* RCTImageSequenceView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageSequenceView.h; sourceTree = ""; }; - C75D3D5B1D3671B500B6F44B /* RCTImageSequenceManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageSequenceManager.m; sourceTree = ""; }; - C75D3D5C1D3671B500B6F44B /* RCTImageSequenceManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageSequenceManager.h; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - C75D3D4A1D36714700B6F44B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - C75D3D441D36714700B6F44B = { - isa = PBXGroup; - children = ( - C75D3D4F1D36714700B6F44B /* RCTImageSequence */, - C75D3D4E1D36714700B6F44B /* Products */, - ); - sourceTree = ""; - }; - C75D3D4E1D36714700B6F44B /* Products */ = { - isa = PBXGroup; - children = ( - C75D3D4D1D36714700B6F44B /* libRCTImageSequence.a */, - ); - name = Products; - sourceTree = ""; - }; - C75D3D4F1D36714700B6F44B /* RCTImageSequence */ = { - isa = PBXGroup; - children = ( - C75D3D591D3671B500B6F44B /* RCTImageSequenceView.m */, - C75D3D5A1D3671B500B6F44B /* RCTImageSequenceView.h */, - C75D3D5B1D3671B500B6F44B /* RCTImageSequenceManager.m */, - C75D3D5C1D3671B500B6F44B /* RCTImageSequenceManager.h */, - ); - path = RCTImageSequence; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - C75D3D4C1D36714700B6F44B /* RCTImageSequence */ = { - isa = PBXNativeTarget; - buildConfigurationList = C75D3D561D36714700B6F44B /* Build configuration list for PBXNativeTarget "RCTImageSequence" */; - buildPhases = ( - C75D3D491D36714700B6F44B /* Sources */, - C75D3D4A1D36714700B6F44B /* Frameworks */, - C75D3D4B1D36714700B6F44B /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = RCTImageSequence; - productName = RCTImageSequence; - productReference = C75D3D4D1D36714700B6F44B /* libRCTImageSequence.a */; - productType = "com.apple.product-type.library.static"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - C75D3D451D36714700B6F44B /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0730; - ORGANIZATIONNAME = "Mads Lee Jensen"; - TargetAttributes = { - C75D3D4C1D36714700B6F44B = { - CreatedOnToolsVersion = 7.3.1; - }; - }; - }; - buildConfigurationList = C75D3D481D36714700B6F44B /* Build configuration list for PBXProject "RCTImageSequence" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = C75D3D441D36714700B6F44B; - productRefGroup = C75D3D4E1D36714700B6F44B /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - C75D3D4C1D36714700B6F44B /* RCTImageSequence */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - C75D3D491D36714700B6F44B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - C75D3D5E1D3671B500B6F44B /* RCTImageSequenceManager.m in Sources */, - C75D3D5D1D3671B500B6F44B /* RCTImageSequenceView.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - C75D3D541D36714700B6F44B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.3; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - }; - name = Debug; - }; - C75D3D551D36714700B6F44B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.3; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - C75D3D571D36714700B6F44B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - HEADER_SEARCH_PATHS = "$(SRCROOT)/../../react-native/React/**"; - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - }; - name = Debug; - }; - C75D3D581D36714700B6F44B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - HEADER_SEARCH_PATHS = "$(SRCROOT)/../../react-native/React/**"; - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - C75D3D481D36714700B6F44B /* Build configuration list for PBXProject "RCTImageSequence" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C75D3D541D36714700B6F44B /* Debug */, - C75D3D551D36714700B6F44B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C75D3D561D36714700B6F44B /* Build configuration list for PBXNativeTarget "RCTImageSequence" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C75D3D571D36714700B6F44B /* Debug */, - C75D3D581D36714700B6F44B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = C75D3D451D36714700B6F44B /* Project object */; -} diff --git a/ios/RCTImageSequence/RCTImageSequenceManager.h b/ios/RCTImageSequence/RCTImageSequenceManager.h deleted file mode 100644 index 964a3a7..0000000 --- a/ios/RCTImageSequence/RCTImageSequenceManager.h +++ /dev/null @@ -1,11 +0,0 @@ -// -// Created by Mads Lee Jensen on 07/07/16. -// Copyright (c) 2016 Facebook. All rights reserved. -// - -#import - -@interface RCTImageSequenceManager : RCTViewManager - - -@end \ No newline at end of file diff --git a/ios/RCTImageSequence/RCTImageSequenceManager.m b/ios/RCTImageSequence/RCTImageSequenceManager.m deleted file mode 100644 index 36a93e2..0000000 --- a/ios/RCTImageSequence/RCTImageSequenceManager.m +++ /dev/null @@ -1,23 +0,0 @@ -// -// Created by Mads Lee Jensen on 07/07/16. -// Copyright (c) 2016 Facebook. All rights reserved. -// - -#import "RCTImageSequenceManager.h" -#import "RCTImageSequenceView.h" - -@implementation RCTImageSequenceManager { -} - -RCT_EXPORT_MODULE(); -RCT_EXPORT_VIEW_PROPERTY(images, NSArray); -RCT_EXPORT_VIEW_PROPERTY(framesPerSecond, NSUInteger); -RCT_EXPORT_VIEW_PROPERTY(loop, BOOL); -RCT_EXPORT_VIEW_PROPERTY(downsampleWidth, NSInteger); -RCT_EXPORT_VIEW_PROPERTY(downsampleHeight, NSInteger); - -- (UIView *)view { - return [RCTImageSequenceView new]; -} - -@end diff --git a/ios/RCTImageSequence/RCTImageSequenceView.h b/ios/RCTImageSequence/RCTImageSequenceView.h deleted file mode 100644 index c63899a..0000000 --- a/ios/RCTImageSequence/RCTImageSequenceView.h +++ /dev/null @@ -1,11 +0,0 @@ -// -// Created by Mads Lee Jensen on 07/07/16. -// Copyright (c) 2016 Facebook. All rights reserved. -// - -#import - -@interface RCTImageSequenceView : UIImageView - - -@end \ No newline at end of file diff --git a/ios/RCTImageSequence/RCTImageSequenceView.m b/ios/RCTImageSequence/RCTImageSequenceView.m deleted file mode 100644 index e80330c..0000000 --- a/ios/RCTImageSequence/RCTImageSequenceView.m +++ /dev/null @@ -1,140 +0,0 @@ -// -// Created by Mads Lee Jensen on 07/07/16. -// Copyright (c) 2016 Facebook. All rights reserved. -// - -#import "RCTImageSequenceView.h" - -#import -#import - -@implementation RCTImageSequenceView { - NSUInteger _framesPerSecond; - NSMutableDictionary *_activeTasks; - NSMutableDictionary *_imagesLoaded; - BOOL _loop; - NSInteger _downsampleWidth; - NSInteger _downsampleHeight; -} - -- (void)setImages:(NSArray *)images { - __weak RCTImageSequenceView *weakSelf = self; - - self.animationImages = nil; - - _activeTasks = [NSMutableDictionary new]; - _imagesLoaded = [NSMutableDictionary new]; - - for (NSUInteger index = 0; index < images.count; index++) { - NSDictionary *item = images[index]; - -#ifdef DEBUG - NSString *urlString = item[@"uri"]; -#else - // when not in debug, the paths are "local paths" (because resources are bundled in app) - NSString *urlString = [NSString stringWithFormat:@"file://%@", item[@"uri"]]; -#endif - - dispatch_async(dispatch_queue_create("dk.mads-lee.ImageSequence.Downloader", NULL), ^{ - // Sleep for 1ms to make sure that all the props have been set properly before starting processing - [NSThread sleepForTimeInterval:0.001]; - - NSURL *url = [NSURL URLWithString:urlString]; - - if (_downsampleWidth <= 0 || _downsampleHeight <= 0) { - // Downsampling is not set so just return normally - UIImage *image = [UIImage imageWithData:[NSData dataWithContentsOfURL:url]]; - dispatch_async(dispatch_get_main_queue(), ^{ - [weakSelf onImageLoadTaskAtIndex:index image:image]; - }); - } else { - // Downsampling is set so we need to downsample - UIImage *image = [weakSelf resizedImage:url width:_downsampleWidth height:_downsampleHeight]; - dispatch_async(dispatch_get_main_queue(), ^{ - [weakSelf onImageLoadTaskAtIndex:index image:image]; - }); - } - }); - - _activeTasks[@(index)] = urlString; - } -} - -- (UIImage *)resizedImage:(NSURL *)url width:(NSInteger)width height:(NSInteger)height { - CFURLRef cfurl = (__bridge CFURLRef)url; - CGImageSourceRef imageSourceRef = CGImageSourceCreateWithURL(cfurl, nil); - if (!imageSourceRef) { - return nil; - } - - NSDictionary* d = @{ - (id)kCGImageSourceShouldAllowFloat: (id)kCFBooleanTrue, - (id)kCGImageSourceCreateThumbnailWithTransform: (id)kCFBooleanTrue, - (id)kCGImageSourceCreateThumbnailFromImageAlways: (id)kCFBooleanTrue, - (id)kCGImageSourceThumbnailMaxPixelSize: @((int)(width > height ? width : height)) - }; - CGImageRef imageRef = CGImageSourceCreateThumbnailAtIndex(imageSourceRef, 0, (__bridge CFDictionaryRef)d); - CFRelease(imageSourceRef); - if (!imageRef) { - return nil; - } - - UIImage* scaledImage = [UIImage imageWithCGImage:imageRef scale:1 orientation:UIImageOrientationUp]; - CFRelease(imageRef); - - return scaledImage; -} - -- (void)onImageLoadTaskAtIndex:(NSUInteger)index image:(UIImage *)image { - if (index == 0) { - self.image = image; - } - - [_activeTasks removeObjectForKey:@(index)]; - - _imagesLoaded[@(index)] = image; - - if (_activeTasks.allValues.count == 0) { - [self onImagesLoaded]; - } -} - -- (void)onImagesLoaded { - NSMutableArray *images = [NSMutableArray new]; - for (NSUInteger index = 0; index < _imagesLoaded.allValues.count; index++) { - UIImage *image = _imagesLoaded[@(index)]; - [images addObject:image]; - } - - [_imagesLoaded removeAllObjects]; - - self.image = nil; - self.animationDuration = images.count * (1.0f / _framesPerSecond); - self.animationImages = images; - self.animationRepeatCount = _loop ? 0 : 1; - [self startAnimating]; -} - -- (void)setFramesPerSecond:(NSUInteger)framesPerSecond { - _framesPerSecond = framesPerSecond; - - if (self.animationImages.count > 0) { - self.animationDuration = self.animationImages.count * (1.0f / _framesPerSecond); - } -} - -- (void)setLoop:(NSUInteger)loop { - _loop = loop; - - self.animationRepeatCount = _loop ? 0 : 1; -} - -- (void)setDownsampleWidth:(NSInteger)downsampleWidth { - _downsampleWidth = downsampleWidth; -} - -- (void)setDownsampleHeight:(NSInteger)downsampleHeight { - _downsampleHeight = downsampleHeight; -} - -@end diff --git a/package.json b/package.json index b691a6f..eea897e 100644 --- a/package.json +++ b/package.json @@ -1,28 +1,35 @@ { "name": "react-native-image-sequence-2", - "repository": { - "type": "git", - "url": "https://github.com/bwindsor/react-native-image-sequence.git" + "version": "0.9.1-0.0.1", + "description": "Showcase a Fabric component with a image sequence", + "react-native": "index", + "source": "index", + "files": [ + "src", + "harmony", + "react-native-image-sequence-2.podspec", + "!android/build", + "!ios/build", + "!**/__tests__", + "!**/__fixtures__", + "!**/__mocks__" + ], + "keywords": ["react-native", "ios", "android", "harmony"], + "repository": "https://github.com//react-native-image-sequence-2", + "author": " (https://github.com/)", + "license": "MIT", + "bugs": { + "url": "https://github.com//react-native-image-sequence-2/issues" }, - "version": "0.9.1", - "description": "A component for react-native", + "homepage": "https://github.com//react-native-image-sequence-2#readme", + "devDependencies": {}, "peerDependencies": { - "react-native": ">=0.47.0", - "prop-types": ">=15.5.0", - "deprecated-react-native-prop-types": "^2.3.0" + "react": "*", + "react-native": "*" }, - "license": "MIT", - "homepage": "https://github.com/bwindsor/react-native-image-sequence", - "main": "index.js", - "types": "typings/index.d.ts", - "keywords": [ - "react-native", - "native", - "sequence", - "imagesequence", - "frames", - "frame-animation", - "animation", - "animationImages" - ] -} + "codegenConfig": { + "name": "ImageSequenceSpecs", + "type": "components", + "jsSrcsDir": "src" + } +} \ No newline at end of file diff --git a/typings/index.d.ts b/src/ImageSequenceNativeComponent.ts similarity index 47% rename from typings/index.d.ts rename to src/ImageSequenceNativeComponent.ts index d24591b..4d15a47 100644 --- a/typings/index.d.ts +++ b/src/ImageSequenceNativeComponent.ts @@ -1,7 +1,24 @@ -import { Component } from 'react'; -import { ViewProps } from 'react-native'; +import type { ViewProps } from 'react-native/Libraries/Components/View/ViewPropTypes'; +import { FlexStyle, HostComponent, ShadowStyleIOS, TransformsStyle } from 'react-native'; +import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent'; -interface ImageSequenceProps extends ViewProps { +export interface ImageStyle extends FlexStyle, TransformsStyle, ShadowStyleIOS { + backfaceVisibility?: 'visible' | 'hidden'; + borderBottomLeftRadius?: number; + borderBottomRightRadius?: number; + backgroundColor?: string; + borderColor?: string; + borderWidth?: number; + borderRadius?: number; + borderTopLeftRadius?: number; + borderTopRightRadius?: number; + overlayColor?: string; + opacity?: number; + width?: number; + height?: number; +} + +export interface NativeProps extends ViewProps { /** An array of source images. Each element of the array should be the result of a call to require(imagePath). */ images: any[]; /** Which index of the images array should the sequence start at. Default: 0 */ @@ -14,9 +31,9 @@ interface ImageSequenceProps extends ViewProps { downsampleWidth?: number; /** The height to use for optional downsampling. Both `downsampleWidth` and `downsampleHeight` must be set to a positive number to enable downsampling. Default: -1 */ downsampleHeight?: number; + style?: ImageStyle; } -declare class ImageSequence extends Component { -} - -export default ImageSequence; +export default codegenNativeComponent( + 'ImageSequenceView', +) as HostComponent; -- Gitee From f32c52b6e8f179da17f5ed69f72d441a58226d41 Mon Sep 17 00:00:00 2001 From: wuya_smile Date: Mon, 22 Apr 2024 10:44:24 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E6=B7=BB=E5=8A=A0harmony=E6=89=93?= =?UTF-8?q?=E5=8C=85=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “leehom6666” --- package.json | 44 +++++++++++++++++++++++++++++++++++--------- tsconfig.build.json | 4 ++++ tsconfig.json | 16 ++++++++++++++++ 3 files changed, 55 insertions(+), 9 deletions(-) create mode 100644 tsconfig.build.json create mode 100644 tsconfig.json diff --git a/package.json b/package.json index eea897e..6b70b29 100644 --- a/package.json +++ b/package.json @@ -1,28 +1,37 @@ { - "name": "react-native-image-sequence-2", + "name": "@react-native-oh-tpl/react-native-image-sequence-2", "version": "0.9.1-0.0.1", "description": "Showcase a Fabric component with a image sequence", "react-native": "index", "source": "index", + "main": "lib/commonjs/index", + "typings": "lib/typescript/index.d.ts", "files": [ "src", "harmony", "react-native-image-sequence-2.podspec", - "!android/build", - "!ios/build", + "index.tsx", "!**/__tests__", "!**/__fixtures__", "!**/__mocks__" ], - "keywords": ["react-native", "ios", "android", "harmony"], - "repository": "https://github.com//react-native-image-sequence-2", - "author": " (https://github.com/)", + "scripts": { + "bob": "bob build", + "prepare": "npm run bob" + }, + "keywords": ["react-native", "harmony"], + "repository": "https://github.com/bwindsor/react-native-image-sequence", + "author": "bwindsor", "license": "MIT", "bugs": { - "url": "https://github.com//react-native-image-sequence-2/issues" + "url": "https://github.com/bwindsor/react-native-image-sequence/issues" + }, + "homepage": "https://github.com/bwindsor/react-native-image-sequence#readme", + "devDependencies": { + "@types/react": "^18.2.12", + "react-native-builder-bob": "^0.20.4", + "typescript": "^5.0.4" }, - "homepage": "https://github.com//react-native-image-sequence-2#readme", - "devDependencies": {}, "peerDependencies": { "react": "*", "react-native": "*" @@ -31,5 +40,22 @@ "name": "ImageSequenceSpecs", "type": "components", "jsSrcsDir": "src" + }, + "harmony": { + "alias": "react-native-image-sequence-2" + }, + "react-native-builder-bob": { + "source": "src", + "output": "lib", + "targets": [ + "commonjs", + "module", + [ + "typescript", + { + "project": "tsconfig.build.json" + } + ] + ] } } \ No newline at end of file diff --git a/tsconfig.build.json b/tsconfig.build.json new file mode 100644 index 0000000..c2ada1e --- /dev/null +++ b/tsconfig.build.json @@ -0,0 +1,4 @@ +{ + "extends": "./tsconfig", + "exclude": ["harmony"] +} \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..5c8e828 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,16 @@ +{ + "compilerOptions": { + "declaration": true, + "module": "commonjs", + "strict": true, + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "jsx": "react-native", + "lib": ["dom", "es5", "es6", "scripthost"], + "target": "es5", + "outDir": "built", + "sourceMap": true, + "skipLibCheck": true + }, + "exclude": ["node_modules"] + } \ No newline at end of file -- Gitee From c09fca33efeda657a4f38a75518b8f8c46df6d6d Mon Sep 17 00:00:00 2001 From: wuya_smile Date: Thu, 25 Apr 2024 10:48:59 +0800 Subject: [PATCH 03/16] =?UTF-8?q?capi=E7=9B=B8=E5=85=B3=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “leehom6666” --- harmony/image_sequence.har | Bin 0 -> 3921 bytes harmony/image_sequence/build-profile.json5 | 5 +- harmony/image_sequence/consumer-rules.txt | 0 harmony/image_sequence/oh-package-lock.json5 | 13 +++-- .../src/main/cpp/CMakeLists.txt | 8 --- .../src/main/cpp/ComponentDescriptors.h | 21 -------- .../src/main/cpp/EventEmitters.cpp | 17 ------ .../src/main/cpp/EventEmitters.h | 25 --------- .../src/main/cpp/ImageSequenceJSIBinder.h | 17 ------ .../src/main/cpp/ImageSequenceNapiBinder.h | 31 ----------- .../src/main/cpp/ImageSequencePackage.h | 24 --------- .../cpp/ImageSequenceSpecsJSI-generated.cpp | 19 ------- .../src/main/cpp/ImageSequenceSpecsJSI.h | 21 -------- harmony/image_sequence/src/main/cpp/Props.cpp | 30 ----------- harmony/image_sequence/src/main/cpp/Props.h | 34 ------------ .../src/main/cpp/ShadowNodes.cpp | 20 ------- .../image_sequence/src/main/cpp/ShadowNodes.h | 34 ------------ .../image_sequence/src/main/cpp/States.cpp | 18 ------- harmony/image_sequence/src/main/cpp/States.h | 36 ------------- .../src/main/ets/ImageSequencePackage.ts | 13 +++++ .../src/main/ets/RNImageSequence.ets | 51 +++++++++++------- harmony/image_sequence/src/main/module.json5 | 5 ++ harmony/image_sequence/src/test/List.test.ets | 5 -- .../src/test/LocalUnit.test.ets | 33 ------------ harmony/image_sequence/ts.ts | 1 + index.tsx | 16 +++++- package.json | 21 +++----- src/ImageSequenceNativeComponent.ts | 43 +++++++-------- tsconfig.build.json | 4 -- tsconfig.json | 16 ------ 30 files changed, 107 insertions(+), 474 deletions(-) create mode 100644 harmony/image_sequence.har delete mode 100644 harmony/image_sequence/consumer-rules.txt delete mode 100644 harmony/image_sequence/src/main/cpp/CMakeLists.txt delete mode 100644 harmony/image_sequence/src/main/cpp/ComponentDescriptors.h delete mode 100644 harmony/image_sequence/src/main/cpp/EventEmitters.cpp delete mode 100644 harmony/image_sequence/src/main/cpp/EventEmitters.h delete mode 100644 harmony/image_sequence/src/main/cpp/ImageSequenceJSIBinder.h delete mode 100644 harmony/image_sequence/src/main/cpp/ImageSequenceNapiBinder.h delete mode 100644 harmony/image_sequence/src/main/cpp/ImageSequencePackage.h delete mode 100644 harmony/image_sequence/src/main/cpp/ImageSequenceSpecsJSI-generated.cpp delete mode 100644 harmony/image_sequence/src/main/cpp/ImageSequenceSpecsJSI.h delete mode 100644 harmony/image_sequence/src/main/cpp/Props.cpp delete mode 100644 harmony/image_sequence/src/main/cpp/Props.h delete mode 100644 harmony/image_sequence/src/main/cpp/ShadowNodes.cpp delete mode 100644 harmony/image_sequence/src/main/cpp/ShadowNodes.h delete mode 100644 harmony/image_sequence/src/main/cpp/States.cpp delete mode 100644 harmony/image_sequence/src/main/cpp/States.h create mode 100644 harmony/image_sequence/src/main/ets/ImageSequencePackage.ts delete mode 100644 harmony/image_sequence/src/test/List.test.ets delete mode 100644 harmony/image_sequence/src/test/LocalUnit.test.ets create mode 100644 harmony/image_sequence/ts.ts delete mode 100644 tsconfig.build.json delete mode 100644 tsconfig.json diff --git a/harmony/image_sequence.har b/harmony/image_sequence.har new file mode 100644 index 0000000000000000000000000000000000000000..b9f1d84a4c0a4cd5272956e930410a6d4932d6c6 GIT binary patch literal 3921 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 f`-Sztn(2RP$n-yh3^K?dgL&{j6^ - -namespace facebook { -namespace react { - -using ImageSequenceComponentDescriptor = ConcreteComponentDescriptor; - -} // namespace react -} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/EventEmitters.cpp b/harmony/image_sequence/src/main/cpp/EventEmitters.cpp deleted file mode 100644 index 74b7928..0000000 --- a/harmony/image_sequence/src/main/cpp/EventEmitters.cpp +++ /dev/null @@ -1,17 +0,0 @@ - -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateEventEmitterCpp.js - */ - -#include "EventEmitters.h" - -namespace facebook { -namespace react { - -} // namespace react -} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/EventEmitters.h b/harmony/image_sequence/src/main/cpp/EventEmitters.h deleted file mode 100644 index 982f60f..0000000 --- a/harmony/image_sequence/src/main/cpp/EventEmitters.h +++ /dev/null @@ -1,25 +0,0 @@ - -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateEventEmitterH.js - */ -#pragma once - -#include - - -namespace facebook { -namespace react { -class ImageSequenceEventEmitter : public ViewEventEmitter { - public: - using ViewEventEmitter::ViewEventEmitter; - - - -}; -} // namespace react -} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/ImageSequenceJSIBinder.h b/harmony/image_sequence/src/main/cpp/ImageSequenceJSIBinder.h deleted file mode 100644 index c591ef3..0000000 --- a/harmony/image_sequence/src/main/cpp/ImageSequenceJSIBinder.h +++ /dev/null @@ -1,17 +0,0 @@ -#include "RNOHCorePackage/ComponentBinders/ViewComponentJSIBinder.h" - -namespace rnoh { - -class ImageSequenceJSIBinder : public ViewComponentJSIBinder { - facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override { - auto object = ViewComponentJSIBinder::createNativeProps(rt); - object.setProperty(rt, "loop", "boolean"); - object.setProperty(rt, "images", "array"); - object.setProperty(rt, "startFrameIndex", "int"); - object.setProperty(rt, "framesPerSecond", "int"); - object.setProperty(rt, "downsampleWidth", "int"); - object.setProperty(rt, "downsampleHeight", "int"); - return object; - } -}; -} // namespace rnoh \ No newline at end of file diff --git a/harmony/image_sequence/src/main/cpp/ImageSequenceNapiBinder.h b/harmony/image_sequence/src/main/cpp/ImageSequenceNapiBinder.h deleted file mode 100644 index e4c9dee..0000000 --- a/harmony/image_sequence/src/main/cpp/ImageSequenceNapiBinder.h +++ /dev/null @@ -1,31 +0,0 @@ -#include "RNOHCorePackage/ComponentBinders/ViewComponentNapiBinder.h" -#include "Props.h" - -namespace rnoh { - -class ImageSequenceNapiBinder : public ViewComponentNapiBinder { -public: - napi_value createProps(napi_env env, facebook::react::ShadowView const shadowView) override { - napi_value napiViewProps = ViewComponentNapiBinder::createProps(env, shadowView); - if (auto props = std::dynamic_pointer_cast(shadowView.props)) { - auto images = std::vector(); - auto imageRaw = props->images; - for (auto imagesItem : imageRaw) { - auto imagesItemInt = ArkJS(env).createString(imagesItem); - images.push_back(imagesItemInt); - } - auto viewBoxArray = ArkJS(env).createArray(images); - return ArkJS(env) - .getObjectBuilder(napiViewProps) - .addProperty("images", viewBoxArray) - .addProperty("loop", props->loop) - .addProperty("startFrameIndex", props->startFrameIndex) - .addProperty("framesPerSecond", props->framesPerSecond) - .addProperty("downsampleWidth", props->downsampleWidth) - .addProperty("downsampleHeight", props->downsampleHeight) - .build(); - } - return napiViewProps; - }; -}; -} //namespace rnoh \ No newline at end of file diff --git a/harmony/image_sequence/src/main/cpp/ImageSequencePackage.h b/harmony/image_sequence/src/main/cpp/ImageSequencePackage.h deleted file mode 100644 index 3b6d49e..0000000 --- a/harmony/image_sequence/src/main/cpp/ImageSequencePackage.h +++ /dev/null @@ -1,24 +0,0 @@ -#include "RNOH/Package.h" -#include "ComponentDescriptors.h" -#include "ImageSequenceJSIBinder.h" -#include "ImageSequenceNapiBinder.h" - -namespace rnoh { - -class ImageSequencePackage : public Package { -public: - ImageSequencePackage(Package::Context ctx) : Package(ctx) {} - - std::vector createComponentDescriptorProviders() override { - return {facebook::react::concreteComponentDescriptorProvider()}; - } - - ComponentNapiBinderByString createComponentNapiBinderByName() override { - return {{"ImageSequenceView", std::make_shared()}}; - } - - ComponentJSIBinderByString createComponentJSIBinderByName() override { - return {{"ImageSequenceView", std::make_shared()}}; - } -}; -} // namespace rnoh \ No newline at end of file diff --git a/harmony/image_sequence/src/main/cpp/ImageSequenceSpecsJSI-generated.cpp b/harmony/image_sequence/src/main/cpp/ImageSequenceSpecsJSI-generated.cpp deleted file mode 100644 index 397d300..0000000 --- a/harmony/image_sequence/src/main/cpp/ImageSequenceSpecsJSI-generated.cpp +++ /dev/null @@ -1,19 +0,0 @@ -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateModuleCpp.js - */ - -#include "ImageSequenceSpecsJSI.h" - -namespace facebook { -namespace react { - - - - -} // namespace react -} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/ImageSequenceSpecsJSI.h b/harmony/image_sequence/src/main/cpp/ImageSequenceSpecsJSI.h deleted file mode 100644 index b301476..0000000 --- a/harmony/image_sequence/src/main/cpp/ImageSequenceSpecsJSI.h +++ /dev/null @@ -1,21 +0,0 @@ -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateModuleH.js - */ - -#pragma once - -#include -#include - -namespace facebook { -namespace react { - - - -} // namespace react -} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/Props.cpp b/harmony/image_sequence/src/main/cpp/Props.cpp deleted file mode 100644 index 916afa4..0000000 --- a/harmony/image_sequence/src/main/cpp/Props.cpp +++ /dev/null @@ -1,30 +0,0 @@ - -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GeneratePropsCpp.js - */ - -#include "Props.h" -#include -#include - -namespace facebook { -namespace react { - - ImageSequenceProps::ImageSequenceProps(const PropsParserContext &context, const ImageSequenceProps &sourceProps, - const RawProps &rawProps) - : ViewProps(context, sourceProps, rawProps), - - loop(convertRawProp(context, rawProps, "loop", sourceProps.loop, {true})), - startFrameIndex(convertRawProp(context, rawProps, "startFrameIndex", sourceProps.startFrameIndex, {0})), - framesPerSecond(convertRawProp(context, rawProps, "framesPerSecond", sourceProps.framesPerSecond, {24})), - downsampleWidth(convertRawProp(context, rawProps, "downsampleWidth", sourceProps.downsampleWidth, {-1})), - downsampleHeight(convertRawProp(context, rawProps, "downsampleHeight", sourceProps.downsampleHeight, {-1})), - images(convertRawProp(context, rawProps, "images", sourceProps.images, {})) {} - -} // namespace react -} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/Props.h b/harmony/image_sequence/src/main/cpp/Props.h deleted file mode 100644 index d13aeb2..0000000 --- a/harmony/image_sequence/src/main/cpp/Props.h +++ /dev/null @@ -1,34 +0,0 @@ - -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GeneratePropsH.js - */ -#pragma once - -#include -#include - -namespace facebook { -namespace react { - -class ImageSequenceProps final : public ViewProps { - public: - ImageSequenceProps() = default; - ImageSequenceProps(const PropsParserContext& context, const ImageSequenceProps &sourceProps, const RawProps &rawProps); - -#pragma mark - Props - - std::vector images{}; - bool loop{true}; - int startFrameIndex{0}; - int framesPerSecond{24}; - int downsampleWidth{-1}; - int downsampleHeight{-1}; -}; - -} // namespace react -} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/ShadowNodes.cpp b/harmony/image_sequence/src/main/cpp/ShadowNodes.cpp deleted file mode 100644 index 305c8ca..0000000 --- a/harmony/image_sequence/src/main/cpp/ShadowNodes.cpp +++ /dev/null @@ -1,20 +0,0 @@ - -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateShadowNodeCpp.js - */ - -#include "Props.h" -#include "ShadowNodes.h" - -namespace facebook { -namespace react { - -extern const char ImageSequenceComponentName[] = "ImageSequenceView"; - -} // namespace react -} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/ShadowNodes.h b/harmony/image_sequence/src/main/cpp/ShadowNodes.h deleted file mode 100644 index 144aefd..0000000 --- a/harmony/image_sequence/src/main/cpp/ShadowNodes.h +++ /dev/null @@ -1,34 +0,0 @@ - -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateShadowNodeH.js - */ - -#pragma once - -#include "EventEmitters.h" -#include "Props.h" -#include "States.h" -#include -#include - -namespace facebook { -namespace react { - -JSI_EXPORT extern const char ImageSequenceComponentName[]; - -/* - * `ShadowNode` for component. - */ -using ImageSequenceShadowNode = ConcreteViewShadowNode< - ImageSequenceComponentName, - ImageSequenceProps, - ImageSequenceEventEmitter, - ImageSequenceState>; - -} // namespace react -} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/States.cpp b/harmony/image_sequence/src/main/cpp/States.cpp deleted file mode 100644 index 62a093d..0000000 --- a/harmony/image_sequence/src/main/cpp/States.cpp +++ /dev/null @@ -1,18 +0,0 @@ - -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateStateCpp.js - */ -#include "States.h" - -namespace facebook { -namespace react { - - - -} // namespace react -} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/States.h b/harmony/image_sequence/src/main/cpp/States.h deleted file mode 100644 index 315f60c..0000000 --- a/harmony/image_sequence/src/main/cpp/States.h +++ /dev/null @@ -1,36 +0,0 @@ -/** - * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). - * - * Do not edit this file as changes may cause incorrect behavior and will be lost - * once the code is regenerated. - * - * @generated by codegen project: GenerateStateH.js - */ -#pragma once - -#ifdef ANDROID -#include -#include -#include -#endif - -namespace facebook { -namespace react { - -class ImageSequenceState { -public: - ImageSequenceState() = default; - -#ifdef ANDROID - ImageSequenceState(ImageSequenceState const &previousState, folly::dynamic data){}; - folly::dynamic getDynamic() const { - return {}; - }; - MapBuffer getMapBuffer() const { - return MapBufferBuilder::EMPTY(); - }; -#endif -}; - -} // namespace react -} // namespace facebook \ No newline at end of file diff --git a/harmony/image_sequence/src/main/ets/ImageSequencePackage.ts b/harmony/image_sequence/src/main/ets/ImageSequencePackage.ts new file mode 100644 index 0000000..f50b377 --- /dev/null +++ b/harmony/image_sequence/src/main/ets/ImageSequencePackage.ts @@ -0,0 +1,13 @@ +import { RNPackage } from '@rnoh/react-native-openharmony/ts'; +import type {DescriptorWrapperFactoryByDescriptorTypeCtx, DescriptorWrapperFactoryByDescriptorType} from '@rnoh/react-native-openharmony/ts'; +import { RNC } from '@rnoh/react-native-openharmony/generated/ts' + +export class ImageSequencePackage extends RNPackage { + createDescriptorWrapperFactoryByDescriptorType(ctx: + DescriptorWrapperFactoryByDescriptorTypeCtx): + DescriptorWrapperFactoryByDescriptorType { + return { + [RNC.ImageSequenceView.NAME]: (ctx) => new RNC.ImageSequenceView.DescriptorWrapper(ctx.descriptor) + } + } +} \ No newline at end of file diff --git a/harmony/image_sequence/src/main/ets/RNImageSequence.ets b/harmony/image_sequence/src/main/ets/RNImageSequence.ets index 865df67..e9d88e6 100644 --- a/harmony/image_sequence/src/main/ets/RNImageSequence.ets +++ b/harmony/image_sequence/src/main/ets/RNImageSequence.ets @@ -1,13 +1,14 @@ -import { Descriptor, ComponentBuilderContext, ViewRawrawProps, Tag } from '@rnoh/react-native-openharmony'; +import { Descriptor, ComponentBuilderContext, ViewRawProps, Tag } from '@rnoh/react-native-openharmony'; import { RNComponentFactory, RNOHContext, RNViewBase } from '@rnoh/react-native-openharmony'; // import { ImageLoaderTurboModule } from '@rnoh/react-native-openharmony/src/main/ets/RNOHCorePackage/turboModules'; import image from '@ohos.multimedia.image'; import resourceManager from '@ohos.resourceManager'; import { BusinessError } from '@ohos.base'; +import { RNC } from '@rnoh/react-native-openharmony/generated/ts' export const IMAGE_SEQUENCE_TYPE: string = "ImageSequenceView" -export interface ImageSequencerawProps extends ViewRawrawProps { +export interface ImageSequencerawProps extends ViewRawProps { loop: boolean, images: Array, startFrameIndex: number, @@ -17,7 +18,7 @@ export interface ImageSequencerawProps extends ViewRawrawProps { } // export type ImageSequenceDescriptor = Descriptor<"ImageSequenceView", ImageSequencerawProps> -export type ImageSequenceDescriptor = Descriptor<"ImageSequenceView", ViewRawrawProps, [], ImageSequencerawProps> +// export type ImageSequenceDescriptor = Descriptor<"ImageSequenceView", ViewRawProps, [], ImageSequencerawProps> export interface ImageData { src: string | Resource, width: number @@ -28,11 +29,14 @@ const resourceMgr: resourceManager.ResourceManager = context.resourceManager; @Component export struct RNImageSequence { + public static readonly NAME: string = RNC.ImageSequenceView.NAME; ctx!: RNOHContext; tag: number = 0; @BuilderParam buildCustomComponent: (componentBuilderContext: ComponentBuilderContext) => void; - @State descriptor: ImageSequenceDescriptor = {} as ImageSequenceDescriptor; - private unregisterDescriptorChangesListener?: () => void = undefined; + // @State descriptor: ImageSequenceDescriptor = {} as ImageSequenceDescriptor; + // private unregisterDescriptorChangesListener?: () => void = undefined; + @State descriptorWrapper: RNC.ImageSequenceView.DescriptorWrapper = {} as RNC.ImageSequenceView.DescriptorWrapper; + @State cleanUpCallbacks: (()=>void)[]=[] @State ImageList: (Resource | string | PixelMap)[] = []; @State duration: number = 0; @State timer: number = 0; @@ -42,15 +46,20 @@ export struct RNImageSequence { @State localIndex: number[] = []; aboutToAppear() { - this.descriptor = this.ctx.descriptorRegistry.getDescriptor(this.tag); - this.unregisterDescriptorChangesListener = this.ctx.descriptorRegistry.subscribeToDescriptorChanges(this.tag, - (newDescriptor) => { - this.descriptor = (newDescriptor as ImageSequenceDescriptor) - } - ) + // this.descriptor = this.ctx.descriptorRegistry.getDescriptor(this.tag); + // this.unregisterDescriptorChangesListener = this.ctx.descriptorRegistry.subscribeToDescriptorChanges(this.tag, + // (newDescriptor) => { + // this.descriptor = (newDescriptor as ImageSequenceDescriptor) + // } + // ) + this.onDescriptorWrapperChange(this.ctx.descriptorRegistry.findDescriptorWrapperByTag(this.tag)!) + this.cleanUpCallbacks.push(this.ctx.descriptorRegistry.subscribeToDescriptorChanges(this.tag, + (descriptor) => { + this.onDescriptorWrapperChange(new RNC.ImageSequenceView.DescriptorWrapper(descriptor)) + })) - this.duration = 1000 / this.descriptor.rawProps.framesPerSecond; - const sourceList = this.descriptor.rawProps.images; + this.duration = 1000 / this.descriptorWrapper.props.framesPerSecond; + const sourceList = this.descriptorWrapper.props.images; this.ImageList.length = sourceList.length; sourceList.forEach((item, index)=>{ @@ -61,7 +70,7 @@ export struct RNImageSequence { this.finishCount +=1 } }) - if (this.descriptor.rawProps.loop) { + if (this.descriptorWrapper.props.loop) { this.num = 0; this.timer = setInterval(()=>{ this.num++; @@ -75,6 +84,10 @@ export struct RNImageSequence { } } + private onDescriptorWrapperChange(descriptorWrapper: RNC.ImageSequenceView.DescriptorWrapper) { + this.descriptorWrapper = descriptorWrapper + } + getRawFileContent(img:string, index:number) { resourceMgr.getRawFileContent(img).then((fileData: Uint8Array) => { const buffer = fileData.buffer.slice(0); @@ -98,8 +111,8 @@ export struct RNImageSequence { calculateInSampleSize(width: number, height: number):number { let inSampleSize = 1; - let reqWidth: number = this.descriptor.rawProps.downsampleWidth; - let reqHeight: number = this.descriptor.rawProps.downsampleHeight; + let reqWidth: number = this.descriptorWrapper.props.downsampleWidth; + let reqHeight: number = this.descriptorWrapper.props.downsampleHeight; if (height > reqHeight || width > reqWidth) { let halfHeight = height / 2; @@ -133,7 +146,8 @@ export struct RNImageSequence { imageSourceApi.release(); } aboutToDisappear() { - this.unregisterDescriptorChangesListener?.() + // this.unregisterDescriptorChangesListener?.() + this.cleanUpCallbacks.forEach(cb => cb()) clearInterval(this.timer); if (this.isLocalResource) { this.localIndex.forEach(lIndex => { @@ -141,6 +155,7 @@ export struct RNImageSequence { item.release(); }) } + this.ImageList.length = 0; } build() { @@ -148,7 +163,7 @@ export struct RNImageSequence { if (this.finishCount === this.ImageList.length) { Image(this.ImageList[this.num]).objectFit(ImageFit.Fill).draggable(false).width('100%').height('100%').onComplete(()=>{ console.log(`加载完成：${new Date().getTime()}`) - }) + }).key('image_sequence') } } } diff --git a/harmony/image_sequence/src/main/module.json5 b/harmony/image_sequence/src/main/module.json5 index 72cc27f..856861a 100644 --- a/harmony/image_sequence/src/main/module.json5 +++ b/harmony/image_sequence/src/main/module.json5 @@ -6,6 +6,11 @@ "default", "tablet", "2in1" + ], + "requestPermissions": [ + { + "name": "ohos.permission.INTERNET" + } ] } } diff --git a/harmony/image_sequence/src/test/List.test.ets b/harmony/image_sequence/src/test/List.test.ets deleted file mode 100644 index bb5b5c3..0000000 --- a/harmony/image_sequence/src/test/List.test.ets +++ /dev/null @@ -1,5 +0,0 @@ -import localUnitTest from './LocalUnit.test'; - -export default function testsuite() { - localUnitTest(); -} \ No newline at end of file diff --git a/harmony/image_sequence/src/test/LocalUnit.test.ets b/harmony/image_sequence/src/test/LocalUnit.test.ets deleted file mode 100644 index ed22d4d..0000000 --- a/harmony/image_sequence/src/test/LocalUnit.test.ets +++ /dev/null @@ -1,33 +0,0 @@ -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; - -export default function localUnitTest() { - describe('localUnitTest',() => { - // Defines a test suite. Two parameters are supported: test suite name and test suite function. - beforeAll(() => { - // Presets an action, which is performed only once before all test cases of the test suite start. - // This API supports only one parameter: preset action function. - }); - beforeEach(() => { - // Presets an action, which is performed before each unit test case starts. - // The number of execution times is the same as the number of test cases defined by **it**. - // This API supports only one parameter: preset action function. - }); - afterEach(() => { - // Presets a clear action, which is performed after each unit test case ends. - // The number of execution times is the same as the number of test cases defined by **it**. - // This API supports only one parameter: clear action function. - }); - afterAll(() => { - // Presets a clear action, which is performed after all test cases of the test suite end. - // This API supports only one parameter: clear action function. - }); - it('assertContain', 0, () => { - // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function. - let a = 'abc'; - let b = 'b'; - // Defines a variety of assertion methods, which are used to declare expected boolean conditions. - expect(a).assertContain(b); - expect(a).assertEqual(a); - }); - }); -} \ No newline at end of file diff --git a/harmony/image_sequence/ts.ts b/harmony/image_sequence/ts.ts new file mode 100644 index 0000000..7b6b357 --- /dev/null +++ b/harmony/image_sequence/ts.ts @@ -0,0 +1 @@ +export * from './src/main/ets/ImageSequencePackage' \ No newline at end of file diff --git a/index.tsx b/index.tsx index 369a16d..7acd51c 100644 --- a/index.tsx +++ b/index.tsx @@ -1,6 +1,20 @@ import { forwardRef, memo } from 'react'; import { View, Image } from 'react-native'; import ImagesequenceView, { NativeProps } from './src/ImageSequenceNativeComponent' + +interface ImageProps { + images: any[], + startFrameIndex?: number, + framesPerSecond?: number, + loop?: boolean, + downsampleWidth?: number, + downsampleHeight?: number, + style?:{ + width?: number, + height?: number + } +} + function ImageSequenceBase({ images, startFrameIndex, @@ -11,7 +25,7 @@ function ImageSequenceBase({ forwardRef, style, ...props -}: NativeProps & { forwardRef: React.Ref }) { +}: ImageProps & { forwardRef: React.Ref }) { let images2: any[] = []; images.forEach(item => { if (item.uri) { diff --git a/package.json b/package.json index 6b70b29..49885fb 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "react-native": "index", "source": "index", "main": "lib/commonjs/index", + "module": "lib/module/index", "typings": "lib/typescript/index.d.ts", "files": [ "src", @@ -36,26 +37,20 @@ "react": "*", "react-native": "*" }, - "codegenConfig": { - "name": "ImageSequenceSpecs", - "type": "components", - "jsSrcsDir": "src" - }, "harmony": { - "alias": "react-native-image-sequence-2" + "alias": "react-native-image-sequence-2", + "codegenConfig": { + "specPaths": [ + "./src" + ] + } }, "react-native-builder-bob": { "source": "src", "output": "lib", "targets": [ "commonjs", - "module", - [ - "typescript", - { - "project": "tsconfig.build.json" - } - ] + "module" ] } } \ No newline at end of file diff --git a/src/ImageSequenceNativeComponent.ts b/src/ImageSequenceNativeComponent.ts index 4d15a47..f0b3871 100644 --- a/src/ImageSequenceNativeComponent.ts +++ b/src/ImageSequenceNativeComponent.ts @@ -1,37 +1,38 @@ import type { ViewProps } from 'react-native/Libraries/Components/View/ViewPropTypes'; import { FlexStyle, HostComponent, ShadowStyleIOS, TransformsStyle } from 'react-native'; import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent'; +import type { Int32 } from 'react-native/Libraries/Types/CodegenTypes'; -export interface ImageStyle extends FlexStyle, TransformsStyle, ShadowStyleIOS { - backfaceVisibility?: 'visible' | 'hidden'; - borderBottomLeftRadius?: number; - borderBottomRightRadius?: number; - backgroundColor?: string; - borderColor?: string; - borderWidth?: number; - borderRadius?: number; - borderTopLeftRadius?: number; - borderTopRightRadius?: number; - overlayColor?: string; - opacity?: number; - width?: number; - height?: number; -} +// export interface ImageStyle extends FlexStyle, TransformsStyle, ShadowStyleIOS { +// backfaceVisibility?: 'visible' | 'hidden'; +// borderBottomLeftRadius?: number; +// borderBottomRightRadius?: number; +// backgroundColor?: string; +// borderColor?: string; +// borderWidth?: number; +// borderRadius?: number; +// borderTopLeftRadius?: number; +// borderTopRightRadius?: number; +// overlayColor?: string; +// opacity?: number; +// width?: number; +// height?: number; +// } export interface NativeProps extends ViewProps { /** An array of source images. Each element of the array should be the result of a call to require(imagePath). */ - images: any[]; + images: string[]; /** Which index of the images array should the sequence start at. Default: 0 */ - startFrameIndex?: number; + startFrameIndex?: Int32; /** Playback speed of the image sequence. Default: 24 */ - framesPerSecond?: number; + framesPerSecond?: Int32; /** Should the sequence loop. Default: true */ loop?: boolean; /** The width to use for optional downsampling. Both `downsampleWidth` and `downsampleHeight` must be set to a positive number to enable downsampling. Default: -1 */ - downsampleWidth?: number; + downsampleWidth?: Int32; /** The height to use for optional downsampling. Both `downsampleWidth` and `downsampleHeight` must be set to a positive number to enable downsampling. Default: -1 */ - downsampleHeight?: number; - style?: ImageStyle; + downsampleHeight?: Int32; + style?: {width?: Int32, height?: Int32}; } export default codegenNativeComponent( diff --git a/tsconfig.build.json b/tsconfig.build.json deleted file mode 100644 index c2ada1e..0000000 --- a/tsconfig.build.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "./tsconfig", - "exclude": ["harmony"] -} \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index 5c8e828..0000000 --- a/tsconfig.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "compilerOptions": { - "declaration": true, - "module": "commonjs", - "strict": true, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "jsx": "react-native", - "lib": ["dom", "es5", "es6", "scripthost"], - "target": "es5", - "outDir": "built", - "sourceMap": true, - "skipLibCheck": true - }, - "exclude": ["node_modules"] - } \ No newline at end of file -- Gitee From df45165ec08929ecd3d17b4d6e14766e35473732 Mon Sep 17 00:00:00 2001 From: wuya_smile Date: Sun, 28 Apr 2024 16:05:40 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=95=B0=E7=BB=84=E4=BC=A0=E5=85=A5=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “leehom6666” --- harmony/image_sequence/src/main/ets/RNImageSequence.ets | 4 ++++ index.tsx | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/harmony/image_sequence/src/main/ets/RNImageSequence.ets b/harmony/image_sequence/src/main/ets/RNImageSequence.ets index e9d88e6..4101c13 100644 --- a/harmony/image_sequence/src/main/ets/RNImageSequence.ets +++ b/harmony/image_sequence/src/main/ets/RNImageSequence.ets @@ -114,6 +114,10 @@ export struct RNImageSequence { let reqWidth: number = this.descriptorWrapper.props.downsampleWidth; let reqHeight: number = this.descriptorWrapper.props.downsampleHeight; + if (reqHeight <= 0 || reqWidth <= 0) { + return inSampleSize; + } + if (height > reqHeight || width > reqWidth) { let halfHeight = height / 2; let halWidth = width/ 2; diff --git a/index.tsx b/index.tsx index 7acd51c..c0d2338 100644 --- a/index.tsx +++ b/index.tsx @@ -29,10 +29,10 @@ function ImageSequenceBase({ let images2: any[] = []; images.forEach(item => { if (item.uri) { - images2.push(item); + images2.push(item.uri); } else { let resolvedSource = Image.resolveAssetSource(item); - images.push(resolvedSource.uri); + images2.push(resolvedSource.uri); } }) if (startFrameIndex !== 0) { -- Gitee From e4cbd2dd810981b6f3b77cc73800431de7433136 Mon Sep 17 00:00:00 2001 From: wuya_smile Date: Sun, 28 Apr 2024 16:06:57 +0800 Subject: [PATCH 05/16] =?UTF-8?q?package.json=E6=B7=BB=E5=8A=A0lib?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “leehom6666” --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 49885fb..1e6fb0a 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "files": [ "src", "harmony", + "lib", "react-native-image-sequence-2.podspec", "index.tsx", "!**/__tests__", -- Gitee From 98e4328bebfd09cdeb98aece74e6182ac8810594 Mon Sep 17 00:00:00 2001 From: wuya_smile Date: Wed, 15 May 2024 09:11:37 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9hvigorfile=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “leehom6666” --- harmony/image_sequence.har | Bin 3921 -> 3975 bytes harmony/image_sequence/hvigorfile.ts | 2 +- .../src/main/ets/ImageSequencePackage.ts | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/harmony/image_sequence.har b/harmony/image_sequence.har index b9f1d84a4c0a4cd5272956e930410a6d4932d6c6..448662467274888ac7462c624368507d087b91f0 100644 GIT binary patch literal 3975 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 literal 3921 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 f`-Sztn(2RP$n-yh3^K?dgL&{j6^ Date: Fri, 17 May 2024 11:50:40 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E6=A0=B7?= =?UTF-8?q?=E7=8E=87=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “leehom6666” --- harmony/image_sequence.har | Bin 3975 -> 4016 bytes harmony/image_sequence/BuildProfile.ets | 6 ++++++ harmony/image_sequence/consumer-rules.txt | 0 .../src/main/ets/ImageSequencePackage.ts | 2 +- .../src/main/ets/RNImageSequence.ets | 10 ++++------ 5 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 harmony/image_sequence/BuildProfile.ets create mode 100644 harmony/image_sequence/consumer-rules.txt diff --git a/harmony/image_sequence.har b/harmony/image_sequence.har index 448662467274888ac7462c624368507d087b91f0..d2268ecdde77b13517102caccade936a905f2641 100644 GIT binary patch literal 4016 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 diff --git a/harmony/image_sequence/BuildProfile.ets b/harmony/image_sequence/BuildProfile.ets new file mode 100644 index 0000000..f05d220 --- /dev/null +++ b/harmony/image_sequence/BuildProfile.ets @@ -0,0 +1,6 @@ +export default class BuildProfile { + static readonly HAR_VERSION = '1.0.0'; + static readonly BUILD_MODE_NAME = 'debug'; + static readonly DEBUG = true; + static readonly TARGET_NAME = 'default'; +} \ No newline at end of file diff --git a/harmony/image_sequence/consumer-rules.txt b/harmony/image_sequence/consumer-rules.txt new file mode 100644 index 0000000..e69de29 diff --git a/harmony/image_sequence/src/main/ets/ImageSequencePackage.ts b/harmony/image_sequence/src/main/ets/ImageSequencePackage.ts index 2b7fc55..f50b377 100644 --- a/harmony/image_sequence/src/main/ets/ImageSequencePackage.ts +++ b/harmony/image_sequence/src/main/ets/ImageSequencePackage.ts @@ -1,6 +1,6 @@ import { RNPackage } from '@rnoh/react-native-openharmony/ts'; import type {DescriptorWrapperFactoryByDescriptorTypeCtx, DescriptorWrapperFactoryByDescriptorType} from '@rnoh/react-native-openharmony/ts'; -import { RNC } from '@rnoh/react-native-openharmony/generated' +import { RNC } from '@rnoh/react-native-openharmony/generated/ts' export class ImageSequencePackage extends RNPackage { createDescriptorWrapperFactoryByDescriptorType(ctx: diff --git a/harmony/image_sequence/src/main/ets/RNImageSequence.ets b/harmony/image_sequence/src/main/ets/RNImageSequence.ets index 4101c13..536a23a 100644 --- a/harmony/image_sequence/src/main/ets/RNImageSequence.ets +++ b/harmony/image_sequence/src/main/ets/RNImageSequence.ets @@ -4,7 +4,7 @@ import { RNComponentFactory, RNOHContext, RNViewBase } from '@rnoh/react-native- import image from '@ohos.multimedia.image'; import resourceManager from '@ohos.resourceManager'; import { BusinessError } from '@ohos.base'; -import { RNC } from '@rnoh/react-native-openharmony/generated/ts' +import { RNC } from '@rnoh/react-native-openharmony/generated' export const IMAGE_SEQUENCE_TYPE: string = "ImageSequenceView" @@ -113,11 +113,9 @@ export struct RNImageSequence { let inSampleSize = 1; let reqWidth: number = this.descriptorWrapper.props.downsampleWidth; let reqHeight: number = this.descriptorWrapper.props.downsampleHeight; - - if (reqHeight <= 0 || reqWidth <= 0) { - return inSampleSize; - } - + if (width<=0 || height<=0) { + return inSampleSize; + } if (height > reqHeight || width > reqWidth) { let halfHeight = height / 2; let halWidth = width/ 2; -- Gitee From 2ca99da3c2df8bfb2defe7c40dc8631616f692a2 Mon Sep 17 00:00:00 2001 From: wuya_smile Date: Sat, 18 May 2024 11:42:39 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “leehom6666” --- harmony/image_sequence/src/main/ets/RNImageSequence.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/harmony/image_sequence/src/main/ets/RNImageSequence.ets b/harmony/image_sequence/src/main/ets/RNImageSequence.ets index 536a23a..a56ef21 100644 --- a/harmony/image_sequence/src/main/ets/RNImageSequence.ets +++ b/harmony/image_sequence/src/main/ets/RNImageSequence.ets @@ -113,7 +113,7 @@ export struct RNImageSequence { let inSampleSize = 1; let reqWidth: number = this.descriptorWrapper.props.downsampleWidth; let reqHeight: number = this.descriptorWrapper.props.downsampleHeight; - if (width<=0 || height<=0) { + if (reqWidth <= 0 || reqHeight <= 0) { return inSampleSize; } if (height > reqHeight || width > reqWidth) { -- Gitee From e1cd9bc517a0174a9c18d2b7970742d916906b33 Mon Sep 17 00:00:00 2001 From: wuya_smile Date: Thu, 23 May 2024 15:05:16 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “leehom6666” --- .../src/main/ets/RNImageSequence.ets | 41 +++++++------------ 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/harmony/image_sequence/src/main/ets/RNImageSequence.ets b/harmony/image_sequence/src/main/ets/RNImageSequence.ets index a56ef21..5aed4a3 100644 --- a/harmony/image_sequence/src/main/ets/RNImageSequence.ets +++ b/harmony/image_sequence/src/main/ets/RNImageSequence.ets @@ -17,8 +17,6 @@ export interface ImageSequencerawProps extends ViewRawProps { downsampleHeight: number } -// export type ImageSequenceDescriptor = Descriptor<"ImageSequenceView", ImageSequencerawProps> -// export type ImageSequenceDescriptor = Descriptor<"ImageSequenceView", ViewRawProps, [], ImageSequencerawProps> export interface ImageData { src: string | Resource, width: number @@ -33,8 +31,6 @@ export struct RNImageSequence { ctx!: RNOHContext; tag: number = 0; @BuilderParam buildCustomComponent: (componentBuilderContext: ComponentBuilderContext) => void; - // @State descriptor: ImageSequenceDescriptor = {} as ImageSequenceDescriptor; - // private unregisterDescriptorChangesListener?: () => void = undefined; @State descriptorWrapper: RNC.ImageSequenceView.DescriptorWrapper = {} as RNC.ImageSequenceView.DescriptorWrapper; @State cleanUpCallbacks: (()=>void)[]=[] @State ImageList: (Resource | string | PixelMap)[] = []; @@ -46,12 +42,6 @@ export struct RNImageSequence { @State localIndex: number[] = []; aboutToAppear() { - // this.descriptor = this.ctx.descriptorRegistry.getDescriptor(this.tag); - // this.unregisterDescriptorChangesListener = this.ctx.descriptorRegistry.subscribeToDescriptorChanges(this.tag, - // (newDescriptor) => { - // this.descriptor = (newDescriptor as ImageSequenceDescriptor) - // } - // ) this.onDescriptorWrapperChange(this.ctx.descriptorRegistry.findDescriptorWrapperByTag(this.tag)!) this.cleanUpCallbacks.push(this.ctx.descriptorRegistry.subscribeToDescriptorChanges(this.tag, (descriptor) => { @@ -59,10 +49,10 @@ export struct RNImageSequence { })) this.duration = 1000 / this.descriptorWrapper.props.framesPerSecond; - const sourceList = this.descriptorWrapper.props.images; + const sourceList: string[] = this.descriptorWrapper.props.images; this.ImageList.length = sourceList.length; - sourceList.forEach((item, index)=>{ + sourceList.forEach((item: string, index: number)=>{ if (item.startsWith("asset://")) { this.getRawFileContent(item.replace("asset://", "assets/"), index) } else { @@ -88,16 +78,16 @@ export struct RNImageSequence { this.descriptorWrapper = descriptorWrapper } - getRawFileContent(img:string, index:number) { + getRawFileContent(img:string, index:number): void { resourceMgr.getRawFileContent(img).then((fileData: Uint8Array) => { - const buffer = fileData.buffer.slice(0); + const buffer: ArrayBuffer = fileData.buffer.slice(0); this.imageEdit(buffer, index); }).catch((err: BusinessError) => { console.error(`getRawFileContent failed: ${err.code}`) }) } - getSource(source:string) { + getSource(source: string) { if (source.startsWith("asset://")) { return $rawfile(source.replace("asset://", "assets/")) } @@ -109,16 +99,16 @@ export struct RNImageSequence { return source; } - calculateInSampleSize(width: number, height: number):number { - let inSampleSize = 1; + calculateInSampleSize(width: number, height: number): number { + let inSampleSize: number = 1; let reqWidth: number = this.descriptorWrapper.props.downsampleWidth; let reqHeight: number = this.descriptorWrapper.props.downsampleHeight; if (reqWidth <= 0 || reqHeight <= 0) { return inSampleSize; } if (height > reqHeight || width > reqWidth) { - let halfHeight = height / 2; - let halWidth = width/ 2; + let halfHeight: number = height / 2; + let halWidth: number = width/ 2; while ((halfHeight / inSampleSize) >= reqHeight && (halWidth / inSampleSize) >= reqWidth) { inSampleSize *= 2; } @@ -128,11 +118,11 @@ export struct RNImageSequence { async imageEdit(imageData:ArrayBuffer, index:number) { let imageSourceApi:image.ImageSource = image.createImageSource(imageData); - let pixelMap = await imageSourceApi.createPixelMap(); - const imageInfo = await pixelMap.getImageInfo(); - const width = imageInfo.size.width; - const height = imageInfo.size.height; - const sampleSize = this.calculateInSampleSize(width, height); + let pixelMap: image.PixelMap = await imageSourceApi.createPixelMap(); + const imageInfo: image.ImageInfo = await pixelMap.getImageInfo(); + const width: number = imageInfo.size.width; + const height: number = imageInfo.size.height; + const sampleSize: number = this.calculateInSampleSize(width, height); const decodeOptions:image.DecodingOptions = { desiredSize: { width: width / sampleSize, @@ -148,11 +138,10 @@ export struct RNImageSequence { imageSourceApi.release(); } aboutToDisappear() { - // this.unregisterDescriptorChangesListener?.() this.cleanUpCallbacks.forEach(cb => cb()) clearInterval(this.timer); if (this.isLocalResource) { - this.localIndex.forEach(lIndex => { + this.localIndex.forEach((lIndex: number) => { const item: PixelMap = this.ImageList[lIndex] as PixelMap; item.release(); }) -- Gitee From 86dafaa58f3ad06546842a21ac5e6bef6d506530 Mon Sep 17 00:00:00 2001 From: wuya_smile Date: Thu, 30 May 2024 09:58:44 +0800 Subject: [PATCH 10/16] refactor:Remove style and change ts to js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “leehom6666” --- index.tsx => index.js | 27 ++++++--------------------- package.json | 2 +- src/ImageSequenceNativeComponent.ts | 3 +-- 3 files changed, 8 insertions(+), 24 deletions(-) rename index.tsx => index.js (63%) diff --git a/index.tsx b/index.js similarity index 63% rename from index.tsx rename to index.js index c0d2338..95f3ce0 100644 --- a/index.tsx +++ b/index.js @@ -1,19 +1,6 @@ import { forwardRef, memo } from 'react'; import { View, Image } from 'react-native'; -import ImagesequenceView, { NativeProps } from './src/ImageSequenceNativeComponent' - -interface ImageProps { - images: any[], - startFrameIndex?: number, - framesPerSecond?: number, - loop?: boolean, - downsampleWidth?: number, - downsampleHeight?: number, - style?:{ - width?: number, - height?: number - } -} +import ImagesequenceView from './src/ImageSequenceNativeComponent' function ImageSequenceBase({ images, @@ -23,10 +10,9 @@ function ImageSequenceBase({ downsampleHeight, downsampleWidth, forwardRef, - style, ...props -}: ImageProps & { forwardRef: React.Ref }) { - let images2: any[] = []; +}) { + let images2 = []; images.forEach(item => { if (item.uri) { images2.push(item.uri); @@ -48,7 +34,6 @@ function ImageSequenceBase({ downsampleWidth={downsampleWidth} downsampleHeight={downsampleHeight} images={images2} - style={style} /> ) @@ -56,11 +41,11 @@ function ImageSequenceBase({ const ImageSequenceMemo = memo(ImageSequenceBase) -const ImageSequenceComponent: React.ComponentType = forwardRef( - (props: NativeProps, ref: React.Ref) => ( +const ImageSequenceComponent = forwardRef( + (props, ref) => ( ), ) ImageSequenceComponent.displayName = 'ImageSequence'; -const ImageSequence: React.ComponentType = ImageSequenceComponent as any; +const ImageSequence = ImageSequenceComponent; export default ImageSequence; \ No newline at end of file diff --git a/package.json b/package.json index 1e6fb0a..0c42fea 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "harmony", "lib", "react-native-image-sequence-2.podspec", - "index.tsx", + "index.js", "!**/__tests__", "!**/__fixtures__", "!**/__mocks__" diff --git a/src/ImageSequenceNativeComponent.ts b/src/ImageSequenceNativeComponent.ts index f0b3871..f0c0f29 100644 --- a/src/ImageSequenceNativeComponent.ts +++ b/src/ImageSequenceNativeComponent.ts @@ -31,8 +31,7 @@ export interface NativeProps extends ViewProps { /** The width to use for optional downsampling. Both `downsampleWidth` and `downsampleHeight` must be set to a positive number to enable downsampling. Default: -1 */ downsampleWidth?: Int32; /** The height to use for optional downsampling. Both `downsampleWidth` and `downsampleHeight` must be set to a positive number to enable downsampling. Default: -1 */ - downsampleHeight?: Int32; - style?: {width?: Int32, height?: Int32}; + downsampleHeight?: Int32 } export default codegenNativeComponent( -- Gitee From 61da47f6527c3d0a898daf9c1cf276700dcc30dd Mon Sep 17 00:00:00 2001 From: wuya_smile Date: Mon, 17 Jun 2024 15:15:39 +0800 Subject: [PATCH 11/16] =?UTF-8?q?refactor:=20=E6=B7=BB=E5=8A=A0logger.ets?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BF=AE=E6=94=B9RNImageSequence.et?= =?UTF-8?q?s=E5=86=85=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “leehom6666” --- .../image_sequence/src/main/ets/Logger.ets | 60 +++++++++++++++++++ .../src/main/ets/RNImageSequence.ets | 6 +- 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 harmony/image_sequence/src/main/ets/Logger.ets diff --git a/harmony/image_sequence/src/main/ets/Logger.ets b/harmony/image_sequence/src/main/ets/Logger.ets new file mode 100644 index 0000000..e48ab8e --- /dev/null +++ b/harmony/image_sequence/src/main/ets/Logger.ets @@ -0,0 +1,60 @@ +/** + * MIT License + * + * Copyright (C) 2023 Huawei Device Co., Ltd. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +import hilog from '@ohos.hilog'; +class Logger +{ + private domain : number; + private prefix : string; + private format : string = '%{public}s, %{public}s'; + private isDebug : boolean; + /** + * constructor. + * @param Prefix Identifies the log tag. + * @param domain Domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFFF. + * */ + constructor(prefix + : string = 'MyApp', domain + : number = 0xFF00, isDebug = false) + { + this.prefix = prefix; + this.domain = domain; + this.isDebug = isDebug; + } + debug(... args + : string[]) : void + { + if (this.isDebug) + { + hilog.debug(this.domain, this.prefix, this.format, args); + } + } + info(... args + : string[]) : void { hilog.info(this.domain, this.prefix, this.format, args); } + warn(... args + : string[]) : void { hilog.warn(this.domain, this.prefix, this.format, args); } + error(... args + : string[]) : void { hilog.error(this.domain, this.prefix, this.format, args); } +} +export default new Logger('HarmonyPicker', 0xFF00, true) \ No newline at end of file diff --git a/harmony/image_sequence/src/main/ets/RNImageSequence.ets b/harmony/image_sequence/src/main/ets/RNImageSequence.ets index 5aed4a3..a921d65 100644 --- a/harmony/image_sequence/src/main/ets/RNImageSequence.ets +++ b/harmony/image_sequence/src/main/ets/RNImageSequence.ets @@ -5,6 +5,7 @@ import image from '@ohos.multimedia.image'; import resourceManager from '@ohos.resourceManager'; import { BusinessError } from '@ohos.base'; import { RNC } from '@rnoh/react-native-openharmony/generated' +import Logger from './Logger'; export const IMAGE_SEQUENCE_TYPE: string = "ImageSequenceView" @@ -22,6 +23,7 @@ export interface ImageData { width: number } +const TAG: string = "[RNOH] RNImageSequence" const context: Context = getContext(this); const resourceMgr: resourceManager.ResourceManager = context.resourceManager; @@ -83,7 +85,7 @@ export struct RNImageSequence { const buffer: ArrayBuffer = fileData.buffer.slice(0); this.imageEdit(buffer, index); }).catch((err: BusinessError) => { - console.error(`getRawFileContent failed: ${err.code}`) + Logger.error(TAG, `getRawFileContent failed: ${err.code}`); }) } @@ -153,7 +155,7 @@ export struct RNImageSequence { RNViewBase({ctx: this.ctx, tag: this.tag}) { if (this.finishCount === this.ImageList.length) { Image(this.ImageList[this.num]).objectFit(ImageFit.Fill).draggable(false).width('100%').height('100%').onComplete(()=>{ - console.log(`加载完成：${new Date().getTime()}`) + Logger.debug(TAG, `加载完成：${new Date().getTime()}`); }).key('image_sequence') } } -- Gitee From a2b4eff80d208166d253c4e2ce3f16dd42204cf2 Mon Sep 17 00:00:00 2001 From: wuya_smile Date: Mon, 17 Jun 2024 18:18:54 +0800 Subject: [PATCH 12/16] =?UTF-8?q?refactor:=20=E9=87=8D=E6=96=B0=E6=9E=84?= =?UTF-8?q?=E5=BB=BAhar=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “leehom6666” --- harmony/image_sequence.har | Bin 4016 -> 6062 bytes .../src/main/ets/RNImageSequence.ets | 2 +- package.json | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/harmony/image_sequence.har b/harmony/image_sequence.har index d2268ecdde77b13517102caccade936a905f2641..8157d15454b998007dfc222eb831976ebd304b2b 100644 GIT binary patch literal 6062 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­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 W`kz7yDWs6XJoq2RFA4PkbN~RK(ic, startFrameIndex: number, - framesPerSecond: number, + framesPerSecond: number,e downsampleWidth: number, downsampleHeight: number } diff --git a/package.json b/package.json index 0c42fea..1c08b60 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@react-native-oh-tpl/react-native-image-sequence-2", - "version": "0.9.1-0.0.1", + "version": "0.9.1-0.0.2", "description": "Showcase a Fabric component with a image sequence", "react-native": "index", "source": "index", -- Gitee From 94127d93ec12fc523fb76f5ea213dc87edbc8da4 Mon Sep 17 00:00:00 2001 From: wuya_smile Date: Mon, 17 Jun 2024 18:37:45 +0800 Subject: [PATCH 13/16] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=AC=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “leehom6666” --- harmony/image_sequence/src/main/ets/RNImageSequence.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/harmony/image_sequence/src/main/ets/RNImageSequence.ets b/harmony/image_sequence/src/main/ets/RNImageSequence.ets index e7193e0..a921d65 100644 --- a/harmony/image_sequence/src/main/ets/RNImageSequence.ets +++ b/harmony/image_sequence/src/main/ets/RNImageSequence.ets @@ -13,7 +13,7 @@ export interface ImageSequencerawProps extends ViewRawProps { loop: boolean, images: Array, startFrameIndex: number, - framesPerSecond: number,e + framesPerSecond: number, downsampleWidth: number, downsampleHeight: number } -- Gitee From f8c0a80b99f3dc7d358c63e0b5eddd7a3b7f6890 Mon Sep 17 00:00:00 2001 From: D786565784 Date: Wed, 26 Jun 2024 17:47:56 +0800 Subject: [PATCH 14/16] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dios=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E6=96=87=E4=BB=B6=E5=AF=BC=E8=87=B4=E7=9A=84=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “leehom6666” --- react-native-image-sequence-2.podspec | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 react-native-image-sequence-2.podspec diff --git a/react-native-image-sequence-2.podspec b/react-native-image-sequence-2.podspec deleted file mode 100644 index 309181b..0000000 --- a/react-native-image-sequence-2.podspec +++ /dev/null @@ -1,16 +0,0 @@ -require "json" - - package = JSON.parse(File.read(File.join(__dir__, "package.json"))) - - Pod::Spec.new do |s| - s.name = package["name"] - s.version = package["version"] - s.summary = package["description"] - s.author = "Mads Lee Jensen " - s.homepage = package["homepage"] - s.license = package["license"] - s.platform = :ios, "10.0" - s.source = {:git => "https://github.com/bwindsor/react-native-image-sequence.git" } - s.source_files = "ios/RCTImageSequence/*.{h,m}" - s.dependency "React" -end -- Gitee From 96d2b15f2089a60ab88e3e2c2d07738233d0e241 Mon Sep 17 00:00:00 2001 From: D786565784 Date: Wed, 26 Jun 2024 18:26:14 +0800 Subject: [PATCH 15/16] release:@react-native-oh-tpl/react-native-image-sequence-2@0.9.1-0.0.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “leehom6666” --- harmony/image_sequence.har | Bin 6062 -> 4852 bytes harmony/image_sequence/oh-package.json5 | 2 +- package.json | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/harmony/image_sequence.har b/harmony/image_sequence.har index 8157d15454b998007dfc222eb831976ebd304b2b..9e57a737bc56ce39b968a0bf54c0f1760caf105e 100644 GIT binary patch literal 4852 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­VELr{;dLwKeQa&K8I6ghAy4et5yaWh?is#!;xJ~D020r#v_W-Khm zIC#VdJwrXg7|~Pt*fx3n2AH?@ojxZ0y-hRr-xUu5t^31q7t0{>i%V(EL!;?CET>Ia2hC}ME>^0Ea?f+&)KL1lGWBj*W zO6~vhX`cN@{>rKF@yDQ)ACsd-k2LuuO#IIB>dxfKHHRagWa~LnE|x3gaH?HU6ATW9 zGEhOulcsMdVUs96A*M%0)TR9^GITW?%xfOZF{Q*A5PgIZUY__4(d;V%_QHb(PTvOs z#M1#9(E&9B2(|qYfbyJyf1$Y)8W;rZvZI@5vWem7Q{0_nfebqi@ z1mYlbfPX3L;$+&lOmCDY2HvVS`%@n>JP(f!)*{+c4SFYCGXz_MnE= zcg`v68kYpy@p0rCH8?I&q!|=>BZwR0=$(s{facl0saXW4TST4gbtG54 zLzQ&f2fdfIj*72J9Cz9;8vE)#$<*+biACp`i+I<;2s6=@%kTI&`0aig`L zC+bg*J8HK}+8qY2adg~lsF2@i)te{#jn;GW4BFz06wL;x0s!u{8BzhRp>`4Ak=nt{ z%U&;r@ z2;8aKQSG_PTD1WZ?HrNI9zl0Mv zGA(B)KSrgn9CY)zYsROk$7{@wnYiXTSOgGsoW{rwv8Urcb$8{miAx9OC6w`3Ph(~L zwt85GZ;b!&Ez@58+RKyZ^LnhA>Fwis7_{p|>vOZ5Y%IDvNII^FIwxRvpmuCLVQ}Ip%fpU=d7xg!Weh3w)^= zR5!<aFJj5O{&K56=Xbg&%2bcn^I1Vw=vz&F@jgxtFbXA*7*7E{)P|kS| zW}@cG;^4T%hMfb&KKG?#d>k;$II!Af-HW%|VzE=qZZIky{keF=LQ;ZDNvK{kev z)xH-#js?u8y*L(D`vF*}>w;`7jD}agH=gS-Bny6~03#8u{n>S~a(iszE;dMFAab}q zoqJE7*LNq)_5bIbFL&GG*kf8`V|m_#9b zo`lD0*bjkFmmSu*1f9fSzoT8?0UVeUd)jcpHJ0SkOaNc3Q{*A9eHdctv=GlTd{}02 z@Pz^iF)-V4Yy&9ftBk=;nPY00n!*aD z$|P807l#%}tYM-s#=2)y&$OxMsc1;!FLf$?;MdYiVC!LfZeGJ@A^2B>AFYp}djPI9 zxSgk6_0Lb#R$V>qy*gGU{~$B7R+Nz-phw~kG;m#F)m$NA;WC>nc6>&*9A^@`TZT6vYre+m2N?^w^d$*?e1So}kZ}ocoYlSBbD6cTQ8wR@gt5*9 zwRNseJ4EOeG#OG~d|{I?`X;o+DtMU5EDa6_^&2?bo@*8}dCBfT<4-=3hz%(~s88pQb1wcP6LX1({RTu#e1lD| z1bgQ~LFINs`lF5|mk;Enr<)b>;d4*i1kS+0RhVR+MA;m191nNmVlSjVSQ!X5Bt!pW zo=lI2ImI7QJDbG?e)OVt$O-sXpE74JZmqc9_ossacAHgr#=hVbB3diFSn+TbK3mMi zC5q|4YM6eOR}1td7>b;tYd&fhFN8WHb12`##g-_;3i%+u|sUVZXR&{)u)L_|y z;(!7`ExHuq{_Ha`73{_~-K9J+u;8NTQwub@VRu0*Mv9L5`5xHyh;m{G^$ z5}7?rB;r2BP0?0SHdk!bCSqf>TAY20C+fl}KhIZyfDEoK0WEKLI55x z{+pHb{^!zZ$?^Zi=(OH?U*lg+$A9Ux8hEbXukT=X(tgdlsU2`}?1zt>o{2mn)^M^!I<3PK(_C z Date: Wed, 20 Nov 2024 15:52:21 +0800 Subject: [PATCH 16/16] refactor: Generate scaffolding code using codegen lib script and embed it into third-party libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “leehom6666” --- OAT.xml | 60 ++++++++ harmony/image_sequence.har | Bin 4852 -> 0 bytes harmony/image_sequence/BuildProfile.ets | 6 - harmony/image_sequence/Index.ets | 6 + harmony/image_sequence/build-profile.json5 | 13 -- harmony/image_sequence/consumer-rules.txt | 0 harmony/image_sequence/obfuscation-rules.txt | 18 --- harmony/image_sequence/oh-package-lock.json5 | 18 --- harmony/image_sequence/oh-package.json5 | 11 +- .../src/main/cpp/CMakeLists.txt | 9 ++ .../src/main/cpp/ImageSequence2Package.h | 16 +++ .../BaseReactNativeImageSequence2Package.h | 65 +++++++++ .../components/ImageSequenceViewJSIBinder.h | 32 +++++ .../ComponentDescriptors.h | 22 +++ .../EventEmitters.cpp | 17 +++ .../EventEmitters.h | 25 ++++ .../react_native_image_sequence_2/Props.cpp | 32 +++++ .../react_native_image_sequence_2/Props.h | 35 +++++ .../ShadowNodes.cpp | 19 +++ .../ShadowNodes.h | 34 +++++ .../react_native_image_sequence_2/States.cpp | 17 +++ .../react_native_image_sequence_2/States.h | 36 +++++ .../src/main/ets/ImageSequencePackage.ts | 8 +- .../image_sequence/src/main/ets/Logger.ets | 60 -------- .../src/main/ets/RNImageSequence.ets | 33 ++--- .../generated/components/ImageSequenceView.ts | 134 ++++++++++++++++++ .../src/main/ets/generated/components/ts.ts | 5 + .../src/main/ets/generated/index.ets | 5 + .../src/main/ets/generated/ts.ts | 6 + .../src/main/ets/generated/turboModules/ts.ts | 5 + harmony/image_sequence/ts.ts | 6 + index.js | 12 +- package.json | 19 ++- src/ImageSequenceNativeComponent.ts | 22 +-- 34 files changed, 633 insertions(+), 173 deletions(-) create mode 100644 OAT.xml delete mode 100644 harmony/image_sequence.har delete mode 100644 harmony/image_sequence/BuildProfile.ets delete mode 100644 harmony/image_sequence/consumer-rules.txt delete mode 100644 harmony/image_sequence/obfuscation-rules.txt delete mode 100644 harmony/image_sequence/oh-package-lock.json5 create mode 100644 harmony/image_sequence/src/main/cpp/CMakeLists.txt create mode 100644 harmony/image_sequence/src/main/cpp/ImageSequence2Package.h create mode 100644 harmony/image_sequence/src/main/cpp/generated/RNOH/generated/BaseReactNativeImageSequence2Package.h create mode 100644 harmony/image_sequence/src/main/cpp/generated/RNOH/generated/components/ImageSequenceViewJSIBinder.h create mode 100644 harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/ComponentDescriptors.h create mode 100644 harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/EventEmitters.cpp create mode 100644 harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/EventEmitters.h create mode 100644 harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/Props.cpp create mode 100644 harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/Props.h create mode 100644 harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/ShadowNodes.cpp create mode 100644 harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/ShadowNodes.h create mode 100644 harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/States.cpp create mode 100644 harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/States.h delete mode 100644 harmony/image_sequence/src/main/ets/Logger.ets create mode 100644 harmony/image_sequence/src/main/ets/generated/components/ImageSequenceView.ts create mode 100644 harmony/image_sequence/src/main/ets/generated/components/ts.ts create mode 100644 harmony/image_sequence/src/main/ets/generated/index.ets create mode 100644 harmony/image_sequence/src/main/ets/generated/ts.ts create mode 100644 harmony/image_sequence/src/main/ets/generated/turboModules/ts.ts diff --git a/OAT.xml b/OAT.xml new file mode 100644 index 0000000..3fda8f3 --- /dev/null +++ b/OAT.xml @@ -0,0 +1,60 @@ + + + + LICENSE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/harmony/image_sequence.har b/harmony/image_sequence.har deleted file mode 100644 index 9e57a737bc56ce39b968a0bf54c0f1760caf105e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4852 zcmVq3hT;^r1``FL61hJJMZ7JB$>PM0+IYu&ecUjf4j20(XTiM!uMnMwU`IzxKBX~mc2 z5&bXj6+`_mRmw%s|J~jFQmX&!mL>Yn`KuPG|38osbEjlmD|pN-ObyE^fGiZct>zS@ zqeuTdr;bUtUv7P+sifr#l|cWy)N|*|qp8)oJ-9OQ8P)bopM*WB~9d&vhyr!|{mz zgHxK^|MzywssF!rS!MsfeYr(Q#+X_Cn;FeiNe0+4rf2SuX7ap=3r2h9Tdo7my!+ik zOON`{_z|m#=z}HW7*h_DQJWf`gveVA_DPKN0-&WR1a%dWbbLj*;j% zIKXxHi#b|>{+qzm`INGV1DnI~*#2K!@c%*o)BS(#vWor(>p%Hyja|l#|Hfm$N8`V} zl@xDkKD;n@QpihJt-Hj@b{~kJs(@n_CXp2emf=5f7=>( zg)f8y^kIL0exq}qRo zPxo;D-`lOE_J7^7JpSK{^%4I6l=?>GQezANu5_CXDTCUPVS7~Z`%ym7QFuq0C*1TM z(NOF6^;W;xZlPn_KWX*|{8wv{+IheIR&VLuT3>IFyTotrnBCfY7V+ojTm zbgeO3;ephZjghq&7(5J438g-V%aAE*`(>?MR2mueT>CQ}V(UW`s3XRf=d+t29)#64 zY&ATA|D{JR-%MGw{~J#JeD|pTUny3S`QOTZDb4?^T~^8e-b#a$L349yO?e(z9`|JO zk#WiJGhV0}QqN?T%m-yUJh4MW<$w}@Ldn4JER$Hy$YoQWRRL?B!6PN;A09J8l`;1x zE^IIv_-$Jzbv&e_24Xm&ugVe`*r*}UVxg(Meat9Ud7h{GkfFQFXIz*RvxXakc=u}# zhXVb_W4|wj;~D;crM#Q^|Lc~g`2W7Q`Mgh19?k#kB=bKz`|16k^~?I_|FP5mju4gY zuQZ#qe2Jpkf4=Nr0LRnq|L$(3nA-n!%Tw%sOzk&J$J5szw*Q@U{nsteTK}m#oXZ;k zo1)|4{l8SI>@M8@*-P*LtY21&|F&LajM)rRP+KovWCn9*Xw#O=L7DDU!}v(^spnIc z$zvCOfj2m2#|jxE*743jm6QYn)Rq983?Z>)YB{w|Gs+-Vgea7Gqc}FdzulNwU2&rz zNK(}e$6z;Q0UM~ELD1G4eu~CtDu`Pv{XW?xfN&zBxpq%<5PS$4kwIH8?w}NP*AqpvYQm4(rZd$X|*SjsfkDy-Mh43r~8MFW~9>|K9FiIo=gjTQVmi z-i2DG3xr<#u)%o>)A#|N2{?SZ>cq09e_d7Y6+VG|xn~Uwju{#C=gf%?9X|rMwAe)7 zS@cT7cdag}1nJC?!`H;2S7dq51p;u4HVkWX>G|Q`X<2IjPu=mDvW>kB_OSim-Pzes z=70A~sr_HStYZHQKl}hn`2#s?_Q|O@gu`cES9fPO%oyfY95Y04UEL`Bw&`Fknc)F1x0MCYuahb3Ubx&jT64uX&R!o9vph?`vHhZxwaA?RU+F-XNJ8-ZIMM$@^yiqUxIK@|XSzs-?Ka81330MGPp z{RAFsN6ph_|3jVwJ8t${2>ZC*B{kBib^Fcw`Dv|7I_KR^yQc#g4FKJ0wvM}iNk7wD zeGM=}9ns&x1L>XAPEQdXhgUm?nRJm>Qg3%YbenHa`sAd2+R&l$NCygQN2j_#2NSHH z)|zMFPSwt8Z*@MZ4UoheoZsc5OmzeNR>GA>435WwQa`e$hw9$@zz_c zP25%p+wdLp-`;ZVHSfGUiGFX#hFM+%^I+q53op5OT=sF!zA+B^2A$=!8sbkAl+^_EVu(i>H^-t+9xQ@oPSE}uV1ciV zAvLWjXqg2@82ClN8jo>?oU_I2A{v9@^)Z$JE3QL~^sHc=aN|@So!!)Cv+caZ9kdJH zLp#DP7V{yS4n>xU`-9T`L^Gnvl{u74bf7fJnIB3NYEuMN{yLBjCLuganbkCnz*ghM z>Hc_;gWsQBYp9T6jd0(HfaVf!>~PuB1XzWxyh^`(5Tcalm~#hl*O%~%F^>|47xFnm z-up@T1Qsx#&gxir?`L44jDc*dj7D^SGM>9IBnv)Mfsu&N{_M8Q+;%MU6J;QYfyiNg zI`@@4uU}7D>i;KR`(HN@c+meZ?G`J^_dm;IIsC8gl;va&c ztnR|raSb|&!G71c>M(Z(dt%=hub5*=re*^8GEb3*y7ozkrQ1S0M|iPtb?}7(2{CZ# zJ#}H{WBoZBxM%!qV%2<5LKToO7G!=3egscVIPn9Zn6EMgJ7rDj&@wdMsB|Vlj{VGV z4BU}p0~3ug)*a0~%b}j9qalsIsih5oUu&npw!`tlyoT3;#3RCw@?+>8fGZ7d=Ved- z$8)_^*Dw1YI=bQ?WEOHo83h7*By41W>k{k6q=bcOHdXAzj%>T`EOfc}<#o46QhkT{tlHdfV`?a?!XFsB7UXX;X&IG+pp-ojH)e44; zsV^V+9*nMu=o^aMm{pU)sdW>=dKiFCN-CF)H=%BaTo68Fl2E}2;Z&34$DT0rsLb{L z^d$GLO#k{fRn>&>T5zION0isSkp`{9eQN#!dmT0acN$WS>CWZWuX>+Z z&%=;pMzp$W>J*5*y(5OVYJU~0iRy4Zt3$Xw0D}eUkj>@}Un6n3j~9m@FOh9d}?*qr*U5P1uG#Bh<4BWZjcOinI2FvDR5sB+8aJoK$$cYO7HJ;z@%9my| zAZoZU?&t<~%AZzT&esAyNN?^pIfb6&(rUB0H+hg2%&_oV`F%ISBIe+QNWvF?vP!ld z1zP#M!Xx~6%CUfgBo}@<0e`9ipA;@wDZETV3bHy048jK3543~{m+_V`Y(k8LkOxr- zeq!z+cw!?_!^}`qG@CkOe*zF9z_RWjn1a#*k&JGblWf-V=`;l3eF{h?fVu1_jhH!ye}{;RPeBp zTN+#t>Njz>{cPCW9`sfdnxrnVjwt=4E>K~GCdvVG=D;! zY!>tT=tWh@Irvt;=e}OtS_!=$%ts@fHt%r6A8-qiqczd2d6+qXguiw&Rd@Raba?>t-%BMo!{R=Kh1Q9^zM%lsyK6{ z-UWN3U~EoJV2P&3?T0)7{vJGSWJ)mZVZ)&w;@*pnzb;iM$UzuNMdMe;e?OEMK?gC4 zAOaMtkE1&Vx6|SN$ebqLc*AT4a8ij1e_9?azRqTphD;7e)$z@=A+MGc2NVEmIi(Qy zAO0Y>f`izZyHY0?7F-l_Zi7ZQogR-Ude&cPHWmit$s`tKa@3|6Y(&Eqhp2QA zbz$_+u~6o*tuPS*#UaH5pVdK$aR-qU1yqrrz$B8Ne~y6jnnkfuXL_(8l!8@Y(<3kd zlk-zla%2iroX^CtM+*~@kP4)Hkm#G_B8RT_yPDvqbF9mxi8 z@9CK&o5XsN9}X4tcQLNq$2KW|hIiwbBr;UF~Q^e3YY8J%&PK7x!H)I z;!t$a#Pt}ZB|?=`WNRh^kE$FN1R?;(xH7CHLJ2nLmCeOGK;F0MjNAZPGpGo`1^7_K z!`1|ttHgqbU^Nf8sa+}RAqGs6!ju>>QMEuitIO0^7_j?IL|_`?z#B5leu`J45i0Xov!5pA3VGgpv zw)>cisGMKLn3D9OmHCA6NjyeQhJR9#cnqWHVuHT{#swxWI<j>O@?kvWJUA+^4uN z+A6B%if3&iHb%+f>@8lX3%C5d$N&X_?w!JjkXP!uA08&>v@8q|yMJQtflq&t(_DVP z;uy>*Z-yTlxO;X^8!}@&#{2zQaRMrAMs^!Q+~02Jq&)~9@pTGRBcCRtnb5BkN0Gv> z{M*0$$N&8GuYdc`fBo-&{psrmJF6*tYwf=kQ`mbHqTz_u=!DYkiwQGsNlh?moDwZqh`mb9yV*fWF0MA(eQu_U$ z^~*-=|5sZ7Qo8 +#include "RNOH/Package.h" +#include "RNOH/ArkTSTurboModule.h" +#include "RNOH/generated/components/ImageSequenceViewJSIBinder.h" + +namespace rnoh { + +class BaseReactNativeImageSequence2PackageTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate { + public: + SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override { + return nullptr; + }; +}; + +class BaseReactNativeImageSequence2PackageEventEmitRequestHandler : public EventEmitRequestHandler { + public: + void handleEvent(Context const &ctx) override { + auto eventEmitter = ctx.shadowViewRegistry->getEventEmitter(ctx.tag); + if (eventEmitter == nullptr) { + return; + } + + std::vector supportedEventNames = { + }; + if (std::find(supportedEventNames.begin(), supportedEventNames.end(), ctx.eventName) != supportedEventNames.end()) { + eventEmitter->dispatchEvent(ctx.eventName, ArkJS(ctx.env).getDynamic(ctx.payload)); + } + } +}; + + +class BaseReactNativeImageSequence2Package : public Package { + public: + BaseReactNativeImageSequence2Package(Package::Context ctx) : Package(ctx){}; + + std::unique_ptr createTurboModuleFactoryDelegate() override { + return std::make_unique(); + } + + std::vector createComponentDescriptorProviders() override { + return { + facebook::react::concreteComponentDescriptorProvider(), + }; + } + + ComponentJSIBinderByString createComponentJSIBinderByName() override { + return { + {"ImageSequenceView", std::make_shared()}, + }; + }; + + EventEmitRequestHandlers createEventEmitRequestHandlers() override { + return { + std::make_shared(), + }; + } +}; + +} // namespace rnoh diff --git a/harmony/image_sequence/src/main/cpp/generated/RNOH/generated/components/ImageSequenceViewJSIBinder.h b/harmony/image_sequence/src/main/cpp/generated/RNOH/generated/components/ImageSequenceViewJSIBinder.h new file mode 100644 index 0000000..c9bd94c --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/generated/RNOH/generated/components/ImageSequenceViewJSIBinder.h @@ -0,0 +1,32 @@ +/** + * This code was generated by "react-native codegen-lib-harmony" + */ + +#pragma once +#include "RNOHCorePackage/ComponentBinders/ViewComponentJSIBinder.h" + +namespace rnoh { +class ImageSequenceViewJSIBinder : public ViewComponentJSIBinder { + protected: + facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override { + auto object = ViewComponentJSIBinder::createNativeProps(rt); + object.setProperty(rt, "images", true); + object.setProperty(rt, "startFrameIndex", true); + object.setProperty(rt, "framesPerSecond", true); + object.setProperty(rt, "loop", true); + object.setProperty(rt, "downsampleWidth", true); + object.setProperty(rt, "downsampleHeight", true); + return object; + } + + facebook::jsi::Object createBubblingEventTypes(facebook::jsi::Runtime &rt) override { + facebook::jsi::Object events(rt); + return events; + } + + facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override { + facebook::jsi::Object events(rt); + return events; + } +}; +} // namespace rnoh diff --git a/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/ComponentDescriptors.h b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/ComponentDescriptors.h new file mode 100644 index 0000000..bd3e779 --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/ComponentDescriptors.h @@ -0,0 +1,22 @@ + +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GenerateComponentDescriptorH.js + */ + +#pragma once + +#include +#include + +namespace facebook { +namespace react { + +using ImageSequenceViewComponentDescriptor = ConcreteComponentDescriptor; + +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/EventEmitters.cpp b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/EventEmitters.cpp new file mode 100644 index 0000000..e4154a9 --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/EventEmitters.cpp @@ -0,0 +1,17 @@ + +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GenerateEventEmitterCpp.js + */ + +#include + +namespace facebook { +namespace react { + +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/EventEmitters.h b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/EventEmitters.h new file mode 100644 index 0000000..81da52a --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/EventEmitters.h @@ -0,0 +1,25 @@ + +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GenerateEventEmitterH.js + */ +#pragma once + +#include + + +namespace facebook { +namespace react { +class ImageSequenceViewEventEmitter : public ViewEventEmitter { + public: + using ViewEventEmitter::ViewEventEmitter; + + + +}; +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/Props.cpp b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/Props.cpp new file mode 100644 index 0000000..ceceeeb --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/Props.cpp @@ -0,0 +1,32 @@ + +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GeneratePropsCpp.js + */ + +#include +#include +#include + +namespace facebook { +namespace react { + +ImageSequenceViewProps::ImageSequenceViewProps( + const PropsParserContext &context, + const ImageSequenceViewProps &sourceProps, + const RawProps &rawProps): ViewProps(context, sourceProps, rawProps), + + images(convertRawProp(context, rawProps, "images", sourceProps.images, {})), + startFrameIndex(convertRawProp(context, rawProps, "startFrameIndex", sourceProps.startFrameIndex, {0})), + framesPerSecond(convertRawProp(context, rawProps, "framesPerSecond", sourceProps.framesPerSecond, {0})), + loop(convertRawProp(context, rawProps, "loop", sourceProps.loop, {false})), + downsampleWidth(convertRawProp(context, rawProps, "downsampleWidth", sourceProps.downsampleWidth, {0})), + downsampleHeight(convertRawProp(context, rawProps, "downsampleHeight", sourceProps.downsampleHeight, {0})) + {} + +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/Props.h b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/Props.h new file mode 100644 index 0000000..3c5066d --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/Props.h @@ -0,0 +1,35 @@ + +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GeneratePropsH.js + */ +#pragma once + +#include +#include +#include + +namespace facebook { +namespace react { + +class ImageSequenceViewProps final : public ViewProps { + public: + ImageSequenceViewProps() = default; + ImageSequenceViewProps(const PropsParserContext& context, const ImageSequenceViewProps &sourceProps, const RawProps &rawProps); + +#pragma mark - Props + + std::vector images{}; + int startFrameIndex{0}; + int framesPerSecond{0}; + bool loop{false}; + int downsampleWidth{0}; + int downsampleHeight{0}; +}; + +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/ShadowNodes.cpp b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/ShadowNodes.cpp new file mode 100644 index 0000000..7e4a469 --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/ShadowNodes.cpp @@ -0,0 +1,19 @@ + +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GenerateShadowNodeCpp.js + */ + +#include + +namespace facebook { +namespace react { + +extern const char ImageSequenceViewComponentName[] = "ImageSequenceView"; + +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/ShadowNodes.h b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/ShadowNodes.h new file mode 100644 index 0000000..841e31f --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/ShadowNodes.h @@ -0,0 +1,34 @@ + +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GenerateShadowNodeH.js + */ + +#pragma once + +#include +#include +#include +#include +#include + +namespace facebook { +namespace react { + +JSI_EXPORT extern const char ImageSequenceViewComponentName[]; + +/* + * `ShadowNode` for component. + */ +using ImageSequenceViewShadowNode = ConcreteViewShadowNode< + ImageSequenceViewComponentName, + ImageSequenceViewProps, + ImageSequenceViewEventEmitter, + ImageSequenceViewState>; + +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/States.cpp b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/States.cpp new file mode 100644 index 0000000..437b772 --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/States.cpp @@ -0,0 +1,17 @@ + +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GenerateStateCpp.js + */ +#include +namespace facebook { +namespace react { + + + +} // namespace react +} // namespace facebook diff --git a/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/States.h b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/States.h new file mode 100644 index 0000000..e2b7532 --- /dev/null +++ b/harmony/image_sequence/src/main/cpp/generated/react/renderer/components/react_native_image_sequence_2/States.h @@ -0,0 +1,36 @@ +/** + * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). + * + * Do not edit this file as changes may cause incorrect behavior and will be lost + * once the code is regenerated. + * + * @generated by codegen project: GenerateStateH.js + */ +#pragma once + +#ifdef ANDROID +#include +#include +#include +#endif + +namespace facebook { +namespace react { + +class ImageSequenceViewState { +public: + ImageSequenceViewState() = default; + +#ifdef ANDROID + ImageSequenceViewState(ImageSequenceViewState const &previousState, folly::dynamic data){}; + folly::dynamic getDynamic() const { + return {}; + }; + MapBuffer getMapBuffer() const { + return MapBufferBuilder::EMPTY(); + }; +#endif +}; + +} // namespace react +} // namespace facebook \ No newline at end of file diff --git a/harmony/image_sequence/src/main/ets/ImageSequencePackage.ts b/harmony/image_sequence/src/main/ets/ImageSequencePackage.ts index f50b377..4f2eda0 100644 --- a/harmony/image_sequence/src/main/ets/ImageSequencePackage.ts +++ b/harmony/image_sequence/src/main/ets/ImageSequencePackage.ts @@ -1,6 +1,12 @@ +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved + * Use of this source code is governed by a MIT license that can be + * found in the LICENSE file. + */ + import { RNPackage } from '@rnoh/react-native-openharmony/ts'; import type {DescriptorWrapperFactoryByDescriptorTypeCtx, DescriptorWrapperFactoryByDescriptorType} from '@rnoh/react-native-openharmony/ts'; -import { RNC } from '@rnoh/react-native-openharmony/generated/ts' +import { RNC } from './generated/ts'; export class ImageSequencePackage extends RNPackage { createDescriptorWrapperFactoryByDescriptorType(ctx: diff --git a/harmony/image_sequence/src/main/ets/Logger.ets b/harmony/image_sequence/src/main/ets/Logger.ets deleted file mode 100644 index e48ab8e..0000000 --- a/harmony/image_sequence/src/main/ets/Logger.ets +++ /dev/null @@ -1,60 +0,0 @@ -/** - * MIT License - * - * Copyright (C) 2023 Huawei Device Co., Ltd. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -import hilog from '@ohos.hilog'; -class Logger -{ - private domain : number; - private prefix : string; - private format : string = '%{public}s, %{public}s'; - private isDebug : boolean; - /** - * constructor. - * @param Prefix Identifies the log tag. - * @param domain Domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFFF. - * */ - constructor(prefix - : string = 'MyApp', domain - : number = 0xFF00, isDebug = false) - { - this.prefix = prefix; - this.domain = domain; - this.isDebug = isDebug; - } - debug(... args - : string[]) : void - { - if (this.isDebug) - { - hilog.debug(this.domain, this.prefix, this.format, args); - } - } - info(... args - : string[]) : void { hilog.info(this.domain, this.prefix, this.format, args); } - warn(... args - : string[]) : void { hilog.warn(this.domain, this.prefix, this.format, args); } - error(... args - : string[]) : void { hilog.error(this.domain, this.prefix, this.format, args); } -} -export default new Logger('HarmonyPicker', 0xFF00, true) \ No newline at end of file diff --git a/harmony/image_sequence/src/main/ets/RNImageSequence.ets b/harmony/image_sequence/src/main/ets/RNImageSequence.ets index a921d65..8127a47 100644 --- a/harmony/image_sequence/src/main/ets/RNImageSequence.ets +++ b/harmony/image_sequence/src/main/ets/RNImageSequence.ets @@ -1,23 +1,18 @@ -import { Descriptor, ComponentBuilderContext, ViewRawProps, Tag } from '@rnoh/react-native-openharmony'; -import { RNComponentFactory, RNOHContext, RNViewBase } from '@rnoh/react-native-openharmony'; -// import { ImageLoaderTurboModule } from '@rnoh/react-native-openharmony/src/main/ets/RNOHCorePackage/turboModules'; +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved + * Use of this source code is governed by a MIT license that can be + * found in the LICENSE file. + */ + +import { Descriptor, ComponentBuilderContext, } from '@rnoh/react-native-openharmony'; +import { RNOHContext, RNViewBase } from '@rnoh/react-native-openharmony'; import image from '@ohos.multimedia.image'; import resourceManager from '@ohos.resourceManager'; import { BusinessError } from '@ohos.base'; -import { RNC } from '@rnoh/react-native-openharmony/generated' -import Logger from './Logger'; - +import { RNOHLogger} from "@rnoh/react-native-openharmony/ts"; +import { RNC } from './generated'; export const IMAGE_SEQUENCE_TYPE: string = "ImageSequenceView" -export interface ImageSequencerawProps extends ViewRawProps { - loop: boolean, - images: Array, - startFrameIndex: number, - framesPerSecond: number, - downsampleWidth: number, - downsampleHeight: number -} - export interface ImageData { src: string | Resource, width: number @@ -26,9 +21,9 @@ export interface ImageData { const TAG: string = "[RNOH] RNImageSequence" const context: Context = getContext(this); const resourceMgr: resourceManager.ResourceManager = context.resourceManager; - @Component export struct RNImageSequence { + private logger!: RNOHLogger public static readonly NAME: string = RNC.ImageSequenceView.NAME; ctx!: RNOHContext; tag: number = 0; @@ -43,7 +38,9 @@ export struct RNImageSequence { @State finishCount: number = 0; @State localIndex: number[] = []; + aboutToAppear() { + this.logger = this.ctx!.logger.clone("Index") this.onDescriptorWrapperChange(this.ctx.descriptorRegistry.findDescriptorWrapperByTag(this.tag)!) this.cleanUpCallbacks.push(this.ctx.descriptorRegistry.subscribeToDescriptorChanges(this.tag, (descriptor) => { @@ -85,7 +82,7 @@ export struct RNImageSequence { const buffer: ArrayBuffer = fileData.buffer.slice(0); this.imageEdit(buffer, index); }).catch((err: BusinessError) => { - Logger.error(TAG, `getRawFileContent failed: ${err.code}`); + this.logger.error(TAG,`getRawFileContent failed: ${err.code}`) }) } @@ -155,7 +152,7 @@ export struct RNImageSequence { RNViewBase({ctx: this.ctx, tag: this.tag}) { if (this.finishCount === this.ImageList.length) { Image(this.ImageList[this.num]).objectFit(ImageFit.Fill).draggable(false).width('100%').height('100%').onComplete(()=>{ - Logger.debug(TAG, `加载完成：${new Date().getTime()}`); + this.logger.debug(TAG,`加载完成：${new Date().getTime()}`) }).key('image_sequence') } } diff --git a/harmony/image_sequence/src/main/ets/generated/components/ImageSequenceView.ts b/harmony/image_sequence/src/main/ets/generated/components/ImageSequenceView.ts new file mode 100644 index 0000000..6d8cad7 --- /dev/null +++ b/harmony/image_sequence/src/main/ets/generated/components/ImageSequenceView.ts @@ -0,0 +1,134 @@ +/** + * This code was generated by "react-native codegen-lib-harmony" + */ + +import { + Descriptor as ComponentDescriptor, + ViewBaseProps, + ViewRawProps, + ViewDescriptorWrapperBase, + ColorValue, + Color, + RNInstance, + Tag, + RNComponentCommandReceiver, + ViewPropsSelector, +} from '@rnoh/react-native-openharmony/ts'; + + +export namespace ImageSequenceView { + export const NAME = "ImageSequenceView" as const + + export interface DirectRawProps { + images: string[]; + startFrameIndex?: number; + framesPerSecond?: number; + loop?: boolean; + downsampleWidth?: number; + downsampleHeight?: number; + } + + export interface Props extends ViewBaseProps {} + + export interface State {} + + export interface RawProps extends ViewRawProps, DirectRawProps {} + + export class PropsSelector extends ViewPropsSelector { + get images() { + return this.rawProps.images; + } + + get startFrameIndex() { + return this.rawProps.startFrameIndex ?? 0; + } + + get framesPerSecond() { + return this.rawProps.framesPerSecond ?? 0; + } + + get loop() { + return this.rawProps.loop ?? false; + } + + get downsampleWidth() { + return this.rawProps.downsampleWidth ?? 0; + } + + get downsampleHeight() { + return this.rawProps.downsampleHeight ?? 0; + } + + + } + + export type Descriptor = ComponentDescriptor< + typeof NAME, + Props, + State, + RawProps + >; + + export class DescriptorWrapper extends ViewDescriptorWrapperBase< + typeof NAME, + Props, + State, + RawProps, + PropsSelector + > { + protected createPropsSelector() { + return new PropsSelector(this.descriptor.props, this.descriptor.rawProps) + } + } + + export interface EventPayloadByName { + } + + export class EventEmitter { + constructor(private rnInstance: RNInstance, private tag: Tag) {} + + emit(eventName: TEventName, payload: EventPayloadByName[TEventName]) { + this.rnInstance.emitComponentEvent(this.tag, eventName, payload) + } + } + + export interface CommandArgvByName { + } + + export class CommandReceiver { + private listenersByCommandName = new Map void>>() + private cleanUp: (() => void) | undefined = undefined + + constructor(private componentCommandReceiver: RNComponentCommandReceiver, private tag: Tag) { + } + + subscribe(commandName: TCommandName, listener: (argv: CommandArgvByName[TCommandName]) => void) { + if (!this.listenersByCommandName.has(commandName)) { + this.listenersByCommandName.set(commandName, new Set()) + } + this.listenersByCommandName.get(commandName)!.add(listener) + const hasRegisteredCommandReceiver = !!this.cleanUp + if (!hasRegisteredCommandReceiver) { + this.cleanUp = this.componentCommandReceiver.registerCommandCallback(this.tag, (commandName: string, argv: any[]) => { + if (this.listenersByCommandName.has(commandName)) { + const listeners = this.listenersByCommandName.get(commandName)! + listeners.forEach(listener => { + listener(argv) + }) + } + }) + } + + return () => { + this.listenersByCommandName.get(commandName)?.delete(listener) + if (this.listenersByCommandName.get(commandName)?.size ?? 0 === 0) { + this.listenersByCommandName.delete(commandName) + } + if (this.listenersByCommandName.size === 0) { + this.cleanUp?.() + } + } + } + } + +} diff --git a/harmony/image_sequence/src/main/ets/generated/components/ts.ts b/harmony/image_sequence/src/main/ets/generated/components/ts.ts new file mode 100644 index 0000000..3595925 --- /dev/null +++ b/harmony/image_sequence/src/main/ets/generated/components/ts.ts @@ -0,0 +1,5 @@ +/** + * This code was generated by "react-native codegen-lib-harmony" + */ + +export * from "./ImageSequenceView" diff --git a/harmony/image_sequence/src/main/ets/generated/index.ets b/harmony/image_sequence/src/main/ets/generated/index.ets new file mode 100644 index 0000000..041b7ed --- /dev/null +++ b/harmony/image_sequence/src/main/ets/generated/index.ets @@ -0,0 +1,5 @@ +/** + * This code was generated by "react-native codegen-lib-harmony" + */ + +export * from "./ts" diff --git a/harmony/image_sequence/src/main/ets/generated/ts.ts b/harmony/image_sequence/src/main/ets/generated/ts.ts new file mode 100644 index 0000000..4c568a8 --- /dev/null +++ b/harmony/image_sequence/src/main/ets/generated/ts.ts @@ -0,0 +1,6 @@ +/** + * This code was generated by "react-native codegen-lib-harmony" + */ + +export * as RNC from "./components/ts" +export * as TM from "./turboModules/ts" diff --git a/harmony/image_sequence/src/main/ets/generated/turboModules/ts.ts b/harmony/image_sequence/src/main/ets/generated/turboModules/ts.ts new file mode 100644 index 0000000..d1dae56 --- /dev/null +++ b/harmony/image_sequence/src/main/ets/generated/turboModules/ts.ts @@ -0,0 +1,5 @@ + +/** + */ + +export {} diff --git a/harmony/image_sequence/ts.ts b/harmony/image_sequence/ts.ts index 7b6b357..e681383 100644 --- a/harmony/image_sequence/ts.ts +++ b/harmony/image_sequence/ts.ts @@ -1 +1,7 @@ +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved + * Use of this source code is governed by a MIT license that can be + * found in the LICENSE file. + */ + export * from './src/main/ets/ImageSequencePackage' \ No newline at end of file diff --git a/index.js b/index.js index 95f3ce0..4833233 100644 --- a/index.js +++ b/index.js @@ -1,8 +1,8 @@ import { forwardRef, memo } from 'react'; import { View, Image } from 'react-native'; -import ImagesequenceView from './src/ImageSequenceNativeComponent' +import ImagesequenceView from './src/ImageSequenceNativeComponent'; -function ImageSequenceBase({ +function imageSequenceBase({ images, startFrameIndex, framesPerSecond, @@ -20,7 +20,7 @@ function ImageSequenceBase({ let resolvedSource = Image.resolveAssetSource(item); images2.push(resolvedSource.uri); } - }) + }); if (startFrameIndex !== 0) { images2 = [...images2.slice(startFrameIndex), ...images2.slice(0, startFrameIndex)]; } @@ -36,16 +36,16 @@ function ImageSequenceBase({ images={images2} /> - ) + ); } -const ImageSequenceMemo = memo(ImageSequenceBase) +const ImageSequenceMemo = memo(imageSequenceBase); const ImageSequenceComponent = forwardRef( (props, ref) => ( ), -) +); ImageSequenceComponent.displayName = 'ImageSequence'; const ImageSequence = ImageSequenceComponent; export default ImageSequence; \ No newline at end of file diff --git a/package.json b/package.json index 0969591..59bf83b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "@react-native-oh-tpl/react-native-image-sequence-2", - "version": "0.9.1-0.0.3", + "name": "@react-native-ohos/react-native-image-sequence-2", + "version": "0.9.2-rc1", "description": "Showcase a Fabric component with a image sequence", "react-native": "index", "source": "index", @@ -19,7 +19,8 @@ ], "scripts": { "bob": "bob build", - "prepare": "npm run bob" + "prepare": "npm run bob", + "codegen-lib": "react-native codegen-lib-harmony --no-safety-check --npm-package-name react-native-image-sequence-2 --cpp-output-path ./harmony/image_sequence/src/main/cpp/generated --ets-output-path ./harmony/image_sequence/src/main/ets/generated --arkts-components-spec-paths ./src/ImageSequenceNativeComponent.ts" }, "keywords": ["react-native", "harmony"], "repository": "https://github.com/bwindsor/react-native-image-sequence", @@ -32,19 +33,17 @@ "devDependencies": { "@types/react": "^18.2.12", "react-native-builder-bob": "^0.20.4", - "typescript": "^5.0.4" + "typescript": "^5.0.4", + "@react-native-community/cli": "11.3.6", + "react-native-harmony-cli": "npm:@react-native-oh/react-native-harmony-cli@^0.0.27" }, "peerDependencies": { "react": "*", "react-native": "*" }, "harmony": { - "alias": "react-native-image-sequence-2", - "codegenConfig": { - "specPaths": [ - "./src" - ] - } + "alias": "react-native-image-sequence-2" + }, "react-native-builder-bob": { "source": "src", diff --git a/src/ImageSequenceNativeComponent.ts b/src/ImageSequenceNativeComponent.ts index f0c0f29..b2eb35c 100644 --- a/src/ImageSequenceNativeComponent.ts +++ b/src/ImageSequenceNativeComponent.ts @@ -1,24 +1,14 @@ +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved + * Use of this source code is governed by a MIT license that can be + * found in the LICENSE file. + */ + import type { ViewProps } from 'react-native/Libraries/Components/View/ViewPropTypes'; import { FlexStyle, HostComponent, ShadowStyleIOS, TransformsStyle } from 'react-native'; import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent'; import type { Int32 } from 'react-native/Libraries/Types/CodegenTypes'; -// export interface ImageStyle extends FlexStyle, TransformsStyle, ShadowStyleIOS { -// backfaceVisibility?: 'visible' | 'hidden'; -// borderBottomLeftRadius?: number; -// borderBottomRightRadius?: number; -// backgroundColor?: string; -// borderColor?: string; -// borderWidth?: number; -// borderRadius?: number; -// borderTopLeftRadius?: number; -// borderTopRightRadius?: number; -// overlayColor?: string; -// opacity?: number; -// width?: number; -// height?: number; -// } - export interface NativeProps extends ViewProps { /** An array of source images. Each element of the array should be the result of a call to require(imagePath). */ images: string[]; -- Gitee