Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime

This commit is contained in:
cw 2014-05-14 15:11:59 +08:00
parent 501762f3b5 fe7774947d
commit 7c8e237ee2
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/lua/main.cpp
View File

@ -3,6 +3,7 @@
#include "2d/platform/android/jni/JniHelper.h"
#include <jni.h>
#include <android/log.h>
#include "ConfigParser.h"
#define LOG_TAG "main"
#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
@ -13,3 +14,16 @@ void cocos_android_app_init (JNIEnv* env, jobject thiz) {
LOGD("cocos_android_app_init");
AppDelegate *pAppDelegate = new AppDelegate();
}
extern "C"
{
bool Java_org_cocos2dx_lua_AppActivity_nativeIsLandScape(JNIEnv *env, jobject thisz)
{
if (!ConfigParser::getInstance()->isInit())
{
ConfigParser::getInstance()->readConfig();
}
return ConfigParser::getInstance()->isLanscape();
}
}

8
templates/lua-template-runtime/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/AppActivity.java
View File

@ -60,6 +60,12 @@ public class AppActivity extends Cocos2dxActivity{
// TODO Auto-generated method stub
super.onCreate(savedInstanceState);
if(nativeIsLandScape()) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
} else {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
}
//2.Set the format of window
// Check the wifi is opened when the android:debuggable is "true".
@ -115,4 +121,6 @@ public class AppActivity extends Cocos2dxActivity{
return null;
}
private static native boolean nativeIsLandScape();
}