Browse Source

multiple改造

huangbo 9 years ago
parent
commit
c45ac0c160

+ 2 - 0
display-server/etc/server-config.xml

@ -20,6 +20,8 @@
20 20
	<config name="exceptionHandler" value="com.ai.server.core.handle.DisplayExceptionHandler"/>
21 21
	<!-- 自定义Session管理器 -->
22 22
	<config name="sessionManager" value="com.ai.server.core.session.DisplaySessionManager"/>
23
	<!-- 自定义安全管理器 -->
24
	<config name="securityHandler" value="com.ai.server.core.security.DisplaySecurityHandler"/>
23 25
	<!-- 是否运行标签引擎 -->
24 26
	<config name="isUseTag" value="true"/>
25 27
</configs>

+ 12 - 0
display-server/src/com/ai/server/core/security/DisplaySecurityHandler.java

@ -0,0 +1,12 @@
1
package com.ai.server.core.security;
2

3
import com.ailk.mobile.frame.handle.impl.DefaultSecurityHandler;
4

5
public class DisplaySecurityHandler extends DefaultSecurityHandler{
6
	
7
	@Override
8
	public String getResKey() throws Exception {
9
		// TODO Auto-generated method stub
10
		return "77777777";
11
	}
12
}

+ 2 - 2
multiple-client/src/com/ai/mobile/multiple/SubAppActivity.java

@ -93,12 +93,12 @@ public class SubAppActivity extends TemplateMainActivity{
93 93
	
94 94
	/**
95 95
	 * 第二次进入则不使用欢迎页的延时配置
96
	 */
96
	 *//*
97 97
	@Override
98 98
	protected boolean isUseLoadingTime() {
99 99
		// TODO Auto-generated method stub
100 100
		return firstStatus.get(MultipleManager.getCurrAppId()) == null;
101
	}
101
	}*/
102 102
	
103 103
	/**
104 104
	 * 重写指定欢迎页,不同应用使用不同的欢迎页

+ 2 - 5
multiple-client/src/com/ai/mobile/multiple/func/AppManagePlugin.java

@ -1,6 +1,5 @@
1 1
package com.ai.mobile.multiple.func;
2 2

3
import java.io.File;
4 3
import java.util.HashMap;
5 4
import java.util.Map;
6 5

@ -14,7 +13,6 @@ import com.ailk.common.data.IData;
14 13
import com.ailk.common.data.IDataset;
15 14
import com.ailk.common.data.impl.DataMap;
16 15
import com.ailk.common.data.impl.DatasetList;
17
import com.wade.mobile.app.MobileAppInfo;
18 16
import com.wade.mobile.app.MobileUtil;
19 17
import com.wade.mobile.app.SimpleUpdate;
20 18
import com.wade.mobile.frame.IWadeMobile;
@ -68,6 +66,7 @@ public class AppManagePlugin extends Plugin {
68 66
	 * 打开IPU应用
69 67
	 */
70 68
	public void openIpuApp(JSONArray params) throws Exception {
69
		String basePath = TemplateManager.getBasePath();//欢迎页存储在multiple的应用中,所以需要放在setCurrAppId之前
71 70
		String appId = params.getString(0);
72 71
		MultipleManager.setCurrAppId(appId);
73 72
		MultipleManager.setMultiple(true);
@ -77,7 +76,7 @@ public class AppManagePlugin extends Plugin {
77 76
		
78 77
		String indexPage = appConfig.getDefine("appIndexPage");
79 78
		String appWelcomePage = appConfig.getDefine("appWelcomePage");
80
		String welcomePage = Constant.START_FILE + FileUtil.connectFilePath(TemplateManager.getBasePath(),appWelcomePage);
79
		String welcomePage = Constant.START_FILE + FileUtil.connectFilePath(basePath, appWelcomePage);
81 80
		
82 81
		intent.putExtra("INDEX_PAGE", indexPage);//IPU的初始页
83 82
		intent.putExtra("WELCOME_PAGE", welcomePage);//IPU的欢迎页
@ -119,8 +118,6 @@ public class AppManagePlugin extends Plugin {
119 118
		// TODO Auto-generated method stub
120 119
		if (requestCode == OPEN_IPU_APP) {
121 120
			MultipleManager.setMultiple(false);
122
			String basePath = MobileAppInfo.getSdcardAppPath(context);
123
			TemplateManager.initBasePath(basePath + File.separator);// 存储模板基础路径
124 121
		}
125 122
	}
126 123
	

+ 1 - 1
multiple-server/etc/app-config.xml

@ -1,7 +1,7 @@
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<apps>
3 3
	<app appId="display" appName="IPU展示" appType="I" appIcon="e_ico-qr"
4
		appWelcomePage="welcome/WelcomeDisplay.htm" requestHost="http://114.215.100.48:8080"
4
		appWelcomePage="welcome/WelcomeDisplay.htm" requestHost="http://10.0.2.2:8080"
5 5
		requestPath="/display" requestServlet="/mobiledata" appPath="display-client" />
6 6

7 7
	<app appId="ioo" appName="广东统一平台" appType="I" appIcon="e_ico-audio" appIndexPage="Home"