增加人脸采集功能;
识别人脸成功后打开有餐盘的第一个柜子; 扫码打开已绑定的柜子,无则打开第一个空柜子并放入餐盘; 设置页面问题优化;
This commit is contained in:
@@ -1,57 +1,57 @@
|
||||
package com.sw.platecabinet.activity
|
||||
|
||||
import android.graphics.Color
|
||||
import android.view.Gravity
|
||||
import android.view.ViewGroup
|
||||
import androidx.core.graphics.drawable.toDrawable
|
||||
import androidx.core.view.WindowCompat
|
||||
import com.sw.platecabinet.GlobalKey
|
||||
import com.sw.platecabinet.databinding.ActivityUnbindDialogBinding
|
||||
import com.sw.platecabinet.databinding.ItemTitleTimeBinding
|
||||
import com.sw.platecabinet.ext.dp
|
||||
import com.sw.platecabinet.model.response.EquipmentUserInfo
|
||||
|
||||
/**
|
||||
* 解绑确认弹窗界面
|
||||
*/
|
||||
class UnBindDialogActivity : BaseActivity<ActivityUnbindDialogBinding>() {
|
||||
private var equipmentUserInfo: EquipmentUserInfo? = null
|
||||
|
||||
override fun inflateViewBinding(): ActivityUnbindDialogBinding {
|
||||
return ActivityUnbindDialogBinding.inflate(layoutInflater)
|
||||
}
|
||||
|
||||
override fun inflateTitleBinding(): ItemTitleTimeBinding? {
|
||||
return null
|
||||
}
|
||||
|
||||
override fun initialize() {
|
||||
window?.apply {
|
||||
WindowCompat.setDecorFitsSystemWindows(this, false)
|
||||
setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
|
||||
|
||||
attributes = attributes.apply {
|
||||
y = 314.dp
|
||||
width = (context.resources.displayMetrics.widthPixels * 0.8).toInt()
|
||||
height = ViewGroup.LayoutParams.MATCH_PARENT
|
||||
gravity = Gravity.CENTER
|
||||
}
|
||||
}
|
||||
equipmentUserInfo =
|
||||
intent.getParcelableExtra<EquipmentUserInfo>(GlobalKey.PARAM_EQUIPMENT_INFO)
|
||||
if (equipmentUserInfo == null) return
|
||||
binding.tvTipInfo.text = "即将解除【${equipmentUserInfo!!.name}】的餐盘"
|
||||
binding.tvCancel.setOnClickListener {
|
||||
finish()
|
||||
}
|
||||
binding.tvConfirm.setOnClickListener {
|
||||
setResult(RESULT_OK)
|
||||
finish()
|
||||
}
|
||||
}
|
||||
|
||||
override fun finish() {
|
||||
super.finish()
|
||||
overridePendingTransition(0, 0) // 确保退出也无动画
|
||||
}
|
||||
}
|
||||
//package com.sw.platecabinet.activity
|
||||
//
|
||||
//import android.graphics.Color
|
||||
//import android.view.Gravity
|
||||
//import android.view.ViewGroup
|
||||
//import androidx.core.graphics.drawable.toDrawable
|
||||
//import androidx.core.view.WindowCompat
|
||||
//import com.sw.platecabinet.GlobalKey
|
||||
//import com.sw.platecabinet.databinding.ActivityUnbindDialogBinding
|
||||
//import com.sw.platecabinet.databinding.ItemTitleTimeBinding
|
||||
//import com.sw.platecabinet.ext.dp
|
||||
//import com.sw.platecabinet.model.response.EquipmentUserInfo
|
||||
//
|
||||
///**
|
||||
// * 解绑确认弹窗界面
|
||||
// */
|
||||
//class UnBindDialogActivity : BaseActivity<ActivityUnbindDialogBinding>() {
|
||||
// private var equipmentUserInfo: EquipmentUserInfo? = null
|
||||
//
|
||||
// override fun inflateViewBinding(): ActivityUnbindDialogBinding {
|
||||
// return ActivityUnbindDialogBinding.inflate(layoutInflater)
|
||||
// }
|
||||
//
|
||||
// override fun inflateTitleBinding(): ItemTitleTimeBinding? {
|
||||
// return null
|
||||
// }
|
||||
//
|
||||
// override fun initialize() {
|
||||
// window?.apply {
|
||||
// WindowCompat.setDecorFitsSystemWindows(this, false)
|
||||
// setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
|
||||
//
|
||||
// attributes = attributes.apply {
|
||||
// y = 314.dp
|
||||
// width = (context.resources.displayMetrics.widthPixels * 0.8).toInt()
|
||||
// height = ViewGroup.LayoutParams.MATCH_PARENT
|
||||
// gravity = Gravity.CENTER
|
||||
// }
|
||||
// }
|
||||
// equipmentUserInfo =
|
||||
// intent.getParcelableExtra<EquipmentUserInfo>(GlobalKey.PARAM_EQUIPMENT_INFO)
|
||||
// if (equipmentUserInfo == null) return
|
||||
// binding.tvTipInfo.text = "即将解除【${equipmentUserInfo!!.name}】的餐盘"
|
||||
// binding.tvCancel.setOnClickListener {
|
||||
// finish()
|
||||
// }
|
||||
// binding.tvConfirm.setOnClickListener {
|
||||
// setResult(RESULT_OK)
|
||||
// finish()
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// override fun finish() {
|
||||
// super.finish()
|
||||
// overridePendingTransition(0, 0) // 确保退出也无动画
|
||||
// }
|
||||
//}
|
||||
Reference in New Issue
Block a user