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/08/24 02:27:40 UTC
[1/2] incubator-weex git commit: * [android] show alert in debug mode
when pageName not be set
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev 365332e97 -> 61abcdc37
* [android] show alert in debug mode when pageName not be set
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/837f033c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/837f033c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/837f033c
Branch: refs/heads/0.16-dev
Commit: 837f033c6898f484efa77bb9c4271e90a5868c7c
Parents: 41ce0f6
Author: misakuo <mi...@apache.org>
Authored: Wed Aug 23 11:46:45 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Wed Aug 23 11:46:45 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/WXSDKInstance.java | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/837f033c/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 1c2877a..de68c64 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -18,6 +18,7 @@
*/
package com.taobao.weex;
+import android.app.AlertDialog;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
@@ -398,8 +399,18 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
*/
public void render(String pageName, String template, Map<String, Object> options, String jsonInitData, WXRenderStrategy flag) {
if(WXEnvironment.isApkDebugable() && WXPerformance.DEFAULT.equals(pageName)){
- WXLogUtils.e("Please set your pageName or your js bundle url !!!!!!!");
- return;
+ WXLogUtils.e("WXSDKInstance", "Please set your pageName or your js bundle url !!!!!!!");
+
+ if (getUIContext() != null) {
+ new AlertDialog.Builder(getUIContext())
+ .setTitle("Error: Missing pageName")
+ .setMessage("We highly recommend you to set pageName. Call" +
+ "\nWXSDKInstance#render(String pageName, String template, Map<String, Object> options, String jsonInitData, WXRenderStrategy flag)\n" +
+ "to fix it.")
+ .show();
+ }
+
+ return;
}
renderInternal(pageName,template,options,jsonInitData,flag);
}
@@ -423,6 +434,8 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
return;
}
+ WXLogUtils.d("WXSDKInstance", "Start render page: " + pageName);
+
if (WXTracing.isAvailable()) {
WXTracing.TraceEvent traceEvent = WXTracing.newEvent("executeBundleJS", mInstanceId, -1);
traceEvent.traceId = mExecJSTraceId;
[2/2] incubator-weex git commit: Merge remote-tracking branch
'upstream/pr634' into apache-0.16-dev
Posted by mi...@apache.org.
Merge remote-tracking branch 'upstream/pr634' 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/61abcdc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/61abcdc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/61abcdc3
Branch: refs/heads/0.16-dev
Commit: 61abcdc375b2b386880e29ceaea1f4c866d18d0f
Parents: 365332e 837f033
Author: misakuo <mi...@apache.org>
Authored: Thu Aug 24 10:28:13 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Thu Aug 24 10:28:13 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/WXSDKInstance.java | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/61abcdc3/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------