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

Conflicts:
	display-server/web/res/js/mobile/expand-mobile.js
	ipu-server/.classpath
	wade-mobile-lib/libs/android-support-v4.jar

display-client/.classpath

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="src"/>
	<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 exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>

display-client/.gitignore

@@ -2,5 +2,4 @@
/bin
/gen
/proguard
/.classpath
/project.properties

display-client/project.properties

@@ -1,16 +1,17 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system edit
# "ant.properties", and override values to adapt the script to your
# project structure.
#
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-15
android.library.reference.1=../wade-mobile-common
android.library.reference.2=../wade-mobile-lib
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system edit
# "ant.properties", and override values to adapt the script to your
# project structure.
#
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-15
android.library.reference.1=../wade-mobile-lib
android.library.reference.2=../wade-mobile-common
proguard.config=proguard-project.txt

ipu-client/.classpath

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

ipu-client/assets/mobile-action.xml

@@ -100,4 +100,6 @@
	<action name="unregisterForPush" class="com.ai.mobile.im.func.MobilePush" method="unregisterForPush"></action>
	<action name="sendText" class="com.ai.mobile.im.func.MobilePush" method="sendText"></action>
	<action name="setCallbackForPush" class="com.ai.mobile.im.func.MobilePush" method="setCallbackForPush"></action>
	
	<action name="openBrowser" class="com.ipu.func.Util" method="openBrowser" ></action>
</actions>

ipu-client/assets/mobile-config.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configs>
    <!-- 必须。10.0.2.2为Android模拟器的保留ip地址。访问到本机电脑时使用 -->
	<config name="request_host" value="http://192.168.57.1:8080"/>
	<config name="request_host" value="http://114.215.100.48:8080"/>
	<!-- 请求主机名或请求地址。包括服务器的ip地址和端口 -->
	<!-- <config name="request_host" value="http://192.168.0.143:8080"/>  -->
	<!-- 必须。容器应用名或请求根路径 -->
@@ -15,7 +15,7 @@
	<!-- 非必须， 默认false。是否开启多WebView模式 -->
	<config name="is_mult_webview" value="true"/>
	<!-- 必须。应用license -->
	<config name="license" value="bLeTfTQEH04oADDaVadPbBa/vfrTum76UbdrC088jwF76std3Ie0vm7BQU9ialMxyGUA/-18MqhfJw3uTCJdmMD56zJRg87sGwTnJuRKYBVr5LRd0YAgY6EUzoq1BvFm9mt07ELvG4H9F-YaI7WNkhBthV00Qc/qRgAoLVCzdg0=|@@MDBDN0MwNjA3ODUzQUZDMENGQzhCQUI4RUU2MDU3Q0EyQzQ0MjNFMENGQjA3QTQzNUM5QjEzMUEwN0QwN0EyRkUzRDNEMERENEJFMjRBREMxQTZENDQ0REZFQjJENUNDRTdCMjg2ODU4NjcyN0RGQjA4MTg2ODVFRkZDNzEyRDFEREY3NjMwNDlCQjc3NjNEQTRFMUFDMzk0RkY0NzEyQUNEQTI5MDY4QkFGMDgyQTNFRDIwMzIyRDIwNUIzQ0JFRkM1RTA0RENFNkU3NzU4RTdGNzI1RDZGQzhERjY1NTVENTdCMzYwM0FBQzBCNERDRUUyRDk3NEVEOTE5RkM1QTgx" ></config>
	<config name="license" value="V5wmdy1QhAgTICM57dfOCrd9jknVTYbmQIw5mqBSlBFIAkZ-8YS5tQMdBppxcsWLeFafH-ZFa4-kk2kKGx1a9vnFKnBM7LeQK07LBvr-ku2GqmegFittbCkOCVdBHTeLmhITXdB-4Zh52AZQLKV5OxhhGITQriArrXro6-TVst4=|@@MDA4RUYzNkZCQzREQTY0N0FENDREMzc5OEY3QjI1NkQ2MUYxNDUyQkM5QzdEREY4QjZBMUMxQjYzQTA4OTUwQzAyRUU5NjhDQUQyQ0E0NDFEM0M1ODA0MzMwRTUwN0ExMEI5MEIxRkY0NzU5NkQxNjU5RTU0NTQ4MjAxMEZFQTk2NjFEOTM5MzdCQjFFM0YzRDIzRkU1MjYzOTkzNEEzMDEyMkFERTM4MTQ4RjQ3RTQyRjJDMjA2REQ5QUY3NkJEMDg4MDg5MjI4NzUwQUQ0NjAxNTQ1NzJENTEzMUM2NzE5OTc0RTc4MEE1NjgxRUYwRjI2REE4ODU0Q0ZGRDY0Mjk5" ></config>
	<!-- 非必须。进入应用时的欢迎页面 --><!-- file:///android_asset为固定写法，表示工程的asset目录 -->
	<config name="loading_page" value="file:///android_asset/local/welcome.html"/>
	<!-- 非必须。更新应用的url -->

