...

app/src/main/java/com/base/scanqrclear/qr/QrStyleActivity.kt

@@ -33,6 +33,7 @@ class QrStyleActivity : BaseActivity<ActivityQrStyleBinding>(ActivityQrStyleBind
 
     private var scanBean: ScanBean? = null
     private var key: String = ""
+    private var changeStyle: Boolean = false
 
     override fun initView() {
         super.initView()
@@ -40,6 +41,8 @@ class QrStyleActivity : BaseActivity<ActivityQrStyleBinding>(ActivityQrStyleBind
 
         key = intent.extras?.getString("key") ?: ""
         val data = intent.extras?.getString("data") ?: ""
+        changeStyle = intent.extras?.getBoolean("changeStyle", false) ?: false
+
         when (key) {
             KEY_WHATSAPP -> {
                 scanBean = Gson().fromJson(data, WhatsappUIBean::class.java)
@@ -103,9 +106,11 @@ class QrStyleActivity : BaseActivity<ActivityQrStyleBinding>(ActivityQrStyleBind
                 val qrStyleBean = adapter.items.find { it.isSelect }
                 scanBean?.qrStyleBean = qrStyleBean
 
+                putExtra("changeStyle", changeStyle)
                 putExtra("key", key)
                 putExtra("data", Gson().toJson(scanBean))
             })
+            finish()
         }
 
     }

app/src/main/java/com/base/scanqrclear/qr/QrStyleResultActivity.kt

 package com.base.scanqrclear.qr
 
+import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Color
 import android.graphics.Point
 import android.graphics.drawable.Drawable
+import android.util.Log
 import androidx.activity.addCallback
 import androidx.core.view.updatePadding
 import com.base.scanqrclear.R
@@ -129,11 +131,75 @@ class QrStyleResultActivity : BaseActivity<ActivityQrStyleResultBinding>(Activit
 
         //创建历史记录
         createHistorySp()
+
+        //重新更改历史记录样式
+        changeHistoryStyle()
+
+    }
+
+    private fun changeHistoryStyle() {
+        val changeStyle = intent.extras?.getBoolean("changeStyle", false) ?: false
+        LogEx.logDebug(TAG, "changeStyle=$changeStyle")
+        if (!changeStyle) return
+
+        when (key) {
+            KEY_WHATSAPP -> {
+                val list = SpJsonUtils.getSpJsonList<WhatsappUIBean>(KEY_WHATSAPP)
+                list.find { it.createTime == scanBean?.createTime }?.qrStyleBean = scanBean?.qrStyleBean
+                SpJsonUtils.saveJsonBeanList(KEY_WHATSAPP, list)
+            }
+
+            KEY_YOUTUBE -> {
+                val list = SpJsonUtils.getSpJsonList<YoutubeUIBean>(KEY_YOUTUBE)
+                list.find { it.createTime == scanBean?.createTime }?.qrStyleBean = scanBean?.qrStyleBean
+                SpJsonUtils.saveJsonBeanList(KEY_YOUTUBE, list)
+            }
+
+            KEY_FACEBOOK -> {
+                val list = SpJsonUtils.getSpJsonList<FacebookUIBean>(KEY_FACEBOOK)
+                list.find { it.createTime == scanBean?.createTime }?.qrStyleBean = scanBean?.qrStyleBean
+                SpJsonUtils.saveJsonBeanList(KEY_FACEBOOK, list)
+            }
+
+            KEY_INSTAGRAM -> {
+                val list = SpJsonUtils.getSpJsonList<InstagramUIBean>(KEY_INSTAGRAM)
+                list.find { it.createTime == scanBean?.createTime }?.qrStyleBean = scanBean?.qrStyleBean
+                SpJsonUtils.saveJsonBeanList(KEY_INSTAGRAM, list)
+            }
+
+            KEY_X -> {
+                val list = SpJsonUtils.getSpJsonList<XUIBean>(KEY_X)
+                list.find { it.createTime == scanBean?.createTime }?.qrStyleBean = scanBean?.qrStyleBean
+                SpJsonUtils.saveJsonBeanList(KEY_X, list)
+            }
+
+            KEY_SPOTIFY -> {
+                val list = SpJsonUtils.getSpJsonList<SpotifyUIBean>(KEY_SPOTIFY)
+                list.find { it.createTime == scanBean?.createTime }?.qrStyleBean = scanBean?.qrStyleBean
+                SpJsonUtils.saveJsonBeanList(KEY_SPOTIFY, list)
+            }
+
+            KEY_PAYPAL -> {
+                val list = SpJsonUtils.getSpJsonList<PaypalUIBean>(KEY_PAYPAL)
+                list.find { it.createTime == scanBean?.createTime }?.qrStyleBean = scanBean?.qrStyleBean
+                SpJsonUtils.saveJsonBeanList(KEY_PAYPAL, list)
+            }
+
+            KEY_ADDRESS -> {
+                val list = SpJsonUtils.getSpJsonList<AddressUIBean>(KEY_ADDRESS)
+                list.find { it.createTime == scanBean?.createTime }?.qrStyleBean = scanBean?.qrStyleBean
+                SpJsonUtils.saveJsonBeanList(KEY_ADDRESS, list)
+            }
+
+        }
+
     }
 
     private fun createHistorySp() {
 
+
         scanBean?.let {
+
             if (it.needCreate) {
                 it.needCreate = false
                 when (key) {
@@ -272,7 +338,6 @@ class QrStyleResultActivity : BaseActivity<ActivityQrStyleResultBinding>(Activit
 
     }.start()
 
-
     fun createTempImageFile(bitmap: Bitmap) = Thread {
         val file = File(cacheDir, System.currentTimeMillis().toString() + ".jpg")
         val flag = saveBitmapToFile(bitmap, file.absolutePath)
@@ -289,10 +354,17 @@ class QrStyleResultActivity : BaseActivity<ActivityQrStyleResultBinding>(Activit
         binding.flBack.setOnClickListener {
             onBackPressedDispatcher.onBackPressed()
         }
-
         binding.llDelete.setOnClickListener {
             showHintDialog { }
         }
+        binding.llReplaceStyle.setOnClickListener {
+            startActivity(Intent(this, QrStyleActivity::class.java).apply {
+                putExtra("key", key)
+                putExtra("data", Gson().toJson(scanBean))
+                putExtra("changeStyle", true)
+            })
+            finish()
+        }
     }
 
     override fun configSystemBar() {

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

@@ -13,10 +13,8 @@ import com.base.scanqrclear.base.BaseFragment
 import com.base.scanqrclear.bean.AdScanBean
 import com.base.scanqrclear.bean.FunctionUIBean
 import com.base.scanqrclear.bean.ScanBean
-import com.base.scanqrclear.bean.WhatsappUIBean
 import com.base.scanqrclear.bean.config.AdConfigBean.Companion.adsConfigBean
 import com.base.scanqrclear.databinding.FragmentHistoryBinding
-import com.base.scanqrclear.qr.QrStyleActivity
 import com.base.scanqrclear.qr.QrStyleResultActivity
 import com.base.scanqrclear.ui.contact.ContractCodeActivity
 import com.base.scanqrclear.ui.email.EmailCodeActivity

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

@@ -111,6 +111,7 @@
             tools:ignore="DisableBaselineAlignment">
 
             <LinearLayout
+                android:id="@+id/llReplaceStyle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"