优化
This commit is contained in:
@@ -5,6 +5,7 @@ import android.content.Context
|
||||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
import android.text.TextUtils
|
||||
import android.util.Log
|
||||
import android.view.KeyEvent
|
||||
import android.view.View
|
||||
import android.view.WindowInsetsController
|
||||
@@ -16,6 +17,7 @@ import androidx.appcompat.app.AppCompatActivity
|
||||
import androidx.core.view.WindowCompat
|
||||
import androidx.lifecycle.lifecycleScope
|
||||
import androidx.viewbinding.ViewBinding
|
||||
import com.google.gson.Gson
|
||||
import com.sw.inbound.utils.DateTimeUtils
|
||||
import com.sw.plate.utils.Base64
|
||||
import com.sw.plate.utils.ScanGunKeyEventHelper
|
||||
@@ -113,6 +115,10 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
|
||||
if (scanInfo.length > 6) {
|
||||
plateNumber = scanInfo.take(6)
|
||||
}
|
||||
Log.d("TAG", "handleScanKeyInfo: "+ Gson().toJson(MyApp.plateList))
|
||||
if (MyApp.plateList == null) {
|
||||
initPlateList()
|
||||
}
|
||||
//柜子未关联该餐盘,直接找空位置放入盘子
|
||||
val item = MyApp.plateList?.firstOrNull { it.plateNumber.isNullOrBlank() }
|
||||
if (item == null) {
|
||||
@@ -486,12 +492,24 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
|
||||
try {
|
||||
if (faceList.isNotEmpty()) {
|
||||
FaceDatabase.getInstance(this).faceDao().insert(faceList)
|
||||
recognizeViewModel.refreshFaceList()
|
||||
}
|
||||
recognizeViewModel.refreshFaceList()
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
}.start()
|
||||
}
|
||||
|
||||
fun initPlateList() {
|
||||
// SpTool.putString(SpTool.PLATE_BOX_DATA, "")
|
||||
// var list = SpTool.getPlateData()
|
||||
val list: MutableList<EquipmentUserInfo> = mutableListOf()
|
||||
repeat(22) { index ->
|
||||
list.add(
|
||||
EquipmentUserInfo(equipmentBoxCode = "${index + 1}")
|
||||
)
|
||||
}
|
||||
MyApp.plateList = list
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user