diff --git a/.github/workflows/.github-ci.yml b/.github/workflows/.github-ci.yml index b5ef7757..ea23b49c 100644 --- a/.github/workflows/.github-ci.yml +++ b/.github/workflows/.github-ci.yml @@ -6,7 +6,7 @@ on: - master # 触发 CI/CD 的分支 pull_request: branches: - - master # 监听到 PR 到 main 分支时触发 CI/CD + - master # 监听到 PR 到 master 分支时触发 CI/CD jobs: lint: @@ -117,6 +117,7 @@ jobs: release: runs-on: ubuntu-latest needs: [build] # 依赖于 build 作业的成功 + if: github.event_name == 'push' # 仅在合并到 master(push)时执行,PR 阶段跳过 steps: - name: Check out repository @@ -237,6 +238,7 @@ jobs: upload-to-gitlab-maven: runs-on: ubuntu-latest needs: [build] + if: github.event_name == 'push' # 仅在合并到 master(push)时执行,PR 阶段跳过 steps: - name: Check out repository @@ -404,6 +406,7 @@ jobs: deploy: runs-on: ubuntu-latest # 使用 Ubuntu 作为运行环境 needs: [build] # 部署依赖于构建作业成功 + if: github.event_name == 'push' # 仅在合并到 master(push)时执行,PR 阶段跳过 steps: - name: Check out repository uses: actions/checkout@v2 @@ -417,7 +420,7 @@ jobs: notify-upload-to-shiply: runs-on: ubuntu-latest needs: [ release ] - if: success() + if: github.event_name == 'push' && success() # 仅在合并到 master(push)且前置成功时执行 steps: - name: Check out repository @@ -524,8 +527,4 @@ jobs: ------------------------------------------------------------ This email was generated automatically by GitHub Actions. Please do not reply directly. - ------------------------------------------------------------ - - - - + ------------------------------------------------------------ \ No newline at end of file diff --git a/pos_android_studio_demo/pos_android_app/build.gradle b/pos_android_studio_demo/pos_android_app/build.gradle index b2b48d47..d4042fcd 100644 --- a/pos_android_studio_demo/pos_android_app/build.gradle +++ b/pos_android_studio_demo/pos_android_app/build.gradle @@ -31,8 +31,8 @@ android { applicationId "com.dspread.pos_android_app" minSdk 24 targetSdk 34 - versionCode 146 - versionName "8.5.4-2609021540" + versionCode 147 + versionName "8.5.5-2609101030" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { // Set up supported SO library architecture diff --git a/pos_android_studio_demo/pos_android_app/libs/dspread_pos_sdk_8.5.4-min.aar b/pos_android_studio_demo/pos_android_app/libs/dspread_pos_sdk_8.5.4-min.aar deleted file mode 100644 index ed56265c..00000000 Binary files a/pos_android_studio_demo/pos_android_app/libs/dspread_pos_sdk_8.5.4-min.aar and /dev/null differ diff --git a/pos_android_studio_demo/pos_android_app/libs/dspread_pos_sdk_8.5.4.aar b/pos_android_studio_demo/pos_android_app/libs/dspread_pos_sdk_8.5.4.aar deleted file mode 100644 index 34b22ddc..00000000 Binary files a/pos_android_studio_demo/pos_android_app/libs/dspread_pos_sdk_8.5.4.aar and /dev/null differ diff --git a/pos_android_studio_demo/pos_android_app/libs/dspread_pos_sdk_8.5.5-min.aar b/pos_android_studio_demo/pos_android_app/libs/dspread_pos_sdk_8.5.5-min.aar new file mode 100644 index 00000000..5ca1ed34 Binary files /dev/null and b/pos_android_studio_demo/pos_android_app/libs/dspread_pos_sdk_8.5.5-min.aar differ diff --git a/pos_android_studio_demo/pos_android_app/libs/dspread_pos_sdk_8.5.5.aar b/pos_android_studio_demo/pos_android_app/libs/dspread_pos_sdk_8.5.5.aar new file mode 100644 index 00000000..17d16d3b Binary files /dev/null and b/pos_android_studio_demo/pos_android_app/libs/dspread_pos_sdk_8.5.5.aar differ diff --git a/pos_android_studio_demo/pos_android_app/src/main/java/com/dspread/pos/utils/HandleTxnsResultUtils.java b/pos_android_studio_demo/pos_android_app/src/main/java/com/dspread/pos/utils/HandleTxnsResultUtils.java index 3d3e2a33..ff4fda33 100644 --- a/pos_android_studio_demo/pos_android_app/src/main/java/com/dspread/pos/utils/HandleTxnsResultUtils.java +++ b/pos_android_studio_demo/pos_android_app/src/main/java/com/dspread/pos/utils/HandleTxnsResultUtils.java @@ -117,6 +117,12 @@ public static String getDisplayMessage(QPOSService.Display displayMsg, Context c return "transaction terminated"; case PlEASE_TAP_CARD_AGAIN: return context.getString(R.string.please_tap_card_again); + case CONFIRM_NEW_PIN: + return "confirm new pin"; + case INPUT_NEW_PIN: + return "input new pin"; + case INPUT_NEW_PIN_CHECK_ERROR: + return "input new pin check error"; default: return ""; }