huangbo 9 vuotta sitten
vanhempi
commit
e47f010a7f

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

@ -21,8 +21,8 @@
21 21
	<action name="UI-CustomDialog" template="template/webapp/plugin/UI-CustomDialog.html"></action>
22 22
	<action name="UI-CustomWindow" template="template/webapp/plugin/UI-CustomWindow.html"></action>
23 23
	<action name="UI-SlidingMenu" template="template/webapp/plugin/UI-SlidingMenu.html"></action>
24
	<action name="FileUpload" template="template/webapp/plugin/FileUpload.html"></action>
25
	<action name="RecordVideo" template="template/webapp/plugin/Video.html"></action>
24
	<action name="UploadDownload" template="template/webapp/plugin/UploadDownload.html"></action>
25
	<action name="Video" template="template/webapp/plugin/Video.html"></action>
26 26
	<!-- Web Component Demo-->
27 27
	<action name="WmTab" template="template/webapp/tag/WmTab.html"></action>
28 28
	<action name="WmTabbar" template="template/webapp/tag/WmTabbar.html"></action>

+ 13 - 4
display-server/web/res/js/mobile/expand-mobile.js

@ -216,12 +216,21 @@ define(["require"],function(require) {
216 216
			},aliPay:function(tradeNo,subject,body,price,callback,err){
217 217
				storageCallback("aliPay",callback);
218 218
				execute("aliPay",[tradeNo,subject,body,price],err);	
219
			},uploadFile:function(filePath,callback,err){
219
			},uploadWithServlet:function(filePath,dataAction,param,callback,err){
220
				if(typeof(filePath)=="string"){
221
					filePath = [filePath];
222
				}
223
				storageCallback("uploadWithServlet",callback);
224
				execute("uploadWithServlet",[filePath,dataAction,param],err);	
225
			},downloadWithServlet:function(savePath,dataAction,param,callback,err){
226
				storageCallback("downloadWithServlet",callback);
227
				execute("downloadWithServlet",[savePath,dataAction,param],err);	
228
			}uploadFile:function(filePath,servletUrl,callback,err){
220 229
				storageCallback("uploadFile",callback);
221
				execute("uploadFile",[filePath],err);	
222
			},downloadFile:function(filePath,callback,err){
230
				execute("uploadFile",[filePath,servletUrl],err);	
231
			},downloadFile:function(savePath,servletUrl,callback,err){
223 232
				storageCallback("downloadFile",callback);
224
				execute("downloadFile",[filePath],err);	
233
				execute("downloadFile",[savePath,servletUrl],err);	
225 234
			},recordVideo:function(callback,compressRatio,timeLimit,err){
226 235
				storageCallback("recordVideo",callback);
227 236
				execute("recordVideo",[compressRatio,timeLimit],err);	

+ 5 - 1
display-server/web/template/webapp/PluginIndex.html

@ -35,6 +35,10 @@
35 35
		<div class="pic"><span class="e_ico-audio"></span></div>
36 36
		<div class="text">音频</div>
37 37
	</li>
38
	<li action="RecordVideo">
39
		<div class="pic"><span class="e_ico-storage"></span></div>
40
		<div class="text">视频</div>
41
	</li>
38 42
	<li action="Database">
39 43
		<div class="pic"><span class="e_ico-conect"></span></div>
40 44
		<div class="text">数据库</div>
@ -45,6 +49,6 @@
45 49
	</li>
46 50
	<li action="RecordVideo">
47 51
		<div class="pic"><span class="e_ico-storage"></span></div>
48
		<div class="text">视频录制</div>
52
		<div class="text">云巴推送</div>
49 53
	</li>
50 54
</ul>

+ 1 - 1
display-server/web/template/webapp/plugin/Video.html

@ -14,7 +14,7 @@
14 14
	<div class="left">
15 15
		<div class="back">
16 16
			<span class="e_ico-back"></span>
17
			<span class="text">文件上传</span>
17
			<span class="text">视频</span>
18 18
		</div>
19 19
	</div>
20 20
</div>