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

Merge pull request #13172 from jianglong0156/addEmotionTest 

add emotion bug test current nothing will show
This commit is contained in:
pandamicro 2015-08-03 16:36:47 +08:00
parent f10994c20b f9b6d6b670
commit 80a207ae43
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/js-tests/project/proj.android/src/org/cocos2dx/js_tests/AppActivity.java
View File

@ -106,4 +106,9 @@ public class AppActivity extends Cocos2dxActivity {
});
}
public static String getUtfStr() {
final String utf8Str = "you will see emotion:💝";
return utf8Str;
}
}

15
tests/js-tests/src/ReflectionTest/ReflectionTest.js
View File

@ -52,7 +52,20 @@ var ReflectionTestLayer = BaseTestLayer.extend({
}
}, this);
var menu = new cc.Menu(menuItem, menuItem2);
var label3 = new cc.LabelTTF("CallReflectionWithUTF8Str", "Arial", 35);
var menuItem3 = new cc.MenuItemLabel(label3, function(){
if(cc.sys.os == cc.sys.OS_ANDROID){
var ret = jsb.reflection.callStaticMethod("org/cocos2dx/js_tests/AppActivity", "getUtfStr", "()Ljava/lang/String;");
jsb.reflection.callStaticMethod("org/cocos2dx/js_tests/AppActivity", "showAlertDialog",
"(Ljava/lang/String;Ljava/lang/String;)V", "Show Emotion", ret);
cc.log("result:" + ret);
}else if(cc.sys.os == cc.sys.OS_IOS || cc.sys.os == cc.sys.OS_OSX){
var ret = "you will see emotion:💝";
jsb.reflection.callStaticMethod("NativeOcClass","callNativeUIWithTitle:andContent:","Show Emotion", ret);
cc.log("result:" + ret);
}
}, this);
var menu = new cc.Menu(menuItem, menuItem2, menuItem3);
menu.alignItemsVerticallyWithPadding(4);
this.addChild(menu);