恢复打开关闭窗口方式&修复取消时的js错误&更新wade-mobile.jar

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

@@ -127,6 +127,10 @@ define(["wadeMobile","clientTool"],function(WadeMobile,clientTool) {
			WadeMobile.openWindow(callback,pageAction,param.toString());
		};
		this.closeWindow = function(result){
			if(typeof(result) == "undefined" || result == null){
				WadeMobile.closeWindow();
				return;
			}
			if(typeof(result) != "string"){
				result = result.toString();
			}

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

@@ -6,7 +6,6 @@ import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.Map;
import java.util.Stack;
import org.json.JSONArray;
@@ -64,7 +63,6 @@ public class MobileUI extends Plugin {
	private final int REQUEST_CODE_SLIDING_MENU = 300;
	private final int REQUEST_CODE_CONTACTS_VIEW = 400;
	private final String DATA_REQUEST_ERROR = "dataRequestError";
	private Stack<String> stackForCallback = new Stack<String>();
	public MobileUI(IWadeMobile wademobile) {
		super(wademobile);
@@ -865,48 +863,31 @@ public class MobileUI extends Plugin {
	 * 打开窗口
	 */
	public void openWindow(JSONArray param) throws Exception {
		final String pageAction = param.getString(0);
		final String data = param.getString(1);
		String pageAction = param.getString(0);
		String data = param.getString(1);
        openTemplate(pageAction, isNull(data) ? null : new DataMap(data), true);
		Intent intent = new Intent(context, CustomWindowActivity.class);
		intent.putExtra(CustomWindowActivity.KEY_PAGE_ACTION, pageAction);
		intent.putExtra(CustomWindowActivity.KEY_DATA, data);
		startActivityForResult(intent, REQUEST_CODE_CUSTOM_WINDOW);
	}
	/**
	 * 关闭窗口
	 */
	public void closeWindow(JSONArray param) throws Exception {
		final String resultData = isNull(param.getString(0)) ? null : param.getString(0);
		final Plugin plugin = this;
		context.runOnUiThread(new Runnable() {
			@Override
			public void run() {
                wademobile.getFlipperLayout().back();
				plugin.callback(resultData);
			}
		});
		String resultData = param.getString(0);
		resultData = isNull(resultData) ? null : resultData;
		int resultState = isNull(param.getString(1)) ? CustomWindowActivity.SUCCESS_CODE
				: param.getInt(1);
		if (context instanceof CustomWindowActivity) {
			((CustomWindowActivity) context).closeWindow(resultData,
					resultState);
		} else {
			HintUtil.alert(context, "无窗口可以关闭!");
		}
	}
	
	@Override
    public void setCallback(String callback) {
        if (callback !=null && callback.contains("openWindow")) {
            stackForCallback.push(callback);
        }else{
            super.setCallback(callback);
        }
    }
    @Override
    public String getCallback() {
        String result = super.getCallback();
        if (result != null && result.contains("closeWindow") && !stackForCallback.empty()) {
            result = stackForCallback.pop();
        }else{
            result = super.getCallback();
        }
        return result;
    }
	/**
	 * 打开侧滑菜单
	 */