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

Merge pull request #1377 from minggo/gles20 

fix auto building error
This commit is contained in:
minggo 2012-09-24 21:14:10 -07:00
parent 450f8f3a30 74b9e2539b
commit df24c919a4
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
View File

@ -257,9 +257,11 @@ public class Cocos2dxGLSurfaceView extends GLSurfaceView {
break;
}
/*
if (BuildConfig.DEBUG) {
Cocos2dxGLSurfaceView.dumpMotionEvent(pMotionEvent);
}
*/
return true;
}

16
cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTextInputWraper.java
View File

@ -79,22 +79,26 @@ public class Cocos2dxTextInputWraper implements TextWatcher, OnEditorActionListe
return;
}
if (BuildConfig.DEBUG) {
Log.d(TAG, "afterTextChanged: " + s);
}
//if (BuildConfig.DEBUG) {
//Log.d(TAG, "afterTextChanged: " + s);
//}
int nModified = s.length() - this.mText.length();
if (nModified > 0) {
final String insertText = s.subSequence(this.mText.length(), s.length()).toString();
this.mCocos2dxGLSurfaceView.insertText(insertText);
/*
if (BuildConfig.DEBUG) {
Log.d(TAG, "insertText(" + insertText + ")");
}
*/
} else {
for (; nModified < 0; ++nModified) {
this.mCocos2dxGLSurfaceView.deleteBackward();
/*
if (BuildConfig.DEBUG) {
Log.d(TAG, "deleteBackward");
}
*/
}
}
this.mText = s.toString();
@ -102,9 +106,11 @@ public class Cocos2dxTextInputWraper implements TextWatcher, OnEditorActionListe
@Override
public void beforeTextChanged(final CharSequence pCharSequence, final int start, final int count, final int after) {
/*
if (BuildConfig.DEBUG) {
Log.d(TAG, "beforeTextChanged(" + pCharSequence + ")start: " + start + ",count: " + count + ",after: " + after);
}
*/
this.mText = pCharSequence.toString();
}
@ -119,9 +125,11 @@ public class Cocos2dxTextInputWraper implements TextWatcher, OnEditorActionListe
// user press the action button, delete all old text and insert new text
for (int i = this.mOriginText.length(); i > 0; i--) {
this.mCocos2dxGLSurfaceView.deleteBackward();
/*
if (BuildConfig.DEBUG) {
Log.d(TAG, "deleteBackward");
}
*/
}
String text = pTextView.getText().toString();
@ -136,9 +144,11 @@ public class Cocos2dxTextInputWraper implements TextWatcher, OnEditorActionListe
final String insertText = text;
this.mCocos2dxGLSurfaceView.insertText(insertText);
/*
if (BuildConfig.DEBUG) {
Log.d(TAG, "insertText(" + insertText + ")");
}
*/
}
return false;
}

2
tools/jenkins_scripts/build.xml
View File

@ -51,7 +51,7 @@
<target name="-pre-build">
<copy todir="src/org/cocos2dx">
<fileset dir="..\..\..\cocos2dx\platform\android\java\src_common\org\cocos2dx">
<fileset dir="..\..\..\cocos2dx\platform\android\java\src\org\cocos2dx">
<include name="lib/" />
</fileset>
</copy>