Commit 79c5d4f1 authored by wanglei's avatar wanglei

...

parent 09cd095f
This diff is collapsed.
...@@ -40,8 +40,6 @@ class ScanQRCActivity : BaseActivity<ActivityScanQrcBinding>() { ...@@ -40,8 +40,6 @@ class ScanQRCActivity : BaseActivity<ActivityScanQrcBinding>() {
BarUtils.setStatusBarColor(this, Color.TRANSPARENT) BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
binding.root.updatePadding(top = BarUtils.getStatusBarHeight()) binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
binding.ivQrc.overlay
if (checkCameraPermission()) { if (checkCameraPermission()) {
initCamera() initCamera()
...@@ -68,6 +66,8 @@ class ScanQRCActivity : BaseActivity<ActivityScanQrcBinding>() { ...@@ -68,6 +66,8 @@ class ScanQRCActivity : BaseActivity<ActivityScanQrcBinding>() {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
} }
binding.ivShoudian.setOnClickListener { }
binding.ivPhoto.setOnClickListener { }
} }
private fun initCamera() { private fun initCamera() {
......
...@@ -23,12 +23,6 @@ ...@@ -23,12 +23,6 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black_a_70"
tools:ignore="ContentDescription" />
<com.base.browserwhite.ui.views.TransparentSrcInImageView <com.base.browserwhite.ui.views.TransparentSrcInImageView
android:id="@+id/iv_qrc" android:id="@+id/iv_qrc"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -40,6 +34,12 @@ ...@@ -40,6 +34,12 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black_a_70"
tools:ignore="ContentDescription" />
<ImageView <ImageView
android:id="@+id/iv_shoudian" android:id="@+id/iv_shoudian"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -51,4 +51,15 @@ ...@@ -51,4 +51,15 @@
app:layout_constraintTop_toBottomOf="@id/iv_qrc" app:layout_constraintTop_toBottomOf="@id/iv_qrc"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/iv_photo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="35dp"
android:background="@mipmap/s_tupian"
app:layout_constraintBottom_toBottomOf="@id/iv_shoudian"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/iv_shoudian"
tools:ignore="ContentDescription" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment