You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2018/01/17 12:47:08 UTC
[3/9] incubator-weex git commit: * [android] sync return for locale
module
* [android] sync return for locale module
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/bbd0829b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bbd0829b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bbd0829b
Branch: refs/heads/master
Commit: bbd0829bcb246c89600e5d1afd5cd55c7ab059d5
Parents: 8ac4445
Author: misakuo <mi...@apache.org>
Authored: Mon Jan 15 15:38:45 2018 +0800
Committer: misakuo <mi...@apache.org>
Committed: Mon Jan 15 15:38:45 2018 +0800
----------------------------------------------------------------------
.../com/taobao/weex/ui/module/WXLocaleModule.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bbd0829b/android/sdk/src/main/java/com/taobao/weex/ui/module/WXLocaleModule.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXLocaleModule.java b/android/sdk/src/main/java/com/taobao/weex/ui/module/WXLocaleModule.java
index f31f8f3..5b243b4 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXLocaleModule.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/module/WXLocaleModule.java
@@ -30,6 +30,8 @@ import com.taobao.weex.annotation.JSMethod;
import com.taobao.weex.bridge.JSCallback;
import com.taobao.weex.common.WXModule;
+import java.util.Arrays;
+import java.util.List;
import java.util.Locale;
/**
@@ -40,14 +42,17 @@ import java.util.Locale;
public class WXLocaleModule extends WXModule {
- @JSMethod
- public void getLanguage(JSCallback callback) {
+ @JSMethod(uiThread = false)
+ public String getLanguage(JSCallback callback) {
+ String languageTags = getLanguageTags();
callback.invoke(getLanguageTags());
+ return languageTags;
}
- @JSMethod
- public void getLanguages(JSCallback callback) {
- callback.invoke(getLanguageTags().split(","));
+ @JSMethod(uiThread = false)
+ public List<String> getLanguages(JSCallback callback) {
+ String[] tags = getLanguageTags().split(",");
+ return Arrays.asList(tags);
}
private String getLanguageTags() {