Merge pull request #23 from chuanweizhang2013/v3luaruntime

cocoscodeide · cocoscodeide · commit d505cb3b5096 · 2014-05-20T11:59:26.000+08:00
fixed android degbug
diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/lua/main.cpp b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/lua/main.cpp
@@ -25,5 +25,14 @@ extern "C"
 		}
 		return ConfigParser::getInstance()->isLanscape();
 	}
+
+	bool Java_org_cocos2dx_lua_AppActivity_nativeIsDebug(JNIEnv *env, jobject thisz)
+	{
+		#ifdef NDEBUG 
+    		return false;
+    	#else
+    		return true;	
+		#endif
+	}
 }
 
diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/AppActivity.java b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/AppActivity.java
@@ -69,8 +69,8 @@ protected void onCreate(Bundle savedInstanceState) {
 		
 		//2.Set the format of window
 		
-		// Check the wifi is opened when the android:debuggable is "true".
-		if(0!=((this.getApplicationInfo().flags) & ApplicationInfo.FLAG_DEBUGGABLE))
+		// Check the wifi is opened when the native is debug.
+		if(nativeIsDebug())
 		{
 			if(!isWifiConnected())
 			{

Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,14 @@ extern "C"`
`25`	`25`	`}`
`26`	`26`	`return ConfigParser::getInstance()->isLanscape();`
`27`	`27`	`}`
	`28`	`+`
	`29`	`+ bool Java_org_cocos2dx_lua_AppActivity_nativeIsDebug(JNIEnv *env, jobject thisz)`
	`30`	`+ {`
	`31`	`+ #ifdef NDEBUG`
	`32`	`+ return false;`
	`33`	`+ #else`
	`34`	`+ return true;`
	`35`	`+ #endif`
	`36`	`+ }`
`28`	`37`	`}`
`29`	`38`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,8 @@ protected void onCreate(Bundle savedInstanceState) {`
`69`	`69`
`70`	`70`	`//2.Set the format of window`
`71`	`71`
`72`		`- // Check the wifi is opened when the android:debuggable is "true".`
`73`		`- if(0!=((this.getApplicationInfo().flags) & ApplicationInfo.FLAG_DEBUGGABLE))`
	`72`	`+ // Check the wifi is opened when the native is debug.`
	`73`	`+ if(nativeIsDebug())`
`74`	`74`	`{`
`75`	`75`	`if(!isWifiConnected())`
`76`	`76`	`{`