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

display-client/.classpath

@@ -1,9 +0,0 @@
<?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

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

display-client/assets/mobile-config.xml

@@ -38,4 +38,4 @@
	<config name="loadurl_timeout" value="20000"/>
	<!-- 非必须，默认false。打开调试模式，不再比对资源版本，客户端每次下载所有资源-->
	<!-- <config name="is_debug" value="true"/> -->
</configs>
</configs>

display-client/project.properties

@@ -1,17 +0,0 @@
# 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/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://10.0.2.2:8080"/>
	<config name="request_host" value="http://192.168.57.1:8080"/>
	<!-- 请求主机名或请求地址。包括服务器的ip地址和端口 -->
	<!-- <config name="request_host" value="http://192.168.0.143:8080"/>  -->
	<!-- 必须。容器应用名或请求根路径 -->

multiple-client/assets/mobile-config.xml

@@ -3,7 +3,7 @@
    <!-- 请求主机名或请求地址。包括服务器的ip地址和端口 -->
	<!-- <config name="request_host" value="http://192.168.1.102:8080"/> -->
	<!-- 必须。10.0.2.2为Android模拟器的保留ip地址。访问到本机电脑时使用 -->
	<config name="request_host" value="http://10.0.2.2:8080"/>
	<config name="request_host" value="http://192.168.57.1:8080"/>
	<!-- 必须。容器应用名或请求根路径 -->
	<config name="request_path" value="/mult"/>
	<!-- 必须。数据接口的servlet路径 -->

multiple-server/.gitignore

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