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

qa_shell_script/app/XyqbAndroidBuild.sh

@@ -13,8 +13,11 @@ build_time=$3
 cd ${project_path}
 function get_code()
 {
+    git checkout ./
+    git fetch -p
     if [ -z ${branch_name} ]; then
         echo "分支为空，已切换默认分支master"
+        
         git pull
     else
         echo "checkout specified branch ${branch_name}"
@@ -35,7 +38,7 @@ function replace_config()
         echo "正在替换配置文件，请稍后......"
         sed -i "s/apply plugin\: 'newlens'/\/\/apply plugin\: 'newlens'/g" ${BuildGradle_file}
         sed -i "s/artifact = 'com.tencent.mm:SevenZip:1.1.13'/\/\/artifact = 'com.tencent.mm:SevenZip:1.1.13'/g" ${BuildGradle_file}
-        sed -i "s/\/\/path = \"\/usr\/local\/bin\/7za\"/path = \"\/usr\/local\/p7zip_9.20.1\/bin\/7za\"/g" ${BuildGradle_file}
+        #sed -i "s/\/\/path = \"\/usr\/local\/bin\/7za\"/path = \"\/usr\/local\/p7zip_9.20.1\/bin\/7za\"/g" ${BuildGradle_file}
     else
         echo "${BuildGradle_file} 文件不存在，请联系管理人员查看"
         exit -1
@@ -56,9 +59,11 @@ function build_android()
     cd ${project_path}
     pwd
     echo "开始使用gradle进行编译该版本的代码"
-    gradle resguard
+    #gradle resguard
+    echo "=================== ${GRADLE_HOME}"
+    gradle clean resguardRelease
     if [ $? = 0 ]; then
-        echo "成功构建APK包".
+        echo "成功构建APK包"
         echo "开始重命名对应的渠道包"
         cd ${BuildApk_path}
         #if [[ ! -z ${product_flavors} ]]; then