..

app/src/main/java/com/base/scanqrclear/ui/main/MainActivity.kt

@@ -20,7 +20,6 @@ import com.base.scanqrclear.bean.config.AdConfigBean
 import com.base.scanqrclear.databinding.ActivityMainBinding
 import com.base.scanqrclear.databinding.ItemHomeTabBinding
 import com.base.scanqrclear.luma.HomeFragment
-import com.base.scanqrclear.qr.CameraUtils
 import com.base.scanqrclear.ui.widget.AppExitDialog.showAppExitDialog
 import com.base.scanqrclear.ui.widget.NotificationDialog.showNotificationTurnOn
 import com.base.scanqrclear.utils.LogEx
@@ -34,14 +33,11 @@ import java.util.concurrent.atomic.AtomicBoolean
 class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::inflate) {
 
 
-
-
-
     private val homeTabs by lazy {
         arrayOf(
             HomeTabUIBean(R.drawable.bg_selector_create, getString(R.string.create)),
             HomeTabUIBean(R.drawable.bg_selector_clean, getString(R.string.files)),
-           // HomeTabUIBean(R.drawable.bg_selector_scan, getString(R.string.scan)),
+            // HomeTabUIBean(R.drawable.bg_selector_scan, getString(R.string.scan)),
             HomeTabUIBean(R.drawable.bg_selector_history, getString(R.string.history)),
             HomeTabUIBean(R.drawable.bg_selector_settings, getString(R.string.settings)),
         )
@@ -63,7 +59,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
         HomeFragment()
     }
 
-    private val fragments = arrayOf(createFragment, homeFragment, historyFragment ,settingFragment)
+    private val fragments = arrayOf(createFragment, homeFragment, historyFragment, settingFragment)
     private var pageAdapter: FragmentStateAdapter? = null
 
 
@@ -78,16 +74,16 @@ class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::infl
 
     override fun onResume() {
         super.onResume()
-        if (checkCameraPermission()) {
-            if (!bannerShowed.get()) {
-                bannerShowed.set(true)
-                AdsMgr.showBanner(binding.flBanner, true) {
-                    showNotificationDialog()
-                }
-            } else {
+//        if (checkCameraPermission()) {
+        if (!bannerShowed.get()) {
+            bannerShowed.set(true)
+            AdsMgr.showBanner(binding.flBanner, true) {
                 showNotificationDialog()
             }
+        } else {
+            showNotificationDialog()
         }
+//        }
     }
 
     private fun showNotificationDialog() {

app/src/main/java/com/base/scanqrclear/utils/QRCodeUtils.kt

@@ -36,6 +36,33 @@ object QRCodeUtils {
 //            e.printStackTrace()
 //        }
 //        return null
+//    }
+
+//    fun generateQRCode(content: String, width: Int, height: Int, margin: Int = 1): Bitmap? {
+//        val writer = QRCodeWriter()
+//        val hints = HashMap<EncodeHintType, Any>()
+//        hints[EncodeHintType.MARGIN] = margin // 设置二维码边距，默认为1
+//        hints[EncodeHintType.ERROR_CORRECTION] = com.google.zxing.qrcode.decoder.ErrorCorrectionLevel.L // 设置二维码的容错级别
+//        hints[EncodeHintType.CHARACTER_SET] = "UTF-8" // 设置字符集为UTF-8，确保中文可以正确编码
+//        try {
+//            val bitMatrix: BitMatrix = writer.encode(content, BarcodeFormat.QR_CODE, width, height, hints)
+//            val bitmapWidth = bitMatrix.width + margin * 2
+//            val bitmapHeight = bitMatrix.height + margin * 2
+//            val bitmap = Bitmap.createBitmap(bitmapWidth, bitmapHeight, Bitmap.Config.ARGB_8888)
+//
+//            // 绘制带有边距的二维码
+//            for (x in 0 until bitMatrix.width) {
+//                for (y in 0 until bitMatrix.height) {
+//                    val nX = x + margin
+//                    val nY = y + margin
+//                    bitmap.setPixel(nX, nY, if (bitMatrix[x, y]) Color.BLACK else Color.WHITE)
+//                }
+//            }
+//            return bitmap
+//        } catch (e: WriterException) {
+//            e.printStackTrace()
+//        }
+//        return null
 //    }
 
     fun generateQRCode(content: String, width: Int, height: Int, margin: Int = 1): Bitmap? {
@@ -46,16 +73,14 @@ object QRCodeUtils {
         hints[EncodeHintType.CHARACTER_SET] = "UTF-8" // 设置字符集为UTF-8，确保中文可以正确编码
         try {
             val bitMatrix: BitMatrix = writer.encode(content, BarcodeFormat.QR_CODE, width, height, hints)
-            val bitmapWidth = bitMatrix.width + margin * 2
-            val bitmapHeight = bitMatrix.height + margin * 2
+            val bitmapWidth = bitMatrix.width
+            val bitmapHeight = bitMatrix.height
             val bitmap = Bitmap.createBitmap(bitmapWidth, bitmapHeight, Bitmap.Config.ARGB_8888)
 
-            // 绘制带有边距的二维码
+            // 绘制二维码
             for (x in 0 until bitMatrix.width) {
                 for (y in 0 until bitMatrix.height) {
-                    val nX = x + margin
-                    val nY = y + margin
-                    bitmap.setPixel(nX, nY, if (bitMatrix[x, y]) Color.BLACK else Color.WHITE)
+                    bitmap.setPixel(x, y, if (bitMatrix[x, y]) Color.BLACK else Color.WHITE)
                 }
             }
             return bitmap
@@ -89,8 +114,9 @@ object QRCodeUtils {
             }
             return bitmap
         } catch (e: WriterException) {
-            throw RuntimeException(e)
+            e.printStackTrace()
         }
+        return null
     }
 
     fun getPairKeyValue(keyValue: String): Pair<String, String> {

app/src/main/res/layout/activity_main.xml

@@ -20,6 +20,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="60dp"
+        android:background="@color/white"
         app:layout_constraintBottom_toBottomOf="parent">
 
         <com.google.android.material.tabs.TabLayout
@@ -27,6 +28,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:background="@color/white"
             app:tabIndicatorHeight="0dp"
             app:tabMaxWidth="200dp"
             app:tabMinWidth="100dp"
@@ -39,6 +41,7 @@
         android:id="@+id/fl_banner"
         android:layout_width="match_parent"
         android:layout_height="60dp"
+        android:background="@color/white"
         app:layout_constraintBottom_toBottomOf="parent">
 
         <ImageView