Skip to content

fix for load API, updated loadme file, includes deleteglobalref fix and ... #43

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: develop
Choose a base branch
from
Open

fix for load API, updated loadme file, includes deleteglobalref fix and ... #43

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion platforms/android/assets/www/assets/canvas/loadme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
console.log("Hello World!");
var maxCurves = 140;
maxCurves = 140;
2 changes: 0 additions & 2 deletions platforms/android/libs/armeabi-v7a/gdb.setup
View file
Open in desktop

This file was deleted.

Binary file removed platforms/android/libs/armeabi-v7a/gdbserver
View file
Open in desktop
Binary file not shown.
Binary file modified platforms/android/libs/armeabi-v7a/libejecta.so
View file
Open in desktop
Binary file not shown.
2 changes: 0 additions & 2 deletions platforms/android/libs/armeabi/gdb.setup
View file
Open in desktop

This file was deleted.

Binary file removed platforms/android/libs/armeabi/gdbserver
View file
Open in desktop
Binary file not shown.
Binary file modified platforms/android/libs/armeabi/libejecta.so
View file
Open in desktop
Binary file not shown.
47 changes: 22 additions & 25 deletions platforms/android/src/jp/wizcorp/phonegap/plugin/wizCanvas/WizCanvas.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,42 +212,34 @@ public void onPostMessageReceived(String target, String message, String type, St
public void load(Activity act, String source) {
// Check remote or local source
try {
URL u = new URL(source); // Check for the protocol
u.toURI(); // Extra checking required for validation of URI
final URL _u = new URL(source); // Check for the protocol
_u.toURI(); // Extra checking required for validation of URI

// If we did not fall out here then source is a valid URI
Log.d(TAG, "load URL: " + source);

// Download URL source to data/data/<package_name>/filename then call load()
// again with local path
new asyncDownload(u, act).execute();
final Activity _act = act;
Thread thread = new Thread() {
@Override
public void run() {
new asyncDownload(_u, _act).execute();
}
};
thread.start();

} catch (MalformedURLException ex1) {
// Missing protocol

// Copies the file to data/data/<package_name>/filename
// Allows the file to be readable from Ejecta-X
String mainBundle = "/data/data/" + act.getPackageName();
new Utils().copyDatFile(act, mainBundle + "/cache/", source);

File f = new File("file:///android_asset/" + source);

((EjectaGLSurfaceView)mGLView).loadJavaScriptFile(f.getName());

f = null;
Log.d(TAG, "NOT URL: " + source);
((EjectaGLSurfaceView) mGLView).loadJavaScriptFile(source);

} catch (URISyntaxException ex2) {

// Copies the file to data/data/<package_name>/filename
// Allows the file to be readable from Ejecta-X
String mainBundle = "/data/data/" + act.getPackageName();
new Utils().copyDatFile(act, mainBundle + "/cache/", source);
Log.d(TAG, "NOT URL: " + source);
((EjectaGLSurfaceView) mGLView).loadJavaScriptFile(source);

File f = new File("file:///android_asset/" + source);

((EjectaGLSurfaceView)mGLView).loadJavaScriptFile(f.getName());

f = null;
}
}

Expand Down Expand Up @@ -439,7 +431,7 @@ protected String doInBackground(File... params) {
File file = new File("/data/data/" + this.activity.getPackageName() + "/cache/" + filename);
if (!file.exists()) {
// Create the directory if not existing
file.mkdirs();
file.getParentFile().mkdirs();
}

Log.d(TAG, "[downloadUrl] *********** /data/data/" + this.activity.getPackageName() + "/cache/" + filename + " > " + file.getAbsolutePath());
Expand Down Expand Up @@ -479,7 +471,6 @@ protected String doInBackground(File... params) {
byte[] buffer = new byte[1024];

int len1 = 0;

FileOutputStream fos = new FileOutputStream(file);

while ( (len1 = is.read(buffer)) > 0 ) {
Expand All @@ -490,7 +481,13 @@ protected String doInBackground(File... params) {
is.close();

// Tell Ejecta-X to load file from downloaded path
load(activity, filename);
final String _src = filename;
final Activity _act = activity;
activity.runOnUiThread(new Runnable() {
public void run() {
load(_act, _src);
}
});

} catch (MalformedURLException e) {
Log.e(TAG, "Bad url : ", e);
Expand Down