整理property定义，添加buil.xml中添加一些注释

show-client/build/build.properties

@@ -31,3 +31,31 @@ library_packages=com.ai.ipu.mobile:com.ai.ipu.jpush:com.ai.ipu.scan:com.ai.ipu.m
log_file=build.log
#输出目录
output_path=.
android-target-dir=${android_sdk_home}/platforms/${android-target}
android-jar=${android-target-dir}/android.jar
android-framework=${android-target-dir}/framework.aidl
proguard-jar=${android_sdk_home}/tools/proguard/lib/proguard.jar
annotations-jar=${android_sdk_home}/tools/support/annotations.jar
gen-dir=gen
src-dir=src
libs-dir=libs
res-dir=res
asset-dir=assets
bin-dir=bin
build-dir=build
manifest-xml=AndroidManifest.xml
#主工程各个目录
host-gen=${project_home}/${gen-dir}
host-src=${project_home}/${src-dir}
host-libs=${project_home}/${libs-dir}
host-bin=${project_home}/${bin-dir}
host-build=${project_home}/${build-dir}
host-classes=${host-bin}/classes
intermediate-dex=${project_home}/${bin-dir}/${app_name}/classes.dex
intermediate-dex-dir=${project_home}/${bin-dir}/${app_name}
#The final package file to generate
resources-package=${project_home}/${bin-dir}/${app_name}/${app_name}.ap_
out-unsigned-package=${project_home}/${bin-dir}/${app_name}/${app_name}-unsigned.apk
out-signed-package=${project_home}/${bin-dir}/${app_name}/${app_name}-signed.apk
zipalign-package=${output_path}/${app_name}.apk

show-client/build/build.xml

@@ -8,43 +8,12 @@
	<condition property="exe" value=".exe" else=""><os family="windows" /></condition>
	<condition property="bat" value=".bat" else=""><os family="windows" /></condition>
    <!-- Android SDK Tools -->
    
	<property name="zipalign" value="${android_tools}/zipalign${exe}" />
	<property name="jarsigner" value="${jdk_home}/bin/jarsigner${exe}" />
	
	<property name="android-target-dir" value="${android_sdk_home}/platforms/${android-target}" />
	<property name="android-jar" value="${android-target-dir}/android.jar" />
	<property name="android-framework" value="${android-target-dir}/framework.aidl" />
	<property name="aapt" value="${android_tools}/aapt${exe}" />
	<property name="dx" value="${android_tools}/dx${bat}" />
	<property name="aidl" value="${android_tools}/aidl${exe}" />
	<property name="proguard-jar" value="${android_sdk_home}/tools/proguard/lib/proguard.jar" />
	<property name="annotations-jar" value="${android_sdk_home}/tools/support/annotations.jar" />
	
    <!-- some file directory exclude "bin" file, because "bin" file will be changed each loop -->
    <property name="gen-dir" value="gen" />
    <property name="src-dir" value="src" />
    <property name="libs-dir" value="libs" />
    <property name="res-dir" value="res" />
    <property name="asset-dir" value="assets" />
    <property name="bin-dir" value="bin" />
    <property name="build-dir" value="build"/>
    <property name="manifest-xml" value="AndroidManifest.xml" />
    <!-- 主工程各个目录 -->
    <property name="host-gen" value="${project_home}/${gen-dir}" />
	<property name="host-src" value="${project_home}/${src-dir}" />
	<property name="host-libs" value="${project_home}/${libs-dir}" />
	<property name="host-bin" value="${project_home}/${bin-dir}" />
	<property name="host-build" value="${project_home}/${build-dir}" />
	<property name="host-classes" value="${host-bin}/classes" />
	<property name="intermediate-dex" value="${project_home}/${bin-dir}/${app_name}/classes.dex" />
	<property name="intermediate-dex-dir" value="${project_home}/${bin-dir}/${app_name}" />
    <!-- The final package file to generate -->
	<property name="resources-package" value="${project_home}/${bin-dir}/${app_name}/${app_name}.ap_" />
	<property name="out-unsigned-package" value="${project_home}/${bin-dir}/${app_name}/${app_name}-unsigned.apk" />
	<property name="out-signed-package" value="${project_home}/${bin-dir}/${app_name}/${app_name}-signed.apk" />
	<property name="zipalign-package" value="${output_path}/${app_name}.apk" />
	
	<!-- 自动化打包的target -->
	<target name="apkpackaging" depends="init,aapt_gererateR,aidl,compile,obfuscate,dex-package,aapt-package-res,apk-builder,add-dex,jar-signer,zipalign"/>
