新增back回调方法 && 插件展示代码更新

display-server/src/main/webapp/biz/js/plugin/pageHandler/pageA.js

@@ -1,4 +1,4 @@
require([ "domReady!", "wadeMobile", "mobile", "util" ], function(doc,
require([ "domReady!", "wadeMobile", "mobile", "util"], function(doc,
		WadeMobile, Mobile) {
	$("#back").tap(function() {
		Mobile.back();
@@ -7,6 +7,11 @@ require([ "domReady!", "wadeMobile", "mobile", "util" ], function(doc,
		Mobile.openPage("PageB");
	});
	$("#backCallback").tap(function() {
		
		Mobile.backWithCallback("回调：测试数据来自pageA");
	});
	
	WadeMobile.setBackCallListener(function(e){
		var data = e.data;
		WadeMobile.tip(data);
	});
});

display-server/src/main/webapp/biz/js/plugin/pageHandler/pageB.js

@@ -7,9 +7,9 @@ require([ "domReady!", "wadeMobile", "mobile", "util" ], function(doc,
		Mobile.back("PageHandler");
	});
	$("#backCallback").tap(function() {
		Mobile.backWithCallback("回调：测试数据来自pageB");
	});
	$("#backTagCallback").tap(function() {
		
		Mobile.backWithCallback("回调：测试数据来自pageB","PageHandler");
	});
});

display-server/src/main/webapp/biz/js/plugin/pageHandler/pageHandler.js

@@ -30,4 +30,9 @@ require(["domReady!","wadeMobile","mobile","util"], function(doc,WadeMobile,Mobi
	$("#menu").tap(function(){
		Mobile.openPage("KeyDownListen");
	});
	
	WadeMobile.setBackCallListener(function(e){
		var data = e.data;
		WadeMobile.tip(data);
	});
});

display-server/src/main/webapp/res/js/mobile/mobile-client.js

@@ -67,8 +67,8 @@ define(["wadeMobile","clientTool"],function(WadeMobile,clientTool) {
			WadeMobile.back(tag,err);
		};
		/*带回调的回退*/
		this.backWithCallback = function(callback,tag,err){
			WadeMobile.backWithCallback(callback,tag,err);
		this.backWithCallback = function(data,tag,err){
			WadeMobile.backWithCallback(data,tag,err);
		};
		/******************基础UI**********************/
		/*打开loading对话框*/

display-server/src/main/webapp/res/js/mobile/wade-mobile.js

@@ -74,9 +74,8 @@ define(["jcl","base64","res/js/mobile/expand-mobile.js","biz/js/common/biz-mobil
				execute("loadTemplate", [action,context],err);
			},back:function(tag,err){
				execute("back",[tag],err);
			},backWithCallback:function(callback,tag,err){
				WadeMobile.callback.storageCallback("backWithCallback",callback);
				execute("backWithCallback",[tag],err);
			},backWithCallback:function(data,tag,err){
				execute("backWithCallback",[data,tag],err);
			},getPage:function(callback,action,param,err){
				WadeMobile.callback.storageCallback("getPage",callback);
				execute("getPage", [action,param],err);
@@ -336,6 +335,25 @@ define(["jcl","base64","res/js/mobile/expand-mobile.js","biz/js/common/biz-mobil
	})();
	/**物理按键监听end**/
	
	/**back回调事件监听开始**/
	WadeMobile.backevent = (function(){
		if(WadeMobile.isApp()){
			return {
				backCall:function(data){
					var backCallEvent = document.createEvent('Event');
					backCallEvent.initEvent("backCall",true,true);
					backCallEvent.data = data;
					document.dispatchEvent(backCallEvent);
				}
			};
		}
	})();
	
	WadeMobile.setBackCallListener = function(callback){
		document.addEventListener("backCall", callback);
	}
	/**back回调事件监听结束**/
	
	/************公共方法**************/
	/**
	 * @param {String}  errorMessage   错误信息

display-server/src/main/webapp/template/webapp/plugin/PageHandler/PageA.html

@@ -19,30 +19,31 @@
		<div class="c_list l_mt">
			<ul>
				<li>
				<li id="back">
					<div class="content">
						<div class="main">
							<div class="info">普通返回上一个界面</div>
						</div>
						<div class="fn fn-2" id="back">返回</div>
						<div class="fn fn-2" >返回</div>
					</div>
				</li>
				<li>
				<li id="toB">
					<div class="content">
						<div class="main">
							<div class="info">打开下一个界面，A to B</div>
							<div class="info">打开下一个界面（B）</div>
						</div>
						<div class="fn fn-2" id="toB">点击</div>
						<div class="fn fn-2" >点击</div>
					</div>
				</li>
				<li>
				<li  id="backCallback">
					<div class="content">
						<div class="main">
							<div class="info">返回上一个界面，回调</div>
						</div>
						<div class="fn fn-2" id="backCallback">返回回调</div>
						<div class="fn fn-2">返回回调</div>
					</div>	
				</li>
				
			</ul>
		</div>

display-server/src/main/webapp/template/webapp/plugin/PageHandler/PageB.html

@@ -19,36 +19,36 @@
		<div class="c_list l_mt">
			<ul>
				<li>
				<li  id="back">
					<div class="content">
						<div class="main">
							<div class="info">普通返回上一个界面</div>
						</div>
						<div class="fn fn-2" id="back">返回</div>
						<div class="fn fn-2">返回</div>
					</div>
				</li>
				<li>
				<li id="backTag">
					<div class="content">
						<div class="main">
							<div class="info">跳转，直接返回指定界面(PageHandler界面)</div>
							<div class="info">跳转，直接返回指定界面(首页)</div>
						</div>
						<div class="fn fn-2" id="backTag">跳转返回</div>
						<div class="fn fn-2">跳转返回</div>
					</div>
				</li>
				<li>
				<li  id="backCallback">
					<div class="content">
						<div class="main">
							<div class="info">返回上一个界面并回调</div>
						</div>
						<div class="fn fn-2" id="backCallback">返回回调</div>
						<div class="fn fn-2">返回回调</div>
					</div>
				</li>
				<li>
				<li  id="backTagCallback">
					<div class="content">
						<div class="main">
							<div class="info">跳转直接返回指定界面(UI界面)并回调</div>
							<div class="info">跳转直接返回指定界面(首页)并回调</div>
						</div>
						<div class="fn fn-2" id="backTagCallback">跳转返回回调</div>
						<div class="fn fn-2">跳转返回回调</div>
					</div>
				</li>
			</ul>

display-server/src/main/webapp/template/webapp/plugin/PageHandler/PageHandler.html

@@ -104,6 +104,7 @@
						<div class="more"></div>
					</div>
				</li>
				
			</ul>
		</div>
	</div>

wade-mobile-func/src/com/wade/mobile/func/MobileUI.java

@@ -45,6 +45,7 @@ import com.wade.mobile.frame.event.IKeyListenerEvent.Action;
import com.wade.mobile.frame.event.impl.TemplateWebViewEvent;
import com.wade.mobile.frame.plugin.Plugin;
import com.wade.mobile.frame.template.TemplateWebView;
import com.wade.mobile.frame.webview.WadeWebView;
import com.wade.mobile.ui.activity.CustomDialogActivity;
import com.wade.mobile.ui.activity.CustomWindowActivity;
import com.wade.mobile.ui.activity.SlidingMenuActivity;
@@ -423,30 +424,45 @@ public class MobileUI extends Plugin {
		}
	}
	
	private void backWithCallback(JSONArray param) throws Exception{
	public void backWithCallback(JSONArray param) throws Exception{
		final FlipperLayout mainFlipper = wademobile.getFlipperLayout();
		if(mainFlipper != null){
			final String tag = param.getString(0);
			final String data = param.getString(0);
			final String tag = param.getString(1);
			if(!isNull(tag)){
				context.runOnUiThread(new Runnable() {public void run() {
						mainFlipper.back(new IFlipperLayoutListener() {
							
							@Override
							public void onBack(View currView, View preView) {
								// TODO Auto-generated method stub
							mainFlipper.back(tag, new IFlipperLayoutListener() {
								
							}
						});
					}
				});
								@Override
								public void onBack(View currView, View preView) {
									// TODO Auto-generated method stub
									if(currView instanceof WadeWebView){
										
									}
									if(preView instanceof WadeWebView){
										String result = encodeForJs(data);
										((WadeWebView) preView).executeJs(
												"WadeMobile.backevent.backCall('" + result + "');"
												);
									}
								}
							});
						}
					});
			}else {
				context.runOnUiThread(new Runnable() {public void run() {
						mainFlipper.back(tag, new IFlipperLayoutListener() {
						mainFlipper.back(new IFlipperLayoutListener() {
							
							@Override
							@Override 
							public void onBack(View currView, View preView) {
								// TODO Auto-generated method stub
								
								if(currView instanceof WadeWebView){
								}
								if(preView instanceof WebView){
									String result = encodeForJs(data);
									((WadeWebView) preView).executeJs(
											"WadeMobile.backevent.backCall('" + result + "');"
											); 
								}
							}
						});
					}