Commit 12e70506 authored by wanglei's avatar wanglei

...

parent 3e08a526
......@@ -3,6 +3,6 @@ package com.base.scanqr.bean
open class ScanBean(
val scanType: String = ""
) {
var createTime = 0L
var createTime = System.currentTimeMillis()
var isCreateOrScan: Boolean = true//create:true ; scan:false
}
\ No newline at end of file
......@@ -56,9 +56,6 @@ class EmailCodeActivity : BaseActivity<ActivityEmailCodeBinding>(ActivityEmailCo
tempImage = file.absolutePath
}
}
if (email.createTime == 0L) {
email.createTime = System.currentTimeMillis()
}
SpJsonUtils.addJsonBean<EmailUIBean>(KEY_EMAIL, email)
}
}.start()
......
package com.base.scanqr.ui.main
import android.content.Context
import android.text.format.DateUtils
import android.view.View
import android.view.ViewGroup
import com.base.scanqr.R
......@@ -21,17 +20,20 @@ import com.base.scanqr.bean.WifiUIBean
import com.base.scanqr.databinding.ItemHistoryBinding
import com.base.scanqr.ui.adapter.CommonViewHolder
import com.base.scanqr.utils.DateUtils.formatTimeAgo
import com.base.scanqr.utils.LogEx
import com.base.scanqr.utils.XmlEx.inflate
import com.chad.library.adapter4.BaseQuickAdapter
class HistoryAdapter : BaseQuickAdapter<ScanBean, CommonViewHolder>() {
private val TAG = "HistoryAdapter"
var moreAction: ((view: View, item: ScanBean) -> Unit)? = null
var itemClick: ((item: ScanBean) -> Unit)? = null
override fun onBindViewHolder(holder: CommonViewHolder, position: Int, item: ScanBean?) {
item ?: return
val binding = ItemHistoryBinding.bind(holder.itemView)
LogEx.logDebug(TAG, "item.scanType=${item.scanType}")
when (item.scanType) {
KEY_WIFI -> {
if (item is WifiUIBean) {
......
package com.base.scanqr.ui.main
import android.content.Intent
import android.graphics.Color
import androidx.core.content.ContextCompat
import androidx.core.view.updatePadding
import androidx.lifecycle.ViewModelProvider
import com.base.scanqr.R
import com.base.scanqr.base.BaseFragment
import com.base.scanqr.bean.FunctionUIBean
import com.base.scanqr.databinding.FragmentHistoryBinding
import com.base.scanqr.ui.email.EmailCodeActivity
import com.base.scanqr.ui.text.TextCodeActivity
import com.base.scanqr.ui.widget.DeleteQRDialog.showDeleteQRDialog
import com.base.scanqr.ui.widget.HistoryMoreDialog.showHistoryMoreDialog
import com.base.scanqr.ui.wifi.WifiCodeActivity
import com.base.scanqr.utils.BarUtils
import com.google.gson.Gson
class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBinding::inflate) {
......@@ -42,7 +48,29 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind
}
})
}
adapter?.itemClick = {}
adapter?.itemClick = { item ->
val activity = requireActivity() as MainActivity?
when (item.scanType) {
FunctionUIBean.KEY_WIFI -> {
activity?.startActivity(Intent(activity, WifiCodeActivity::class.java).apply {
putExtra("data", Gson().toJson(item))
})
}
FunctionUIBean.KEY_TEXT -> {
activity?.startActivity(Intent(activity, TextCodeActivity::class.java).apply {
putExtra("data", Gson().toJson(item))
})
}
FunctionUIBean.KEY_EMAIL -> {
activity?.startActivity(Intent(activity, EmailCodeActivity::class.java).apply {
putExtra("data", Gson().toJson(item))
})
}
}
}
}
override fun initListener() {
......
......@@ -46,9 +46,6 @@ class TextCodeActivity : BaseActivity<ActivityTextCodeBinding>(ActivityTextCodeB
tempImage = file.absolutePath
}
}
if (textUIBean.createTime == 0L) {
textUIBean.createTime = System.currentTimeMillis()
}
SpJsonUtils.addJsonBean<ScanBean>(FunctionUIBean.KEY_TEXT, textUIBean)
}
}.start()
......
......@@ -80,9 +80,6 @@ class WifiCodeActivity : BaseActivity<ActivityWifiCodeBinding>(ActivityWifiCodeB
tempImage = file.absolutePath
}
}
if (wifiBean.createTime == 0L) {
wifiBean.createTime = System.currentTimeMillis()
}
SpJsonUtils.addJsonBean<WifiUIBean>(FunctionUIBean.KEY_WIFI, wifiBean)
}
}.start()
......
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