Repository: incubator-weex Updated Branches: refs/heads/0.15-dev 571b735ac -> e4ba34646
* [android] Add RAW and None for imageQuality Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2c248325 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2c248325 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2c248325 Branch: refs/heads/0.15-dev Commit: 2c248325d808cf3780c96a2d1dafbe2cd4a86038 Parents: b549a22 Author: YorkShen <shenyua...@gmail.com> Authored: Wed Jun 14 17:39:42 2017 +0800 Committer: YorkShen <shenyua...@gmail.com> Committed: Mon Jun 26 17:14:46 2017 +0800 ---------------------------------------------------------------------- .../java/com/taobao/weex/common/Constants.java | 1 + .../com/taobao/weex/common/WXImageStrategy.java | 9 ++++- .../main/java/com/taobao/weex/dom/WXAttr.java | 38 ++++++++------------ .../com/taobao/weex/dom/WXImageQuality.java | 6 +++- 4 files changed, 28 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c248325/android/sdk/src/main/java/com/taobao/weex/common/Constants.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java index f683c99..3da084c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java +++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java @@ -199,6 +199,7 @@ public class Constants { String LOW = "low"; String NORMAL = "normal"; String HIGH = "high"; + String RAW = "raw"; String VISIBLE = "visible"; String HIDDEN = "hidden"; String TEXT = "text"; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c248325/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java b/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java index 74d06b0..994c99b 100644 --- a/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java +++ b/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java @@ -24,9 +24,16 @@ import java.util.Map; public class WXImageStrategy { + /** - * Whether to clip image. The default value is false. + * <strong>Never!</strong> + * <strong>Never!</strong> + * <strong>Never!</strong> + * Never use this flag, ImageView has done all the job of clipping! + * There is no method to read this flag any more. + * This field will be removed when it's appropriate. */ + @Deprecated public boolean isClipping; /** http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c248325/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java index 05e1626..d143dac 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java +++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java @@ -18,23 +18,23 @@ */ package com.taobao.weex.dom; +import static java.lang.Boolean.parseBoolean; + import android.support.annotation.NonNull; import android.support.v4.util.ArrayMap; import android.text.TextUtils; - import com.taobao.weex.common.Constants; +import com.taobao.weex.common.Constants.Name; import com.taobao.weex.common.WXImageSharpen; import com.taobao.weex.ui.view.listview.WXRecyclerView; import com.taobao.weex.utils.WXLogUtils; import com.taobao.weex.utils.WXUtils; import com.taobao.weex.utils.WXViewUtils; - import java.util.Collection; +import java.util.Locale; import java.util.Map; import java.util.Set; -import static java.lang.Boolean.parseBoolean; - /** * store value of component attribute * @@ -95,27 +95,17 @@ public class WXAttr implements Map<String, Object>,Cloneable { } public WXImageQuality getImageQuality() { - - Object obj = get(Constants.Name.QUALITY); - if (obj == null) { - obj = get(Constants.Name.IMAGE_QUALITY); - } - if (obj == null) { - return WXImageQuality.LOW; - } - WXImageQuality waImageQuality = WXImageQuality.LOW; - String imageQuality = obj.toString(); - if (imageQuality.equals(Constants.Value.ORIGINAL)) { - waImageQuality = WXImageQuality.ORIGINAL; - } else if (imageQuality.equals(Constants.Value.LOW)) { - waImageQuality = WXImageQuality.LOW; - } else if (imageQuality.equals(Constants.Value.NORMAL)) { - waImageQuality = WXImageQuality.NORMAL; - } else if (imageQuality.equals(Constants.Value.HIGH)) { - waImageQuality = WXImageQuality.HIGH; + Object obj = containsKey(Name.QUALITY) ? get(Name.QUALITY) : get(Name.IMAGE_QUALITY); + WXImageQuality imageQuality = WXImageQuality.NONE; + String value; + if (obj != null && !TextUtils.isEmpty(value = obj.toString())) { + try { + imageQuality = WXImageQuality.valueOf(value.toUpperCase(Locale.US)); + }catch (IllegalArgumentException e){ + WXLogUtils.e("Image", "Invalid value image quality. Only low, normal, high, original are valid"); + } } - - return waImageQuality; + return imageQuality; } public WXImageSharpen getImageSharpen() { http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c248325/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java index 20771d9..488f84a 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java +++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java @@ -26,5 +26,9 @@ public enum WXImageQuality { NORMAL, - HIGH + HIGH, + + RAW, + + NONE }
