update android

qa_shell_script/app/XyqbAndroidBuild.sh

-#!/bin/bash
+#!/bin/bash -ilex
+source /etc/profile
+source ~/.bash_profile
 
 project_path=/home/quant_group/jenkins/workspace/XyqbAndroidBuild
+apk_path=/home/quant_group/jenkins/workspace/XyqbAndroidBuild/apk
 target_file=${project_path}/app/build.gradle
 store_path=/home/ganshc/
 source_gradlefile=${store_path}/build.gradle
@@ -33,25 +36,27 @@ function get_code()
 
 function build_android()
 {
+    
     echo "拷贝可使用的gradle文件"
+    rm -rf ${target_file}
     cp -r ${source_gradlefile} ${target_file}
     if [[ ! -z ${product_flavors} ]]; then
         echo "${product_flavors}" > ${project_path}/markets.txt
     fi
     rm -rf ${project_path}/apk/*
+    cd ${project_path}
+    pwd
     echo "开始使用gradle进行编译该版本的代码"
-    gradle clean resguard  --stacktrace --debug
+    gradle resguard
     if [ $? = 0 ]; then
+	cd ${buildapk_path}
         echo "gradle build is ok".
         echo "开始重命名对应的渠道包"
-        #apkfile="`find ${buildapk_path} -name "*${product_flavors}.apk"`"
-        #apkfile=`grep "${product_flavors}" *.apk`
-        apkfile=`ls ${buildapk_path} | grep "${product_flavors}"`
-        echo ${apkfile}
-        echo "当前路径"
-	cd ${buildapk_path}
-        pwd
-        mv ${apkfile} ${project_path}/apk/${branch_name}_${product_flavors}.apk
+        apkfile="`find ${buildapk_path} -name "*${product_flavors}.apk"`"
+        echo "apk名称是：${apkfile}"
+        ls ${buildapk_path}
+        echo "当前路径 `pwd`"
+        mv ${apkfile} ${apk_path}/${branch_name}_${product_flavors}.apk
     else
         echo "Fail to build android".
         exit -1
@@ -60,13 +65,13 @@ function build_android()
 
 function upload_apk()
 {
-   echo "正在将apk上传到蒲公英，请等待......"
-   curl -F "file=@${project_path}/apk/${branch_name}_${product_flavors}.apk" -F "uKey=13d17385c02ea9ea994d0c985d87ff32" -F "_api_key=5b09af98d5a8ff43f2f39935fa6bfbc1" https://static.pgyer.com/app/qrcode/lJrv 
+   echo "apk正在上传到蒲公英，请等待......"
+   curl -F "file=@${apk_path}/${branch_name}_${product_flavors}.apk" -F "uKey=13d17385c02ea9ea994d0c985d87ff32" -F "_api_key=5b09af98d5a8ff43f2f39935fa6bfbc1" https://static.pgyer.com/app/qrcode/lJrv 
 }
 
 get_code
 
 build_android
 
-#upload_apk
+upload_apk