a

qa_shell_script/app/XyqbAndroidBuild.sh

@@ -3,7 +3,8 @@
 project_path=/home/quant_group/jenkins/workspace/XyqbAndroidBuild
 target_file=${project_path}/app/build.gradle
 store_path=/home/ganshc/
-source_file=${store_path}/build.gradle
+source_gradlefile=${store_path}/build.gradle
+source_flavors=${store_path}/markets.txt
 buildapk_path=/home/quant_group/jenkins/workspace/XyqbAndroidBuild/build/archives
 branch_name=$1
 product_flavors=$2
@@ -29,7 +30,11 @@ fi
 
 echo "copy file to app"
 
-cp -r ${source_file} ${target_file}
+cp -r ${source_gradlefile} ${target_file}
+
+if [[ -z ${product_flavors} ]]; then
+    echo "${product_flavors}" > ${project_path}/markets.txt
+fi
 
 echo "gradle build start"
 
@@ -37,9 +42,7 @@ gradle clean resguard  --stacktrace --debug
 
 echo "rename apk"
 
-cd ${buildapk_path}
-
-apkfile=`find ./ -name "*${product_flavors}.apk"`
+apkfile=`find /home/quant_group/jenkins/workspace/XyqbAndroidBuild/build/archives -name "*${product_flavors}.apk"`
 
 cp ${apkfile} /home/quant_group/jenkins/workspace/XyqbAndroidBuild/apk/${branch_name}_${product_flavors}.apk