diff --git a/native/cocos/scripting/js-bindings/manual/js_module_register.cpp b/native/cocos/scripting/js-bindings/manual/js_module_register.cpp index 9d1b96c310..6dd965a082 100755 --- a/native/cocos/scripting/js-bindings/manual/js_module_register.cpp +++ b/native/cocos/scripting/js-bindings/manual/js_module_register.cpp @@ -34,6 +34,10 @@ #include "platform/ios/JavaScriptObjCBridge.h" #endif +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) +#include "platform/android/CCJavascriptJavaBridge.h" +#endif + USING_NS_CC; int js_module_register() { @@ -94,7 +98,9 @@ int js_module_register() sc->addRegisterCallback(register_all_cocos2dx_audioengine); #endif -#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) + sc->addRegisterCallback(JavascriptJavaBridge::_js_register); +#elif (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) sc->addRegisterCallback(JavaScriptObjCBridge::_js_register); #endif return 1; diff --git a/native/cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp b/native/cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp index 964473b35f..24728661d6 100644 --- a/native/cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp +++ b/native/cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp @@ -40,13 +40,13 @@ JNIEXPORT jint JNICALL Java_org_cocos2dx_lib_Cocos2dxJavascriptJavaBridge_evalSt (JNIEnv *env, jclass cls, jstring value) { bool strFlag = false; - std::string strValue = cocos2d::StringUtils::getStringUTFCharsJNI(env, value, &strFlag); + std::string strValue = cocos2d::JniHelper::getStringUTFCharsJNI(env, value, &strFlag); if (!strFlag) { CCLOG("Cocos2dxJavascriptJavaBridge_evalString error, invalid string code"); return 0; } - ScriptingCore::getInstance()->evalString(strValue.c_str()); + ScriptingCore::getInstance()->evalString(strValue.c_str(), nullptr); return 1; } @@ -84,7 +84,7 @@ bool JavascriptJavaBridge::CallInfo::execute(void) case TypeString: m_retjstring = (jstring)m_env->CallStaticObjectMethod(m_classID, m_methodID); - std::string strValue = cocos2d::StringUtils::getStringUTFCharsJNI(m_env, m_retjstring); + std::string strValue = cocos2d::JniHelper::getStringUTFCharsJNI(m_env, m_retjstring); m_ret.stringValue = new string(strValue); break; @@ -124,7 +124,7 @@ bool JavascriptJavaBridge::CallInfo::executeWithArgs(jvalue *args) case TypeString: m_retjstring = (jstring)m_env->CallStaticObjectMethodA(m_classID, m_methodID, args); - std::string strValue = cocos2d::StringUtils::getStringUTFCharsJNI(m_env, m_retjstring); + std::string strValue = cocos2d::JniHelper::getStringUTFCharsJNI(m_env, m_retjstring); m_ret.stringValue = new string(strValue); break; } diff --git a/native/templates/js-template-binary/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java b/native/templates/js-template-binary/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java index 5f065885bb..eb6780aa05 100755 --- a/native/templates/js-template-binary/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java +++ b/native/templates/js-template-binary/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java @@ -33,7 +33,8 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Bundle; import android.view.WindowManager; - +import android.app.AlertDialog; +import android.content.DialogInterface; // The name of .so is specified in AndroidMenifest.xml. NativityActivity will load it automatically for you. // You can use "System.loadLibrary()" to load other .so files. @@ -41,11 +42,13 @@ import android.view.WindowManager; public class AppActivity extends Cocos2dxActivity{ static String hostIPAdress = "0.0.0.0"; + private static AppActivity app = null; + @Override protected void onCreate(Bundle savedInstanceState) { // TODO Auto-generated method stub super.onCreate(savedInstanceState); - + app = this; if(nativeIsDebug()){ getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON, WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); } @@ -74,4 +77,16 @@ public class AppActivity extends Cocos2dxActivity{ private static native boolean nativeIsDebug(); + public static void showAlertDialog(final String title,final String message) { + // Here be sure to use runOnUiThread + app.runOnUiThread(new Runnable() { + @Override + public void run() { + AlertDialog alertDialog = new AlertDialog.Builder(app).create(); + alertDialog.setTitle(title); + alertDialog.setMessage(message); + alertDialog.show(); + } + }); + } } diff --git a/native/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java b/native/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java index 6b14791fad..9225d410bd 100755 --- a/native/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java +++ b/native/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java @@ -25,8 +25,19 @@ package org.cocos2dx.javascript; import org.cocos2dx.lib.Cocos2dxActivity; import org.cocos2dx.lib.Cocos2dxGLSurfaceView; +import android.os.Bundle; +import android.app.AlertDialog; +import android.content.DialogInterface; public class AppActivity extends Cocos2dxActivity { + + private static AppActivity app = null; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + app = this; + } @Override public Cocos2dxGLSurfaceView onCreateView() { @@ -36,4 +47,17 @@ public class AppActivity extends Cocos2dxActivity { return glSurfaceView; } + + public static void showAlertDialog(final String title,final String message) { + // Here be sure to use runOnUiThread + app.runOnUiThread(new Runnable() { + @Override + public void run() { + AlertDialog alertDialog = new AlertDialog.Builder(app).create(); + alertDialog.setTitle(title); + alertDialog.setMessage(message); + alertDialog.show(); + } + }); + } } diff --git a/native/templates/js-template-default/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java b/native/templates/js-template-default/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java index 7bc1264c83..25befe4a6f 100755 --- a/native/templates/js-template-default/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java +++ b/native/templates/js-template-default/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java @@ -28,8 +28,19 @@ package org.cocos2dx.javascript; import org.cocos2dx.lib.Cocos2dxActivity; import org.cocos2dx.lib.Cocos2dxGLSurfaceView; +import android.os.Bundle; +import android.app.AlertDialog; +import android.content.DialogInterface; public class AppActivity extends Cocos2dxActivity { + + private static AppActivity app = null; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + app = this; + } @Override public Cocos2dxGLSurfaceView onCreateView() { @@ -39,4 +50,17 @@ public class AppActivity extends Cocos2dxActivity { return glSurfaceView; } + + public static void showAlertDialog(final String title,final String message) { + // Here be sure to use runOnUiThread + app.runOnUiThread(new Runnable() { + @Override + public void run() { + AlertDialog alertDialog = new AlertDialog.Builder(app).create(); + alertDialog.setTitle(title); + alertDialog.setMessage(message); + alertDialog.show(); + } + }); + } } diff --git a/native/templates/js-template-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java b/native/templates/js-template-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java index 6b14791fad..ace6006f78 100755 --- a/native/templates/js-template-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java +++ b/native/templates/js-template-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java @@ -25,8 +25,19 @@ package org.cocos2dx.javascript; import org.cocos2dx.lib.Cocos2dxActivity; import org.cocos2dx.lib.Cocos2dxGLSurfaceView; +import android.os.Bundle; +import android.app.AlertDialog; +import android.content.DialogInterface; public class AppActivity extends Cocos2dxActivity { + + private static AppActivity app = null; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + app = this; + } @Override public Cocos2dxGLSurfaceView onCreateView() { @@ -36,4 +47,17 @@ public class AppActivity extends Cocos2dxActivity { return glSurfaceView; } + + public static void showAlertDialog(final String title,final String message) { + // Here be sure to use runOnUiThread + app.runOnUiThread(new Runnable() { + @Override + public void run() { + AlertDialog alertDialog = new AlertDialog.Builder(app).create(); + alertDialog.setTitle(title); + alertDialog.setMessage(message); + alertDialog.show(); + } + }); + } } diff --git a/native/templates/js-template-link/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java b/native/templates/js-template-link/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java index 7bc1264c83..25befe4a6f 100755 --- a/native/templates/js-template-link/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java +++ b/native/templates/js-template-link/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java @@ -28,8 +28,19 @@ package org.cocos2dx.javascript; import org.cocos2dx.lib.Cocos2dxActivity; import org.cocos2dx.lib.Cocos2dxGLSurfaceView; +import android.os.Bundle; +import android.app.AlertDialog; +import android.content.DialogInterface; public class AppActivity extends Cocos2dxActivity { + + private static AppActivity app = null; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + app = this; + } @Override public Cocos2dxGLSurfaceView onCreateView() { @@ -39,4 +50,17 @@ public class AppActivity extends Cocos2dxActivity { return glSurfaceView; } + + public static void showAlertDialog(final String title,final String message) { + // Here be sure to use runOnUiThread + app.runOnUiThread(new Runnable() { + @Override + public void run() { + AlertDialog alertDialog = new AlertDialog.Builder(app).create(); + alertDialog.setTitle(title); + alertDialog.setMessage(message); + alertDialog.show(); + } + }); + } }