@@ -63,12 +32,15 @@
	
  	<!-- 生成R文件和Manifest.java -->
  	<target name="aapt_gererateR">
  		<!-- 这种方式每个library工程执行一次aapt生成R.java,导致library的R.java中的资源id值与主工程R.java
  		中的对应的值可能不一致，运行时找不到资源，用 extra-packages参数解决 -->
		<!-- <foreach target="aapt_gererateR_library" list="${libraries}" param="library" delimiter=",">
		</foreach>  这种方式导致library的R.java中的资源id值与主工程R.java中的对应的值可能不一致，运行时找不到资源 -->
		</foreach> -->
        <!-- auto-add-overlay 这个重要，覆盖资源，不然报错-->
        <var name="p" value="package -m --auto-add-overlay -J ${host-gen} -M ${project_home}/${manifest-xml}
			-I ${android-jar} -S ${project_home}/${res-dir}"/>
        <!-- 把每个library工程的res目录加入参数 -->
  		<for list="${libraries}" param="library">
            <sequential>
            	<available property="isExist_library_res_r" file="@{library}/res" type="dir" />
@@ -85,36 +57,11 @@
		<!-- 编译工程的的R文件 -->
		<exec executable="${aapt}" failonerror="true">
			<!-- 使用 extra-packages参数生成library工程包名的R.java -->
			<!-- 使用 extra-packages参数生成library工程包名的R.java。aapt只执行一次，生成各工程对应的R.java,
			对应资源id的值是一致的 -->
			<arg line="${p} --extra-packages ${library_packages}" />
		</exec>
    </target>
	
	<target name="aapt_gererateR_library">
		<echo>gererate R.java with ${library}</echo>
		<available property="isExist_library_r_l" file="${library}/res" type="dir" />
		<!-- 是否需要参数 -S ${library}/${res-dir} -->
		<if>
		    <equals arg1="${isExist_library_r_l}" arg2="true" />
		    <then>
		    	<var name="param" value="-S ${library}/${res-dir}"/>
		    </then>
			<else>
				<var name="param" value=""/>
			</else>
		</if>
		
		<var name="param" value="package -m --non-constant-id --auto-add-overlay -J ${host-gen}
			-M ${library}/${manifest-xml} -I ${android-jar} ${param}"/>
		<echo>aapt_gererateR_library param：${param}</echo>
		
		<mkdir dir="${library}/gen"/>
		<!-- 编译Libray的R文件 -->
		<exec executable="${aapt}" failonerror="true">
            <arg line="${param}" />
        </exec>
	</target>
    
	<!-- 生成aidl对应的java文件 -->
  	<target name="aidl">
@@ -131,6 +78,7 @@
	<!-- 编译java文件为class文件 -->
	<target name="compile">
		<!-- 把主工程libs目录下的内容拷贝到${host-bin}/libs -->
        <available property="isExist_host_libs_h" file="${host-libs}" type="dir" />
        <if>
@@ -140,6 +88,7 @@
                 dest="${host-bin}/libs"/>
            </then>
        </if>
        <!-- 把每个library工程libs目录下的内容也拷贝到${host-bin}/libs -->
        <for list="${libraries}" param="library">
            <sequential>
                <available property="isExist_library_libs_l" file="@{library}/libs" type="dir" />
@@ -156,6 +105,7 @@
            </sequential>
        </for>
        <!-- ${host-bin}/libs下的内容需要编译 -->
        <path id="library.libs">
            <fileset dir="${host-bin}/libs">
                <include name="*.so" />
@@ -202,6 +152,8 @@
	<!-- 打包dex文件 -->
	<target name="dex-package">
	    <echo>Packaging dex...</echo>
	    <!-- -JXmx2048m用于解决dx报错java.lang.OutOfMemoryError
	     multi-dex用于方法数超过65535分包处理，分包生成的dex文件放在${intermediate-dex-dir}目录 -->
        <var name="dex_p" value="-JXmx2048m --dex --multi-dex --output=${intermediate-dex-dir} ${host-classes}"/>
        <available property="isExist_host_libs_dx" file="${host-libs}" type="dir" />
@@ -237,6 +189,7 @@
		<echo>Packaging resources and assets...</echo>
		<!-- 把每个library工程的res目录加入参数 -->
        <var name="temp" value=""/>
        <for list="${libraries}" param="library">
            <sequential>
@@ -288,15 +241,17 @@
	    </java>
	</target>
	
	<!-- add classes2.dex class3.dex ... -->
	<!-- 分包生成的 classes2.dex、class3.dex等文件不会自动加入apk，以下代码实现添加 -->
	<target name="add-dex">
		<echo>Add classes*.dex...</echo>
		
		<for param="file">
			<!-- fileset包括classes*.dex但不包括classes.dex -->
			<fileset dir="${intermediate-dex-dir}" includes="classes*.dex"
				excludes="classes.dex"/>
			<sequential>
				<copy file="@{file}" todir="." />
				<!-- 取文件名，不包含绝对路径。如果有路径，分按路径加入对应的路径下面 -->
				<propertyregex 
					property="dexfile"  
					input="@{file}"