diff --git a/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java b/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java index ca6e25e..3985ced 100644 --- a/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java +++ b/app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java @@ -1219,7 +1219,8 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi handleVerificationCodeClick(); } else if (id == R.id.btn_scanner_door) { // 扫码器开门点击事件 - handleScannerDoorClick(); +// handleScannerDoorClick(); + Toast.makeText(this, "请将核销码对准屏幕下方的扫码器", Toast.LENGTH_SHORT).show(); } } diff --git a/app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java b/app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java index f0ab4b1..0a5b255 100644 --- a/app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java +++ b/app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java @@ -700,7 +700,7 @@ public class OrderVerificationResultActivity extends AppCompatActivity { */ private void updateCountdownDisplay() { if (tvCountdown != null) { - tvCountdown.setText("页面将在 " + countdownSeconds + " 秒后自动关闭"); + tvCountdown.setText("将在 " + countdownSeconds + " 秒后自动关闭"); } } diff --git a/app/src/main/res/drawable/ic_placeholder_qrcode.xml b/app/src/main/res/drawable/ic_placeholder_qrcode.xml index fb42f09..51e86ff 100644 --- a/app/src/main/res/drawable/ic_placeholder_qrcode.xml +++ b/app/src/main/res/drawable/ic_placeholder_qrcode.xml @@ -1,9 +1,9 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/primary_color_rounded_background.xml b/app/src/main/res/drawable/primary_color_rounded_background.xml index 6b78168..33f48e0 100644 --- a/app/src/main/res/drawable/primary_color_rounded_background.xml +++ b/app/src/main/res/drawable/primary_color_rounded_background.xml @@ -2,15 +2,15 @@ - - + + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/rounded_square_background.xml b/app/src/main/res/drawable/rounded_square_background.xml index 5c83334..04daec1 100644 --- a/app/src/main/res/drawable/rounded_square_background.xml +++ b/app/src/main/res/drawable/rounded_square_background.xml @@ -5,5 +5,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_oxface_online.xml b/app/src/main/res/layout/activity_oxface_online.xml index 99c4258..8923471 100644 --- a/app/src/main/res/layout/activity_oxface_online.xml +++ b/app/src/main/res/layout/activity_oxface_online.xml @@ -268,7 +268,7 @@ android:id="@+id/img_mini_program_code" android:layout_width="80dp" android:layout_height="80dp" - android:src="@drawable/ic_placeholder_circle" + android:src="@drawable/ic_placeholder_qrcode" android:background="@drawable/circle_background" />