Author SHA1 Message Date
mazengfeiandClaude Sonnet 4.6 e8735db27b fix: 优化人脸采集日志及提示界面交互
- LoginByFaceActivity: 新增人脸采集关键节点调试日志
- PlcSettingActivity: 添加点击提示区域关闭提示布局功能,格式化代码
- activity_plc_setting.xml: 给提示 TextView 添加 id,字体调整为 32sp

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
2026-06-01 18:10:16 +08:00
mazengfei e1e4bc5123 feat(plc): 添加餐盘平台复位功能和无餐盘提示界面
- 在PLC设置页面添加餐盘平台复位按钮
- 实现平台复位功能,先执行平台上升再返回营业状态
- 添加无餐盘提示界面,包含图片和文字提示
- 修改启动方法支持显示提示界面参数传递
- 在人脸识别登录页面检测到无餐盘时自动显示提示界面
2026-04-16 18:06:47 +08:00
mazengfei 18f45e7821 修改uat环境域名端口 2026-04-15 16:53:45 +08:00
mazengfei 1826ac0f60 fix(login): 修复人脸登录后餐盘状态判断逻辑
- 当检测到餐盘已空时跳转到餐盘设置页面
- 当检测到剩余餐盘时继续执行初始化操作
- 添加餐盘状态检查的日志记录功能
2026-04-14 15:02:36 +08:00
mazengfei d81381ae6f fix(login): 修复人脸识别登录后的流程处理
- 移除出盘完成日志的重复打印
- 添加餐盘已空时的页面跳转功能
2026-04-14 14:59:09 +08:00
5 changed files with 95 additions and 5 deletions
@@ -39,7 +39,7 @@ object GlobalData {
* 具体业务 BaseUrl * 具体业务 BaseUrl
*/ */
const val TEST_BASE_URL: String = "http://192.168.1.201:14801" const val TEST_BASE_URL: String = "http://192.168.1.201:14801"
const val UAT_BASE_URL: String = "https://dev.yixiong-tech.com:8081" const val UAT_BASE_URL: String = "https://dev.yixiong-tech.com:8083"
const val PROD_BASE_URL: String = "https://api.dm.yixiong-tech.com:8443" const val PROD_BASE_URL: String = "https://api.dm.yixiong-tech.com:8443"
/** /**
@@ -221,6 +221,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
private fun isFitData(userFaceInfo: UserFaceInfo?): Boolean { private fun isFitData(userFaceInfo: UserFaceInfo?): Boolean {
if (userFaceInfo == null) return false if (userFaceInfo == null) return false
val headBmp = userFaceInfo.headBmp val headBmp = userFaceInfo.headBmp
loadLogInfo("collectFace,isFitData:w=${headBmp?.width},height=${headBmp?.height}")
if (headBmp == null) return false if (headBmp == null) return false
// if (headBmp.width <= 200 || headBmp.height <= 200) { // if (headBmp.width <= 200 || headBmp.height <= 200) {
// loadLogInfo("collectFace,isFitData:拿到人脸提取特征数据照片过小-----------") // loadLogInfo("collectFace,isFitData:拿到人脸提取特征数据照片过小-----------")
@@ -234,9 +235,12 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
recognizeViewModel.prepareRegister() recognizeViewModel.prepareRegister()
recognizeViewModel.setOnRegisterFinishedCallback { facePreviewInfo, userFaceInfo -> recognizeViewModel.setOnRegisterFinishedCallback { facePreviewInfo, userFaceInfo ->
registerHandler?.setCallback { registerHandler?.setCallback {
loadLogInfo("collectFace,registerHandler?.setCallback")
if (!isCollectFace || !isCollecting.get()) { if (!isCollectFace || !isCollecting.get()) {
loadLogInfo("collectFace,isCollectFace=${isCollectFace},isCollecting=${isCollecting.get()}")
return@setCallback return@setCallback
} }
loadLogInfo("collectFace,userFaceInfo==null:${userFaceInfo==null}")
if (this.userFaceInfo == null && isFitData(userFaceInfo)) { if (this.userFaceInfo == null && isFitData(userFaceInfo)) {
val headBmp = userFaceInfo.headBmp ?: run { val headBmp = userFaceInfo.headBmp ?: run {
loadLogInfo("collectFace,isFitData:headBmp 为 null,跳过") loadLogInfo("collectFace,isFitData:headBmp 为 null,跳过")
@@ -419,7 +423,6 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
override fun onSuccess(result: String) { override fun onSuccess(result: String) {
plateEnable = false plateEnable = false
recognizeCountDownUtil.cancelCountDown() recognizeCountDownUtil.cancelCountDown()
loadLogInfo("collectFace,openPlate: 出盘完成,result=$result,开始查询剩余餐盘")
// result 为 false 时表示出盘后无餐盘,直接播放无盘提示音 // result 为 false 时表示出盘后无餐盘,直接播放无盘提示音
if (result.equals("false", ignoreCase = true)) { if (result.equals("false", ignoreCase = true)) {
loadLogInfo("collectFace,openPlate: result=false,餐盘已空") loadLogInfo("collectFace,openPlate: result=false,餐盘已空")
@@ -427,6 +430,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
goInitActivity() goInitActivity()
return return
} }
loadLogInfo("collectFace,openPlate: 出盘完成,result=$result,开始查询剩余餐盘")
// result 为 true,出盘成功,再查询是否还有剩余餐盘 // result 为 true,出盘成功,再查询是否还有剩余餐盘
SoundPoolUtil.getInstance().play(RECOGNIZE_SUCCESS, 0) SoundPoolUtil.getInstance().play(RECOGNIZE_SUCCESS, 0)
checkRemainingPlate() checkRemainingPlate()
@@ -452,8 +456,12 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
if (result.isEmptyPlate) { if (result.isEmptyPlate) {
// 餐盘已空,播放无盘提示音 // 餐盘已空,播放无盘提示音
SoundPoolUtil.getInstance().play(NO_PLATE_REMIND, 0) SoundPoolUtil.getInstance().play(NO_PLATE_REMIND, 0)
//跳转到餐盘设置页面
PlcSettingActivity.start(this@LoginByFaceActivity, showTips = true)
} else {
loadLogInfo("collectFace,checkRemainingPlate: 剩余餐盘,继续使用")
goInitActivity()
} }
goInitActivity()
} }
override fun onError(message: String) { override fun onError(message: String) {
@@ -24,11 +24,17 @@ import kotlinx.coroutines.withContext
class PlcSettingActivity : BaseActivity<ActivityPlcSettingBinding>() { class PlcSettingActivity : BaseActivity<ActivityPlcSettingBinding>() {
companion object { companion object {
/** Intent Extra 键:是否显示 tips 界面 */
private const val EXTRA_SHOW_TIPS = "extra_show_tips"
/** /**
* 启动 PlcSettingActivity * 启动 PlcSettingActivity
* @param showTips 是否显示 tips 界面(暂无餐盘提示)
*/ */
fun start(context: Context) { fun start(context: Context, showTips: Boolean = false) {
context.startActivity(Intent(context, PlcSettingActivity::class.java)) val intent = Intent(context, PlcSettingActivity::class.java)
intent.putExtra(EXTRA_SHOW_TIPS, showTips)
context.startActivity(intent)
} }
} }
@@ -42,9 +48,15 @@ class PlcSettingActivity : BaseActivity<ActivityPlcSettingBinding>() {
} }
override fun initialize() { override fun initialize() {
// 根据传入参数控制 tips 界面显示
val showTips = intent.getBooleanExtra(EXTRA_SHOW_TIPS, false)
binding.layoutTips.visibility =
if (showTips) android.view.View.VISIBLE else android.view.View.GONE
initConnectButtons() initConnectButtons()
initOutPlateButton() initOutPlateButton()
initPlatformButtons() initPlatformButtons()
initPlatformResetButton()
initAlarmButton() initAlarmButton()
initParamButtons() initParamButtons()
initStatusButton() initStatusButton()
@@ -67,6 +79,10 @@ class PlcSettingActivity : BaseActivity<ActivityPlcSettingBinding>() {
}) })
}).show() }).show()
} }
binding.tvTips.clickWithDebounce {
binding.layoutTips.visibility = android.view.View.GONE
}
} }
// ==================== 连接控制 ==================== // ==================== 连接控制 ====================
@@ -183,6 +199,38 @@ class PlcSettingActivity : BaseActivity<ActivityPlcSettingBinding>() {
// ==================== 故障处理 ==================== // ==================== 故障处理 ====================
/**
* 初始化平台复位按钮:先执行平台上升,成功后自动执行返回营业
*/
private fun initPlatformResetButton() {
binding.btnPlatformReset.clickWithDebounce {
showWaitingDialog("正在复位平台……")
PlcHelper.getInstance(this).platformUp(object : PlcCallback<String> {
override fun onSuccess(result: String) {
// 平台上升完成,继续执行返回营业
PlcHelper.getInstance(this@PlcSettingActivity)
.backToBusiness(object : PlcCallback<String> {
override fun onSuccess(result: String) {
hideWaitingDialog()
ToastUtils.showToast("平台复位成功")
finish()
}
override fun onError(message: String) {
hideWaitingDialog()
ToastUtils.showToast("返回营业失败:$message")
}
})
}
override fun onError(message: String) {
hideWaitingDialog()
ToastUtils.showToast("平台上升失败:$message")
}
})
}
}
/** /**
* 初始化故障复位按钮 * 初始化故障复位按钮
*/ */
@@ -11,6 +11,29 @@
android:id="@+id/includeHeader" android:id="@+id/includeHeader"
layout="@layout/item_title_time" /> layout="@layout/item_title_time" />
<RelativeLayout
android:id="@+id/layout_tips"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:src="@mipmap/img_error_tips"
tools:ignore="ContentDescription" />
<TextView android:id="@+id/tv_tips"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="144dp"
android:text="暂无餐盘 请联系管理人员"
android:textColor="#fff0c8b4"
android:textSize="32sp" />
</RelativeLayout>
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
@@ -143,6 +166,17 @@
android:textColor="#FFCC99" android:textColor="#FFCC99"
android:textSize="22sp" /> android:textSize="22sp" />
<TextView
android:id="@+id/btnPlatformReset"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="12dp"
android:background="@drawable/btn_outline"
android:gravity="center"
android:text="餐盘平台复位"
android:textColor="#FFCC99"
android:textSize="22sp" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
Binary file not shown.

After

Width:  |  Height:  |  Size: 179 KiB