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,15 +92,18 @@ function build_android()
 
 function upload_apk()
 {
-   echo "apk正在上传到蒲公英，请等待......"
-   #cd ${StroeApk_path}
-   echo "当前上传apk包的路径是 `pwd`"
-   #curl -F "file=@${branch_name}_${product_flavors}_${build_time}.apk" -F "uKey=13d17385c02ea9ea994d0c985d87ff32" -F "_api_key=5b09af98d5a8ff43f2f39935fa6bfbc1" https://qiniu-storage.pgyer.com/apiv1/app/upload
-   curl -F "file=@${branch_name}_${product_flavors}_${build_time}.apk" -F "uKey=41968e9da5a634b7b33dc8ff41e31c4e" -F "_api_key=8c303b6f70e8abbda50d1503568f1864" https://qiniu-storage.pgyer.com/apiv1/app/upload
-   if [ $? != 0 ]; then
-        echo "上传失败，请联系管理员查看"
-   fi
-}
+
+    if [ "$need_upload" -eq "true" ]; then
+        echo "apk正在上传到蒲公英，请等待......"
+        #cd ${StroeApk_path}
+        echo "当前上传apk包的路径是 `pwd`"
+        #curl -F "file=@${branch_name}_${product_flavors}_${build_time}.apk" -F "uKey=13d17385c02ea9ea994d0c985d87ff32" -F "_api_key=5b09af98d5a8ff43f2f39935fa6bfbc1" https://qiniu-storage.pgyer.com/apiv1/app/upload
+        curl -F "file=@${branch_name}_${product_flavors}_${build_time}.apk" -F "uKey=41968e9da5a634b7b33dc8ff41e31c4e" -F "_api_key=8c303b6f70e8abbda50d1503568f1864" https://qiniu-storage.pgyer.com/apiv1/app/upload
+        if [ $? != 0 ]; then
+            echo "上传失败，请联系管理员查看"
+        fi
+    fi
+}   
 
 #get_code