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 2017/09/06 09:54:08 UTC
[1/7] incubator-weex git commit: * [android] correct the format of
the date returned by pickDate method.
Repository: incubator-weex
Updated Branches:
refs/heads/apache-0.16-dev [created] ff13f51d5
* [android] correct the format of the date returned by pickDate method.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1a6f4475
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1a6f4475
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1a6f4475
Branch: refs/heads/apache-0.16-dev
Commit: 1a6f4475f9eb44e1e5efe60420375778386842bf
Parents: be18b19
Author: coreycao <ca...@gmail.com>
Authored: Wed Sep 6 17:38:24 2017 +0800
Committer: coreycao <ca...@gmail.com>
Committed: Wed Sep 6 17:38:24 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1a6f4475/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java b/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java
index c6ccac3..f6950bf 100644
--- a/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java
+++ b/android/sdk/src/main/java/com/taobao/weex/appfram/pickers/DatePickerImpl.java
@@ -58,7 +58,8 @@ public class DatePickerImpl {
public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
int realMonth = monthOfYear + 1;
String realMonthString = realMonth < 10 ? "0" + realMonth : String.valueOf(realMonth);
- String result = year + "-" + realMonthString + "-" + dayOfMonth;
+ String realDayString = dayOfMonth < 10 ? "0" + dayOfMonth : String.valueOf(dayOfMonth);
+ String result = year + "-" + realMonthString + "-" + realDayString;
listener.onPick(true, result);
}
},
[7/7] incubator-weex git commit: Merge branch '0.16-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.16-dev
Posted by mi...@apache.org.
Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.16-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ff13f51d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ff13f51d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ff13f51d
Branch: refs/heads/apache-0.16-dev
Commit: ff13f51d5d591e0c587dcd94209cdf0c54183864
Parents: af1d731 a944f3e
Author: misakuo <mi...@apache.org>
Authored: Wed Sep 6 17:51:39 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Wed Sep 6 17:51:39 2017 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[5/7] incubator-weex git commit: * [android] update libweexjsc.so,
jsc will run on a process alone
Posted by mi...@apache.org.
* [android] update libweexjsc.so, jsc will run on a process alone
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d4eff8eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d4eff8eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d4eff8eb
Branch: refs/heads/apache-0.16-dev
Commit: d4eff8eb1cd3f59b73cc3e2d57a8d9f185e8c29b
Parents: 6e09b82
Author: yuhun-alibaba <to...@gmail.com>
Authored: Fri Sep 1 12:10:45 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Wed Sep 6 17:51:13 2017 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi/libweexjsb.so | Bin 0 -> 22556 bytes
android/sdk/libs/armeabi/libweexjsc.so | Bin 7570392 -> 325660 bytes
android/sdk/libs/armeabi/libweexjss.so | Bin 0 -> 6754012 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d4eff8eb/android/sdk/libs/armeabi/libweexjsb.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjsb.so b/android/sdk/libs/armeabi/libweexjsb.so
new file mode 100755
index 0000000..c46e857
Binary files /dev/null and b/android/sdk/libs/armeabi/libweexjsb.so differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d4eff8eb/android/sdk/libs/armeabi/libweexjsc.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjsc.so b/android/sdk/libs/armeabi/libweexjsc.so
index a365bed..3368735 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and b/android/sdk/libs/armeabi/libweexjsc.so differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d4eff8eb/android/sdk/libs/armeabi/libweexjss.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjss.so b/android/sdk/libs/armeabi/libweexjss.so
new file mode 100755
index 0000000..df1e4d8
Binary files /dev/null and b/android/sdk/libs/armeabi/libweexjss.so differ
[4/7] incubator-weex git commit: * [android] change for android so
check fail
Posted by mi...@apache.org.
* [android] change for android so check fail
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/669c84b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/669c84b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/669c84b1
Branch: refs/heads/apache-0.16-dev
Commit: 669c84b1ac61ef05d652e859e62ecdcb2e688c71
Parents: d4eff8e
Author: yuhun-alibaba <to...@gmail.com>
Authored: Fri Sep 1 15:46:59 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Wed Sep 6 17:51:13 2017 +0800
----------------------------------------------------------------------
dangerfile.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/669c84b1/dangerfile.js
----------------------------------------------------------------------
diff --git a/dangerfile.js b/dangerfile.js
index 50e28ed..05db91d 100644
--- a/dangerfile.js
+++ b/dangerfile.js
@@ -344,8 +344,8 @@ function getContent(url) {
// handle http errors
console.log('response:', response.statusCode)
if (response.statusCode < 200 || response.statusCode > 299) {
- if (response.statusCode === 404) {
- // ignore this, probably a renamed file.
+ if (response.statusCode === 404 || response.statusCode === 502) {
+ // ignore this, probably a renamed file,or .so that can't blame
return resolve('')
}
reject(new Error('Failed to load page, status code: ' + response.statusCode + ', '
[6/7] incubator-weex git commit: * [android] update so,
support gcanvas
Posted by mi...@apache.org.
* [android] update so, support gcanvas
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/af1d7311
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/af1d7311
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/af1d7311
Branch: refs/heads/apache-0.16-dev
Commit: af1d73112494d6b8c58514904c95b8ddd2a24b7e
Parents: 669c84b
Author: yuhun-alibaba <to...@gmail.com>
Authored: Tue Sep 5 20:07:55 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Wed Sep 6 17:51:14 2017 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi/libweexjsc.so | Bin 325660 -> 325660 bytes
android/sdk/libs/armeabi/libweexjss.so | Bin 6754012 -> 6754012 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/af1d7311/android/sdk/libs/armeabi/libweexjsc.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjsc.so b/android/sdk/libs/armeabi/libweexjsc.so
index 3368735..d3fb7e7 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and b/android/sdk/libs/armeabi/libweexjsc.so differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/af1d7311/android/sdk/libs/armeabi/libweexjss.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjss.so b/android/sdk/libs/armeabi/libweexjss.so
index df1e4d8..c0236b6 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and b/android/sdk/libs/armeabi/libweexjss.so differ
[2/7] incubator-weex git commit: * [android] when WxInstance report
createInstance Exception after jsc thread crash, will try reload again
Posted by mi...@apache.org.
* [android] when WxInstance report createInstance Exception after jsc thread crash, will try reload again
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/6e09b827
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6e09b827
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6e09b827
Branch: refs/heads/apache-0.16-dev
Commit: 6e09b827f7c4ce47a69099cc4b65438a2bdcedf2
Parents: f9584d1
Author: yuhun-alibaba <to...@gmail.com>
Authored: Thu Aug 31 20:44:39 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Wed Sep 6 17:51:11 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/WXSDKInstance.java | 8 ++++++++
.../java/com/taobao/weex/bridge/WXBridgeManager.java | 14 ++++++++++++++
2 files changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6e09b827/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index 9e26736..7e0da86 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -117,6 +117,7 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
private boolean trackComponent;
private boolean enableLayerType = true;
private boolean mNeedValidate = false;
+ private boolean mNeedReLoad = false;
private static volatile int mViewPortWidth = 750;
private int mInstanceViewPortWidth = 750;
@@ -203,6 +204,13 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
return mNeedValidate;
}
+ public boolean isNeedReLoad() {
+ return mNeedReLoad;
+ }
+
+ public void setNeedLoad(boolean load) {
+ mNeedReLoad = load;
+ }
/*
* Warning: use setInstanceViewPortWidth instead.
* store custom ViewPort Width
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/6e09b827/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index f6c3144..89b2d3b 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -1804,6 +1804,20 @@ public class WXBridgeManager implements Callback,BactchExecutor {
if (instanceId != null && (instance = WXSDKManager.getInstance().getSDKInstance(instanceId)) != null) {
instance.onJSException(WXErrorCode.WX_ERR_JS_EXECUTE.getErrorCode(), function, exception);
+ if (METHOD_CREATE_INSTANCE.equals(function)) {
+ try {
+ if (reInitCount > 1 && !instance.isNeedReLoad()) {
+ // JSONObject domObject = JSON.parseObject(tasks);
+ WXDomModule domModule = getDomModule(instanceId);
+ Action action = Actions.getReloadPage(instanceId);
+ domModule.postAction((DOMAction)action, true);
+ instance.setNeedLoad(true);
+ return;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
String err = "function:" + function + "#exception:" + exception;
commitJSBridgeAlarmMonitor(instanceId, WXErrorCode.WX_ERR_JS_EXECUTE, err);
[3/7] incubator-weex git commit: * [android] add getCacheDir method
for native call, kernerl use it to init crash Handler
Posted by mi...@apache.org.
* [android] add getCacheDir method for native call, kernerl use it to init crash Handler
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f9584d1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f9584d1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f9584d1b
Branch: refs/heads/apache-0.16-dev
Commit: f9584d1b86bc9d31edbb3f338f4facd0c5a784e7
Parents: 1a6f447
Author: yuhun-alibaba <to...@gmail.com>
Authored: Thu Aug 31 15:55:16 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Wed Sep 6 17:51:11 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/WXEnvironment.java | 16 ++++++++++++++++
.../com/taobao/weex/bridge/WXBridgeManager.java | 9 +++++++++
.../main/java/com/taobao/weex/bridge/WXParams.java | 9 +++++++++
.../main/java/com/taobao/weex/common/WXConfig.java | 1 +
4 files changed, 35 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f9584d1b/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 fecfc11..d1e0779 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
@@ -102,6 +102,7 @@ public class WXEnvironment {
Map<String, String> configs = new HashMap<>();
configs.put(WXConfig.os, OS);
configs.put(WXConfig.appVersion, getAppVersionName());
+ configs.put(WXConfig.cacheDir, getAppCacheFile());
configs.put(WXConfig.devId, DEV_Id);
configs.put(WXConfig.sysVersion, SYS_VERSION);
configs.put(WXConfig.sysModel, SYS_MODEL);
@@ -137,6 +138,21 @@ public class WXEnvironment {
return versionName;
}
+ /**
+ *
+ * @return string cache file
+ */
+ private static String getAppCacheFile() {
+ String cache = "";
+ try {
+ cache = sApplication.getApplicationContext().getCacheDir().getPath();
+ } catch (Exception e) {
+ WXLogUtils.e("WXEnvironment getAppCacheFile Exception: ", e);
+ }
+ return cache;
+ }
+
+
public static Map<String, String> getCustomOptions() {
return options;
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f9584d1b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index e4f846b..f6c3144 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -938,6 +938,14 @@ public class WXBridgeManager implements Callback,BactchExecutor {
if (instance != null) {
url = instance.getBundleUrl();
}
+ try {
+ if (WXEnvironment.getApplication() != null) {
+ crashFile = WXEnvironment.getApplication().getApplicationContext().getCacheDir().getPath() + crashFile;
+ // Log.e("jsengine", "callReportCrashReloadPage crashFile:" + crashFile);
+ }
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
callReportCrash(crashFile, instanceId, url);
if (reInitCount > CRASHREINIT) {
return IWXBridge.INSTANCE_RENDERING_ERROR;
@@ -1604,6 +1612,7 @@ public class WXBridgeManager implements Callback,BactchExecutor {
Map<String, String> config = WXEnvironment.getConfig();
WXParams wxParams = new WXParams();
wxParams.setPlatform(config.get(WXConfig.os));
+ wxParams.setCacheDir(config.get(WXConfig.cacheDir));
wxParams.setOsVersion(config.get(WXConfig.sysVersion));
wxParams.setAppVersion(config.get(WXConfig.appVersion));
wxParams.setWeexVersion(config.get(WXConfig.weexVersion));
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f9584d1b/android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java
index f3de40e..6f964ce 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXParams.java
@@ -33,6 +33,7 @@ public class WXParams {
private String shouldInfoCollect;
private String logLevel;
private String needInitV8;
+ private String cacheDir;
private Map<String, String> options;
@@ -60,6 +61,14 @@ public class WXParams {
this.platform = platform;
}
+ public void setCacheDir(String cache) {
+ this.cacheDir = cache;
+ }
+
+ public String getCacheDir() {
+ return this.cacheDir;
+ }
+
public String getOsVersion() {
return osVersion;
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f9584d1b/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 44ca87f..ae1774d 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/WXConfig.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/WXConfig.java
@@ -23,6 +23,7 @@ public interface WXConfig {
String os = "os";
String osName = "osName";
String appVersion="appVersion";
+ String cacheDir = "cacheDir";
String devId="devId";
String sysVersion="sysVersion";
String sysModel="sysModel";