You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/03/09 10:07:14 UTC
incubator-weex git commit: * [android] Set DensityDpi to Viewport to deal with “dp” unit
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev e7badfbee -> 265a63dac
* [android] Set DensityDpi to Viewport to deal with \u201cdp\u201d unit
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/265a63da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/265a63da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/265a63da
Branch: refs/heads/0.11-dev
Commit: 265a63dac2c71a4a708781fdd400ef55f4f786b5
Parents: e7badfb
Author: zshshr <zh...@gmail.com>
Authored: Thu Mar 9 17:21:40 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Thu Mar 9 17:21:40 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/module/WXMetaModule.java | 2 +-
.../main/java/com/taobao/weex/utils/WXViewUtils.java | 14 +++++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/265a63da/android/sdk/src/main/java/com/taobao/weex/ui/module/WXMetaModule.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXMetaModule.java b/android/sdk/src/main/java/com/taobao/weex/ui/module/WXMetaModule.java
index 9ca3f50..2144dee 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/module/WXMetaModule.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/module/WXMetaModule.java
@@ -231,7 +231,7 @@ public class WXMetaModule extends WXModule {
param = URLDecoder.decode(param, "utf-8");
JSONObject jsObj = JSON.parseObject(param);
if (DEVICE_WIDTH.endsWith(jsObj.getString(WIDTH))) {
- mWXSDKInstance.setViewPortWidth(WXViewUtils.getScreenWidth(mWXSDKInstance.getContext()));
+ mWXSDKInstance.setViewPortWidth(WXViewUtils.getScreenDensityDpi(mWXSDKInstance.getContext()));
} else {
int width = jsObj.getInteger(WIDTH);
if (width > 0) {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/265a63da/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
index e075ee8..798fc88 100755
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java
@@ -215,6 +215,7 @@ import android.graphics.drawable.LayerDrawable;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
+import android.util.DisplayMetrics;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
@@ -307,11 +308,22 @@ public class WXViewUtils {
return getScreenWidth(WXEnvironment.sApplication);
}
+ public static int getScreenDensityDpi(Context ctx){
+ if(ctx != null){
+ try{
+ Resources res = ctx.getResources();
+ return res.getDisplayMetrics().densityDpi;
+ }catch (Exception e){
+ WXLogUtils.e("getScreenDensityDpi exception:"+e.getMessage());
+ }
+ }
+ return DisplayMetrics.DENSITY_DEFAULT;
+ }
+
public static int getScreenWidth(Context ctx) {
if(ctx!=null){
Resources res = ctx.getResources();
mScreenWidth = res.getDisplayMetrics().widthPixels;
-
if(WXEnvironment.SETTING_FORCE_VERTICAL_SCREEN){
mScreenHeight = res
.getDisplayMetrics()