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

display-server/build/build.properties

@@ -12,7 +12,7 @@ template=${web}/template
encrypt=${web}/encrypt
version_class=com.ailk.mobile.tool.VersionTool
encrypt_class=com.ailk.mobile.tool.FileEncryptTool
version_filter=setup|.gitignore|.DS_Store
version_filter=upload|setup|.gitignore|.DS_Store
is_debug=false
encode=UTF-8

display-server/etc/server-data.xml

@@ -6,6 +6,7 @@
	
	<action name="receiveData" class="com.ai.server.bean.TestBean" method="receive" verify="false"></action>
	
	<action name="FileUpDownload.download" class="com.ai.server.bean.FileUpDownload" method="download" verify="false"></action>
	<action name="FileUpDownload.upload" class="com.ai.server.bean.FileUpDownload" method="upload" verify="false"></action>
	
	<!-- ##################################场景演示########################################################### -->

display-server/etc/server-page.xml

@@ -102,7 +102,9 @@
	<action name="SceneBean_dataRequest" template="template/webapp/scene/DataRequest.html"></action>
	<!-- 页面跳转（直接数据渲染）场景 -->
	<action name="SceneBean_templateRedirect" template="template/webapp/scene/TemplateRedirect.html"></action>
	<action name="PageRedirect" template="template/webapp/scene/PageRedirect.html"></action>
	<!-- 页面跳转(调用数据接口)场景***************脑筋急转弯-->
	<action name="SceneBean_PageRedirect" template="template/webapp/scene/PageRedirect.html"></action>
	
	<action name="TemplateRefresh" template="template/webapp/scene/TemplateRefresh.html"></action>
	<action name="PageRefresh" template="template/webapp/scene/PageRefresh.html"></action>
	<action name="TemplateRefresh.personDetailTemplate" template="template/webapp/scene/personDetailTemplate.html"></action>

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

@@ -24,8 +24,10 @@ import com.ailk.mobile.servlet.ServletManager;
 *
 */
public class FileUpDownload extends DisplayBean {
	/**
	 * 文件上传
	/************************************************************************************
	 * 文件上传；
	 * 如果在参数param中包含USER_NAME键值对，那么文件将保存到USER_NAME对应的目录下；否则保存在TEMP目录下
	 * 
	 * @param param
	 * @return
	 * @throws Exception
@@ -33,79 +35,94 @@ public class FileUpDownload extends DisplayBean {
	public IData upload(IData param) throws Exception{
		HttpServletRequest request = ServletManager.getRequest();
		//获取文件需要上传到的路径
		String userDir = "default";//此处一般使用用户名管理文件
		String path = ApplicationPath.getFilePath(request) + "upload" + File.separator + userDir;
		String path = ApplicationPath.getFilePath(request) + "upload" + File.separator;
		//获取临时目录，文件保存目录
		String tempPath = path + "temp", savePath = null;
		
		File file = new File(path);
		File file = new File(tempPath);
		if(! file.exists() && ! file.mkdirs()){
			throw new RuntimeException("生成用户上传文件夹失败，无法进行上传操作！");
			throw new RuntimeException("生成上传临时文件夹失败，无法进行上传操作！");
		}
		
		//获得磁盘文件条目工厂
		DiskFileItemFactory factory = new DiskFileItemFactory();
        //如果没以下两行设置的话，上传大的文件会占用很多内存
        //设置暂时存放的存储室，这个存储室可以和最终存储文件的目录不同
        /**
         * 原理它是先存到暂时存储室，然后在真正写到对应目录的硬盘上
         * 按理来说当上传一个文件时，其实是上传了两份，第一个是以.tem格式的
         * 然后再将其真正写到对应目录的硬盘上
         */
         factory.setRepository(file);
         //设置缓存的大小，当上传文件的容量超过该缓存时，直接放到暂时存储室
         factory.setSizeThreshold(1024*1024);
         //文件上传处理
         ServletFileUpload upload = new ServletFileUpload(factory);
        factory.setRepository(file);
        //设置缓存的大小，当上传文件的容量超过该缓存时，将产生临时文件并存储于临时目录中.
        factory.setSizeThreshold(5*1024*1024);
        //文件上传处理
        ServletFileUpload upload = new ServletFileUpload(factory);
         
