Browse Source

update UI

devab
MTing 4 weeks ago
parent
commit
2909bb6cd3
  1. 3
      app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java
  2. 2
      app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java
  3. 4
      app/src/main/res/drawable/ic_placeholder_qrcode.xml
  4. 6
      app/src/main/res/drawable/primary_color_rounded_background.xml
  5. 2
      app/src/main/res/drawable/rounded_square_background.xml
  6. 2
      app/src/main/res/layout/activity_oxface_online.xml

3
app/src/main/java/com/ouxuan/oxface/OXFaceOnlineActivity.java

@ -1219,7 +1219,8 @@ public class OXFaceOnlineActivity extends BaseActivity implements View.OnClickLi
handleVerificationCodeClick(); handleVerificationCodeClick();
} else if (id == R.id.btn_scanner_door) { } else if (id == R.id.btn_scanner_door) {
// 扫码器开门点击事件 // 扫码器开门点击事件
handleScannerDoorClick();
// handleScannerDoorClick();
Toast.makeText(this, "请将核销码对准屏幕下方的扫码器", Toast.LENGTH_SHORT).show();
} }
} }

2
app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java

@ -700,7 +700,7 @@ public class OrderVerificationResultActivity extends AppCompatActivity {
*/ */
private void updateCountdownDisplay() { private void updateCountdownDisplay() {
if (tvCountdown != null) { if (tvCountdown != null) {
tvCountdown.setText("页面将在 " + countdownSeconds + " 秒后自动关闭");
tvCountdown.setText("将在 " + countdownSeconds + " 秒后自动关闭");
} }
} }

4
app/src/main/res/drawable/ic_placeholder_qrcode.xml

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="#2196F3" />
<solid android:color="#40FFFFFF" />
<stroke <stroke
android:width="2dp" android:width="2dp"
android:color="#FFFFFF" /> android:color="#FFFFFF" />
<corners android:radius="4dp" />
<corners android:radius="2dp" />
</shape> </shape>

6
app/src/main/res/drawable/primary_color_rounded_background.xml

@ -2,15 +2,15 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"> <item android:state_pressed="true">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="#0056CC" />
<corners android:radius="8dp" />
<solid android:color="#40FFFFFF" />
<corners android:radius="2dp" />
</shape> </shape>
</item> </item>
<item> <item>
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<!-- <solid android:color="#007AFF" />--> <!-- <solid android:color="#007AFF" />-->
<solid android:color="@color/primary_color" /> <solid android:color="@color/primary_color" />
<corners android:radius="2dp" />
<corners android:radius="1dp" />
</shape> </shape>
</item> </item>
</selector> </selector>

2
app/src/main/res/drawable/rounded_square_background.xml

@ -5,5 +5,5 @@
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="#80FFFFFF" /> android:color="#80FFFFFF" />
<corners android:radius="8dp" />
<corners android:radius="2dp" />
</shape> </shape>

2
app/src/main/res/layout/activity_oxface_online.xml

@ -268,7 +268,7 @@
android:id="@+id/img_mini_program_code" android:id="@+id/img_mini_program_code"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" android:layout_height="80dp"
android:src="@drawable/ic_placeholder_circle"
android:src="@drawable/ic_placeholder_qrcode"
android:background="@drawable/circle_background" /> android:background="@drawable/circle_background" />
<TextView <TextView

Loading…
Cancel
Save