修改和优化

android_package.sh

@@ -35,10 +35,6 @@ PGY_API_KEY=""
 PGY_USER_KEY=""
 # 钉钉 机器人 webhook 链接的 access_token 参数值 #
 DD_HOST_URL=""
-# 蒲公英 APP 图标 #
-DD_ICON_URL=""
-# 蒲公英 APP 关键字 #
-DD_DOWN_URL=""
 
 # 不要改 #
 WORKSPACE="/Users/${USER}/AutoPackage/Android/CODE"
@@ -54,4 +50,4 @@ cp -r ${SCRIPT_PATH}/apk_script ${WORKSPACE}
 # 修改环境文件
 cp -r ${WORKSPACE}/app/src/main/res/values/ccbpi_env/${BUILD_ENV}.xml ${WORKSPACE}/app/src/main/res/values/ccbpi.xml
 
-sh ${WORKSPACE}/apk_script/auto_package_apk.sh ${BUILD_ENV} ${BUILD_TYPE} ${PGY_API_KEY} ${PGY_USER_KEY} ${DD_HOST_URL} ${DD_ICON_URL} ${DD_DOWN_URL} ${DD_MESSAGE}
+sh ${WORKSPACE}/apk_script/auto_package_apk.sh ${BUILD_ENV} ${BUILD_TYPE} ${PGY_API_KEY} ${PGY_USER_KEY} ${DD_HOST_URL} ${DD_MESSAGE}

apk_script/auto_package_apk.sh

@@ -4,9 +4,7 @@ BUILD_TYPE=$2
 PGY_API_KEY=$3
 PGY_USER_KEY=$4
 DD_HOST_URL=$5
-DD_ICON_URL=$6
-DD_DOWN_URL=$7
-DD_MESSAGE=$8
+DD_MESSAGE=$6
 
 COLOR_Cyan='\033[0;36m'
 COLOR_Red='\033[41;37m'
@@ -46,7 +44,7 @@ echo_log "===== 打包耗时：${SECONDS}s ====="
 
 # 上传到蒲公英 (以上调试完成后，再打开以下注释)
 if [ "yes" == "$DD_MESSAGE" ]; then
-	sh ${PROJECT_DIR}/apk_script/auto_upload_pgy.sh ${APK_PATH} ${BUILD_ENV} ${BUILD_NUMBER} ${PGY_API_KEY} ${PGY_USER_KEY} ${DD_HOST_URL} ${DD_ICON_URL} ${DD_DOWN_URL}
+	sh ${PROJECT_DIR}/apk_script/auto_upload_pgy.sh ${APK_PATH} ${BUILD_ENV} ${BUILD_NUMBER} ${PGY_API_KEY} ${PGY_USER_KEY} ${DD_HOST_URL}
 else
 	sh ${PROJECT_DIR}/apk_script/auto_upload_pgy.sh ${APK_PATH} ${BUILD_ENV} ${BUILD_NUMBER} ${PGY_API_KEY} ${PGY_USER_KEY}
 fi

apk_script/auto_upload_pgy.sh

@@ -63,12 +63,11 @@ RESPONSE_CODE=$(echo $RESPONSE | jq '.code')
 DD_ICON_URL=$(echo $RESPONSE | jq '.data.appIcon')/120
 DD_DOWN_URL=$(echo $RESPONSE | jq '.data.appShortcutUrl')
 
-if [ $RESPONSE_CODE -eq 0 ]; then
-    
-else
+if [ $RESPONSE_CODE -ne 0 ]; then
     echo_error "upload error"
     exit 1
 fi
+
 # (以上调试完成后，再打开以下注释)
 if [ $# -eq 6 ]; then    
     python ${CURRENT_DIR}/auto_push_ding_talk.py ${EBIZ_Version} ${EBIZ_APP_Name} ${EBIZ_ENV} ${DD_ICON_URL//\"/} ${DD_DOWN_URL//\"/} ${DD_HOST_URL} ${PGY_password}