         try {
	         if (! ServletFileUpload.isMultipartContent(request)) {
	    	 	 log.debug("{'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();
        try{
        	if (! ServletFileUpload.isMultipartContent(request)) {
        		log.debug("获取的上传文件并非以文件流格式传送，请核查！");
        		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();
                 
            	 //如果获取的 表单信息是普通的文本信息
                 if(item.isFormField()){
                     //获取用户具体输入的字符串，因为表单提交过来的是字符串类型的
                     String value = item.getString();
                     request.setAttribute(name, value);
            	//如果获取的 表单信息是普通的文本信息
                if(item.isFormField()){
                 	//获取用户具体输入的字符串，因为表单提交过来的是字符串类型的
                 	String value = item.getString();
                    request.setAttribute(name, value);
                    //获取用户保存目录
                    if(savePath == null)
                    	savePath = "USER_NAME".equals(name) ? path + value : tempPath;
                 	 
                 }else{
	                 //获取路径名
	                 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());
	                 //写出到文件中
	                 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;
                }else{
                	//获取路径名
	             	String value = item.getName();
	                int start = value.lastIndexOf("\\");
	                String filename = value.substring(start + 1);
	                //保存文件名
	                request.setAttribute(name, filename);
	                
	                //检查保存目录
	                File saveDir = new File(savePath);
	         		if(! saveDir.exists() && ! saveDir.mkdirs()){
	         			throw new RuntimeException("生成上传保存文件夹失败，无法进行上传操作！");
	         		}
	         		//设置保存文件
	                File saveFile = new File(savePath, filename);
	                //写到磁盘上
	                OutputStream out = new FileOutputStream(saveFile);
	                InputStream in = item.getInputStream();
	                
	                int length = 0;
	                byte[] buf = new byte[1024];
	                //写出到文件中
	                while((length = in.read(buf) ) != -1) {
	                    //在BUF数组中取出数据写到（输出流）磁盘上
	                    out.write(buf, 0, length);
	                }
	                out.flush();
	                in.close();
	                out.close();
	                
	                log.debug("获取上传文件的总共的容量：" + item.getSize());
               }
           }
       } catch (FileUploadException e) {
           e.printStackTrace();
           
       }catch (Exception e) {
           e.printStackTrace();
       }
       return null;
	}
	/************************************************************************************
	 * 文件下载；
	 * 
	 * @param param
	 * @return
	 * @throws Exception
	 */
	public IData download(IData param) throws Exception{
		
       return null;
	}
}

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

@@ -29,7 +29,7 @@ public class SceneBean extends DisplayBean {
		// 获取人品--随机数
		Random random = new Random();
		int testCharacter = random.nextInt(100);
		
		StringBuffer retMsg = new StringBuffer();
		if (testCharacter > 0 && testCharacter < 20) {
			retMsg.append("是我不好...不应该和你谈人品问题的...");
@@ -50,6 +50,30 @@ public class SceneBean extends DisplayBean {
	}
	/**
	 * 页面跳转(调用数据接口)场景
	 * 
	 * @param param
	 * @return
	 * @throws Exception
	 */
	public IData openPageScene(IData param) throws Exception {
		IData result = new DataMap();
		// 获取从前台传过来的数据
		String data = param.getString("data", "");
		// 处理前台传过来的数据
		if ("1".equals(data.trim())) {
			result.put("retMsg", "太棒了，回答正确");
		} else {
			result.put("retMsg", "哎呀，回答错误了，答案：1个，因为再吃的时候就不是空着肚子了");
		}
		return result;
	}
	/**
	 * 初始化验证码
	 * 
	 * @param param

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

@@ -3,21 +3,25 @@ require(["domReady!","wadeMobile", "util"], function(doc,WadeMobile) {
	$("#upload").tap(function() {
		//文件上传可以下载多个文件
		var uploadFiles = new Array();
//		uploadFiles.push('/Users/kevin/Downloads/cat.png');
		uploadFiles.push('/Users/kevin/Downloads/cat.txt');
		uploadFiles.push('/Users/kevin/Downloads/cat.png');
		uploadFiles.push('/Users/kevin/Downloads/cat.mov');
		//保存在"kevin"目录下
		var params = new Wade.DataMap();
		params.put("USER_NAME", "kevin");
		
		WadeMobile.uploadFile(uploadFiles, function(){
		WadeMobile.uploadWithServlet(uploadFiles, "FileUpDownload.upload", params, function(){
			
		});
	});
	
	//下载
	$("#download").tap(function() {
		//文件下载可以下载多个文件
		var uploadFiles = new Array();
		uploadFiles.push('http://127.0.0.1:9001/display/upload/default/20151013151525.png');//下载文件地址
		//下载文件保存
		var downloadPath = "/Users/kevin/Downloads";
		
		var params = new Wade.DataMap();
		
		WadeMobile.downloadFile(uploadFiles, function(){
		WadeMobile.downloadWithServlet(downloadPath, "FileUpDownload.download", params, function(){
			
		});
	});

display-server/web/biz/js/scene/Login.js

@@ -1,11 +1,13 @@
require(["wmTabbar","common","mobile","util"], function(WmTabbar,Common,Mobile) {
	// 页面初始化，初始化验证码
	Common.callSvc("SceneBean.initVerifyCode", null, function(resultData){
		if(typeof(resultData) == "string" ){
			resultData = new Wade.DataMap(resultData);
		}
		$("#J_ver_img").attr("src", "data:image/png;base64, " + resultData.get("VERIFY_IMG"));
		// 保存session_id
		
		// 保存session_id(以后每次请求，都会在Common中自动添加此SessionId,以便通过Session校验)
		Common.put("SESSION_ID", resultData.get("SESSION_ID"));
	});
	
@@ -17,44 +19,29 @@ require(["wmTabbar","common","mobile","util"], function(WmTabbar,Common,Mobile)
			}
			$("#J_ver_img").attr("src", "data:image/png;base64, " + resultData.get("VERIFY_IMG"));
			$("#J_ver").val("");
			$("#J_ver").select();
		});
	})
	
	// 登录
	$("#sceneLoginBtn").tap(function(){
		var loginData = new Wade.DataMap();
		loginData.put("USER_NAME", $("#J_username").val());
		loginData.put("USER_PASSWORD", $("#J_pwd").val());
		loginData.put("VERIFY_CODE", $("#J_ver").val());
		
		// 将前台输入的参数传至后台校验
		Common.callSvc("SceneBean.login",loginData,function(data){
			console.log("结果[用户登陆]：" + data);
			//校验不正确
			if("0" != data.get("X_RESULTCODE")){
				$("#mention").text(data.get("X_RESULTINFO"));
			
			//校验正确	
			}else{
				Mobile.tip("亲爱的【"+data.get("ACCOUNT")+"】用户，登陆成功");
			if(typeof(resultData) == "string" ){
				resultData = new Wade.DataMap(resultData);
			}
			// 登录成功或失败之后的操作
			$("#retMsg").text("亲爱的【"+data.get("ACCOUNT")+"】用户，登陆成功");
			$("#loginForm").hide();
			$("#loginResult").show();
		});
	});
	
//	var loginData = new Wade.DataMap();
//	loginData.put("ACCOUNT","测试工号");
//	loginData.put("PASSWORD", "");
//	
//	Common.callSvc("LoginBean.login",loginData,function(data){
//		console.log("登陆成功:" + data);
//		Common.put("SESSION_ID",data.get("SESSION_ID"));
//		setTimeout(function(){
//			data.put("NEW_ACCOUNT","更新工号");
//			Common.callSvc("LoginBean.setLoginInfo",data,function(result){
//				console.log("更新信息:" + result);
//				Common.callSvc("LoginBean.getLoginInfo",null,function(result){
//					console.log("获取信息:" + result);
//				});
//			});
//		},200);
//	});
});

display-server/web/biz/js/scene/TemplateRedirect.js

@@ -1,12 +1,13 @@
require(["mobile","util"], function(Mobile) {
	
	// 开始游戏
	$("#startGame").tap(function(){
		
		// 页面跳转
		var param = new Wade.DataMap();
		Mobile.openTemplate("SceneBean_dataRequest",param);
	});
	
require(["mobile","util"], function(Mobile) {
	
	// 开始游戏
	$("#startGame").tap(function(){
		
		// 页面跳转需要渲染的数据
		var param = new Wade.DataMap();
		param.put("TemplateRedirectData","页面跳转（直接数据渲染）传过来的数据")
		Mobile.openTemplate("SceneBean_dataRequest",param);
	});
	
});

display-server/web/template/webapp/plugin/UI-CustomDialog.html

@@ -16,9 +16,7 @@
			<li tapfor="msgContent">
				<div class="content content-vertical">
					<div class="label">输入返回值:</div>
					<div class="value"><textarea id="result" style="height:1rem;">
						返回值测试
					</textarea></div>
					<div class="value"><textarea id="result" style="height:1rem;">返回值测试</textarea></div>
				</div>
			</li>
		</ul>

display-server/web/template/webapp/plugin/UI-CustomWindow.html

@@ -16,9 +16,7 @@
			<li tapfor="msgContent">
				<div class="content content-vertical">
					<div class="label">输入返回值:</div>
					<div class="value"><textarea id="result" style="height:1rem;">
						返回值测试
					</textarea></div>
					<div class="value"><textarea id="result" style="height:1rem;">返回值测试</textarea></div>
				</div>
			</li>
		</ul>

display-server/web/template/webapp/scene/DataRequest.html

@@ -64,7 +64,7 @@
				<tbody>
					<tr>
						<td width="30%"><label class="des">输入人名：</label></td>
						<td><input value="" type="text" id="J_username" name="J_username" class="ui-input ui-nt" maxlength="20" title="姓名"></td>
						<td><input value="{%TemplateRedirectData%}" type="text" id="J_username" name="J_username" class="ui-input ui-nt" maxlength="20" title="姓名"></td>
					</tr>
					<tr>
						<td>&nbsp;</td>
@@ -84,7 +84,7 @@
						<td id="retName"></td>
					</tr>
					<tr>
						<td width="30%"><label class="des">评价：</label></td>
						<td><label class="des">评价：</label></td>
						<td id="retMsg"></td>
					</tr>
					<tr>
@@ -96,6 +96,7 @@
				</tbody>
			</table>
		</div>
		
	</form>
	
</div>

display-server/web/template/webapp/scene/Login.html

@@ -50,6 +50,10 @@
	width: 1rem;
	height: 0.4rem;
}
#loginResult span {
	line-height: 0.4rem;
    height: 0.4rem;
}
</style>
</head>
<body>
@@ -64,7 +68,7 @@
	
	<div class="m_content m_content-nofooter" id="content">
		<form class="reg_form">
			<table class="reg_table" cellpadding="0" cellspacing="0" border="0" width="100%">
			<table class="reg_table" cellpadding="0" cellspacing="0" border="0" width="100%" id="loginForm">
				<tbody>
					<tr>
						<td width="30%"><label class="des">用户名：</label></td>
@@ -89,6 +93,11 @@
					</tr>
				</tbody>
			</table>
			
			<div id="loginResult" style="text-align: center;display: none;">
				<img src="biz/img/scene/login_success.png"/><br><br>
				<span id="retMsg"></span>
			</div>
		</form>
	</div>
</body>

display-server/web/template/webapp/scene/PageRedirect.html

@@ -6,6 +6,50 @@
	<title>页面跳转</title>
	{%>template/common/Head.html%}
	<link href="biz/css/project.css" rel="stylesheet" type="text/css" />
	<style>
		.ui-input {
			padding: 6px 9px;
			line-height: 0.22rem;
		    height: 0.4rem;
			width: 3rem;
			border: 1px solid #BBBBBB;
			font-size: 0.22rem;
		    color: #777;
		    background: transparent;
		    font-size: 0.22rem;
		}
		.reg_form {
			background-color: #fff;
			font-size: 0.22rem;
			padding-top: 0.12rem;
			box-shadow: 0 0.02rem 0 rgba(0,0,0,0.1);
		    line-height: 1;
		    border: 1px solid #ccc;
		    overflow: hidden;
		    background: #fff;
		}
		.reg_form .reg_table {
		}
		.reg_form .reg_table td {
			padding: 0 0 8px 0;
			height: 32px;
		}
		.reg_form .reg_table td label.des {
			text-align: right;
			display: table-cell;
		    width: 1.5rem;
		    padding: 0.16rem;
		    line-height: 0.28rem;
		}
		.reg_form .reg_table .J_ver-wrap .ui-input {
			width: 2rem;
		}
		.reg_form .reg_table td span.num {
			padding: 0.16rem;
		    line-height: 0.28rem;
		    display: inline-block;
		}
	</style>
</head>
<body>
<div class="c_navBar">
@@ -16,20 +60,36 @@
		</div>
	</div>
</div>
<div class="c_submit">
	<ul>
		<li></li>
		<li><button class="e_button-cancel" id="call">跳转</button></li>
		<li></li>
	</ul>
<div class="m_content m_content-nofooter" id="content">
	<form class="reg_form">
		<table class="reg_table" cellpadding="0" cellspacing="0" border="0" width="100%" id="loginForm">
			<tbody>
				<tr>
					<td width="30%"><label class="des">脑筋急转弯：</label></td>
					<td>空着肚子能吃几个鸡蛋？</td>
				</tr>
				<tr>
					<td><label class="des">请回答：</label></td>
					<td class="J_ver-wrap">
						<input value="" type="text" id="J_answer" name="J_answer" class="ui-input" maxlength="4" /><span class="num">个</span>
					</td>
				</tr>
				<tr>
					<td>&nbsp;</td>
					<td>
						<button class="e_button-ok" id="testPageRedirectBtn" onclick="javascript:return false;">确定</button>
					</td>
				</tr>
			</tbody>
		</table>
	</form>
</div>
</body>
<script type="text/javascript">
require(["mobile","util"], function(Mobile) {
	
	$(".e_button-cancel").tap(function(){
		
	$("#testPageRedirectBtn").tap(function(){
		Mobile.openPage("Basic");
	});
});

display-server/web/template/webapp/scene/PageRedirectResult.html

@@ -0,0 +1,51 @@
<!DOCTYPE HTML>
<html class="s_bs">
<head>
	<meta 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%}
	<link href="biz/css/project.css" rel="stylesheet" type="text/css" />
	<style>
		.ui-input {
			padding: 6px 9px;
			line-height: 0.22rem;
		    height: 0.4rem;
			width: 3rem;
			border: 1px solid #BBBBBB;
			font-size: 0.22rem;
		    color: #777;
		    background: transparent;
		    font-size: 0.22rem;
		}
		.reg_form {
			background-color: #fff;
			font-size: 0.22rem;
			padding-top: 0.12rem;
			box-shadow: 0 0.02rem 0 rgba(0,0,0,0.1);
		    line-height: 1;
		    border: 1px solid #ccc;
		    overflow: hidden;
		    background: #fff;
		}
	</style>
</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">
	<form class="reg_form">
		<div style="text-align: center;padding: 0.5rem;">
			<span id="retMsg">{%retMsg%}</span>
		</div>
		
	</form>
</div>
</body>
</html>

display-server/web/template/webapp/scene/Scene.html

@@ -21,14 +21,14 @@
<div>
	<div class="c_list">
		<ul id="scene-menu">
			<li action="testCalendar">
			<!-- <li action="testCalendar">
				<div class="content">
					<div class="main">
						<div class="title">日历测试</div>
						<div class="info">暂时先放在这里！！！</div>
					</div>
				</div>
			</li>
			</li> -->
			
			<li action="SceneBean_login_init">
				<div class="content">
@@ -56,7 +56,7 @@
					</div>
				</div>
			</li>
			<li action="PageRedirect">
			<li action="SceneBean_PageRedirect">
				<div class="content">
					<div class="main">
						<div class="title">页面跳转(调用数据接口)</div>