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

display-server/etc/server-config.xml

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

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

@@ -0,0 +1,12 @@
package com.ai.server.core.security;
import com.ailk.mobile.frame.handle.impl.DefaultSecurityHandler;
public class DisplaySecurityHandler extends DefaultSecurityHandler{
	
	@Override
	public String getResKey() throws Exception {
		// TODO Auto-generated method stub
		return "77777777";
	}
}

multiple-client/clean-res.cmd

@@ -0,0 +1,3 @@
adb shell rm -r /mnt/sdcard/multiple-client
adb shell ls /mnt/sdcard/
pause

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

@@ -1,19 +1,29 @@
package com.ai.mobile.multiple;
import java.util.HashMap;
import java.util.Map;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Bundle;
import android.view.View;
import com.ailk.common.data.IData;
import com.ailk.common.data.impl.DataMap;
import com.wade.mobile.app.AppRecord;
import com.wade.mobile.app.MobileOperation;
import com.wade.mobile.app.MobileUtil;
import com.wade.mobile.frame.activity.TemplateMainActivity;
import com.wade.mobile.frame.config.MobileConfig;
import com.wade.mobile.frame.config.ServerConfig;
import com.wade.mobile.frame.multiple.MultipleManager;
import com.wade.mobile.frame.template.TemplateWebView;
import com.wade.mobile.func.MobileStorage;
import com.wade.mobile.func.MobileUI;
import com.wade.mobile.ui.comp.dialog.ConfirmBlockDialog;
import com.wade.mobile.ui.view.FlipperLayout;
public class SubAppActivity extends TemplateMainActivity{
	private static Map<String,Boolean> firstStatus = new HashMap<String,Boolean>();//判断子应用第一次开启状态
	
