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

display-client/assets/mobile-action.xml

@@ -65,14 +65,11 @@
	<action name="browserFile" class="com.ailk.mobile.client.func.SwitchActivity" method = "browserFile"/>
	<action name="openDisplayPage" class="com.ailk.mobile.client.func.SwitchActivity" method = "openDisplayPage"/>
	<!-- MobileMap -->
	<!-- 
	<action name="location" class="com.wade.mobile.func.MobileMap" method="location"/>
	<action name="markMap" class="com.wade.mobile.func.MobileMap" method="markMap"/>
	<action name="selectLocation" class="com.wade.mobile.func.MobileMap" method="selectLocation"/>
	 -->
	 <action name="location" class="com.ai.ipu.map.func.MobileMap" method="location"></action>
	<!--  
	<action name="location" class="com.ai.ipu.map.func.MobileMap" method="location"></action>
	 <action name="markMap" class="com.ai.ipu.map.func.MobileMap" method="markMap"></action>
	 <action name="selectLocation" class="com.ai.ipu.map.func.MobileMap" method="selectLocation"></action>
	 <action name="selectLocation" class="com.ai.ipu.map.func.MobileMap" method="selectLocation"></action> 
	 -->
	<!-- MobileStorage -->
	<action name="removeMemoryCache" class="com.wade.mobile.func.MobileStorage" method="removeMemoryCache"></action>
	<action name="clearMemoryCache" class="com.wade.mobile.func.MobileStorage" method="clearMemoryCache"></action>

display-client/project.properties

@@ -13,5 +13,5 @@
# Project target.
target=android-22
android.library=false
android.library.reference.1=../wade-mobile-lib
android.library.reference.1=..\\wade-mobile-lib
android.library.reference.2=../wade-mobile-common

ipu-alertdialog/.classpath

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

ipu-alertdialog/AndroidManifest.xml

@@ -5,8 +5,8 @@
    android:versionName="1.0" >
    <uses-sdk
        android:minSdkVersion="11"
        android:targetSdkVersion="21" />
        android:minSdkVersion="8"
        android:targetSdkVersion="22" />
 
</manifest>

ipu-count-test/AndroidManifest.xml

@@ -4,8 +4,8 @@
    android:versionName="1.0" >
    <uses-sdk
        android:minSdkVersion="10"
        android:targetSdkVersion="15" />
        android:minSdkVersion="8"
        android:targetSdkVersion="22" />
    <uses-permission android:name="android.permission.INTERNET"/>
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
    <uses-permission android:name="android.permission.WRITE_CONTACTS" />

ipu-count-test/project.properties

@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-15
target=android-22
android.library=false

wade-mobile-common/AndroidManifest.xml

@@ -5,5 +5,5 @@
    <uses-sdk
        android:minSdkVersion="8"
        android:targetSdkVersion="15" />
        android:targetSdkVersion="22" />
</manifest>

wade-mobile-common/project.properties

@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-15
target=android-22
android.library=true

wade-mobile-lib/AndroidManifest.xml

@@ -5,7 +5,7 @@
    <uses-sdk
        android:minSdkVersion="8"
        android:targetSdkVersion="15" />
        android:targetSdkVersion="22" />
    <!-- <application
        android:allowBackup="true"

wade-mobile-lib/project.properties

@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-15
target=android-22
android.library=true