Merge branch 'master' of http://gitabc.xyqb.com/QA/qa-deploy-utils

qa_shell_script/app/XyqbAndroidBuild.sh

@@ -12,6 +12,8 @@ branch_name=$1
 product_flavors=$2
 build_time=$3
 test_server=$4
+apk_name=$5
+need_upload=$6
 
 cd ${project_path}
 function get_code()
@@ -81,7 +83,7 @@ function build_android()
         echo "当前路径 `pwd`"
         #mv ${ApkFile} ${StroeApk_path}/${branch_name}_${product_flavors}.apk
         mv ${ApkFile} ${branch_name}_${product_flavors}_${build_time}.apk
-        cp -R ${branch_name}_${product_flavors}_${build_time}.apk ${downloadApk_path}/${branch_name}.apk
+        cp -R ${branch_name}_${product_flavors}_${build_time}.apk ${downloadApk_path}/${apk_name}.apk
     else
         echo "构建失败，请联系管理员查看".
         exit -1
@@ -90,6 +92,8 @@ function build_android()
 
 function upload_apk()
 {
+
+    if [ "$need_upload" -eq "true" ]; then
         echo "apk正在上传到蒲公英，请等待......"
         #cd ${StroeApk_path}
         echo "当前上传apk包的路径是 `pwd`"
@@ -98,6 +102,7 @@ function upload_apk()
         if [ $? != 0 ]; then
             echo "上传失败，请联系管理员查看"
         fi
+    fi
 }   
 
 #get_code