fix: running on both platforms

NativeScript · Oct 16, 2023 · 991972a · 991972a
1 parent 900f5be
commit 991972a
Show file tree

Hide file tree

Showing 25 changed files with 5,896 additions and 562 deletions.
diff --git a/apps/demo/src/app.ts b/apps/demo/src/app.ts
@@ -1,10 +1,10 @@
-import { Helpers } from '@nativescript/canvas/helpers';
+/*import { Helpers } from '@nativescript/canvas/helpers';
 Helpers.initialize();
 require('@nativescript/canvas-polyfill');
+*/
 // import { CanvasRenderingContext2D } from '@nativescript/canvas';
 declare const jp, GDPerformanceMonitor;
 let monitor;
-import { Canvas } from '@nativescript/canvas';
 import { Application, path as filePath, knownFolders, Utils, path as nsPath, ImageSource, Trace } from '@nativescript/core';
 
 Application.on('discardedError', (args) => {
@@ -43,6 +43,11 @@ JSI
 // eval(call);
 
 // : CONSOLE TIME: data: 4.250ms image data
+
+Application.on('uncaughtError', (args) => {
+	console.log('uncaughtError: error', args.error);
+	console.log('uncaughtError: platform error', args.android ?? args.ios);
+});
 Application.on('launch', (args) => {
 	require('@nativescript/canvas-polyfill');
 	if (global.isAndroid) {

diff --git a/packages/canvas/platforms/android/canvas-release.aar b/packages/canvas/platforms/android/canvas-release.aar
diff --git a/packages/canvas/platforms/ios/src/cpp/CanvasJSIModule.cpp b/packages/canvas/platforms/ios/src/cpp/CanvasJSIModule.cpp
diff --git a/packages/canvas/platforms/ios/src/cpp/Common.h b/packages/canvas/platforms/ios/src/cpp/Common.h
@@ -23,6 +23,7 @@ extern "C" {
 
 #ifdef __ANDROID__
 #include "include/v8.h"
+#include "include/canvas_android.h"
 #include <android/log.h>
 #include <thread>
 #endif