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

display-client/assets/display-client/res/js/mobile/expand-mobile.js

@@ -53,12 +53,12 @@ define(["require"],function(require) {
				execute("shock", [time],err);
			},call:function(sn,autoCall,err){
				if(autoCall==undefined){
					autoCall=true;//0-跳转至拨打界面,1-直接拨打
					autoCall = false;// false-跳转至拨打界面,true-直接拨打
				}
				execute("call", [sn,autoCall],err);
			},sms:function(sn,msg,autoSms,err){
				if(autoSms==undefined){
					autoSms=false;//0-跳转至短信界面,1-直接短信
					autoSms = false;// false-跳转至短信界面,true-直接短信
				}
				execute("sms", [sn,msg,autoSms],err);
			},openApp:function(appId,urlParams,installUrl,err){
@@ -213,6 +213,21 @@ define(["require"],function(require) {
				execute("sendText", [account,content],err);
			},setCallbackForPush:function(callback){
				execute("setCallbackForPush", [callback]);
			},aliPay:function(tradeNo,subject,body,price,callback,err){
				storageCallback("aliPay",callback);
				execute("aliPay",[tradeNo,subject,body,price],err);	
			},uploadFile:function(filePath,callback,err){
				storageCallback("uploadFile",callback);
				execute("uploadFile",[filePath],err);	
			},downloadFile:function(filePath,callback,err){
				storageCallback("downloadFile",callback);
				execute("downloadFile",[filePath],err);	
			},recordVideo:function(callback,compressRatio,timeLimit,err){
				storageCallback("recordVideo",callback);
				execute("recordVideo",[compressRatio,timeLimit],err);	
			},playVideo:function(callback,videoPath,err){
				storageCallback("playVideo",callback);
				execute("playVideo",[videoPath],err);	
			}
		};
	})();
@@ -234,4 +249,4 @@ define(["require"],function(require) {
	}
	
	return ExpandMobile;
});
});

display-server/etc/server-data.xml

@@ -5,7 +5,8 @@
	<action name="LoginBean.setLoginInfo" class="com.ai.server.bean.LoginBean" method="setLoginInfo"></action>
	
	<action name="receiveData" class="com.ai.server.bean.TestBean" method="receive" verify="false"></action>
	<action name="TestBean.reverse" class="com.ai.server.bean.TestBean" method="reverse" verify="false"></action>
	
	<action name="FileUpDownload.upload" class="com.ai.server.bean.FileUpDownload" method="upload" verify="false"></action>
	
	<action name="SceneBean.dataRequestScene" class="com.ai.server.bean.SceneBean" method="dataRequestScene" verify="false"></action>
</datas>

display-server/etc/server-page.xml

@@ -92,4 +92,6 @@
	<action name="DataRequest" template="template/webapp/scene/DataRequest.html"></action>
	<action name="TemplateRedirect" template="template/webapp/scene/TemplateRedirect.html"></action>
	<action name="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>
</pages>

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

@@ -5,13 +5,22 @@ import com.ai.server.core.context.DisplayContextData;
import com.ai.server.core.session.DisplaySessionManager;
import com.ai.server.util.Constant;
import com.ailk.common.data.IData;
import com.ailk.mobile.util.MobileUtility;
public class LoginBean extends DisplayBean{
	
	public IData login(IData param) throws Exception{
		DisplayContextData displayContextData = new DisplayContextData(param.getString("ACCOUNT"));
		String sessionId = DisplaySessionManager.getInstance().createSession(displayContextData);
		param.put(Constant.Session.SESSION_ID, sessionId);
		/*
		 * 通过传入的账号密码做登陆校验
		 */
		boolean isSuccess = true; //登陆成功
		if(isSuccess){
			DisplayContextData displayContextData = new DisplayContextData(param.getString("ACCOUNT"));
			String sessionId = DisplaySessionManager.getInstance().createSession(displayContextData);
			param.put(Constant.Session.SESSION_ID, sessionId);
		}else{
			MobileUtility.error("登陆失败!");
		}
		return param;
	}
	

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

@@ -0,0 +1,12 @@
package com.ai.server.bean;
import com.ai.server.core.bean.DisplayBean;
import com.ailk.common.data.IData;
public class SceneBean extends DisplayBean{
	
