Commit 572d1b16 authored by wanglei's avatar wanglei

...

parent a7b94b37
......@@ -5,11 +5,11 @@ open class ScanBean(
) {
var listContent: String = ""//用来排序用,这个内容用来展示列表名
var createTime = System.currentTimeMillis()
var createType: Int = CREATE_TYPE_USER//0手动创建 1扫描创建 2用于浏览无需创建
var createType: Int = CREATE_TYPE_USER//0手动创建 1扫描创建
var needCreate: Boolean = true//是否需要创建
companion object {
const val CREATE_TYPE_USER = 0
const val CREATE_TYPE_SCAN = 1
const val CREATE_TYPE_VIEW = 2
}
}
\ No newline at end of file
......@@ -7,7 +7,6 @@ import com.base.scanqr.R
import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.EmailUIBean
import com.base.scanqr.bean.FunctionUIBean.Companion.KEY_EMAIL
import com.base.scanqr.bean.ScanBean.Companion.CREATE_TYPE_VIEW
import com.base.scanqr.databinding.ActivityEmailCodeBinding
import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog
import com.base.scanqr.utils.BarUtils
......@@ -58,7 +57,8 @@ class EmailCodeActivity : BaseActivity<ActivityEmailCodeBinding>(ActivityEmailCo
tempImage = file.absolutePath
}
}
if (email.createType != CREATE_TYPE_VIEW) {
if (email.needCreate) {
email.needCreate = false
SpJsonUtils.addJsonBean<EmailUIBean>(KEY_EMAIL, email)
}
}
......
......@@ -10,7 +10,6 @@ import com.base.scanqr.R
import com.base.scanqr.base.BaseFragment
import com.base.scanqr.bean.FunctionUIBean
import com.base.scanqr.bean.ScanBean
import com.base.scanqr.bean.ScanBean.Companion.CREATE_TYPE_VIEW
import com.base.scanqr.databinding.FragmentHistoryBinding
import com.base.scanqr.ui.email.EmailCodeActivity
import com.base.scanqr.ui.text.TextCodeActivity
......@@ -36,7 +35,6 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind
binding.flTop.updatePadding(top = BarUtils.getStatusBarHeight())
initAdapter()
viewModel.initData()
}
......@@ -45,7 +43,6 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind
binding.rv.adapter = adapter
adapter?.moreAction = { view, bean ->
requireContext().showHistoryMoreDialog(view, detailAction = {
bean.createType = CREATE_TYPE_VIEW
jumpByScanBean(bean)
}, removeAction = {
viewModel.removeBean(bean)
......@@ -57,7 +54,6 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind
})
}
adapter?.itemClick = { item ->
item.createType = CREATE_TYPE_VIEW
jumpByScanBean(item)
}
}
......
......@@ -116,7 +116,6 @@ class ScanFragment : BaseFragment<FragmentScanBinding>(FragmentScanBinding::infl
scanJump.set(true)
activity.startActivity(Intent(activity, WifiCodeActivity::class.java).apply {
val bean = QRCodeUtils.createWifiBean(qrCodeValue)
bean.createType = CREATE_TYPE_SCAN
putExtra("data", Gson().toJson(bean))
})
return
......@@ -127,7 +126,6 @@ class ScanFragment : BaseFragment<FragmentScanBinding>(FragmentScanBinding::infl
scanJump.set(true)
activity.startActivity(Intent(activity, EmailCodeActivity::class.java).apply {
val bean = QRCodeUtils.createEmailBean(qrCodeValue)
bean.createType = CREATE_TYPE_SCAN
putExtra("data", Gson().toJson(bean))
})
return
......
......@@ -11,7 +11,6 @@ import com.base.scanqr.R
import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.FunctionUIBean
import com.base.scanqr.bean.ScanBean
import com.base.scanqr.bean.ScanBean.Companion.CREATE_TYPE_VIEW
import com.base.scanqr.bean.TextUIBean
import com.base.scanqr.databinding.ActivityTextCodeBinding
import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog
......@@ -53,7 +52,8 @@ class TextCodeActivity : BaseActivity<ActivityTextCodeBinding>(ActivityTextCodeB
tempImage = file.absolutePath
}
}
if (textUIBean.createType != CREATE_TYPE_VIEW) {
if (textUIBean.needCreate) {
textUIBean.needCreate = false
SpJsonUtils.addJsonBean<ScanBean>(FunctionUIBean.KEY_TEXT, textUIBean)
}
}
......
......@@ -6,7 +6,6 @@ import androidx.core.view.updatePadding
import com.base.scanqr.R
import com.base.scanqr.base.BaseActivity
import com.base.scanqr.bean.FunctionUIBean
import com.base.scanqr.bean.ScanBean.Companion.CREATE_TYPE_VIEW
import com.base.scanqr.bean.WifiUIBean
import com.base.scanqr.databinding.ActivityWifiCodeBinding
import com.base.scanqr.ui.widget.InputNameDialog.showInputNameDialog
......@@ -82,7 +81,8 @@ class WifiCodeActivity : BaseActivity<ActivityWifiCodeBinding>(ActivityWifiCodeB
tempImage = file.absolutePath
}
}
if (wifiBean.createType != CREATE_TYPE_VIEW) {
if (wifiBean.needCreate) {
wifiBean.needCreate = false
SpJsonUtils.addJsonBean<WifiUIBean>(FunctionUIBean.KEY_WIFI, wifiBean)
}
}
......
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