Merge branch 'master' of http://114.215.100.48:3000/ipu/android-share.git

display-server/web/res/js/base/jcl.js

@@ -520,7 +520,7 @@ define(["zepto"],function($){
				.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
				.replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) {
						
				console.log("########data");
				//console.log("########data");
				//先尝试使用浏览器内部JSON解析器
				return window.JSON && window.JSON.parse ?
					window.JSON.parse( data ) :
@@ -721,7 +721,7 @@ define(["zepto"],function($){
		},
		parseString:function(str){
			str=$.parseJsonString(str);
			console.log("#####this.parseObject");
			//console.log("#####this.parseObject");
			return window.JSON && window.JSON.parse ? this.parseObject(window.JSON.parse(str)) 
					: (new Function("this.parseObject(" +str+")")).apply(this);
			//if(typeof(o)=="object")this.parseObject(o);
@@ -812,7 +812,7 @@ define(["zepto"],function($){
		},	
		parseString:function(str){
			str=$.parseJsonString(str);
			console.log("#####this.parseArray");
			//console.log("#####this.parseArray");
			return window.JSON && window.JSON.parse ? this.parseArray(window.JSON.parse(str)) : 
				(new Function("this.parseArray(" +str+")")).apply(this);	
		},

display-server/web/template/webapp/plugin/NFC.html

@@ -26,8 +26,8 @@
			<li>
				<div class="content">
					<div class="main">
						<div class="title">读取NFC</div>
						<div class="info"></div>
						<div class="title">读取北京公交卡</div>
						<div class="info">通过参数不同，理论上可以读取任何类型的芯片卡。</div>
					</div>
					<div class="fn fn-2" id="read">读取</div>
				</div>
@@ -35,23 +35,26 @@
		</ul>
	</div>
	
	<div class="c_list" style="display: none;" id="result">
		<ul>
			<li>
				<div class="content">
					<div class="label">余额</div>
					<div class="value"><span id="cash"></span></div>
				</div>
			</li>
			<li>
				<label class="content content-vertical">
					<div class="label">最近10条交易记录</div>
					<div class="value">
						<div id="log"></div>
	<div style="display: none;" id="result">
		<div class="c_title">读取结果</div>
		<div class="c_list">
			<ul>
				<li>
					<div class="content">
						<div class="label">余额</div>
						<div class="value"><span id="cash"></span></div>
					</div>
				</label>
			</li>
		</ul>
				</li>
				<li>
					<label class="content content-vertical">
						<div class="label">最近10条交易记录</div>
						<div class="value">
							<div id="log"></div>
						</div>
					</label>
				</li>
			</ul>
		</div>
	</div>
</div>
</body>

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

@@ -7,6 +7,7 @@ import android.os.Build;
import com.wade.mobile.app.MobileAppInfo;
import com.wade.mobile.common.nfc.activity.NfcActivity;
import com.wade.mobile.common.nfc.util.NfcConstant;
import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.plugin.Plugin;
import com.wade.mobile.ui.helper.HintHelper;
@@ -15,7 +16,7 @@ import com.wade.mobile.util.Utility;
public class MobileDevice extends Plugin {
	private static final int INIT_NFC = 1;
	private static String NFC_CALLBACK;
	private static String nfcCallback;
	public MobileDevice(IWadeMobile wademobile) {
		super(wademobile);
@@ -30,25 +31,27 @@ public class MobileDevice extends Plugin {
			return;
		}
		String cmds = param.getString(0);
		NFC_CALLBACK = param.getString(1);
		if(isNull(cmds)||isNull(NFC_CALLBACK)){
		nfcCallback = param.getString(1);
		if (isNull(cmds) || isNull(nfcCallback)) {
			Utility.error("参数为空异常!");
		}
		
		Intent intent = new Intent(context, NfcActivity.class);
		intent.putExtra(NfcActivity.CMDS, cmds);
		startActivityForResult(intent, INIT_NFC);
	}
	
	@Override
	public void onActivityResult(int requestCode, int resultCode, Intent intent) {
		if (requestCode == INIT_NFC) {
			String nfcMsg = intent.getStringExtra(NfcActivity.NFC_DATA);
			StringBuilder buff = new StringBuilder();
			buff.append("if(").append(NFC_CALLBACK).append("){");
			buff.append(NFC_CALLBACK).append("(unescape(").append(EscapeUnescape.escape(nfcMsg)).append("));");
			buff.append("}else{alert('请设置获取NFC的回调方法');};");
			wademobile.getCurrentWebView().executeJs(buff.toString());
			if (resultCode == NfcConstant.SUCCESS_CODE) {
				String nfcMsg = intent.getStringExtra(NfcActivity.NFC_DATA);
				 StringBuilder buff = new StringBuilder();
				 buff.append("if(window['").append(nfcCallback).append("']){");
				 buff.append(nfcCallback).append("(unescape('").append(EscapeUnescape.escape(nfcMsg)).append("'));");
				 buff.append("}else{alert('请设置获取NFC的回调方法');};");
				 wademobile.getCurrentWebView().executeJs(buff.toString());
			}
		}
	}
}