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

display-client/AndroidManifest.xml

@@ -87,10 +87,14 @@
        </activity>
        <!-- 音乐播放服务 -->
        <service android:name="com.wade.mobile.common.audio.play.AudioPlayerService" />
        <!-- 录制声音 -->
        <!-- 录制声音
        <activity
            android:name="com.wade.mobile.common.audio.activity.AudioRecorderActivity"
            android:theme="@style/AudioDialogTheme" >
        </activity> -->
         <activity
            android:name="com.wade.mobile.common.simplemedia.activity.SARecorder"
            android:theme="@style/AudioDialogTheme" >
        </activity>
		<!-- 播放音乐 -->
        <activity
@@ -114,4 +118,4 @@
        </activity>
    </application>
</manifest>
</manifest>

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

@@ -44,7 +44,11 @@ define(["wadeMobile","clientTool"],function(WadeMobile,clientTool) {
		};
		/*将Page转换成html源码*/
		this.getPage = function(action, param, callback, err){
			alert("getPage待开发……");
			param = param ? param : "";
			if(typeof(param) != "string"){
				param = param.toString();
			}
			WadeMobile.getPage(callback,action,param,err);
		};
		/*回退到前一个界面*/
		this.back = function(){

display-client/assets/mobile-action.xml

@@ -22,6 +22,7 @@
	<action name="openPage" class="com.wade.mobile.func.MobileUI" method="openPage"/>
	<action name="openTemplate" class="com.wade.mobile.func.MobileUI" method="openTemplate"/>
	<action name="getTemplate" class="com.wade.mobile.func.MobileUI" method="getTemplate"/>
	<action name="getPage" class="com.wade.mobile.func.MobileUI" method="getPage"/>
	<action name="back" class="com.wade.mobile.func.MobileUI" method="back"/>
	<action name="loadingStart" class="com.wade.mobile.func.MobileUI" method="loadingStart"/>
	<action name="loadingStop" class="com.wade.mobile.func.MobileUI" method="loadingStop"/>

display-server/etc/server-data.xml

@@ -22,5 +22,7 @@
	<action name="SceneBean.dataRequestScene" class="com.ai.server.bean.SceneBean" method="dataRequestScene" verify="false"></action>
	<!-- 页面跳转(调用数据接口)场景***************脑筋急转弯 -->
	<action name="SceneBean.openPageScene" class="com.ai.server.bean.SceneBean" method="openPageScene" verify="false"></action>
	<!-- 局部刷新(调用数据接口) -->
	<action name="getPersonDetailMore" class="com.ai.server.bean.PersonBean" method="getPersonDetailMore" verify="false"></action>
	
</datas>

display-server/etc/server-page.xml

@@ -109,7 +109,8 @@
	
	<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>
	<action name="TemplateRefresh.PersonDetailTemplate" template="template/webapp/scene/PersonDetailTemplate.html"></action>
	<action name="PageRefresh.PersonDetailTemplateMore" template="template/webapp/scene/PersonDetailTemplateMore.html" data="getPersonDetailMore"></action>
	
	<!-- 测试gum日历插件 -->	
	<action name="testCalendar" template="template/calendar/calendar.html"></action>

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

@@ -0,0 +1,41 @@
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;
public class PersonBean extends DisplayBean
{
    public IData getPersonDetailMore(IData param)
    {
        IData result = new DataMap();
        int personId = param.getInt("id");
        if (personId <= 0)
        {
            throw new RuntimeException("获取参数失败！");
        }
        if (personId == 1)
        {
            result.put("name", "小胖");
            result.put("age", 20);
            result.put("gender", "男");
            result.put("dept", "移动部门");
        }
        else if (personId == 2)
        {
            result.put("name", "张三");
            result.put("age", 22);
            result.put("gender", "男");
            result.put("dept", "联通部门");
        }
        else if (personId == 3)
        {
            result.put("name", "李四");
            result.put("age", 24);
            result.put("gender", "女");
            result.put("dept", "财务部门");
        }
        return result;
    }
}

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

@@ -0,0 +1,12 @@
require(["wmTabbar","common","mobile","util"], function(WmTabbar,Common,Mobile) {
	
	$("#tbody tr").click(function() {
		param = new Wade.DataMap();
		param.put("id", $(this).data("id"));
		Mobile.getPage("PageRefresh.PersonDetailTemplateMore", param.toString(), function(html){
			$("#content2").html(html);
			new iScroll("content2");
		});
	});
	
});	

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

@@ -0,0 +1,15 @@
require(["wmTabbar","common","mobile","util"], function(WmTabbar,Common,Mobile) {
	
	$("#tbody tr").click(function() {
		console.log($(this).data("id"));
		param = new Wade.DataMap();
		param.put("name", $(this).children().eq(0).text());
		param.put("age",  $(this).children().eq(1).text());
		param.put("gender",  $(this).children().eq(2).text());
		Mobile.getTemplate("TemplateRefresh.PersonDetailTemplate", param.toString(), function(html){
			$("#content2").html(html);
			new iScroll("content2");
		});
	});
	
});

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

@@ -44,7 +44,11 @@ define(["wadeMobile","clientTool"],function(WadeMobile,clientTool) {
		};
		/*将Page转换成html源码*/
		this.getPage = function(action, param, callback, err){
			alert("getPage待开发……");
			param = param ? param : "";
			if(typeof(param) != "string"){
				param = param.toString();
			}
			WadeMobile.getPage(callback,action,param,err);
		};
		/*回退到前一个界面*/
		this.back = function(){

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

@@ -5,18 +5,55 @@
	<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/scene/pageRefresh.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 class="c_navBar">
		<div class="left">
			<div class="back">
				<span class="e_ico-back"></span>
				<span class="text">局部刷新(调用数据接口)</span>
			</div>
		</div>
	</div>
</div>
	<div class="m_content m_content-nofooter" id="content">
		<div>
			<div class="c_title">人员列表</div>
			<div class="c_table">
				<table>
					<thead>
						<tr>
							<th>姓名</th>
							<th>年龄</th>
							<th>性别</th>
						</tr>
					</thead>
					<tbody id="tbody">
						<tr data-id="1">
							<th>小胖</th>
							<th>20</th>
							<th>男</th>
						</tr>
						<tr data-id="2">
							<th>张三</th>
							<th>22</th>
							<th>男</th>
						</tr>
						<tr data-id="3">
							<th>李四</th>
							<th>24</th>
							<th>女</th>
						</tr>
					</tbody>
				</table>
			</div>
		</div>
	</div>
	
	<div class="c_scroll c_scroll-mix c_scroll-fixed l_padding" style="top:3rem; bottom:0;" id="content2">
	</div>
</body>
</script>
</html>

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

@@ -0,0 +1,26 @@
<div class="wrapper">
	<div class="c_title">详情</div>
	<div class="c_list">
		<ul>
			<li tapfor="input-text">
				<div class="content">
					<div class="label">姓名</div>
					<div class="info" id="name">{%name%}</div>
				</div>
			</li>
			<li tapfor="input-text">
				<div class="content">
					<div class="label">年龄</div>
					<div class="info" id="age">{%age%}</div>
				</div>
			</li>
			<li tapfor="input-text">
				<div class="content">
					<div class="label">性别</div>
					<div class="info" id="gender">{%gender%}</div>
				</div>
			</li>
		</ul>
	</div>
	<div class="c_space"></div>
</div>

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

@@ -0,0 +1,32 @@
<div class="wrapper">
	<div class="c_title">详情</div>
	<div class="c_list">
		<ul>
			<li tapfor="input-text">
				<div class="content">
					<div class="label">姓名</div>
					<div class="info" id="name">{%name%}</div>
				</div>
			</li>
			<li tapfor="input-text">
				<div class="content">
					<div class="label">年龄</div>
					<div class="info" id="age">{%age%}</div>
				</div>
			</li>
			<li tapfor="input-text">
				<div class="content">
					<div class="label">性别</div>
					<div class="info" id="gender">{%gender%}</div>
				</div>
			</li>
			<li tapfor="input-text">
				<div class="content">
					<div class="label">部门</div>
					<div class="info" id="dept">{%dept%}</div>
				</div>
			</li>
		</ul>
	</div>
	<div class="c_space"></div>
</div>

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

@@ -53,7 +53,7 @@
		</div>
	</div>
	
	<div class="c_scroll c_scroll-mix c_scroll-fixed l_padding" style="top:2.8rem; bottom:0;" id="content2">
	<div class="c_scroll c_scroll-mix c_scroll-fixed l_padding" style="top:3rem; bottom:0;" id="content2">
	</div>
</body>
<script type="text/javascript">

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

@@ -23,7 +23,6 @@ import android.widget.LinearLayout;
import com.ailk.common.data.IData;
import com.ailk.common.data.impl.DataMap;
import com.litesuits.android.log.Log;
import com.wade.mobile.common.MobileLog;
import com.wade.mobile.common.contacts.activity.ContactsActivity;
import com.wade.mobile.common.contacts.helper.ContactsData;
@@ -182,6 +181,54 @@ public class MobileUI extends Plugin{
		return ((TemplateWebView)getWebView()).getTemplate(templatePath, data);
	}
	
	public void getPage(JSONArray param) throws Exception {
        String pageAction = param.getString(0);
        String data = param.getString(1);
        boolean isEscape = "true".equals(param.getString(2)) ? true : false;
        String html = getPage(pageAction, isNull(data)?null:new DataMap(data));
        if (isEscape) {
            html = EscapeUnescape.escape(html);
        }
        callback(html);
    }
	
    public String getPage(String pageAction,DataMap param) throws Exception{
        /*获取模板相对路径*/
        String templatePath = ServerPageConfig.getTemplate(pageAction);
        if(templatePath==null||"".equals(templatePath)){
            Utility.error(Messages.NO_TEMPLATE + ",Action:" + pageAction);
        }
        
        IData data = null;
        /*载入业务数据*/
        String dataAction = ServerPageConfig.getData(pageAction);
        if(dataAction!=null){
            MobileNetWork MobileNetWork = wademobile.getPluginManager().getPlugin(MobileNetWork.class);
            String result = MobileNetWork.dataRequest(dataAction, param);// 打开页面时请求业务数据
            data = new DataMap(result);
            if(data.getInt("X_RESULTCODE")<0){
                error(data.toString());
                return null;
            }
        }
        /*String serverDataAction = ServerPageConfig.getData(pageAction);
        String className = ServerDataConfig.getActionClass(serverDataAction);
        String methodName = ServerDataConfig.getActionMethod(serverDataAction);
        // new一个className 调用里面的method 得到resule的dataMap
        Class clz = Class.forName(className);
        Object obj = clz.newInstance();
        //获取方法  
        Method m = obj.getClass().getDeclaredMethod(methodName, String.class);
        //调用方法  
        String result = (String) m.invoke(obj, data);
        JSONObject  jasonObject = (JSONObject) JSONObject.stringToValue(result);
        Map map = (Map)jasonObject;
        if(templatePath==null||"".equals(templatePath)){
            Utility.error(Messages.NO_TEMPLATE);
        }*/
        return ((TemplateWebView)getWebView()).getTemplate(templatePath, data);
    }
	
	/************************多WebView 开始*****************************/
	private TemplateWebView initFlipperPage(String pageAction, boolean isAnimation) {
		// TODO Auto-generated method stub