	public IData dataRequestScene(IData param) throws Exception{
		return null;
	}
}

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

@@ -1,34 +0,0 @@
package com.ai.server.bean;
import com.ai.server.core.bean.DisplayBean;
import com.ailk.common.data.IData;
import com.ailk.common.data.impl.DataMap;
/**
 * a test bean
 * 
 * @author zhangming
 *
 */
public class TestBean extends DisplayBean {
	
	public IData receive(IData param) throws Exception{
		
		return null;
	}
	
	/****
	 * 将参数反转
	 * @param param
	 * @return
	 */
	public IData reverse(IData param){
		String data = param.getString("data", "");
		
		StringBuilder sbuilder = new StringBuilder(data);
		IData result = new DataMap();
		result.put("DATA", sbuilder.reverse().toString());
		
		return result;
	}
}

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

@@ -53,12 +53,12 @@ define(["require"],function(require) {
				execute("shock", [time],err);
			},call:function(sn,autoCall,err){
				if(autoCall==undefined){
					autoCall=true;//0-跳转至拨打界面,1-直接拨打
					autoCall = false;// false-跳转至拨打界面,true-直接拨打
				}
				execute("call", [sn,autoCall],err);
			},sms:function(sn,msg,autoSms,err){
				if(autoSms==undefined){
					autoSms=0;//0-跳转至短信界面,1-直接短信
					autoSms = false;// false-跳转至短信界面,true-直接短信
				}
				execute("sms", [sn,msg,autoSms],err);
			},openApp:function(appId,urlParams,installUrl,err){

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

@@ -0,0 +1,22 @@
<!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" />
</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>
</body>
</script>
</html>

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

@@ -43,7 +43,7 @@
				<div class="content">
					<div class="main">
						<div class="title">页面跳转(直接数据渲染)</div>
						<div class="info">页面跳转，没有数据请求，传入的参数直接用于页面渲染</div>
						<div class="info">没有数据请求，传入的参数直接用于页面渲染</div>
					</div>
				</div>
			</li>
@@ -51,7 +51,23 @@
				<div class="content">
					<div class="main">
						<div class="title">页面跳转(调用数据接口)</div>
						<div class="info">页面跳转，调用数据请求，传入的参数先用于请求数据接口，得到的结果集用于页面渲染</div>
						<div class="info">调用数据请求，传入的参数先用于请求数据接口，得到的结果集用于页面渲染</div>
					</div>
				</div>
			</li>
			<li action="TemplateRefresh">
				<div class="content">
					<div class="main">
						<div class="title">局部刷新(直接数据渲染)</div>
						<div class="info">没有数据请求，传入的参数直接用于解析模板得到html</div>
					</div>
				</div>
			</li>
			<li action="PageRefresh">
				<div class="content">
					<div class="main">
						<div class="title">局部刷新(调用数据接口)</div>
						<div class="info">调用数据请求，传入的参数先用于请求数据接口，得到的结果集用于解析模板得到html</div>
					</div>
				</div>
			</li>

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

@@ -0,0 +1,23 @@
<!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" />
</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>
</body>
<script type="text/javascript">
</script>
</html>

wade-mobile-func/src/com/wade/mobile/func/MobileBasic.java

@@ -38,8 +38,8 @@ public class MobileBasic extends Plugin {
	 * 呼出电话
	 * @param sn
	 */
	public void call(String sn,boolean flag) {
		if(flag){
	public void call(String sn,boolean autoCall) {
		if(autoCall){
			/**权限:android.permission.CALL_PHONE*/
			Intent intent = new Intent(Intent.ACTION_CALL,Uri.parse("tel:"+ sn));
			this.context.startActivity(intent);