Quellcode durchsuchen

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

chengwb3 vor 9 Jahren
Ursprung
Commit
da3b37cf36

+ 0 - 2
display-server/etc/server-page.xml

@ -30,8 +30,6 @@
30 30
	<action name="UploadDownload" template="template/webapp/plugin/UploadDownload.html"></action>
31 31
	<action name="YunbaPush" template="template/webapp/plugin/YunbaPush.html"></action>
32 32
	<action name="Contacts" template="template/webapp/plugin/Contacts.html"></action>
33
	<!-- NFC -->
34
	<action name="NFC" template="template/webapp/plugin/NFC.html"></action>
35 33
36 34
	<!-- Web Component Demo-->
37 35
	<action name="WmTab" template="template/webapp/tag/WmTab.html"></action>

+ 0 - 7
display-server/web/biz/js/plugin/NFC.js

@ -1,7 +0,0 @@
1
require(["domReady!","wadeMobile","util"], function(doc,WadeMobile) {
2
	$("#read").tap(function() {
3
		WadeMobile.readByNfc(function(result) {
4
			alert(result)
5
		});
6
	});
7
});

+ 0 - 3
display-server/web/res/js/mobile/expand-mobile.js

@ -293,9 +293,6 @@ define(["require"],function(require) {
293 293
				execute("setScreeLock",[dataAction,param,indexPage],err);
294 294
			},screeUnlock:function(screenUnlockType, forgetPageAction, err){
295 295
				execute("screeUnlock",[screenUnlockType, forgetPageAction],err);
296
			},readByNfc:function(callback, err){
297
				storageCallback("readByNfc",callback);
298
				execute("readByNfc",[callback], err);
299 296
			}
300 297
		};
301 298
	})();

+ 0 - 4
display-server/web/template/webapp/PluginIndex.html

@ -55,8 +55,4 @@
55 55
		<div class="pic"><span class="e_ico-storage"></span></div>
56 56
		<div class="text">通讯录</div>
57 57
	</li>
58
	<li action="NFC">
59
		<div class="pic"><span class="e_ico-storage"></span></div>
60
		<div class="text">NFC</div>
61
	</li>
62 58
</ul>

+ 0 - 39
display-server/web/template/webapp/plugin/NFC.html

@ -1,39 +0,0 @@
1
<!DOCTYPE HTML>
2
<html class="s_bs">
3
<head>
4
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5
	<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
6
	<title>NFC</title>
7
	{%>template/common/Head.html%}
8
	<script type="text/javascript" src="biz/js/plugin/NFC.js"></script>
9
	<link href="biz/css/project.css" rel="stylesheet" type="text/css" />
10
</head>
11
<body>
12

13
<div class="c_navBar">
14
	<div class="left">
15
		<div class="back">
16
			<span class="e_ico-back"></span>
17
			<span class="text">NFC</span>
18
		</div>
19
	</div>
20
</div>
21

22
<div class="m_content m_content-nofooter" id="content" >
23
	<div class="c_title">读取NFC信息</div>
24
	<div class="c_list">
25
		<ul>
26
			<li>
27
				<div class="content">
28
					<div class="main">
29
						<div class="title">NFC</div>
30
						<div class="info"></div>
31
					</div>
32
					<div class="fn fn-2" id="read">读取</div>
33
				</div>
34
			</li>
35
		</ul>
36
	</div>
37
</div>
38
</body>
39
</html>