You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/03/30 11:38:52 UTC

[18/30] incubator-weex git commit: * [android] fix * https://aone.alibaba-inc.com/project/469098/issue/10392126

* [android] fix
* https://aone.alibaba-inc.com/project/469098/issue/10392126


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f07e6f7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f07e6f7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f07e6f7b

Branch: refs/heads/0.12-dev
Commit: f07e6f7b0f1021bf92dd949212996d8369770ceb
Parents: eb85033
Author: bruno.duan <br...@gmail.com>
Authored: Fri Mar 10 18:00:48 2017 +0800
Committer: bruno.duan <br...@gmail.com>
Committed: Fri Mar 10 18:00:48 2017 +0800

----------------------------------------------------------------------
 .eslintrc                                       |   2 ++
 .../java/com/alibaba/weex/WXApplication.java    |   2 +-
 android/sdk/assets/main.js                      |  14 +++++++-------
 android/sdk/libs/armeabi/libweexv8.so           | Bin 3645300 -> 3645308 bytes
 .../taobao/weex/utils/WXSoInstallMgrSdk.java    |   4 ++--
 html5/frameworks/legacy/static/life.js          |  17 +++++++++++++++++
 6 files changed, 29 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f07e6f7b/.eslintrc
----------------------------------------------------------------------
diff --git a/.eslintrc b/.eslintrc
index 49dfae0..11e3537 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -20,6 +20,8 @@
     "callNativeModule": false,
     "callAddElement":false,
     "callJS": false,
+    "notifyTrimMemory": false,
+    "markupState": false,
     "compileAndRunBundle": false
   },
 

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f07e6f7b/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java
----------------------------------------------------------------------
diff --git a/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java b/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java
index 400f315..4697556 100755
--- a/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java
+++ b/android/playground/app/src/main/java/com/alibaba/weex/WXApplication.java
@@ -314,7 +314,7 @@ public class WXApplication extends Application {
           WXSDKManager.getInstance().notifyTrimMemory();
         }
         // The demo code of calling 'notifySerializeCodeCache()'
-        if (true) {
+        if (false) {
           WXSDKManager.getInstance().notifySerializeCodeCache();
         }
       }