You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mi...@apache.org on 2018/03/15 06:06:45 UTC
incubator-weex git commit: *[android] using android.util.Base64
instead of fastjson.util.Base64
Repository: incubator-weex
Updated Branches:
refs/heads/master 806e1a0b8 -> f77db8fe5
*[android] using android.util.Base64 instead of fastjson.util.Base64
(cherry picked from commit 3963739)
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f77db8fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f77db8fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f77db8fe
Branch: refs/heads/master
Commit: f77db8fe529fd42b632ef4eb25f70313679de4c5
Parents: 806e1a0
Author: misakuo <mi...@apache.org>
Authored: Fri Mar 2 15:38:21 2018 +0800
Committer: misakuo <mi...@apache.org>
Committed: Thu Mar 15 14:06:36 2018 +0800
----------------------------------------------------------------------
android/sdk/src/main/java/com/taobao/weex/utils/FontDO.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f77db8fe/android/sdk/src/main/java/com/taobao/weex/utils/FontDO.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/FontDO.java b/android/sdk/src/main/java/com/taobao/weex/utils/FontDO.java
index aa9ce7b..18467f3 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/FontDO.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/FontDO.java
@@ -21,8 +21,8 @@ package com.taobao.weex.utils;
import android.graphics.Typeface;
import android.net.Uri;
import android.text.TextUtils;
+import android.util.Base64;
-import com.alibaba.fastjson.util.Base64;
import com.taobao.weex.WXEnvironment;
import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.adapter.URIAdapter;
@@ -101,7 +101,7 @@ public class FontDO {
if (!TextUtils.isEmpty(base64Data)) {
String md5 = WXFileUtils.md5(base64Data);
String filePath = WXEnvironment.getApplication().getCacheDir() + "/font-family/" + md5;
- WXFileUtils.saveFile(filePath, Base64.decodeFast(base64Data), WXEnvironment.getApplication());
+ WXFileUtils.saveFile(filePath, Base64.decode(base64Data, Base64.DEFAULT), WXEnvironment.getApplication());
mUrl = filePath;
mType = TYPE_BASE64;
WXLogUtils.d("TypefaceUtil", "Parse base64 font cost " + (System.currentTimeMillis() - start) + " ms");