	@Override
	public void onCreate(Bundle savedInstanceState) {
		setTheme(R.style.Theme_Sherlock_Light);
@@ -49,30 +59,62 @@ public class SubAppActivity extends TemplateMainActivity{
		finish();
	}
	
	@Override
	protected void initActivity() throws Exception {
		// TODO Auto-generated method stub
		firstStatus.put(MultipleManager.getCurrAppId(), false);
		IData param = new DataMap();
		MobileStorage mobileStorage = getPluginManager().getPlugin(MobileStorage.class);
		param.put("SESSION_ID", mobileStorage.getMemoryCache("SESSION_ID", ""));
		param.put("ACCOUNT", mobileStorage.getMemoryCache("ACCOUNT", ""));
		
		String indexPage = getIntent().getStringExtra("INDEX_PAGE");
		indexPage = indexPage == null ? ServerConfig.getInstance().getValue("indexPage") : indexPage;
		MobileUI mobileUI = getPluginManager().getPlugin(MobileUI.class);
		mobileUI.openPage(indexPage, param);
	}
	
	/**
	 * 不再更新客户端
	 * 第二次进入则不做资源更新和客户端更新
	 */
	@Override
	protected boolean isUpdateClient(String clientVersion) throws NameNotFoundException {
	protected boolean isUpdate() {
		// TODO Auto-generated method stub
		return false;
		return firstStatus.get(MultipleManager.getCurrAppId()) == null;
	}
	
	/**
	 * 不使用欢迎页
	 * 不做客户端更新
	 */
	@Override
	protected boolean isLoadingPage() {
	protected boolean isUpdateClient(String clientVersion) throws NameNotFoundException {
		// TODO Auto-generated method stub
		return false;
	}
	
	/**
	 * 第二次进入则不使用欢迎页的延时配置
	 *//*
	@Override
	protected boolean isUseLoadingTime() {
		// TODO Auto-generated method stub
		return firstStatus.get(MultipleManager.getCurrAppId()) == null;
	}*/
	
	/**
	 * 重写指定欢迎页,不同应用使用不同的欢迎页
	 */
	@Override
	protected boolean setLoadingPage() {
		// TODO Auto-generated method stub
		return super.setLoadingPage();
		String welcomePage = getIntent().getStringExtra("WELCOME_PAGE");
		if (welcomePage != null) {
			TemplateWebView templateWebView = new TemplateWebView(this);
			templateWebView.loadUrl(welcomePage);
			templateWebView.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY);//解决2.3版本中 welcome界面右边空白
			setContentView(templateWebView);
			return true;
		} else {
			return false;
		}
	}
}

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

@@ -19,15 +19,73 @@ import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.multiple.MultipleAppConfig;
import com.wade.mobile.frame.multiple.MultipleManager;
import com.wade.mobile.frame.plugin.Plugin;
import com.wade.mobile.frame.template.TemplateManager;
import com.wade.mobile.util.Constant;
import com.wade.mobile.util.FileUtil;
public class AppManagePlugin extends Plugin {
	private Map<String, NativeAppConfig> nativeAppConfigs = new HashMap<String, NativeAppConfig>();
	private int OPEN_IPU_APP = 1;
	private int OPEN_NATIVE_APP = 1;
	public AppManagePlugin(IWadeMobile wademobile) {
		super(wademobile);
	}
	
	/**
	 * 初始化IPU应用的配置
	 */
	public void initAppConfig(JSONArray params) throws Exception {
		String apps = params.getString(0);
		if(isNull(apps)){
			error("App配置信息初始化异常!");
			return;
		}
		IDataset appDatas = new DatasetList(apps);
		IData appData;
		for(Object app : appDatas){
			appData = (IData)app;
			if("I".equals(appData.getString("appType"))){
				MultipleAppConfig appConfig = new MultipleAppConfig(appData.getString("requestHost"),
						appData.getString("requestPath"), 
						appData.getString("requestServlet"), 
						appData.getString("appPath"));
				appConfig.putDefine("appWelcomePage", appData.getString("appWelcomePage"));
				appConfig.putDefine("appIndexPage", appData.getString("appIndexPage"));
				MultipleManager.putAppConfig(appData.getString("appId"), appConfig);
			}else if("N".equals(appData.getString("appType"))){
				nativeAppConfigs.put(appData.getString("appId"), 
						new NativeAppConfig(appData.getString("packageName"), 
						appData.getString("className"), 
						appData.getString("downloadUrl")));
			}
		}
	}
	
	/**
	 * 打开IPU应用
	 */
	public void openIpuApp(JSONArray params) throws Exception {
		String basePath = TemplateManager.getBasePath();//欢迎页存储在multiple的应用中，所以需要放在setCurrAppId之前
		String appId = params.getString(0);
		MultipleManager.setCurrAppId(appId);
		MultipleManager.setMultiple(true);
		Intent intent = new Intent(wademobile.getActivity(), SubAppActivity.class);
		
		MultipleAppConfig appConfig = MultipleManager.getAppConfig(appId);
		
		String indexPage = appConfig.getDefine("appIndexPage");
		String appWelcomePage = appConfig.getDefine("appWelcomePage");
		String welcomePage = Constant.START_FILE + FileUtil.connectFilePath(basePath, appWelcomePage);
		
		intent.putExtra("INDEX_PAGE", indexPage);//IPU的初始页
		intent.putExtra("WELCOME_PAGE", welcomePage);//IPU的欢迎页
		startActivityForResult(intent, OPEN_IPU_APP);
	}
	/**
	 * 打开原生应用
	 */
	public void openNativeApp(JSONArray params) throws Exception {
		String appId = params.getString(0);
		NativeAppConfig appConfig = nativeAppConfigs.get(appId);
@@ -46,7 +104,7 @@ public class AppManagePlugin extends Plugin {
			intent.putExtra("STAFF_ID", ipuData.getString("STAFF_ID"));//IPU的sessionId
			intent.putExtra("ACCOUNT", ipuData.getString("ACCOUNT"));//IPU的登陆账号
			intent.setComponent(cn);
			startActivityForResult(intent, 2);
			startActivityForResult(intent, OPEN_NATIVE_APP);
		}else{
			String downloadUrl = appConfig.getDownloadUrl();
			/* 如果应用不存在则需要下载，配置需要下载应用 */
@@ -55,39 +113,6 @@ public class AppManagePlugin extends Plugin {
		}
	}
	public void initAppConfig(JSONArray params) throws Exception {
		String apps = params.getString(0);
		if(isNull(apps)){
			error("App配置信息初始化异常!");
			return;
		}
		IDataset appDatas = new DatasetList(apps);
		IData appData;
		for(Object app : appDatas){
			appData = (IData)app;
			if("I".equals(appData.getString("appType"))){
				MultipleManager.putAppConfig(appData.getString("appId"),
						new MultipleAppConfig(appData.getString("requestHost"),
								appData.getString("requestPath"), 
								appData.getString("requestServlet"), 
								appData.getString("appPath")));
			}else if("N".equals(appData.getString("appType"))){
				nativeAppConfigs.put(appData.getString("appId"), 
						new NativeAppConfig(appData.getString("packageName"), 
						appData.getString("className"), 
						appData.getString("downloadUrl")));
			}
		}
	}
	public void openIpuApp(JSONArray params) throws Exception {
		String appId = params.getString(0);
		MultipleManager.setCurrAppName(appId);
		MultipleManager.setMultiple(true);
		Intent intent = new Intent(wademobile.getActivity(), SubAppActivity.class);
		startActivityForResult(intent, OPEN_IPU_APP);
	}
	@Override
	public void onActivityResult(int requestCode, int resultCode, Intent intent) {
		// TODO Auto-generated method stub
@@ -96,7 +121,6 @@ public class AppManagePlugin extends Plugin {
		}
	}
	
	
	/**
	 * @author huangbo
	 * 平台级应用中原生应用的配置对象

multiple-server/build/build.properties

@@ -13,6 +13,7 @@ encrypt=${web}/encrypt
version_class=com.ailk.mobile.tool.VersionTool
encrypt_class=com.ailk.mobile.tool.FileEncryptTool
version_filter=setup|.gitignore
encrypt_filter=welcome
is_debug=false
encode=UTF-8

multiple-server/etc/app-config.xml

@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<apps>
	<app appId="display" appName="IPU展示" appType="I" appIcon="e_ico-qr"
		appWelcomePage="WelcomeDisplay" requestHost="http://114.215.100.48:8080"
		appWelcomePage="welcome/WelcomeDisplay.htm" requestHost="http://10.0.2.2:8080"
		requestPath="/display" requestServlet="/mobiledata" appPath="display-client" />
	<app appId="ioo" appName="广东统一平台" appType="I" appIcon="e_ico-audio"
		appWelcomePage="WelcomeIoo" requestHost="http://114.215.100.48:8080"
	<app appId="ioo" appName="广东统一平台" appType="I" appIcon="e_ico-audio" appIndexPage="Home"
		appWelcomePage="welcome/WelcomeIoo.htm" requestHost="http://114.215.100.48:8080"
		requestPath="/ioo" requestServlet="/mobiledata" appPath="ioo-client" />
	
	<app appId="mutl" appName="1vsN平台" appType="I" appIcon="e_ico-file"
		appWelcomePage="WelcomeDisplay" requestHost="http://10.0.2.2:8080"
	<app appId="mutl" appName="1vsN平台" appType="I" appIcon="e_ico-file" appIndexPage="Index"
		appWelcomePage="welcome/WelcomeDisplay.htm" requestHost="http://10.0.2.2:8080"
		requestPath="/mutl" requestServlet="/mobiledata" appPath="mutl-client" />
	<app appId="native" appName="原生案例" appType="N" appIcon="e_ico-storage"

multiple-server/etc/server-page.xml

@@ -3,7 +3,4 @@
    <!-- 工作台 -->
    <action name="Login" template="template/webapp/Login.html" data="LoginBean.init"></action>
 	<action name="Index" template="template/webapp/Index.html" data="IndexBean.getAppDatas"></action>
 	
 	<action name="WelcomeDisplay" template="template/webapp/welcome/welcome-display.html"></action>
 	<action name="IooDisplay" template="template/webapp/welcome/welcome-ioo.html"></action>
</pages>

multiple-server/src/com/ai/server/multiple/core/config/AppConfig.java

@@ -67,6 +67,9 @@ public class AppConfig extends AbstractConfig {
			if(((Element) node).attributeValue(Constant.AppConfig.DOWNLOAD_URL)!=null)
				appMap.put(Constant.AppConfig.DOWNLOAD_URL, 
						((Element) node).attributeValue(Constant.AppConfig.DOWNLOAD_URL));
			if(((Element) node).attributeValue(Constant.AppConfig.APP_INDEX_PAGE)!=null)
				appMap.put(Constant.AppConfig.APP_INDEX_PAGE, 
						((Element) node).attributeValue(Constant.AppConfig.APP_INDEX_PAGE));
			
			results.add(appMap);
		}

multiple-server/src/com/ai/server/multiple/util/Constant.java

@@ -36,6 +36,8 @@ public class Constant {
		public static final String APP_TYPE = "appType";
		public static final String APP_ICON = "appIcon";
		public static final String APP_WELCOME_PAGE = "appWelcomePage";
		public static final String APP_INDEX_PAGE = "appIndexPage";
		
		public static final String REQUEST_HOST = "requestHost";
		public static final String REQUEST_PATH = "requestPath";
		public static final String REQUEST_SERVLET = "requestServlet";

multiple-server/web/welcome/WelcomeDisplay.htm

@@ -0,0 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Insert title here</title>
</head>
<body>
<center>Display欢迎页面</center>
</body>
</html>

multiple-server/web/welcome/WelcomeIoo.htm

@@ -0,0 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Insert title here</title>
</head>
<body>
<center>Ioo欢迎页面</center>
</body>
</html>