From 88d75305687edac8d83cc6ac6f63a6b7cafa4e86 Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Tue, 9 Dec 2025 18:38:26 +0800 Subject: [PATCH] =?UTF-8?q?t=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fragment/pay/PayResultFragment.kt | 2 +- .../sw/dualscreen/model/response/DataBean.kt | 4 +- .../sw/dualscreen/model/response/FoodInfo.kt | 3 +- .../pay/ScanQrCodePayPresentation.kt | 2 +- .../sw/dualscreen/viewmodel/UserViewModel.kt | 17 +++- .../res/drawable-xxhdpi/ic_avatar_default.png | Bin 0 -> 16714 bytes .../main/res/layout/fragment_pay_result.xml | 2 +- .../layout/presentation_scan_qrcode_pay.xml | 2 +- .../java/com/sw/plate/utils/ToastUtils.java | 77 ++++++++++-------- 9 files changed, 67 insertions(+), 42 deletions(-) create mode 100644 app/src/main/res/drawable-xxhdpi/ic_avatar_default.png diff --git a/app/src/main/java/com/sw/dualscreen/activity/fragment/pay/PayResultFragment.kt b/app/src/main/java/com/sw/dualscreen/activity/fragment/pay/PayResultFragment.kt index b896bda..2e50987 100644 --- a/app/src/main/java/com/sw/dualscreen/activity/fragment/pay/PayResultFragment.kt +++ b/app/src/main/java/com/sw/dualscreen/activity/fragment/pay/PayResultFragment.kt @@ -175,7 +175,7 @@ class PayResultFragment : BaseFragment() { } private fun loadUserInfo(item: MemberInfo) { - binding.ivHeadPic.load(R.mipmap.ic_launcher) + binding.ivHeadPic.load(item.faceUrl?.ifBlank { R.drawable.ic_avatar_default }) binding.tvUserName.text = item.name val phone = item.phone ?: "" diff --git a/app/src/main/java/com/sw/dualscreen/model/response/DataBean.kt b/app/src/main/java/com/sw/dualscreen/model/response/DataBean.kt index 3bb471a..67f7185 100644 --- a/app/src/main/java/com/sw/dualscreen/model/response/DataBean.kt +++ b/app/src/main/java/com/sw/dualscreen/model/response/DataBean.kt @@ -40,6 +40,8 @@ data class MemberInfo( val phone: String?, //姓名 val name: String?, + //头像 + val faceUrl: String?, //充值余额 val topUpBalance: Double?, //赠送余额 @@ -92,7 +94,7 @@ data class UserNutrition( //肉蛋超量 val meatEggsExcess: String?=null, ) - +//{"code":"00000","data":"{\"orderType\":0,\"orderPayFrom\":2,\"payType\":\"1\",\"paySuc\":0,\"totalFee\":0.01,\"orderCode\":\"1998193614899372032\",\"message\":\"支付成功\",\"payCode\":\"1998193614899372032508227\"}","msg":"成功","total":0} data class PayResult( val paySuc: String? = null ) diff --git a/app/src/main/java/com/sw/dualscreen/model/response/FoodInfo.kt b/app/src/main/java/com/sw/dualscreen/model/response/FoodInfo.kt index c6d4af7..97c0b01 100644 --- a/app/src/main/java/com/sw/dualscreen/model/response/FoodInfo.kt +++ b/app/src/main/java/com/sw/dualscreen/model/response/FoodInfo.kt @@ -41,12 +41,13 @@ data class FoodInfo( val meatEggs:Double? = null, //推荐能量 val recommendCalorie: Double? = null, + //图片 + var foodImg: String? = "", //----------------------------------- var score: Int = 0, var isChecked: Boolean = false, var photoUri: Uri? = null, - var foodImg: String? = "", // @SerializedName("foodTypeAndRealIntakeVoList") // val foodTypeAndRealIntakeVoList: List? = listOf(), diff --git a/app/src/main/java/com/sw/dualscreen/presentation/pay/ScanQrCodePayPresentation.kt b/app/src/main/java/com/sw/dualscreen/presentation/pay/ScanQrCodePayPresentation.kt index 9192d9c..a901a93 100644 --- a/app/src/main/java/com/sw/dualscreen/presentation/pay/ScanQrCodePayPresentation.kt +++ b/app/src/main/java/com/sw/dualscreen/presentation/pay/ScanQrCodePayPresentation.kt @@ -129,7 +129,7 @@ class ScanQrCodePayPresentation( } private fun loadUserInfo(item: MemberInfo) { - binding.ivHeadPic.load(R.mipmap.ic_launcher) + binding.ivHeadPic.load(item.faceUrl?.ifBlank { R.drawable.ic_avatar_default }) binding.tvUserName.text = item.name val phone = item.phone ?: "" diff --git a/app/src/main/java/com/sw/dualscreen/viewmodel/UserViewModel.kt b/app/src/main/java/com/sw/dualscreen/viewmodel/UserViewModel.kt index f232baf..b25176c 100644 --- a/app/src/main/java/com/sw/dualscreen/viewmodel/UserViewModel.kt +++ b/app/src/main/java/com/sw/dualscreen/viewmodel/UserViewModel.kt @@ -98,8 +98,12 @@ class UserViewModel : BaseViewModel() { SPUtil.getInstance().put(GlobalKey.KEY_FIRST_RUN, true) withContext(Dispatchers.Default) { val list: List = response.data ?: emptyList() - val item = list.firstOrNull { it.userId == "1951105919342936066" } - Timber.tag(TAG).d("getUserFaceCache userId = ${item?.userId}") + if (list.isEmpty()) { + ToastUtils.showToast("查询人脸数据为空") + return@withContext + } +// val item = list.firstOrNull { it.userId == "1951105919342936066" } +// Timber.tag(TAG).d("getUserFaceCache userId = ${item?.userId}") val faceEntity = list.map { FaceEntity(it.userId, null, Base64.decode(it.faceFeatureStr)) } @@ -384,7 +388,14 @@ class UserViewModel : BaseViewModel() { Timber.tag(TAG).d("queryOrderState") val response = repository.queryOrderState(orderNo = orderId) if (parseResponse(response)) { - val orderState = response.data == "1" + val respData = response.data as? String + ?: if (response.data is Any) { + GsonUtils.toJson(response.data) + } else { + "" + } + val payResult = GsonUtils.fromJson(respData, PayResult::class.java) + val orderState = payResult?.paySuc == "1" block(orderState) } else { block(false) diff --git a/app/src/main/res/drawable-xxhdpi/ic_avatar_default.png b/app/src/main/res/drawable-xxhdpi/ic_avatar_default.png new file mode 100644 index 0000000000000000000000000000000000000000..e1011263c91837a524b5fe631d872463e1e99d9e GIT binary patch literal 16714 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/fragment_pay_result.xml b/app/src/main/res/layout/fragment_pay_result.xml index a477ee9..65a2ff5 100644 --- a/app/src/main/res/layout/fragment_pay_result.xml +++ b/app/src/main/res/layout/fragment_pay_result.xml @@ -27,7 +27,7 @@ android:id="@+id/ivHeadPic" android:layout_width="120dp" android:layout_height="120dp" - android:src="@mipmap/ic_launcher" + android:src="@drawable/ic_avatar_default" app:shapeAppearance="@style/CircleStyle" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/presentation_scan_qrcode_pay.xml b/app/src/main/res/layout/presentation_scan_qrcode_pay.xml index f742ad0..3f42bcd 100644 --- a/app/src/main/res/layout/presentation_scan_qrcode_pay.xml +++ b/app/src/main/res/layout/presentation_scan_qrcode_pay.xml @@ -121,7 +121,7 @@ android:id="@+id/ivHeadPic" android:layout_width="84dp" android:layout_height="84dp" - tools:src="@mipmap/ic_launcher" + android:src="@drawable/ic_avatar_default" android:layout_marginTop="28dp" app:shapeAppearance="@style/CircleStyle" app:layout_constraintStart_toStartOf="parent" diff --git a/lib_face/src/main/java/com/sw/plate/utils/ToastUtils.java b/lib_face/src/main/java/com/sw/plate/utils/ToastUtils.java index b9d7adf..79dc4dc 100644 --- a/lib_face/src/main/java/com/sw/plate/utils/ToastUtils.java +++ b/lib_face/src/main/java/com/sw/plate/utils/ToastUtils.java @@ -2,6 +2,8 @@ package com.sw.plate.utils; import android.annotation.SuppressLint; import android.content.Context; +import android.os.Handler; +import android.os.Looper; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; @@ -30,18 +32,23 @@ public class ToastUtils { * @param text the text */ public static void showToast(String text) { - Context context = App.getContext(); - if (toast == null) { - View view = LayoutInflater.from(context).inflate(R.layout.toast_bg, null); - textCenterView = view.findViewById(R.id.toast_tv); - toast = new Toast(context); - toast.setGravity(Gravity.CENTER, 0, 20); - toast.setDuration(Toast.LENGTH_SHORT); - toast.setView(view); - } + runOnMainThread(()->{ + Context context = App.getContext(); + if (toast == null) { + View view = LayoutInflater.from(context).inflate(R.layout.toast_bg, null); + textCenterView = view.findViewById(R.id.toast_tv); + toast = new Toast(context); + toast.setGravity(Gravity.CENTER, 0, 20); + toast.setDuration(Toast.LENGTH_SHORT); + toast.setView(view); + } + textCenterView.setText(text); + toast.show(); + }); + } - textCenterView.setText(text); - toast.show(); + public static void runOnMainThread(Runnable runnable) { + new Handler(Looper.getMainLooper()).post(runnable); } /** @@ -50,32 +57,36 @@ public class ToastUtils { * @param text the text */ public static void showToast(String text, int duration) { - Context context = App.getContext(); - if (toast == null) { - View view = LayoutInflater.from(context).inflate(R.layout.toast_bg, null); - textCenterView = view.findViewById(R.id.toast_tv); - toast = new Toast(context); - toast.setGravity(Gravity.CENTER, 0, 20); - toast.setView(view); - } + runOnMainThread(()-> { + Context context = App.getContext(); + if (toast == null) { + View view = LayoutInflater.from(context).inflate(R.layout.toast_bg, null); + textCenterView = view.findViewById(R.id.toast_tv); + toast = new Toast(context); + toast.setGravity(Gravity.CENTER, 0, 20); + toast.setView(view); + } - textCenterView.setText(text); - toast.setDuration(duration); - toast.show(); + textCenterView.setText(text); + toast.setDuration(duration); + toast.show(); + }); } public static void showLongToast(String text) { - Context context = App.getContext(); - if (toast == null) { - View view = LayoutInflater.from(context).inflate(R.layout.toast_bg, null); - textCenterView = view.findViewById(R.id.toast_tv); - toast = new Toast(context); - toast.setGravity(Gravity.TOP, 0, 20); - toast.setDuration(Toast.LENGTH_LONG); - toast.setView(view); - } - textCenterView.setText(text); - showMyToast(toast, 1000000 * 30); + runOnMainThread(()-> { + Context context = App.getContext(); + if (toast == null) { + View view = LayoutInflater.from(context).inflate(R.layout.toast_bg, null); + textCenterView = view.findViewById(R.id.toast_tv); + toast = new Toast(context); + toast.setGravity(Gravity.TOP, 0, 20); + toast.setDuration(Toast.LENGTH_LONG); + toast.setView(view); + } + textCenterView.setText(text); + showMyToast(toast, 1000000 * 30); + }); }