Commit 7df9cf50 authored by wanglei's avatar wanglei

...

parent 84b1c894
...@@ -32,18 +32,16 @@ ...@@ -32,18 +32,16 @@
<application <application
android:name=".MyApplication" android:name=".MyApplication"
android:allowBackup="true" android:allowBackup="true"
android:requestLegacyExternalStorage="true"
android:dataExtractionRules="@xml/data_extraction_rules" android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules" android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/logo" android:icon="@mipmap/logo"
android:label="@string/app_name" android:label="@string/app_name"
android:requestLegacyExternalStorage="true"
android:roundIcon="@mipmap/logo" android:roundIcon="@mipmap/logo"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.ScanQR" android:theme="@style/Theme.ScanQR"
tools:targetApi="31"> tools:targetApi="31">
<activity
android:name=".ui.webview.WebBrowserActivity"
android:exported="false" />
<activity <activity
android:name=".ui.start.StartActivity" android:name=".ui.start.StartActivity"
android:exported="true" android:exported="true"
...@@ -224,6 +222,12 @@ ...@@ -224,6 +222,12 @@
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" /> tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<activity
android:name=".ui.webview.WebBrowserActivity"
android:exported="false"
android:launchMode="singleTop"
android:screenOrientation="portrait"
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
......
...@@ -71,7 +71,7 @@ object MyNotificationManager { ...@@ -71,7 +71,7 @@ object MyNotificationManager {
val next = actionIdList[0] val next = actionIdList[0]
actionIdList.removeAt(0) actionIdList.removeAt(0)
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
return ACTION_ID_SCREEN_SHORT return ACTION_ID_CONSTELLATION
} }
return next return next
} }
......
...@@ -4,6 +4,7 @@ import android.content.Context ...@@ -4,6 +4,7 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import androidx.activity.addCallback
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.base.scanqrclear.R import com.base.scanqrclear.R
...@@ -47,6 +48,9 @@ class SimilarPhotosActivity : BaseActivity2() { ...@@ -47,6 +48,9 @@ class SimilarPhotosActivity : BaseActivity2() {
}, maxCompleted = { nativeAdLoader, nativeMaxAd -> }, maxCompleted = { nativeAdLoader, nativeMaxAd ->
binding.adNative.setNativeAd(nativeAdLoader, nativeMaxAd) binding.adNative.setNativeAd(nativeAdLoader, nativeMaxAd)
}) })
onBackPressedDispatcher.addCallback {
handleBackPressed(this@SimilarPhotosActivity)
}
} }
private fun initView() { private fun initView() {
......
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