Commit 6ee147a1 authored by wanglei's avatar wanglei

...

parent f5185cd8
package com.base.browserwhite.ui.activity.mediabrowser package com.base.browserwhite.ui.activity.mediabrowser
import android.content.Intent import android.content.Intent
import android.graphics.Bitmap
import android.graphics.BitmapFactory
import android.graphics.Color import android.graphics.Color
import android.net.Uri
import android.os.Build import android.os.Build
import android.provider.MediaStore
import android.provider.Settings import android.provider.Settings
import androidx.activity.addCallback import androidx.activity.addCallback
import androidx.core.view.isVisible import androidx.core.view.isVisible
...@@ -14,6 +18,7 @@ import androidx.recyclerview.widget.LinearLayoutManager ...@@ -14,6 +18,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
import com.base.browserwhite.bean.ConstObject import com.base.browserwhite.bean.ConstObject
import com.base.browserwhite.databinding.ActivityMediaBrowserBinding import com.base.browserwhite.databinding.ActivityMediaBrowserBinding
import com.base.browserwhite.ui.activity.BaseActivity import com.base.browserwhite.ui.activity.BaseActivity
import com.base.browserwhite.ui.activity.scanqrc.QRImageAnalyzer
import com.base.browserwhite.ui.adapter.MediaAdapter import com.base.browserwhite.ui.adapter.MediaAdapter
import com.base.browserwhite.ui.fragment.FileFragment import com.base.browserwhite.ui.fragment.FileFragment
import com.base.browserwhite.ui.views.DialogViews.showGerPermission import com.base.browserwhite.ui.views.DialogViews.showGerPermission
...@@ -29,6 +34,7 @@ import com.base.browserwhite.utils.MediaStoreUtils.getMediaVideo ...@@ -29,6 +34,7 @@ import com.base.browserwhite.utils.MediaStoreUtils.getMediaVideo
import com.base.browserwhite.utils.PermissionHelp.checkStorePermission import com.base.browserwhite.utils.PermissionHelp.checkStorePermission
import com.base.browserwhite.utils.PermissionHelp.requestStorePermission import com.base.browserwhite.utils.PermissionHelp.requestStorePermission
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
...@@ -127,6 +133,17 @@ class MediaBrowserActivity : BaseActivity<ActivityMediaBrowserBinding>() { ...@@ -127,6 +133,17 @@ class MediaBrowserActivity : BaseActivity<ActivityMediaBrowserBinding>() {
} }
} }
// lifecycleScope.launch(Dispatchers.IO) {
// delay(3000)
// val uri = adapter.beanList.findLast { it.path.contains("百度qr") }?.uri ?: Uri.EMPTY
// LogEx.logDebug(TAG, "uri=$uri")
// val qr = QRImageAnalyzer()
// val bitmap = BitmapFactory.decodeStream(contentResolver.openInputStream(uri))
// qr.processImage(bitmap)
// qr.action = {
// LogEx.logDebug(TAG, it)
// }
// }
} }
override fun initListener() { override fun initListener() {
......
...@@ -73,7 +73,7 @@ class QRImageAnalyzer() : ImageAnalysis.Analyzer { ...@@ -73,7 +73,7 @@ class QRImageAnalyzer() : ImageAnalysis.Analyzer {
} }
} }
fun processImage(context: Context, bitmap: Bitmap) { fun processImage( bitmap: Bitmap) {
val image = InputImage.fromBitmap(bitmap, 0) val image = InputImage.fromBitmap(bitmap, 0)
val barcodeScanner = BarcodeScanning.getClient(options) val barcodeScanner = BarcodeScanning.getClient(options)
...@@ -83,6 +83,7 @@ class QRImageAnalyzer() : ImageAnalysis.Analyzer { ...@@ -83,6 +83,7 @@ class QRImageAnalyzer() : ImageAnalysis.Analyzer {
} }
.addOnFailureListener { exception -> .addOnFailureListener { exception ->
// 处理失败情况 // 处理失败情况
LogEx.logDebug(TAG,"$exception")
} }
} }
} }
\ No newline at end of file
...@@ -8,21 +8,21 @@ import android.text.Spanned ...@@ -8,21 +8,21 @@ import android.text.Spanned
import android.text.style.UnderlineSpan import android.text.style.UnderlineSpan
import com.base.browserwhite.MyApplication import com.base.browserwhite.MyApplication
import com.base.browserwhite.bean.ConstObject.ifAgreePrivacy import com.base.browserwhite.bean.ConstObject.ifAgreePrivacy
import com.base.browserwhite.databinding.ActivitySplashBinding import com.base.browserwhite.databinding.ActivitySplash2Binding
import com.base.browserwhite.help.ConfigHelper import com.base.browserwhite.help.ConfigHelper
class PrivacyManager { class PrivacyManager {
private val binding: ActivitySplashBinding private val binding: ActivitySplash2Binding
private val context: Activity private val context: Activity
private val listener: onUserPrivacyAggreementListener private val listener: onUserPrivacyAggreementListener
constructor( constructor(
binding: ActivitySplashBinding, binding: ActivitySplash2Binding,
context: Activity, context: Activity,
listener: onUserPrivacyAggreementListener listener: onUserPrivacyAggreementListener
) { ) {
......
...@@ -11,7 +11,7 @@ import android.view.KeyEvent ...@@ -11,7 +11,7 @@ import android.view.KeyEvent
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import com.base.browserwhite.ads.AdmobMaxHelper import com.base.browserwhite.ads.AdmobMaxHelper
import com.base.browserwhite.bean.ConstObject.ifAgreePrivacy import com.base.browserwhite.bean.ConstObject.ifAgreePrivacy
import com.base.browserwhite.databinding.ActivitySplashBinding import com.base.browserwhite.databinding.ActivitySplash2Binding
import com.base.browserwhite.fcm.NotificationUtil import com.base.browserwhite.fcm.NotificationUtil
import com.base.browserwhite.help.EventUtils import com.base.browserwhite.help.EventUtils
import com.base.browserwhite.service.StayNotificationService.Companion.startStayNotification import com.base.browserwhite.service.StayNotificationService.Companion.startStayNotification
...@@ -19,7 +19,7 @@ import com.base.browserwhite.ui.activity.BaseActivity ...@@ -19,7 +19,7 @@ import com.base.browserwhite.ui.activity.BaseActivity
import com.base.browserwhite.utils.BarUtils import com.base.browserwhite.utils.BarUtils
@SuppressLint("CustomSplashScreen") @SuppressLint("CustomSplashScreen")
class Splash2Activity : BaseActivity<ActivitySplashBinding>(), class Splash2Activity : BaseActivity<ActivitySplash2Binding>(),
PrivacyManager.onUserPrivacyAggreementListener, TaskManager.ProgressListener { PrivacyManager.onUserPrivacyAggreementListener, TaskManager.ProgressListener {
private val TAG = "NewStartActivity" private val TAG = "NewStartActivity"
private fun initStatusBar() { private fun initStatusBar() {
...@@ -40,8 +40,8 @@ class Splash2Activity : BaseActivity<ActivitySplashBinding>(), ...@@ -40,8 +40,8 @@ class Splash2Activity : BaseActivity<ActivitySplashBinding>(),
} }
override val binding: ActivitySplashBinding by lazy { override val binding: ActivitySplash2Binding by lazy {
ActivitySplashBinding.inflate(layoutInflater) ActivitySplash2Binding.inflate(layoutInflater)
} }
private var mTaskManager: TaskManager? = null private var mTaskManager: TaskManager? = null
......
...@@ -3,12 +3,12 @@ package com.base.browserwhite.ui.activity.splash ...@@ -3,12 +3,12 @@ package com.base.browserwhite.ui.activity.splash
import android.os.Handler import android.os.Handler
import android.view.View import android.view.View
import androidx.core.view.isVisible import androidx.core.view.isVisible
import com.base.browserwhite.databinding.ActivitySplashBinding import com.base.browserwhite.databinding.ActivitySplash2Binding
class TaskManager { class TaskManager {
private val binding: ActivitySplashBinding private val binding: ActivitySplash2Binding
private var mHandler: Handler private var mHandler: Handler
...@@ -17,7 +17,7 @@ class TaskManager { ...@@ -17,7 +17,7 @@ class TaskManager {
private val listener: ProgressListener private val listener: ProgressListener
constructor(binding: ActivitySplashBinding, listener: ProgressListener) { constructor(binding: ActivitySplash2Binding, listener: ProgressListener) {
this.binding = binding this.binding = binding
this.listener = listener this.listener = listener
mHandler = Handler() mHandler = Handler()
......
...@@ -30,7 +30,7 @@ class MediaAdapter( ...@@ -30,7 +30,7 @@ class MediaAdapter(
val moreAction: ((view: View, bean: MediaBean) -> Unit)? = null val moreAction: ((view: View, bean: MediaBean) -> Unit)? = null
) : RecyclerView.Adapter<MediaAdapter.MediaViewHolder>() { ) : RecyclerView.Adapter<MediaAdapter.MediaViewHolder>() {
private val beanList = arrayListOf<MediaBean>() val beanList = arrayListOf<MediaBean>()
inner class MediaViewHolder(view: View) : ViewHolder(view) inner class MediaViewHolder(view: View) : ViewHolder(view)
......
This diff is collapsed.
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/white"/> <!-- <item android:drawable="@color/white"/>-->
<!-- <item android:drawable="@drawable/splash_bg" />--> <item android:drawable="@drawable/qidongyebg" />
<item <!-- <item-->
android:top="130dp" <!-- android:top="130dp"-->
android:gravity="top|center_horizontal"> <!-- android:gravity="top|center_horizontal">-->
<bitmap <!-- <bitmap-->
android:src="@mipmap/qdylogo" /> <!-- android:src="@mipmap/qdylogo" />-->
</item> <!-- </item>-->
</layer-list> </layer-list>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/splash_bp"
android:gravity="center_horizontal"
android:orientation="vertical">
<LinearLayout
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
android:id="@+id/ll_progress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="49dp"
android:gravity="center_horizontal"
android:orientation="vertical">
<ProgressBar
android:id="@+id/pb"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginHorizontal="32dp"
android:layout_marginTop="5dp"
android:max="100"
android:progressDrawable="@drawable/shape_splash_s"
tools:progress="50" />
<TextView
android:id="@+id/tv_load"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:text="Loading..."
android:textColor="#000000"
android:textSize="15sp"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/tv_ad_des"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="42dp"
android:text="This process may involve ad."
android:textColor="#000000"
android:textSize="15sp"
tools:ignore="HardcodedText" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_start"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:gravity="center">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="4dp"
android:text="By continuing you are agreeing to the"
android:textColor="#676767"
android:textSize="14sp"
tools:ignore="HardcodedText" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" &amp; "
android:visibility="gone"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/id_tv_privacy_policy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Privacy Policy"
android:textColor="#676767"
android:textSize="14sp"
tools:ignore="HardcodedText" />
</LinearLayout>
<TextView
android:id="@+id/id_tv_start"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginHorizontal="40dp"
android:layout_marginBottom="49dp"
android:background="#577CFB"
android:gravity="center"
android:text="START TO USE"
android:textColor="@color/white"
android:textSize="18sp"
android:textStyle="bold"
android:visibility="visible"
tools:ignore="HardcodedText" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
This diff is collapsed.
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