Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .github/workflows/.github-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- master # 触发 CI/CD 的分支
pull_request:
branches:
- master # 监听到 PR 到 main 分支时触发 CI/CD
- master # 监听到 PR 到 master 分支时触发 CI/CD

jobs:
lint:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -524,8 +527,4 @@ jobs:
------------------------------------------------------------
This email was generated automatically by GitHub Actions.
Please do not reply directly.
------------------------------------------------------------




------------------------------------------------------------
4 changes: 2 additions & 2 deletions pos_android_studio_demo/pos_android_app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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 "";
}
Expand Down
Loading