Explorar el Código

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

ybf326 %!s(int64=9) %!d(string=hace) años
padre
commit
1f488f1e26

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

520
				.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
520
				.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
521
				.replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) {
521
				.replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) {
522
						
522
						
523
				console.log("########data");
523
				//console.log("########data");
524
				//先尝试使用浏览器内部JSON解析器
524
				//先尝试使用浏览器内部JSON解析器
525
				return window.JSON && window.JSON.parse ?
525
				return window.JSON && window.JSON.parse ?
526
					window.JSON.parse( data ) :
526
					window.JSON.parse( data ) :
721
		},
721
		},
722
		parseString:function(str){
722
		parseString:function(str){
723
			str=$.parseJsonString(str);
723
			str=$.parseJsonString(str);
724
			console.log("#####this.parseObject");
724
			//console.log("#####this.parseObject");
725
			return window.JSON && window.JSON.parse ? this.parseObject(window.JSON.parse(str)) 
725
			return window.JSON && window.JSON.parse ? this.parseObject(window.JSON.parse(str)) 
726
					: (new Function("this.parseObject(" +str+")")).apply(this);
726
					: (new Function("this.parseObject(" +str+")")).apply(this);
727
			//if(typeof(o)=="object")this.parseObject(o);
727
			//if(typeof(o)=="object")this.parseObject(o);
812
		},	
812
		},	
813
		parseString:function(str){
813
		parseString:function(str){
814
			str=$.parseJsonString(str);
814
			str=$.parseJsonString(str);
815
			console.log("#####this.parseArray");
815
			//console.log("#####this.parseArray");
816
			return window.JSON && window.JSON.parse ? this.parseArray(window.JSON.parse(str)) : 
816
			return window.JSON && window.JSON.parse ? this.parseArray(window.JSON.parse(str)) : 
817
				(new Function("this.parseArray(" +str+")")).apply(this);	
817
				(new Function("this.parseArray(" +str+")")).apply(this);	
818
		},
818
		},

+ 21 - 18
display-server/web/template/webapp/plugin/NFC.html

26
			<li>
26
			<li>
27
				<div class="content">
27
				<div class="content">
28
					<div class="main">
28
					<div class="main">
29
						<div class="title">读取NFC</div>
30
						<div class="info"></div>
29
						<div class="title">读取北京公交卡</div>
30
						<div class="info">通过参数不同,理论上可以读取任何类型的芯片卡。</div>
31
					</div>
31
					</div>
32
					<div class="fn fn-2" id="read">读取</div>
32
					<div class="fn fn-2" id="read">读取</div>
33
				</div>
33
				</div>
35
		</ul>
35
		</ul>
36
	</div>
36
	</div>
37
	
37
	
38
	<div class="c_list" style="display: none;" id="result">
39
		<ul>
40
			<li>
41
				<div class="content">
42
					<div class="label">余额</div>
43
					<div class="value"><span id="cash"></span></div>
44
				</div>
45
			</li>
46
			<li>
47
				<label class="content content-vertical">
48
					<div class="label">最近10条交易记录</div>
49
					<div class="value">
50
						<div id="log"></div>
38
	<div style="display: none;" id="result">
39
		<div class="c_title">读取结果</div>
40
		<div class="c_list">
41
			<ul>
42
				<li>
43
					<div class="content">
44
						<div class="label">余额</div>
45
						<div class="value"><span id="cash"></span></div>
51
					</div>
46
					</div>
52
				</label>
53
			</li>
54
		</ul>
47
				</li>
48
				<li>
49
					<label class="content content-vertical">
50
						<div class="label">最近10条交易记录</div>
51
						<div class="value">
52
							<div id="log"></div>
53
						</div>
54
					</label>
55
				</li>
56
			</ul>
57
		</div>
55
	</div>
58
	</div>
56
</div>
59
</div>
57
</body>
60
</body>

+ 14 - 11
wade-mobile-func/src/com/wade/mobile/func/MobileDevice.java

7

7

8
import com.wade.mobile.app.MobileAppInfo;
8
import com.wade.mobile.app.MobileAppInfo;
9
import com.wade.mobile.common.nfc.activity.NfcActivity;
9
import com.wade.mobile.common.nfc.activity.NfcActivity;
10
import com.wade.mobile.common.nfc.util.NfcConstant;
10
import com.wade.mobile.frame.IWadeMobile;
11
import com.wade.mobile.frame.IWadeMobile;
11
import com.wade.mobile.frame.plugin.Plugin;
12
import com.wade.mobile.frame.plugin.Plugin;
12
import com.wade.mobile.ui.helper.HintHelper;
13
import com.wade.mobile.ui.helper.HintHelper;
15

16

16
public class MobileDevice extends Plugin {
17
public class MobileDevice extends Plugin {
17
	private static final int INIT_NFC = 1;
18
	private static final int INIT_NFC = 1;
18
	private static String NFC_CALLBACK;
19
	private static String nfcCallback;
19

20

20
	public MobileDevice(IWadeMobile wademobile) {
21
	public MobileDevice(IWadeMobile wademobile) {
21
		super(wademobile);
22
		super(wademobile);
30
			return;
31
			return;
31
		}
32
		}
32
		String cmds = param.getString(0);
33
		String cmds = param.getString(0);
33
		NFC_CALLBACK = param.getString(1);
34
		if(isNull(cmds)||isNull(NFC_CALLBACK)){
34
		nfcCallback = param.getString(1);
35
		if (isNull(cmds) || isNull(nfcCallback)) {
35
			Utility.error("参数为空异常!");
36
			Utility.error("参数为空异常!");
36
		}
37
		}
37
		
38

38
		Intent intent = new Intent(context, NfcActivity.class);
39
		Intent intent = new Intent(context, NfcActivity.class);
39
		intent.putExtra(NfcActivity.CMDS, cmds);
40
		intent.putExtra(NfcActivity.CMDS, cmds);
40
		startActivityForResult(intent, INIT_NFC);
41
		startActivityForResult(intent, INIT_NFC);
41
	}
42
	}
42
	
43

43
	@Override
44
	@Override
44
	public void onActivityResult(int requestCode, int resultCode, Intent intent) {
45
	public void onActivityResult(int requestCode, int resultCode, Intent intent) {
45
		if (requestCode == INIT_NFC) {
46
		if (requestCode == INIT_NFC) {
46
			String nfcMsg = intent.getStringExtra(NfcActivity.NFC_DATA);
47
			StringBuilder buff = new StringBuilder();
48
			buff.append("if(").append(NFC_CALLBACK).append("){");
49
			buff.append(NFC_CALLBACK).append("(unescape(").append(EscapeUnescape.escape(nfcMsg)).append("));");
50
			buff.append("}else{alert('请设置获取NFC的回调方法');};");
51
			wademobile.getCurrentWebView().executeJs(buff.toString());
47
			if (resultCode == NfcConstant.SUCCESS_CODE) {
48
				String nfcMsg = intent.getStringExtra(NfcActivity.NFC_DATA);
49
				 StringBuilder buff = new StringBuilder();
50
				 buff.append("if(window['").append(nfcCallback).append("']){");
51
				 buff.append(nfcCallback).append("(unescape('").append(EscapeUnescape.escape(nfcMsg)).append("'));");
52
				 buff.append("}else{alert('请设置获取NFC的回调方法');};");
53
				 wademobile.getCurrentWebView().executeJs(buff.toString());
54
			}
52
		}
55
		}
53
	}
56
	}
54
}
57
}