ipu-client/project.properties

@@ -1,18 +1,18 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system edit
# "ant.properties", and override values to adapt the script to your
# project structure.
#
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-15
android.library.reference.1=../../android/wade-mobile-com
android.library.reference.2=../wade-mobile-lib
proguard.config=proguard-project.txt
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system edit
# "ant.properties", and override values to adapt the script to your
# project structure.
#
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-15
android.library.reference.1=../wade-mobile-lib
android.library.reference.2=../wade-mobile-common
proguard.config=proguard-project.txt

ipu-client/src/com/ipu/func/Util.java

@@ -0,0 +1,22 @@
package com.ipu.func;
import org.json.JSONArray;
import android.content.Intent;
import android.net.Uri;
import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.plugin.Plugin;
public class Util extends Plugin {
	public Util(IWadeMobile wademobile) {
		super(wademobile);
	}
	public void openBrowser(JSONArray param) throws Exception {
		String url = param.getString(0);
		Uri uri = Uri.parse(url);
		Intent intent = new Intent(Intent.ACTION_VIEW, uri);
		context.startActivity(intent);
	}
}

ipu-server/.classpath

@@ -4,6 +4,7 @@
	<classpathentry kind="src" path="etc"/>
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/bcprov-jdk16-140.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/beetl-core-2.2.3.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/commons-beanutils-1.7.0.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/commons-codec-1.3.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/commons-collections-3.2.jar"/>
@@ -16,10 +17,19 @@
	<classpathentry kind="lib" path="/wade-mobile-library/common/commons-net-2.0.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/commons-pool-1.6.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/dom4j-1.6.1.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/http-unirest-1.3.8.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/httpasyncclient-4.0.1.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/httpclient-4.3.2.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/httpcore-4.4.3.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/httpcore-ab-4.4.3.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/httpcore-nio-4.4.3.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/httpmime-4.3.2.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/java_memcached-release_2.5.3.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/jaxen-1.1.1.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/jedis-2.0.0.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/json-20131018.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/jta.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/junit-4.8.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/log4j-1.2.8.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/mysql-connector-java-5.1.6-bin.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/ojdbc14.jar"/>
@@ -29,13 +39,12 @@
	<classpathentry kind="lib" path="/wade-mobile-library/common/poi-ooxml-schemas-3.8.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/servlet-api2.5.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/sqlite-jdbc-3.8.7.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/velocity-1.7.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/wade-apache.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/wade-common.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/wade-database.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/wade-mobile-data.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/wade-mobile-server.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/wade-sqlite-jdbc.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/httpasyncclient-4.0.1.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-library/common/httpcore-4.4.3.jar"/>
	<classpathentry kind="output" path="web/WEB-INF/classes"/>
</classpath>

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

@@ -213,6 +213,8 @@ define(["require"],function(require) {
				execute("sendText", [account,content],err);
			},setCallbackForPush:function(callbackName){
				execute("setCallbackForPush", [callbackName]);
			},openBrowser:function(url,err){
				execute("openBrowser",[url],err);
			}
		};
	})();

push-server/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs

@@ -0,0 +1,4 @@
#org.springsource.ide.eclipse.gradle.core.preferences.GradleProjectPreferences
#Fri Sep 18 14:22:21 CST 2015
build.family.org.gradle.tooling.model.eclipse.HierarchicalEclipseProject=;
org.springsource.ide.eclipse.gradle.rootprojectloc=

wade-mobile-common/.classpath

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<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="output" path="bin/classes"/>
</classpath>

wade-mobile-lib/.classpath

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<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="output" path="bin/classes"/>
</classpath>