Skip to content

[android]optimize skeleton drawable load, Avoid app crashes caused by load error #2947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 4.3-beta
Choose a base branch
from
+27 −10
Open

[android]optimize skeleton drawable load, Avoid app crashes caused by load error #2947

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 27 additions & 10 deletions spine-android/spine-android/src/main/java/com/esotericsoftware/spine/android/SpineView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,11 @@
import android.os.Handler;
import android.os.Looper;
import android.util.AttributeSet;
import android.util.Log;
import android.view.Choreographer;
import android.view.View;

import androidx.annotation.MainThread;
import androidx.annotation.NonNull;

import java.io.File;
Expand Down Expand Up @@ -291,7 +293,7 @@ public void loadFromHttp (URL atlasUrl, URL skeletonUrl, File targetDirectory) {
/** The same as {@link SpineView#loadFromDrawable(AndroidSkeletonDrawable, Context, SpineController)}, but can be used after
* instantiating the view via {@link SpineView#SpineView(Context, SpineController)}. */
public void loadFromDrawable (AndroidSkeletonDrawable drawable) {
loadFrom( () -> drawable);
post( () -> setSkeletonDrawable(drawable));
}

/** Get the {@link SpineController} */
Expand Down Expand Up @@ -350,21 +352,36 @@ public void setRendering (Boolean rendering) {
this.rendering = rendering;
}

private void loadFrom (AndroidSkeletonDrawableLoader loader) {
/** Load the skeleton from a {@link AndroidSkeletonDrawableLoader}. This method is asynchronous.
* If you want to control the loading thread yourself, obtain an {@link AndroidSkeletonDrawable}
* using {@link AndroidSkeletonDrawable#fromHttp(URL, URL, File)} or another load method,
* then call {@link SpineView#loadFromDrawable(AndroidSkeletonDrawable)} or
* {@link SpineView#setSkeletonDrawable(AndroidSkeletonDrawable)}. */
public void loadFrom (AndroidSkeletonDrawableLoader loader) {
Handler mainHandler = new Handler(Looper.getMainLooper());
Thread backgroundThread = new Thread( () -> {
final AndroidSkeletonDrawable skeletonDrawable = loader.load();
mainHandler.post( () -> {
computedBounds = boundsProvider.computeBounds(skeletonDrawable);
updateCanvasTransform();

controller.init(skeletonDrawable);
Choreographer.getInstance().postFrameCallback(SpineView.this);
});
try {
final AndroidSkeletonDrawable skeletonDrawable = loader.load();
mainHandler.post( () -> {
setSkeletonDrawable(skeletonDrawable);
});
}catch (Exception e) {
Log.e("SpineView", "Error loading skeleton", e);
}
});
backgroundThread.start();
}

/** Set the skeleton drawable. Must be called from the main thread.*/
@MainThread
public final void setSkeletonDrawable (@NonNull AndroidSkeletonDrawable skeletonDrawable) {
computedBounds = boundsProvider.computeBounds(skeletonDrawable);
updateCanvasTransform();

controller.init(skeletonDrawable);
Choreographer.getInstance().postFrameCallback(SpineView.this);
}

@Override
public void onDraw (@NonNull Canvas canvas) {
super.onDraw(canvas);
Expand Down