Merge branch 'master' of

http://114.215.100.48:3000/ipu/android-share.git

Conflicts:
	display-server/web/res/js/mobile/expand-mobile.js

display-server/etc/server-page.xml

@@ -22,6 +22,7 @@
	<action name="UI-CustomWindow" template="template/webapp/plugin/UI-CustomWindow.html"></action>
	<action name="UI-SlidingMenu" template="template/webapp/plugin/UI-SlidingMenu.html"></action>
	<action name="FileUpload" template="template/webapp/plugin/FileUpload.html"></action>
	<action name="RecordVideo" template="template/webapp/plugin/Video.html"></action>
	<!-- Web Component Demo-->
	<action name="WmTab" template="template/webapp/tag/WmTab.html"></action>
	<action name="WmTabbar" template="template/webapp/tag/WmTabbar.html"></action>

display-server/src/com/ai/server/bean/FileUpDownload.java

@@ -108,80 +108,4 @@ public class FileUpDownload extends DisplayBean {
        }
        return null;
	}
	/**
	 * 文件下载
	 * @param param
	 * @return
	 * @throws Exception
	 */
	public IData download(IData param) throws Exception{
		HttpServletRequest request = ServletManager.getRequest();
		//获取文件需要上传到的路径
		String appPath = ApplicationPath.getFilePath(request);
		String path = appPath + File.separator + "upload" + File.separator + "Steven";
		File file = new File(path);
		if(! file.exists() && ! file.mkdirs()){
			throw new RuntimeException("生成用户上传文件夹失败，无法进行上传操作！");
		}
		
		//获得磁盘文件条目工厂
		DiskFileItemFactory factory = new DiskFileItemFactory();
       //如果没以下两行设置的话，上传大的文件会占用很多内存
       //设置暂时存放的存储室，这个存储室可以和最终存储文件的目录不同
       /**
        * 原理它是先存到暂时存储室，然后在真正写到对应目录的硬盘上
        * 按理来说当上传一个文件时，其实是上传了两份，第一个是以.tem格式的
        * 然后再将其真正写到对应目录的硬盘上
        */
        factory.setRepository(file);
        //设置缓存的大小，当上传文件的容量超过该缓存时，直接放到暂时存储室
        factory.setSizeThreshold(1024*1024);
        //文件上传处理
        ServletFileUpload upload = new ServletFileUpload(factory);
        
        try {
	        if (! ServletFileUpload.isMultipartContent(request)) {
	    		System.out.println("{'result': false, 'error': 网络异常，请重新上传!}");
	    	    return null;
	        }
	        List<?> fileList = upload.parseRequest(request);
	        
            for(int i = 0; i < fileList.size(); i++){
            	
            	FileItem item = (FileItem)fileList.get(i);
                //获取表单的属性名字
                String name = item.getFieldName();
                /**以下三步，主要获取上传文件的名字*/
                //获取路径名
                String value = item.getName();
                //索引到最后一个反斜杠
                int start = value.lastIndexOf("\\");
                //截取 上传文件的 字符串名字，加1是 去掉反斜杠
                String filename = value.substring(start + 1);
                request.setAttribute(name, filename);
                
                //写到磁盘上
                OutputStream out = new FileOutputStream(new File(path,filename));
                InputStream in = item.getInputStream();
                
                int length = 0;
                byte[] buf = new byte[1024];
                
                System.out.println("获取上传文件的总共的容量：" + item.getSize());
                //in.read(BUF)每次读到的数据存放在BUF数组中
                while((length = in.read(buf) ) != -1) {
                    //在BUF数组中取出数据写到（输出流）磁盘上
                    out.write(buf, 0, length);
                }
                in.close();
                out.close();
            }
        } catch (FileUploadException e) {
            e.printStackTrace();
            
        }catch (Exception e) {
            e.printStackTrace();
        }
        return null;
	}
}

display-server/web/biz/js/plugin/fileupload.js

