You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ji...@apache.org on 2017/01/24 08:21:31 UTC
[20/50] [abbrv] incubator-weex git commit: * [android] Add
screenDensity to WXEnvironment. (#98)
* [android] Add screenDensity to WXEnvironment. (#98)
* * [android] Add screenDensity to WXEnvironment.
* * [android] Add doc for scale exception.
* * [android] Change exception in WXEnvironment.scale
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b905c37f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b905c37f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b905c37f
Branch: refs/heads/master
Commit: b905c37f24e69e0718f8dc097044e921d8966cca
Parents: 0c01770
Author: YorkShen <sh...@gmail.com>
Authored: Wed Jan 11 11:00:56 2017 +0800
Committer: sospartan zheng <so...@apache.org>
Committed: Wed Jan 11 11:00:56 2017 +0800
----------------------------------------------------------------------
android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java | 6 ++++++
android/sdk/src/main/java/com/taobao/weex/common/WXConfig.java | 1 +
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b905c37f/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
index 4149575..376a4d4 100755
--- a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
@@ -287,6 +287,12 @@ public class WXEnvironment {
configs.put(WXConfig.sysModel, SYS_MODEL);
configs.put(WXConfig.weexVersion, String.valueOf(WXSDK_VERSION));
configs.put(WXConfig.logLevel,sLogLevel.getName());
+ try {
+ options.put(WXConfig.scale, Float.toString(sApplication.getResources().getDisplayMetrics().density));
+ }catch (NullPointerException e){
+ //There is little chance of NullPointerException as sApplication may be null.
+ WXLogUtils.e("WXEnvironment scale Exception: ", e);
+ }
configs.putAll(options);
if(configs!=null&&configs.get(WXConfig.appName)==null && sApplication!=null){
configs.put(WXConfig.appName, sApplication.getPackageName());
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b905c37f/android/sdk/src/main/java/com/taobao/weex/common/WXConfig.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXConfig.java b/android/sdk/src/main/java/com/taobao/weex/common/WXConfig.java
index f7cc987..42a49e7 100755
--- a/android/sdk/src/main/java/com/taobao/weex/common/WXConfig.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/WXConfig.java
@@ -216,4 +216,5 @@ public interface WXConfig {
String appGroup="appGroup";
String externalUserAgent="externalUserAgent";
String logLevel="logLevel";
+ String scale = "scale";
}