|
@@ -33,6 +33,9 @@ class DeviceActivity : BaseActivity() {
|
|
|
private lateinit var deviceOkIv: ImageView
|
|
|
private lateinit var deviceInfoTv: TextView
|
|
|
|
|
|
+ private lateinit var qrOkIv: ImageView
|
|
|
+ private lateinit var qrInfoTv: TextView
|
|
|
+
|
|
|
override fun onCreate(savedInstanceState: Bundle?) {
|
|
|
super.onCreate(savedInstanceState)
|
|
|
setContentView(R.layout.activity_device)
|
|
@@ -58,6 +61,8 @@ class DeviceActivity : BaseActivity() {
|
|
|
val intent = Intent(this, CaptureActivity::class.java)
|
|
|
startActivityForResult(intent, REQ_CODE_QR)
|
|
|
}
|
|
|
+ qrOkIv = findViewById(R.id.qrOkIv)
|
|
|
+ qrInfoTv = findViewById(R.id.qrInfoTv)
|
|
|
|
|
|
/*val posCl = findViewById<ConstraintLayout>(R.id.positionCl)
|
|
|
posCl.setOnClickListener {
|
|
@@ -71,7 +76,7 @@ class DeviceActivity : BaseActivity() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ private val qrCodes = mutableSetOf<String>()
|
|
|
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
|
|
|
super.onActivityResult(requestCode, resultCode, data)
|
|
|
// 设备信息
|
|
@@ -86,7 +91,9 @@ class DeviceActivity : BaseActivity() {
|
|
|
if (requestCode == REQ_CODE_QR && resultCode == RESULT_OK) {
|
|
|
val bundle = data?.extras
|
|
|
val result = bundle?.getString(CaptureActivity.EXTRA_STRING) ?: ""
|
|
|
- Toast.makeText(this, "qr:$result", Toast.LENGTH_LONG).show()
|
|
|
+ qrCodes.add(result)
|
|
|
+ qrOkIv.visibility = if (result.isNotEmpty()) View.VISIBLE else View.INVISIBLE
|
|
|
+ qrInfoTv.text = "${qrCodes.size} 码"
|
|
|
}
|
|
|
|
|
|
// 记录文本信息
|