diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 0560d18..e5ece24 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@ diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..87b8b8c 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..350b1d9 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,25 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "android", + "request": "launch", + "name": "Android launch", + "appSrcRoot": "${workspaceRoot}/app", + "apkFile": "${workspaceRoot}/app/build/outputs/apk/debug/app-debug.apk", + "adbPort": 5037, + "preLaunchTask": "InstallDebugApp" + }, + { + "type": "android", + "request": "attach", + "name": "Android attach", + "appSrcRoot": "${workspaceRoot}/app", + "adbPort": 5037, + "processId": "${command:PickAndroidProcess}" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..b2f00a9 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,77 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "AppSignKey", + "type": "shell", + "command": "keytool -genkey -v -keystore my-release-key.jks -keyalg RSA -keysize 2048 -validity 10000 -alias my-alias", + "windows": { + // "command": "${workspaceRoot}\\shell.bat first" + "command": "cd gitoscandroid; del my-release-key.jks; keytool -genkey -v -keystore my-release-key.jks -keyalg RSA -keysize 2048 -validity 10000 -alias my-alias" + // keytool -genkey -v -keystore release.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 + // keytool -genkey -v -keystore debug.keystore -storepass android -alias androiddebugkey -keypass android -keyalg RSA -keysize 2048 -validity 10000 + }, + "group": "test", + "presentation": { + "reveal": "always", + // "panel": "new" + } + }, + { + "label": "CleanApp", + "type": "shell", + "command": "${workspaceRoot}/gradlew clean", + "windows": { + // "command": "${workspaceRoot}\\shell.bat first" + "command": "${workspaceRoot}\\gradlew.bat clean " + }, + "group": "test", + "presentation": { + "reveal": "always", + // "panel": "new" + } + }, + { + "label": "BuildDebugApp", + "type": "shell", + "command": "${workspaceRoot}/gradlew assembleDebug ", + "windows": { + // "command": "${workspaceRoot}\\shell.bat first" + "command": "${workspaceRoot}\\gradlew.bat assembleDebug " + }, + "group": "test", + "presentation": { + "reveal": "always", + // "panel": "new" + } + }, + { + "label": "InstallDebugApp", + "type": "shell", + "command": "${workspaceRoot}/gradlew installDebug ", + "windows": { + "command": "${workspaceRoot}\\gradlew.bat installDebug " + }, + "group": "test", + "presentation": { + "reveal": "always", + // "panel": "new" + } + }, + { + "label": "InstallReleaseApp", + "type": "shell", + "command": "${workspaceRoot}/gradlew installRelease ", + "windows": { + "command": "${workspaceRoot}\\gradlew.bat installRelease " + }, + "group": "test", + "presentation": { + "reveal": "always", + // "panel": "new" + } + }, + ] +} \ No newline at end of file diff --git a/Classes/jsb_module_register.cpp b/Classes/jsb_module_register.cpp index df3c416..7a20068 100644 --- a/Classes/jsb_module_register.cpp +++ b/Classes/jsb_module_register.cpp @@ -35,7 +35,7 @@ #include "cocos/scripting/js-bindings/manual/jsb_platform.h" #include "cocos/scripting/js-bindings/manual/jsb_cocos2dx_manual.hpp" #include "cocos/scripting/js-bindings/manual/jsb_xmlhttprequest.hpp" -#include "JcWallet.h"; +#include "JcWallet.h" #if USE_SOCKET diff --git a/app/build.gradle b/app/build.gradle index c5f5646..d8bbe69 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,4 +113,5 @@ dependencies { // implementation 'com.xm.permissions:XmPermissions:1.0.1' implementation 'pub.devrel:easypermissions:3.0.0' implementation 'com.github.jenly1314:zxing-lite:2.1.1' + implementation project(path: ':libcocos2dx') } \ No newline at end of file diff --git a/js/platform.js b/js/platform.js index 4e6b326..a8abafc 100644 --- a/js/platform.js +++ b/js/platform.js @@ -16,7 +16,3 @@ window.jumpToWallet = function(url) { // url || 'wc://' // ) } - -window.nativeCallback = function(funId, msg) { - console.log(`receive msg from native:: funId: ${funId}, msg: ${msg}`); -} \ No newline at end of file