@@ -1,12 +1,24 @@
require(["domReady!","wadeMobile", "util"], function(doc,WadeMobile) {
	//建表
	$("#location").tap(function() {
	//上传
	$("#upload").tap(function() {
		//文件上传可以下载多个文件
		var uploadFiles = new Array();
//		uploadFiles.push('/Users/kevin/Downloads/cat.png');
		uploadFiles.push('/Users/kevin/Downloads/cat.txt');
		
		WadeMobile.uploadFile(uploadFiles, function(){
//			alert("上传成功！");
			
		});
	});
	
	//下载
	$("#download").tap(function() {
		//文件下载可以下载多个文件
		var uploadFiles = new Array();
		uploadFiles.push('http://127.0.0.1:9001/display/upload/default/20151013151525.png');//下载文件地址
		
		WadeMobile.downloadFile(uploadFiles, function(){
			
		});
	});
});

display-server/web/biz/js/plugin/video.js

@@ -0,0 +1,10 @@
require(["domReady!","wadeMobile", "util"], function(doc,WadeMobile) {
	//建表
	$("#location").tap(function() {
		var uploadFiles = new Array();
//		uploadFiles.push('/Users/kevin/Downloads/cat.png');
		uploadFiles.push('/Users/kevin/Downloads/cat.txt');
		
		WadeMobile.recordVideo("1", "30");
	});
});

display-server/web/res/js/mobile/expand-mobile.js

@@ -219,14 +219,15 @@ define(["require"],function(require) {
			},uploadFile:function(filePath,callback,err){
				storageCallback("uploadFile",callback);
				execute("uploadFile",[filePath],err);	
			},recordVideo:function(callback,timeLimit,err){
			},downloadFile:function(filePath,callback,err){
				storageCallback("downloadFile",callback);
				execute("downloadFile",[filePath],err);	
			},recordVideo:function(callback,compressRatio,timeLimit,err){
				storageCallback("recordVideo",callback);
				execute("recordVideo", [timeLimit],err);
			},playVideo:function(path,callback,err){
				if(callback){
					storageCallback("playVideo",callback);
				}
				execute("playVideo", [path],err)
				execute("recordVideo",[compressRatio,timeLimit],err);	
			},playVideo:function(callback,videoPath,err){
				storageCallback("playVideo",callback);
				execute("playVideo",[videoPath],err);	
			}
		};
	})();
@@ -248,4 +249,4 @@ define(["require"],function(require) {
	}
	
	return ExpandMobile;
});
});

display-server/web/template/webapp/PluginIndex.html

@@ -43,4 +43,8 @@
		<div class="pic"><span class="e_ico-storage"></span></div>
		<div class="text">文件上传</div>
	</li>
	<li action="RecordVideo">
		<div class="pic"><span class="e_ico-storage"></span></div>
		<div class="text">视频录制</div>
	</li>
</ul>

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

@@ -21,21 +21,38 @@
<div class="m_content m_content-nofooter" id="content" >
<div>
	<div class="c_title">文件位置</div>
	<div class="c_title">文件上传</div>
	<div class="c_list">
		<ul>
			<li>
				<div class="content">
					<div class="main">
						<div class="title">文件路径</div>
						<div class="info" id="fileLocation">请选择上传文件路径</div>
						<div class="info" id="fileUpload">请选择上传文件路径</div>
					</div>
					<div class="fn fn-2" id="location">文件路径</div>
					<div class="fn fn-2" id="upload">文件上传</div>
				</div>
			</li>
		</ul>
	</div>
</div>
<div>
	<div class="c_title">文件下载</div>
	<div class="c_list">
		<ul>
			<li>
				<div class="content">
					<div class="main">
						<div class="title">文件路径</div>
						<div class="info" id="fileDownload">请选择下载文件路径</div>
					</div>
					<div class="fn fn-2" id="download">文件下载</div>
				</div>
			</li>
		</ul>
	</div>
</div>
</div>
</body>
</html>

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

@@ -0,0 +1,41 @@
<!DOCTYPE HTML>
<html class="s_bs">
<head>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
	<title>视频</title>
	{%>template/common/Head.html%}
	<script type="text/javascript" src="biz/js/plugin/video.js"></script>
	<link href="biz/css/project.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div class="c_navBar">
	<div class="left">
		<div class="back">
			<span class="e_ico-back"></span>
			<span class="text">文件上传</span>
		</div>
	</div>
</div>
<div class="m_content m_content-nofooter" id="content" >
<div>
	<div class="c_title">视频</div>
	<div class="c_list">
		<ul>
			<li>
				<div class="content">
					<div class="main">
						<div class="title">视频录制</div>
						<div class="info" id="fileLocation">视频录制</div>
					</div>
					<div class="fn fn-2" id="location">视频录制</div>
				</div>
			</li>
		</ul>
	</div>
</div>
</div>
</body>
</html>