Commit 24368a0e authored by wanglei's avatar wanglei

...

parent 07d96824
Pipeline #1474 canceled with stages
...@@ -7,6 +7,7 @@ import com.base.scanqrclear.base.BaseActivity ...@@ -7,6 +7,7 @@ import com.base.scanqrclear.base.BaseActivity
import com.base.scanqrclear.bean.config.AdConfigBean import com.base.scanqrclear.bean.config.AdConfigBean
import com.base.scanqrclear.databinding.ActivityScanBinding import com.base.scanqrclear.databinding.ActivityScanBinding
import com.base.scanqrclear.qr.CameraUtils import com.base.scanqrclear.qr.CameraUtils
import com.base.scanqrclear.utils.PermissionUtils.checkCameraPermission
/** /**
*Create by SleepDog on 2025-01-20 *Create by SleepDog on 2025-01-20
...@@ -26,6 +27,7 @@ class ScanAc : BaseActivity<ActivityScanBinding>(ActivityScanBinding::inflate) { ...@@ -26,6 +27,7 @@ class ScanAc : BaseActivity<ActivityScanBinding>(ActivityScanBinding::inflate) {
super.onResumeOneShoot() super.onResumeOneShoot()
if (AdConfigBean.adsConfigBean.functionInShowAd) { if (AdConfigBean.adsConfigBean.functionInShowAd) {
if (isPopupIn) return if (isPopupIn) return
if (!checkCameraPermission()) return
AdsMgr.showInsert(this, false, object : AdsShowCallBack() { AdsMgr.showInsert(this, false, object : AdsShowCallBack() {
override fun close(where: Int) { override fun close(where: Int) {
} }
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#6379E6" />
<corners android:radius="35dp" />
</shape>
\ No newline at end of file
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
android:layout_height="48dp" android:layout_height="48dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginBottom="40dp" android:layout_marginBottom="40dp"
android:background="@drawable/bg_17a1ff_35" android:background="@drawable/bg_6379e6_35"
android:gravity="center" android:gravity="center"
android:text="@string/turn_on" android:text="@string/turn_on"
android:textColor="@color/white" android:textColor="@color/white"
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="200dp" android:layout_height="200dp"
android:background="@drawable/white_background"> android:background="@drawable/white_background">
...@@ -62,7 +63,8 @@ ...@@ -62,7 +63,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="33dp" android:layout_marginStart="33dp"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:src="@mipmap/img_guangbiao_tuisong" /> android:src="@mipmap/img_guangbiao_tuisong"
tools:ignore="ContentDescription" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
android:layout_marginHorizontal="15dp" android:layout_marginHorizontal="15dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@drawable/bg_17a1ff_80" android:background="@drawable/bg_8559ea_6672f7"
android:gravity="center" android:gravity="center"
android:text="Create Now" android:text="Create Now"
android:textColor="@color/white" android:textColor="@color/white"
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:background="@drawable/bg_17a1ff_80" android:background="@drawable/bg_8559ea_6672f7"
android:gravity="center" android:gravity="center"
android:includeFontPadding="false" android:includeFontPadding="false"
android:paddingHorizontal="14dp" android:paddingHorizontal="14dp"
......
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