a

qa_shell_script/app/XyqbAndroidBuild.sh

@@ -4,6 +4,7 @@ project_path=/home/quant_group/jenkins/workspace/XyqbAndroidBuild
 StroeApk_path=${project_path}/apk
 BuildGradle_file=${project_path}/app/build.gradle
 BuildApk_path=${project_path}/build/archives
+SourceMarkes_flavors=/home/qa-deploy-utils/qa_shell_script/app/markets.txt
 branch_name=$1
 product_flavors=$2
 
@@ -46,8 +47,10 @@ function build_android()
     if [[ ! -z ${SourceMarkes_flavors} ]]; then
         echo "${product_flavors}" > ${project_path}/markets.txt
     else
+	cp -r ${SourceMarkes_flavors} ${project_path}
         echo "构建所有渠道包"
     fi
+    rm -rf ${BuildApk_path}/*
     rm -rf ${project_path}/apk/*
     cd ${project_path}
     pwd
@@ -57,14 +60,15 @@ function build_android()
         echo "成功构建APK包".
         echo "开始重命名对应的渠道包"
         cd ${BuildApk_path}
-        if [[ ! -z ${product_flavors} ]]; then
-            ApkFile="`find ${BuildApk_path} -name "*${product_flavors}.apk"`"
-        else
-            ApkFile="`find ${BuildApk_path} -name "*ceshi.apk"`"
-        fi
-        echo "apk名称是：${apkfile}"
+        #if [[ ! -z ${product_flavors} ]]; then
+        #    ApkFile="`find ${BuildApk_path} -name "*${product_flavors}.apk"`"
+        #else
+        #    ApkFile="`find ${BuildApk_path} -name "*ceshi.apk"`"
+        #fi
+	ApkFile="`find ${BuildApk_path} -name "*${product_flavors}.apk"`"
+        echo "apk名称是：${ApkFile}"
         echo "当前路径 `pwd`"
-        mv ${ApkFile} ${StroeApk_path}/${branch_name}_${product_flavors}.apk
+        cp -r ${ApkFile} ${StroeApk_path}/${branch_name}_${product_flavors}.apk
     else
         echo "构建失败，请联系管理员查看".
         exit -1

qa_shell_script/app/markets.txt

+sanliulingkaifangpingtai
+yingyongbaocpd
+quantgroup
+ceshi
+oppo
+huawei
+anfeng
+anzhi
+xiaomiyingyongshangcheng
+yingyonghui
+sougoushoujizhushou
+mumayi
+jifeng
+baidushoufa
+wangyi
+tengxunkaifangpingtai
+meizuyingyongzhongxin
+oppo
+vivo
+leshi
+wandoujia
+ppzhushou
+jinritoutiao
+baidufengchao
+oppoxinxiliu
+guangdiantongcpd
\ No newline at end of file