From 60b712f216f12399bf23ffa18d7a2181577c76b6 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Wed, 19 Nov 2025 18:35:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E9=A1=B5=E9=9D=A2=E3=80=81?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/AndroidManifest.xml | 3 +
.../main/java/com/sw/dualscreen/GlobalData.kt | 1 +
app/src/main/java/com/sw/dualscreen/MyApp.kt | 43 +
.../activity/CollectedDataActivity.kt | 268 +++----
.../activity/CollectedFoodActivity.kt | 137 ++++
.../activity/FoodCollectionActivity.kt | 734 +++++++++---------
.../sw/dualscreen/activity/MainActivity.kt | 204 +++--
.../com/sw/dualscreen/activity/PayActivity.kt | 128 +++
.../sw/dualscreen/activity/SettingActivity.kt | 71 ++
.../activity/fragment/BaseFragment.kt | 32 +
.../activity/fragment/BusinessFragment.kt | 42 +
.../activity/fragment/CashPayFragment.kt | 25 +
.../activity/fragment/CollectFragment.kt | 285 +++++++
.../activity/fragment/FacePayFragment.kt | 19 +
.../activity/fragment/NumberPayFragment.kt | 15 +
.../activity/fragment/PayResultFragment.kt | 28 +
.../activity/fragment/QrCodePayFragment.kt | 29 +
.../adapter/CollectedFoodAdapter.kt | 68 +-
.../adapter/CollectedFoodNewAdapter.kt | 27 +
.../adapter/FoodCollectionAdapter.kt | 17 +-
.../dualscreen/adapter/SearchFoodAdapter.kt | 35 +
.../java/com/sw/dualscreen/ext/CommonExt.kt | 12 +
.../sw/dualscreen/model/response/FoodInfo.kt | 3 +-
.../com/sw/dualscreen/sdk/SensorScaleUtils.kt | 15 +-
.../sw/dualscreen/utils/ActivityManager.kt | 57 ++
.../com/sw/dualscreen/utils/GlideUtils.kt | 15 +
.../sw/dualscreen/viewmodel/UserViewModel.kt | 6 +-
app/src/main/res/color/color_search_food.xml | 5 +
app/src/main/res/color/setting_radio.xml | 5 +
.../main/res/drawable-xxhdpi/face_mask.png | Bin 0 -> 427116 bytes
.../res/drawable-xxhdpi/ic_arrow_right.png | Bin 0 -> 3217 bytes
app/src/main/res/drawable-xxhdpi/ic_back2.png | Bin 0 -> 2532 bytes
.../res/drawable-xxhdpi/ic_camera_default.png | Bin 0 -> 6890 bytes
.../main/res/drawable-xxhdpi/ic_close2.png | Bin 0 -> 4736 bytes
app/src/main/res/drawable-xxhdpi/ic_del2.png | Bin 0 -> 2672 bytes
.../res/drawable-xxhdpi/ic_delete_red.png | Bin 1465 -> 2672 bytes
.../res/drawable-xxhdpi/ic_pay_success.png | Bin 0 -> 16614 bytes
.../main/res/drawable-xxhdpi/ic_qrcode.png | Bin 0 -> 188373 bytes
.../res/drawable-xxhdpi/ic_retake_photo.png | Bin 0 -> 29617 bytes
.../main/res/drawable-xxhdpi/ic_search2.png | Bin 0 -> 6834 bytes
.../main/res/drawable-xxhdpi/ic_setting.png | Bin 0 -> 6384 bytes
.../drawable-xxhdpi/ic_setting_checked.png | Bin 0 -> 4732 bytes
.../res/drawable-xxhdpi/ic_take_photo.png | Bin 0 -> 25497 bytes
.../main/res/drawable-xxhdpi/ic_vip_level.png | Bin 0 -> 9995 bytes
app/src/main/res/drawable/bg_border_red.xml | 7 +
app/src/main/res/drawable/bg_btn_clear.xml | 6 +
app/src/main/res/drawable/bg_btn_confirm.xml | 6 +
app/src/main/res/drawable/bg_btn_save.xml | 6 +
app/src/main/res/drawable/bg_btn_save2.xml | 6 +
app/src/main/res/drawable/bg_gray2.xml | 6 +
app/src/main/res/drawable/bg_pay_content.xml | 6 +
app/src/main/res/drawable/bg_search_food.xml | 17 +
app/src/main/res/drawable/line_shape.xml | 7 +
app/src/main/res/drawable/setting_border.xml | 6 +
.../main/res/drawable/setting_border_gray.xml | 7 +
.../res/drawable/setting_border_gray2.xml | 7 +
.../res/drawable/setting_border_gray3.xml | 7 +
.../res/drawable/setting_border_gray4.xml | 7 +
.../res/drawable/setting_check_selector.xml | 27 +
app/src/main/res/drawable/vip_level.xml | 13 +
.../res/layout/activity_collected_food.xml | 76 ++
app/src/main/res/layout/activity_main.xml | 84 +-
app/src/main/res/layout/activity_pay.xml | 28 +-
app/src/main/res/layout/activity_setting.xml | 57 ++
app/src/main/res/layout/fragment_business.xml | 180 +++++
app/src/main/res/layout/fragment_cash_pay.xml | 28 +
app/src/main/res/layout/fragment_collect.xml | 184 +++++
app/src/main/res/layout/fragment_face_pay.xml | 55 ++
.../main/res/layout/fragment_number_pay.xml | 86 ++
.../main/res/layout/fragment_pay_result.xml | 218 ++++++
.../main/res/layout/fragment_qrcode_pay.xml | 46 ++
app/src/main/res/layout/layout_title_bar.xml | 30 +
.../res/layout/list_item_collected_food.xml | 49 ++
.../res/layout/list_item_food_collection.xml | 21 +-
.../main/res/layout/list_item_search_food.xml | 18 +
75 files changed, 2983 insertions(+), 647 deletions(-)
create mode 100644 app/src/main/java/com/sw/dualscreen/activity/CollectedFoodActivity.kt
create mode 100644 app/src/main/java/com/sw/dualscreen/activity/PayActivity.kt
create mode 100644 app/src/main/java/com/sw/dualscreen/activity/SettingActivity.kt
create mode 100644 app/src/main/java/com/sw/dualscreen/activity/fragment/BaseFragment.kt
create mode 100644 app/src/main/java/com/sw/dualscreen/activity/fragment/BusinessFragment.kt
create mode 100644 app/src/main/java/com/sw/dualscreen/activity/fragment/CashPayFragment.kt
create mode 100644 app/src/main/java/com/sw/dualscreen/activity/fragment/CollectFragment.kt
create mode 100644 app/src/main/java/com/sw/dualscreen/activity/fragment/FacePayFragment.kt
create mode 100644 app/src/main/java/com/sw/dualscreen/activity/fragment/NumberPayFragment.kt
create mode 100644 app/src/main/java/com/sw/dualscreen/activity/fragment/PayResultFragment.kt
create mode 100644 app/src/main/java/com/sw/dualscreen/activity/fragment/QrCodePayFragment.kt
create mode 100644 app/src/main/java/com/sw/dualscreen/adapter/CollectedFoodNewAdapter.kt
create mode 100644 app/src/main/java/com/sw/dualscreen/adapter/SearchFoodAdapter.kt
create mode 100644 app/src/main/java/com/sw/dualscreen/utils/ActivityManager.kt
create mode 100644 app/src/main/res/color/color_search_food.xml
create mode 100644 app/src/main/res/color/setting_radio.xml
create mode 100644 app/src/main/res/drawable-xxhdpi/face_mask.png
create mode 100644 app/src/main/res/drawable-xxhdpi/ic_arrow_right.png
create mode 100644 app/src/main/res/drawable-xxhdpi/ic_back2.png
create mode 100644 app/src/main/res/drawable-xxhdpi/ic_camera_default.png
create mode 100644 app/src/main/res/drawable-xxhdpi/ic_close2.png
create mode 100644 app/src/main/res/drawable-xxhdpi/ic_del2.png
create mode 100644 app/src/main/res/drawable-xxhdpi/ic_pay_success.png
create mode 100644 app/src/main/res/drawable-xxhdpi/ic_qrcode.png
create mode 100644 app/src/main/res/drawable-xxhdpi/ic_retake_photo.png
create mode 100644 app/src/main/res/drawable-xxhdpi/ic_search2.png
create mode 100644 app/src/main/res/drawable-xxhdpi/ic_setting.png
create mode 100644 app/src/main/res/drawable-xxhdpi/ic_setting_checked.png
create mode 100644 app/src/main/res/drawable-xxhdpi/ic_take_photo.png
create mode 100644 app/src/main/res/drawable-xxhdpi/ic_vip_level.png
create mode 100644 app/src/main/res/drawable/bg_border_red.xml
create mode 100644 app/src/main/res/drawable/bg_btn_clear.xml
create mode 100644 app/src/main/res/drawable/bg_btn_confirm.xml
create mode 100644 app/src/main/res/drawable/bg_btn_save.xml
create mode 100644 app/src/main/res/drawable/bg_btn_save2.xml
create mode 100644 app/src/main/res/drawable/bg_gray2.xml
create mode 100644 app/src/main/res/drawable/bg_pay_content.xml
create mode 100644 app/src/main/res/drawable/bg_search_food.xml
create mode 100644 app/src/main/res/drawable/line_shape.xml
create mode 100644 app/src/main/res/drawable/setting_border.xml
create mode 100644 app/src/main/res/drawable/setting_border_gray.xml
create mode 100644 app/src/main/res/drawable/setting_border_gray2.xml
create mode 100644 app/src/main/res/drawable/setting_border_gray3.xml
create mode 100644 app/src/main/res/drawable/setting_border_gray4.xml
create mode 100644 app/src/main/res/drawable/setting_check_selector.xml
create mode 100644 app/src/main/res/drawable/vip_level.xml
create mode 100644 app/src/main/res/layout/activity_collected_food.xml
create mode 100644 app/src/main/res/layout/activity_setting.xml
create mode 100644 app/src/main/res/layout/fragment_business.xml
create mode 100644 app/src/main/res/layout/fragment_cash_pay.xml
create mode 100644 app/src/main/res/layout/fragment_collect.xml
create mode 100644 app/src/main/res/layout/fragment_face_pay.xml
create mode 100644 app/src/main/res/layout/fragment_number_pay.xml
create mode 100644 app/src/main/res/layout/fragment_pay_result.xml
create mode 100644 app/src/main/res/layout/fragment_qrcode_pay.xml
create mode 100644 app/src/main/res/layout/layout_title_bar.xml
create mode 100644 app/src/main/res/layout/list_item_collected_food.xml
create mode 100644 app/src/main/res/layout/list_item_search_food.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 25d81d8..bfc5579 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -57,6 +57,9 @@
+
+
+
() {
- private val viewModel by viewModels()
- override fun getViewModel(): BaseViewModel {
- return viewModel
- }
-
- override fun inflateViewBinding(): ActivityCollectedDataBinding {
- return ActivityCollectedDataBinding.inflate(layoutInflater)
- }
-
- private val list: MutableList = mutableListOf()
- private val adapter by lazy {
- CollectedFoodAdapter(list).apply {
- isStateViewEnable = true
- addOnItemChildClickListener(R.id.ivDeleteFood) { _, _, position ->
- deleteGoods(position)
- }
- }
- }
-
- override fun initialize() {
- super.initialize()
- binding.rvFoodList.let {
- it.layoutManager = LinearLayoutManager(this)
- it.adapter = adapter
- }
- binding.ivBack.setOnClickListener { finish() }
- binding.ivGoodsSearch.setOnClickListener {
- val searchName = binding.etInputGoods.text.toString().trim()
- if (searchName.isBlank()) {
- ToastUtils.showToast("请输入物品名称")
- return@setOnClickListener
- }
- getCollectGoods(searchName)
- }
- binding.etInputGoods.let { v ->
- v.addOnActionSearchListener {
- val searchName = binding.etInputGoods.text.toString().trim()
- if (searchName.isBlank()) {
- ToastUtils.showToast("请输入物品名称")
- return@addOnActionSearchListener
- }
- getCollectGoods(searchName)
- }
- v.addTextChangedListener {
- if (it.isNullOrBlank()) {
- getCollectGoods()
- }
- }
- }
- getCollectGoods()
- }
-
-
- private var box: Box? = null
-
- @SuppressLint("NotifyDataSetChanged")
- private fun getCollectGoods(searchName:String?=null) {
- if (box == null) {
- box = ObjectBox.boxStore.boxFor(Food::class)
- }
- list.clear()
- var queryList = box?.all?.distinctBy { it.name }
- if (searchName.isNullOrBlank().not()) {
- queryList = queryList?.filter { it.name?.contains(searchName) == true }
- }
- queryList?.forEach {
- list.add(CollectedFoodBean(foodName = it.name))
- }
- adapter.notifyDataSetChanged()
- if (list.isEmpty()) {
- loadEmptyView()
- }
- binding.root.hideKeyboard()
- }
-
- private var emptyBinding: LayoutEmptySearchBinding? = null
- private fun loadEmptyView() {
- if (emptyBinding == null) {
- emptyBinding = LayoutEmptySearchBinding.inflate(layoutInflater, binding.rvFoodList, false)
- }
- emptyBinding?.root?.let { layout ->
- layout.setOnClickListener { layout.hideKeyboard() }
- adapter.stateView = layout
- }
- }
-
- private fun deleteGoods(position: Int) {
- WarnDialog(
- context = context,
- content = "请确认是否删除菜品：${list[position].foodName}？",
- confirmBlock = {
- Thread {
- runOnUiThread {
- showWaitingDialog("加载中……")
- }
- val name = list[position].foodName
- val filterIdList = box?.all?.filter { it.name == name }?.map { it.id }
- box?.removeByIds(filterIdList)
- runOnUiThread {
- hideWaitingDialog()
- adapter.removeAt(position)
- ToastUtils.showToast("删除成功")
- if (list.isEmpty()) {
- loadEmptyView()
- }
- }
- }.start()
- }).show()
- }
-}
\ No newline at end of file
+//package com.sw.dualscreen.activity
+//
+//import android.annotation.SuppressLint
+//import androidx.activity.viewModels
+//import androidx.core.widget.addTextChangedListener
+//import androidx.recyclerview.widget.LinearLayoutManager
+//import com.sw.dualscreen.R
+//import com.sw.dualscreen.adapter.CollectedFoodAdapter
+//import com.sw.dualscreen.databinding.ActivityCollectedDataBinding
+//import com.sw.dualscreen.databinding.LayoutEmptySearchBinding
+//import com.sw.dualscreen.dialog.WarnDialog
+//import com.sw.dualscreen.ext.addOnActionSearchListener
+//import com.sw.dualscreen.ext.hideKeyboard
+//import com.sw.dualscreen.objbox.CollectedFoodBean
+//import com.sw.dualscreen.objbox.Food
+//import com.sw.dualscreen.objbox.ObjectBox
+//import com.sw.dualscreen.viewmodel.BaseViewModel
+//import com.sw.dualscreen.viewmodel.UserViewModel
+//import com.sw.plate.utils.ToastUtils
+//import io.objectbox.Box
+//import io.objectbox.kotlin.boxFor
+//import kotlin.getValue
+//
+//class CollectedDataActivity : BaseActivity() {
+// private val viewModel by viewModels()
+// override fun getViewModel(): BaseViewModel {
+// return viewModel
+// }
+//
+// override fun inflateViewBinding(): ActivityCollectedDataBinding {
+// return ActivityCollectedDataBinding.inflate(layoutInflater)
+// }
+//
+// private val list: MutableList = mutableListOf()
+// private val adapter by lazy {
+// CollectedFoodAdapter(list).apply {
+// isStateViewEnable = true
+// addOnItemChildClickListener(R.id.ivDeleteFood) { _, _, position ->
+// deleteGoods(position)
+// }
+// }
+// }
+//
+// override fun initialize() {
+// super.initialize()
+// binding.rvFoodList.let {
+// it.layoutManager = LinearLayoutManager(this)
+// it.adapter = adapter
+// }
+// binding.ivBack.setOnClickListener { finish() }
+// binding.ivGoodsSearch.setOnClickListener {
+// val searchName = binding.etInputGoods.text.toString().trim()
+// if (searchName.isBlank()) {
+// ToastUtils.showToast("请输入物品名称")
+// return@setOnClickListener
+// }
+// getCollectGoods(searchName)
+// }
+// binding.etInputGoods.let { v ->
+// v.addOnActionSearchListener {
+// val searchName = binding.etInputGoods.text.toString().trim()
+// if (searchName.isBlank()) {
+// ToastUtils.showToast("请输入物品名称")
+// return@addOnActionSearchListener
+// }
+// getCollectGoods(searchName)
+// }
+// v.addTextChangedListener {
+// if (it.isNullOrBlank()) {
+// getCollectGoods()
+// }
+// }
+// }
+// getCollectGoods()
+// }
+//
+//
+// private var box: Box? = null
+//
+// @SuppressLint("NotifyDataSetChanged")
+// private fun getCollectGoods(searchName:String?=null) {
+// if (box == null) {
+// box = ObjectBox.boxStore.boxFor(Food::class)
+// }
+// list.clear()
+// var queryList = box?.all?.distinctBy { it.name }
+// if (searchName.isNullOrBlank().not()) {
+// queryList = queryList?.filter { it.name?.contains(searchName) == true }
+// }
+// queryList?.forEach {
+// list.add(CollectedFoodBean(foodName = it.name))
+// }
+// adapter.notifyDataSetChanged()
+// if (list.isEmpty()) {
+// loadEmptyView()
+// }
+// binding.root.hideKeyboard()
+// }
+//
+// private var emptyBinding: LayoutEmptySearchBinding? = null
+// private fun loadEmptyView() {
+// if (emptyBinding == null) {
+// emptyBinding = LayoutEmptySearchBinding.inflate(layoutInflater, binding.rvFoodList, false)
+// }
+// emptyBinding?.root?.let { layout ->
+// layout.setOnClickListener { layout.hideKeyboard() }
+// adapter.stateView = layout
+// }
+// }
+//
+// private fun deleteGoods(position: Int) {
+// WarnDialog(
+// context = context,
+// content = "请确认是否删除菜品：${list[position].foodName}？",
+// confirmBlock = {
+// Thread {
+// runOnUiThread {
+// showWaitingDialog("加载中……")
+// }
+// val name = list[position].foodName
+// val filterIdList = box?.all?.filter { it.name == name }?.map { it.id }
+// box?.removeByIds(filterIdList)
+// runOnUiThread {
+// hideWaitingDialog()
+// adapter.removeAt(position)
+// ToastUtils.showToast("删除成功")
+// if (list.isEmpty()) {
+// loadEmptyView()
+// }
+// }
+// }.start()
+// }).show()
+// }
+//}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/activity/CollectedFoodActivity.kt b/app/src/main/java/com/sw/dualscreen/activity/CollectedFoodActivity.kt
new file mode 100644
index 0000000..32687ff
--- /dev/null
+++ b/app/src/main/java/com/sw/dualscreen/activity/CollectedFoodActivity.kt
@@ -0,0 +1,137 @@
+package com.sw.dualscreen.activity
+
+import android.annotation.SuppressLint
+import androidx.activity.viewModels
+import androidx.core.widget.addTextChangedListener
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.sw.dualscreen.R
+import com.sw.dualscreen.adapter.CollectedFoodNewAdapter
+import com.sw.dualscreen.databinding.ActivityCollectedFoodBinding
+import com.sw.dualscreen.databinding.LayoutEmptySearchBinding
+import com.sw.dualscreen.dialog.WarnDialog
+import com.sw.dualscreen.ext.addOnActionSearchListener
+import com.sw.dualscreen.ext.hideKeyboard
+import com.sw.dualscreen.objbox.CollectedFoodBean
+import com.sw.dualscreen.objbox.Food
+import com.sw.dualscreen.objbox.ObjectBox
+import com.sw.dualscreen.viewmodel.BaseViewModel
+import com.sw.dualscreen.viewmodel.UserViewModel
+import com.sw.plate.utils.ToastUtils
+import io.objectbox.Box
+import io.objectbox.kotlin.boxFor
+
+class CollectedFoodActivity : BaseActivity() {
+ private val viewModel by viewModels()
+ override fun getViewModel(): BaseViewModel {
+ return viewModel
+ }
+
+ override fun inflateViewBinding(): ActivityCollectedFoodBinding {
+ return ActivityCollectedFoodBinding.inflate(layoutInflater)
+ }
+
+ private val list: MutableList = mutableListOf()
+ private val adapter by lazy {
+ CollectedFoodNewAdapter(list).apply {
+ isStateViewEnable = true
+ addOnItemChildClickListener(R.id.ivDeleteFood) { _, _, position ->
+ deleteGoods(position)
+ }
+ }
+ }
+
+ override fun initialize() {
+ super.initialize()
+ binding.rvFoodList.let {
+ it.layoutManager = LinearLayoutManager(this)
+ it.adapter = adapter
+ }
+ binding.include.let {
+ it.tvPageTitle.text = "已采集餐品"
+ it.ivPageBack.setOnClickListener { finish() }
+ }
+ binding.ivFoodSearch.setOnClickListener {
+ val searchName = binding.etInputFood.text.toString().trim()
+ if (searchName.isBlank()) {
+ ToastUtils.showToast("请输入物品名称")
+ return@setOnClickListener
+ }
+ getCollectGoods(searchName)
+ }
+ binding.etInputFood.let { v ->
+ v.addOnActionSearchListener {
+ val searchName = binding.etInputFood.text.toString().trim()
+ if (searchName.isBlank()) {
+ ToastUtils.showToast("请输入物品名称")
+ return@addOnActionSearchListener
+ }
+ getCollectGoods(searchName)
+ }
+ v.addTextChangedListener {
+ if (it.isNullOrBlank()) {
+ getCollectGoods()
+ }
+ }
+ }
+ getCollectGoods()
+ }
+
+
+ private var box: Box? = null
+
+ @SuppressLint("NotifyDataSetChanged")
+ private fun getCollectGoods(searchName: String? = null) {
+ if (box == null) {
+ box = ObjectBox.boxStore.boxFor(Food::class)
+ }
+ list.clear()
+ var queryList = box?.all?.distinctBy { it.name }
+ if (searchName.isNullOrBlank().not()) {
+ queryList = queryList?.filter { it.name?.contains(searchName) == true }
+ }
+ queryList?.forEach {
+ list.add(CollectedFoodBean(foodName = it.name))
+ }
+ adapter.notifyDataSetChanged()
+ if (list.isEmpty()) {
+ loadEmptyView()
+ }
+ binding.root.hideKeyboard()
+ }
+
+ private var emptyBinding: LayoutEmptySearchBinding? = null
+ private fun loadEmptyView() {
+ if (emptyBinding == null) {
+ emptyBinding =
+ LayoutEmptySearchBinding.inflate(layoutInflater, binding.rvFoodList, false)
+ }
+ emptyBinding?.root?.let { layout ->
+ layout.setOnClickListener { layout.hideKeyboard() }
+ adapter.stateView = layout
+ }
+ }
+
+ private fun deleteGoods(position: Int) {
+ WarnDialog(
+ context = context,
+ content = "请确认是否删除菜品：${list[position].foodName}？",
+ confirmBlock = {
+ Thread {
+ runOnUiThread {
+ showWaitingDialog("加载中……")
+ }
+ val name = list[position].foodName
+ val filterIdList = box?.all?.filter { it.name == name }?.map { it.id }
+ box?.removeByIds(filterIdList)
+ runOnUiThread {
+ hideWaitingDialog()
+ adapter.removeAt(position)
+ ToastUtils.showToast("删除成功")
+ if (list.isEmpty()) {
+ loadEmptyView()
+ }
+ }
+ }.start()
+ }).show()
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/activity/FoodCollectionActivity.kt b/app/src/main/java/com/sw/dualscreen/activity/FoodCollectionActivity.kt
index 32f3b2b..be4bcc0 100644
--- a/app/src/main/java/com/sw/dualscreen/activity/FoodCollectionActivity.kt
+++ b/app/src/main/java/com/sw/dualscreen/activity/FoodCollectionActivity.kt
@@ -1,370 +1,370 @@
-package com.sw.dualscreen.activity
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.Typeface
-import android.net.Uri
-import android.view.View
-import android.view.inputmethod.EditorInfo
-import android.view.inputmethod.InputMethodManager
-import android.widget.Toast
-import androidx.activity.viewModels
-import androidx.camera.view.PreviewView
-import androidx.core.net.toUri
-import androidx.core.view.updateLayoutParams
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.GridLayoutManager
-import com.example.utils.FloatBase64Utils
-import com.sw.dualscreen.R
-import com.sw.dualscreen.adapter.FoodCollectionAdapter
-import com.sw.dualscreen.adapter.GenericItemAdapter
-import com.sw.dualscreen.adapter.GridSpacingItemDecoration
-import com.sw.dualscreen.adapter.dpToPx
-import com.sw.dualscreen.databinding.ActivityFoodCollectionBinding
-import com.sw.dualscreen.databinding.ItemSearchFoodInfoBinding
-import com.sw.dualscreen.databinding.LayoutCameraPreviewBinding
-import com.sw.dualscreen.ext.clickWithDebounce
-import com.sw.dualscreen.ext.dp
-import com.sw.dualscreen.model.response.FoodInfo
-import com.sw.dualscreen.objbox.Food
-import com.sw.dualscreen.objbox.FoodCollectionBean
-import com.sw.dualscreen.objbox.FoodModule
-import com.sw.dualscreen.objbox.ObjectBox
-import com.sw.dualscreen.utils.BitmapCropper
-import com.sw.dualscreen.utils.BitmapSaver
-import com.sw.dualscreen.utils.CameraHelper
-import com.sw.dualscreen.utils.CameraUtils
-import com.sw.dualscreen.utils.Debouncer
-import com.sw.dualscreen.utils.ImageUtil
-import com.sw.dualscreen.viewmodel.BaseViewModel
-import com.sw.dualscreen.viewmodel.UserViewModel
-import com.sw.plate.utils.ToastUtils
-import io.objectbox.Box
-import io.objectbox.kotlin.boxFor
-import kotlinx.coroutines.launch
-import org.pytorch.IValue
-import org.pytorch.Module
-import org.pytorch.torchvision.TensorImageUtils
-import timber.log.Timber
-import kotlin.math.max
-
-class FoodCollectionActivity : BaseActivity() {
- companion object {
- val MAX_COUNT = 100
- }
- private val viewModel by viewModels()
- private var selectedFoodId: String? = ""
- private var selectedFoodName: String? = ""
-
- private var box: Box? = null
- private val foodCollectionList: MutableList = mutableListOf()
-
-// private lateinit var cameraHelper: CameraHelper
-
- private lateinit var foodAdapter: GenericItemAdapter
- private val foodList = mutableListOf() // 适配器内部维护的数据列表
- private val debouncer = Debouncer(2000)
- private lateinit var previewView: PreviewView
-
- private val cameraUtils: CameraUtils by lazy {
- CameraUtils(this)
- }
-
- private val collectionAdapter: FoodCollectionAdapter by lazy {
- FoodCollectionAdapter(foodCollectionList).apply {
-// setOnItemClickListener { _, _, position ->
-// if (list[position].isShowCamera) {
-//// takePhoto()
-// cameraHelper.openCamera()
+//package com.sw.dualscreen.activity
+//
+//import android.annotation.SuppressLint
+//import android.content.Context
+//import android.content.Intent
+//import android.graphics.Bitmap
+//import android.graphics.Typeface
+//import android.net.Uri
+//import android.view.View
+//import android.view.inputmethod.EditorInfo
+//import android.view.inputmethod.InputMethodManager
+//import android.widget.Toast
+//import androidx.activity.viewModels
+//import androidx.camera.view.PreviewView
+//import androidx.core.net.toUri
+//import androidx.core.view.updateLayoutParams
+//import androidx.lifecycle.lifecycleScope
+//import androidx.recyclerview.widget.GridLayoutManager
+//import com.example.utils.FloatBase64Utils
+//import com.sw.dualscreen.R
+//import com.sw.dualscreen.adapter.FoodCollectionAdapter
+//import com.sw.dualscreen.adapter.GenericItemAdapter
+//import com.sw.dualscreen.adapter.GridSpacingItemDecoration
+//import com.sw.dualscreen.adapter.dpToPx
+//import com.sw.dualscreen.databinding.ActivityFoodCollectionBinding
+//import com.sw.dualscreen.databinding.ItemSearchFoodInfoBinding
+//import com.sw.dualscreen.databinding.LayoutCameraPreviewBinding
+//import com.sw.dualscreen.ext.clickWithDebounce
+//import com.sw.dualscreen.ext.dp
+//import com.sw.dualscreen.model.response.FoodInfo
+//import com.sw.dualscreen.objbox.Food
+//import com.sw.dualscreen.objbox.FoodCollectionBean
+//import com.sw.dualscreen.objbox.FoodModule
+//import com.sw.dualscreen.objbox.ObjectBox
+//import com.sw.dualscreen.utils.BitmapCropper
+//import com.sw.dualscreen.utils.BitmapSaver
+//import com.sw.dualscreen.utils.CameraHelper
+//import com.sw.dualscreen.utils.CameraUtils
+//import com.sw.dualscreen.utils.Debouncer
+//import com.sw.dualscreen.utils.ImageUtil
+//import com.sw.dualscreen.viewmodel.BaseViewModel
+//import com.sw.dualscreen.viewmodel.UserViewModel
+//import com.sw.plate.utils.ToastUtils
+//import io.objectbox.Box
+//import io.objectbox.kotlin.boxFor
+//import kotlinx.coroutines.launch
+//import org.pytorch.IValue
+//import org.pytorch.Module
+//import org.pytorch.torchvision.TensorImageUtils
+//import timber.log.Timber
+//import kotlin.math.max
+//
+//class FoodCollectionActivity : BaseActivity() {
+// companion object {
+// val MAX_COUNT = 100
+// }
+// private val viewModel by viewModels()
+// private var selectedFoodId: String? = ""
+// private var selectedFoodName: String? = ""
+//
+// private var box: Box? = null
+// private val foodCollectionList: MutableList = mutableListOf()
+//
+//// private lateinit var cameraHelper: CameraHelper
+//
+// private lateinit var foodAdapter: GenericItemAdapter
+// private val foodList = mutableListOf() // 适配器内部维护的数据列表
+// private val debouncer = Debouncer(2000)
+// private lateinit var previewView: PreviewView
+//
+// private val cameraUtils: CameraUtils by lazy {
+// CameraUtils(this)
+// }
+//
+// private val collectionAdapter: FoodCollectionAdapter by lazy {
+// FoodCollectionAdapter(foodCollectionList).apply {
+//// setOnItemClickListener { _, _, position ->
+//// if (list[position].isShowCamera) {
+////// takePhoto()
+//// cameraHelper.openCamera()
+//// }
+//// }
+// addOnItemChildClickListener(R.id.ivDelete) { _, _, position ->
+//// list.removeAt(position)
+//// collectionAdapter.notifyItemRemoved(position)
+//// collectionAdapter.notifyItemRangeChanged(position, list.size)
+// foodCollectionList[position].let {
+// it.bitmap = null
+// it.isShowCamera = true
+// it.isFinish = false
+// }
+// notifyItemChanged(position)
+// }
+// }
+// }
+//
+// override fun getViewModel(): BaseViewModel {
+// return viewModel
+// }
+//
+// override fun inflateViewBinding(): ActivityFoodCollectionBinding {
+// return ActivityFoodCollectionBinding.inflate(layoutInflater)
+// }
+//
+// private val cameraCallback: (Uri) -> Unit = { uri ->
+// val index = foodCollectionList.indexOfFirst { it.bitmap == null }
+// if (index == -1) {
+// ToastUtils.showToast("每次只允许保存${MAX_COUNT}条数据")
+// rerurn@ cameraCallback
+// }
+// ImageUtil.uriToBitmap(this, uri)?.let { bitmap ->
+//// val cropBitmap = BitmapCropper.cropCenter(
+//// original = bitmap,
+//// targetWidth = 1300, targetHeight = 900,
+//// //offsetX = 30, offsetY = 100
+//// )
+// val file = BitmapSaver.saveToAppFilesDir(
+// bitmap, this, "IMG_CROP_${System.currentTimeMillis()}.jpg"
+// )
+// Timber.d("${this.javaClass.simpleName}-cameraCallback-裁剪bitmap保存文件路径：${file?.absolutePath}")
+//
+// foodCollectionList[index].let {
+// it.bitmap = bitmap
+// it.isShowCamera = false
+// it.imageUri = file?.toUri()
+// }
+// collectionAdapter.notifyItemChanged(index)
+// }
+// }
+//
+// @SuppressLint("NotifyDataSetChanged")
+// private fun takePhoto() {
+// val count = foodCollectionList.count { it.bitmap != null }
+// if (count >= MAX_COUNT) {
+// ToastUtils.showToast("每次只允许保存${MAX_COUNT}条数据")
+// return
+// }
+// cameraUtils.takePhoto(cameraCallback)
+// }
+//
+// override fun initialize() {
+// cameraUtils.initCamera()
+// val previewBinding =
+// LayoutCameraPreviewBinding.inflate(layoutInflater, binding.flCameraPreview)
+// previewView = previewBinding.previewView.also {
+// it.updateLayoutParams {
+// width = 180.dp
+// height = 180.dp
+// }
+// }
+// cameraUtils.setPreviewController(previewView)
+// // 初始化 CameraHelper
+//// cameraHelper = CameraHelper(
+//// context = this,
+//// caller = this,
+//// authority = "${packageName}.fileprovider"
+//// ) { uri, path ->
+//// //if (foodCollectionList.size < 6) {
+//// // val insertIndex = if (foodCollectionList.isEmpty()) 0 else foodCollectionList.size - 1
+//// // foodCollectionList.add(insertIndex, FoodCollectionBean(imageUri = uri))
+//// //} else {
+//// // foodCollectionList[foodCollectionList.size - 1] = FoodCollectionBean(imageUri = uri)
+//// //}
+//// //collectionAdapter.notifyDataSetChanged()
+//// cameraCallback(uri)
+//// }
+//
+// binding.ivBack.setOnClickListener {
+// val intent = Intent(this, MainActivity::class.java)
+// startActivity(intent)
+// finish()
+// }
+// repeat(MAX_COUNT) {
+// foodCollectionList.add(FoodCollectionBean(isShowCamera = true))
+// }
+// binding.rvFoodCollection.let {
+// it.layoutManager = GridLayoutManager(this, 3, GridLayoutManager.VERTICAL, false)
+// it.adapter = collectionAdapter
+// }
+//
+// binding.btnFoodSearch.setOnClickListener {
+// searchInfo()
+// }
+//
+// binding.btnSave.setOnClickListener {
+// if (selectedFoodName.isNullOrBlank()) {
+// Toast.makeText(this, "请选择菜品名称", Toast.LENGTH_SHORT).show()
+// return@setOnClickListener
+// }
+// if (foodCollectionList.size <= 1) {
+// Toast.makeText(this, "请拍摄菜品照片", Toast.LENGTH_SHORT).show()
+// return@setOnClickListener
+// }
+// vectorThread()
+// }
+//
+// binding.editFoodName.setOnEditorActionListener { v, actionId, event ->
+// if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+// searchInfo()
+// val imm =
+// v.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+// imm.hideSoftInputFromWindow(v.windowToken, 0)
+// true
+// } else {
+// false
+// }
+// }
+//
+// binding.btnCollectedGoods.setOnClickListener {
+// startActivity(Intent(this, CollectedDataActivity::class.java))
+// }
+// binding.btnTakePhoto.clickWithDebounce {
+// binding.btnTakePhoto.text = "拍照"
+// val count = foodCollectionList.count { it.bitmap != null }
+// if (count >= MAX_COUNT) {
+// ToastUtils.showToast("每次只允许保存${MAX_COUNT}条数据")
+// return@clickWithDebounce
+// }
+//// cameraHelper.openCamera()
+// takePhoto()
+// }
+// binding.btnClearData.setOnClickListener { clearData() }
+// foodAdapter = createAdapter()
+// binding.recyclerview.layoutManager = GridLayoutManager(context, 2)
+// // 添加间距装饰(12dp)
+// binding.recyclerview.addItemDecoration(
+// GridSpacingItemDecoration(
+// spanCount = 2,
+// spacing = dpToPx(30),
+// includeEdge = false // 包含边缘间距
+// )
+// )
+// binding.recyclerview.adapter = foodAdapter
+// }
+//
+// private fun vectorThread() {
+// //Loading.show(this)
+// showWaitingDialog("加载中……")
+// Thread {
+// foodCollectionList
+// .filter { it.bitmap != null }
+// .forEachIndexed { index, it ->
+// image2VectorTask(it, index)
+// }
+// runOnUiThread {
+// window.decorView.postDelayed({
+// //Loading.dismiss()
+// hideWaitingDialog()
+// }, 1000)
+// }
+// }.start()
+// }
+//
+// private fun initBox() {
+// if (box == null) {
+// box = ObjectBox.boxStore.boxFor(Food::class)
+// }
+// }
+//
+// private fun image2VectorTask(item: FoodCollectionBean, position: Int) {
+// initBox()
+// val imageVector = FoodModule.bitmap2FloatArray(item.bitmap!!)
+//
+// val base64Str = FloatBase64Utils.floatArrayToBase64(imageVector)
+// Timber.tag("mzf1").e(base64Str)
+//// viewModel.postImageData(
+//// context,
+//// foodId = selectedFoodId.toString(),
+//// foodName = selectedFoodName.toString(),
+//// foodVector = base64Str,
+//// uri = item.imageUri!!
+//// )
+// box?.put(Food(name = checkedItem!!.foodName, foodIdx = 0, foodVector = imageVector))
+// foodCollectionList[position].let {
+// it.imageVector = imageVector
+// it.isFinish = true
+// }
+//
+// runOnUiThread {
+// collectionAdapter.notifyItemChanged(position)
+// }
+// }
+//
+//
+// private fun searchInfo() {
+// debouncer.debounce {
+// viewModel.searchByFoodName(binding.editFoodName.text.toString())
+// }
+// }
+//
+// override fun registerDataChange() {
+// super.registerDataChange()
+// lifecycleScope.launch {
+// viewModel.searchFoodInfoList.collect {
+//// foodList.clear()
+//// foodList.addAll(it)
+// foodAdapter.updateData(it)
+// }
+// }
+// }
+//
+//
+// private var checkedItem: FoodInfo? = null
+// private fun createAdapter(): GenericItemAdapter {
+// return GenericItemAdapter(
+// items = emptyList(),
+// bindingInflater = ItemSearchFoodInfoBinding::inflate,
+// bindCallback = { item, position ->
+// this.tvName.text = item.foodName
+// if (item.id != checkedItem?.id) {
+// this.tvName.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
+// this.tvName.setTextColor(resources.getColor(R.color.search_normal))
+// this.llRoot.setBackgroundResource(R.drawable.grid_search_item_normal)
+// } else {
+// this.tvName.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
+// this.tvName.setTextColor(resources.getColor(R.color.search_checked))
+// this.llRoot.setBackgroundResource(R.drawable.grid_search_item_checked)
+// }
+//
+// this.llRoot.setOnClickListener {
+// Timber.d("itemClick ${item.foodName}, position = $position")
+// checkedItem = item
+//// viewModel.updateCurrentItem(item)
+//// itemClickCallback(item)
+// selectedFoodName = item.foodName
+// selectedFoodId = item.id
+//
+// foodAdapter.notifyDataSetChanged()
// }
// }
- addOnItemChildClickListener(R.id.ivDelete) { _, _, position ->
-// list.removeAt(position)
-// collectionAdapter.notifyItemRemoved(position)
-// collectionAdapter.notifyItemRangeChanged(position, list.size)
- foodCollectionList[position].let {
- it.bitmap = null
- it.isShowCamera = true
- it.isFinish = false
- }
- notifyItemChanged(position)
- }
- }
- }
-
- override fun getViewModel(): BaseViewModel {
- return viewModel
- }
-
- override fun inflateViewBinding(): ActivityFoodCollectionBinding {
- return ActivityFoodCollectionBinding.inflate(layoutInflater)
- }
-
- private val cameraCallback: (Uri) -> Unit = { uri ->
- val index = foodCollectionList.indexOfFirst { it.bitmap == null }
- if (index == -1) {
- ToastUtils.showToast("每次只允许保存${MAX_COUNT}条数据")
- rerurn@ cameraCallback
- }
- ImageUtil.uriToBitmap(this, uri)?.let { bitmap ->
-// val cropBitmap = BitmapCropper.cropCenter(
-// original = bitmap,
-// targetWidth = 1300, targetHeight = 900,
-// //offsetX = 30, offsetY = 100
-// )
- val file = BitmapSaver.saveToAppFilesDir(
- bitmap, this, "IMG_CROP_${System.currentTimeMillis()}.jpg"
- )
- Timber.d("${this.javaClass.simpleName}-cameraCallback-裁剪bitmap保存文件路径：${file?.absolutePath}")
-
- foodCollectionList[index].let {
- it.bitmap = bitmap
- it.isShowCamera = false
- it.imageUri = file?.toUri()
- }
- collectionAdapter.notifyItemChanged(index)
- }
- }
-
- @SuppressLint("NotifyDataSetChanged")
- private fun takePhoto() {
- val count = foodCollectionList.count { it.bitmap != null }
- if (count >= MAX_COUNT) {
- ToastUtils.showToast("每次只允许保存${MAX_COUNT}条数据")
- return
- }
- cameraUtils.takePhoto(cameraCallback)
- }
-
- override fun initialize() {
- cameraUtils.initCamera()
- val previewBinding =
- LayoutCameraPreviewBinding.inflate(layoutInflater, binding.flCameraPreview)
- previewView = previewBinding.previewView.also {
- it.updateLayoutParams {
- width = 180.dp
- height = 180.dp
- }
- }
- cameraUtils.setPreviewController(previewView)
- // 初始化 CameraHelper
-// cameraHelper = CameraHelper(
-// context = this,
-// caller = this,
-// authority = "${packageName}.fileprovider"
-// ) { uri, path ->
-// //if (foodCollectionList.size < 6) {
-// // val insertIndex = if (foodCollectionList.isEmpty()) 0 else foodCollectionList.size - 1
-// // foodCollectionList.add(insertIndex, FoodCollectionBean(imageUri = uri))
-// //} else {
-// // foodCollectionList[foodCollectionList.size - 1] = FoodCollectionBean(imageUri = uri)
-// //}
-// //collectionAdapter.notifyDataSetChanged()
-// cameraCallback(uri)
-// }
-
- binding.ivBack.setOnClickListener {
- val intent = Intent(this, MainActivity::class.java)
- startActivity(intent)
- finish()
- }
- repeat(MAX_COUNT) {
- foodCollectionList.add(FoodCollectionBean(isShowCamera = true))
- }
- binding.rvFoodCollection.let {
- it.layoutManager = GridLayoutManager(this, 3, GridLayoutManager.VERTICAL, false)
- it.adapter = collectionAdapter
- }
-
- binding.btnFoodSearch.setOnClickListener {
- searchInfo()
- }
-
- binding.btnSave.setOnClickListener {
- if (selectedFoodName.isNullOrBlank()) {
- Toast.makeText(this, "请选择菜品名称", Toast.LENGTH_SHORT).show()
- return@setOnClickListener
- }
- if (foodCollectionList.size <= 1) {
- Toast.makeText(this, "请拍摄菜品照片", Toast.LENGTH_SHORT).show()
- return@setOnClickListener
- }
- vectorThread()
- }
-
- binding.editFoodName.setOnEditorActionListener { v, actionId, event ->
- if (actionId == EditorInfo.IME_ACTION_SEARCH) {
- searchInfo()
- val imm =
- v.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
- imm.hideSoftInputFromWindow(v.windowToken, 0)
- true
- } else {
- false
- }
- }
-
- binding.btnCollectedGoods.setOnClickListener {
- startActivity(Intent(this, CollectedDataActivity::class.java))
- }
- binding.btnTakePhoto.clickWithDebounce {
- binding.btnTakePhoto.text = "拍照"
- val count = foodCollectionList.count { it.bitmap != null }
- if (count >= MAX_COUNT) {
- ToastUtils.showToast("每次只允许保存${MAX_COUNT}条数据")
- return@clickWithDebounce
- }
-// cameraHelper.openCamera()
- takePhoto()
- }
- binding.btnClearData.setOnClickListener { clearData() }
- foodAdapter = createAdapter()
- binding.recyclerview.layoutManager = GridLayoutManager(context, 2)
- // 添加间距装饰(12dp)
- binding.recyclerview.addItemDecoration(
- GridSpacingItemDecoration(
- spanCount = 2,
- spacing = dpToPx(30),
- includeEdge = false // 包含边缘间距
- )
- )
- binding.recyclerview.adapter = foodAdapter
- }
-
- private fun vectorThread() {
- //Loading.show(this)
- showWaitingDialog("加载中……")
- Thread {
- foodCollectionList
- .filter { it.bitmap != null }
- .forEachIndexed { index, it ->
- image2VectorTask(it, index)
- }
- runOnUiThread {
- window.decorView.postDelayed({
- //Loading.dismiss()
- hideWaitingDialog()
- }, 1000)
- }
- }.start()
- }
-
- private fun initBox() {
- if (box == null) {
- box = ObjectBox.boxStore.boxFor(Food::class)
- }
- }
-
- private fun image2VectorTask(item: FoodCollectionBean, position: Int) {
- initBox()
- val imageVector = FoodModule.bitmap2FloatArray(item.bitmap!!)
-
- val base64Str = FloatBase64Utils.floatArrayToBase64(imageVector)
- Timber.tag("mzf1").e(base64Str)
-// viewModel.postImageData(
-// context,
-// foodId = selectedFoodId.toString(),
-// foodName = selectedFoodName.toString(),
-// foodVector = base64Str,
-// uri = item.imageUri!!
// )
- box?.put(Food(name = checkedItem!!.foodName, foodIdx = 0, foodVector = imageVector))
- foodCollectionList[position].let {
- it.imageVector = imageVector
- it.isFinish = true
- }
-
- runOnUiThread {
- collectionAdapter.notifyItemChanged(position)
- }
- }
-
-
- private fun searchInfo() {
- debouncer.debounce {
- viewModel.searchByFoodName(binding.editFoodName.text.toString())
- }
- }
-
- override fun registerDataChange() {
- super.registerDataChange()
- lifecycleScope.launch {
- viewModel.searchFoodInfoList.collect {
-// foodList.clear()
-// foodList.addAll(it)
- foodAdapter.updateData(it)
- }
- }
- }
-
-
- private var checkedItem: FoodInfo? = null
- private fun createAdapter(): GenericItemAdapter {
- return GenericItemAdapter(
- items = emptyList(),
- bindingInflater = ItemSearchFoodInfoBinding::inflate,
- bindCallback = { item, position ->
- this.tvName.text = item.foodName
- if (item.id != checkedItem?.id) {
- this.tvName.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
- this.tvName.setTextColor(resources.getColor(R.color.search_normal))
- this.llRoot.setBackgroundResource(R.drawable.grid_search_item_normal)
- } else {
- this.tvName.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
- this.tvName.setTextColor(resources.getColor(R.color.search_checked))
- this.llRoot.setBackgroundResource(R.drawable.grid_search_item_checked)
- }
-
- this.llRoot.setOnClickListener {
- Timber.d("itemClick ${item.foodName}, position = $position")
- checkedItem = item
-// viewModel.updateCurrentItem(item)
-// itemClickCallback(item)
- selectedFoodName = item.foodName
- selectedFoodId = item.id
-
- foodAdapter.notifyDataSetChanged()
- }
- }
- )
- }
-
- private var clickIndex = -1
-
- @SuppressLint("NotifyDataSetChanged")
- private fun clearData() {
- foodCollectionList.forEach {
- it.bitmap = null
- it.isShowCamera = true
- it.isFinish = false
- }
- collectionAdapter.notifyDataSetChanged()
-
- clickIndex = -1
- binding.editFoodName.setText("")
-// foodList.clear()
-// foodAdapter.updateData(mutableListOf())
-// foodAdapter.notifyDataSetChanged()
- //loadEmptyView()
- }
-
- override fun onResume() {
- super.onResume()
- cameraUtils.bind()
- binding.llCameraFlag.run {
- visibility = View.VISIBLE
- postDelayed({
- visibility = View.GONE
- }, 3000)
- }
- }
-
- override fun onPause() {
- super.onPause()
- cameraUtils.unbind()
- binding.llCameraFlag.visibility = View.VISIBLE
- }
-
-}
\ No newline at end of file
+// }
+//
+// private var clickIndex = -1
+//
+// @SuppressLint("NotifyDataSetChanged")
+// private fun clearData() {
+// foodCollectionList.forEach {
+// it.bitmap = null
+// it.isShowCamera = true
+// it.isFinish = false
+// }
+// collectionAdapter.notifyDataSetChanged()
+//
+// clickIndex = -1
+// binding.editFoodName.setText("")
+//// foodList.clear()
+//// foodAdapter.updateData(mutableListOf())
+//// foodAdapter.notifyDataSetChanged()
+// //loadEmptyView()
+// }
+//
+// override fun onResume() {
+// super.onResume()
+// cameraUtils.bind()
+// binding.llCameraFlag.run {
+// visibility = View.VISIBLE
+// postDelayed({
+// visibility = View.GONE
+// }, 3000)
+// }
+// }
+//
+// override fun onPause() {
+// super.onPause()
+// cameraUtils.unbind()
+// binding.llCameraFlag.visibility = View.VISIBLE
+// }
+//
+//}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt b/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt
index 454f28b..ed9cae1 100644
--- a/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt
+++ b/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt
@@ -1,5 +1,6 @@
package com.sw.dualscreen.activity
+import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import android.graphics.Outline
@@ -28,11 +29,13 @@ import com.sw.dualscreen.GlobalKey
import com.sw.dualscreen.R
import com.sw.dualscreen.adapter.GenericItemAdapter
import com.sw.dualscreen.adapter.GridSpacingItemDecoration
+import com.sw.dualscreen.adapter.SearchFoodAdapter
import com.sw.dualscreen.adapter.dpToPx
import com.sw.dualscreen.databinding.ActivityMainBinding
import com.sw.dualscreen.databinding.ItemFoodInfoBinding
import com.sw.dualscreen.ext.dp
import com.sw.dualscreen.ext.format2String
+import com.sw.dualscreen.ext.visible
import com.sw.dualscreen.model.response.FoodInfo
import com.sw.dualscreen.objbox.FoodModule
import com.sw.dualscreen.objbox.FoodModule.IdNameScore
@@ -55,6 +58,10 @@ import com.sw.plate.utils.arcface.viewmodel.RecognizeViewModel
import kotlinx.coroutines.launch
import timber.log.Timber
import java.io.File
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import java.util.Locale
import java.util.concurrent.Executors
import kotlin.math.roundToInt
@@ -67,7 +74,23 @@ class MainActivity : BaseActivity() {
private var isAnalyzing = true // 控制是否进行图像分析
private var presentation: SecondaryScreenPresentation? = null
private val executor = Executors.newSingleThreadExecutor()
- private lateinit var adapter: GenericItemAdapter
+ private val searchFoodList = mutableListOf()
+ private val adapter by lazy {
+ SearchFoodAdapter(searchFoodList).apply {
+ setOnItemClickListener { adapter, view, position ->
+ searchFoodList.forEachIndexed { index, info ->
+ searchFoodList[index].isChecked = index == position
+ }
+ val item = searchFoodList[position]
+ Timber.d("itemClick ${item.foodName}, position = $position")
+ item.photoUri = null
+ checkedItem = item
+ notifyDataSetChanged()
+ // TODO 暂时注释---------------
+ //updateCurrentFood(item)
+ }
+ }
+ }
private var checkedItem: FoodInfo? = null
private var imageAnalysis: ImageAnalysis? = null
private var cameraProviderFuture: ListenableFuture? = null
@@ -102,11 +125,16 @@ class MainActivity : BaseActivity() {
private fun initView() {
viewModel.activeEngine()
- binding.foodDisplayLayout.setOnClickListener {
- val intent = Intent(this, FoodCollectionActivity::class.java)
- startActivity(intent)
+ updateDateTime()
+ binding.ivSetting.setOnClickListener {
+ startActivity(Intent(this, SettingActivity::class.java))
finish()
}
+ //binding.foodDisplayLayout.setOnClickListener {
+ // val intent = Intent(this, FoodCollectionActivity::class.java)
+ // startActivity(intent)
+ // finish()
+ //}
binding.previewView.outlineProvider = object : ViewOutlineProvider() {
override fun getOutline(view: View, outline: Outline) {
outline.setRoundRect(0, 0, view.width, view.height, 12f.dp)
@@ -121,49 +149,57 @@ class MainActivity : BaseActivity() {
bottomSheetDialog!!.show(supportFragmentManager, "CustomBottomSheetDialog")
}
- val spinnerAdapter = ArrayAdapter(
- this,
- R.layout.item_for_custom_spinner,
- arrayOf("即放即取", "余量取餐")
- )
- binding.spinner.adapter = spinnerAdapter
+ //val spinnerAdapter = ArrayAdapter(
+ // this,
+ // R.layout.item_for_custom_spinner,
+ // arrayOf("即放即取", "余量取餐")
+ //)
+ //binding.spinner.adapter = spinnerAdapter
val mode = SPUtil.getInstance().get(GlobalKey.KEY_PICKUP_MODE, 0)
- binding.spinner.setSelection(mode ?: 0)
+ //binding.spinner.setSelection(mode ?: 0)
presentation?.updateMealPickupMode(mode ?: 0)
- binding.spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
- override fun onItemSelected(
- parent: AdapterView<*>?,
- view: View?,
- position: Int,
- id: Long
- ) {
- SPUtil.getInstance().put(GlobalKey.KEY_PICKUP_MODE, position)
- updateCurrentFood(null)
- isRecognitionFood = true
- presentation?.updateMealPickupMode(position)
-
- SensorScaleUtils.zero()
- }
-
- override fun onNothingSelected(parent: AdapterView<*>?) {}
+ //binding.spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+ // override fun onItemSelected(
+ // parent: AdapterView<*>?,
+ // view: View?,
+ // position: Int,
+ // id: Long
+ // ) {
+ // SPUtil.getInstance().put(GlobalKey.KEY_PICKUP_MODE, position)
+ // updateCurrentFood(null)
+ // isRecognitionFood = true
+ // presentation?.updateMealPickupMode(position)
+//
+ // SensorScaleUtils.zero()
+ // }
+//
+ // override fun onNothingSelected(parent: AdapterView<*>?) {}
+ //}
+ //adapter = createAdapter()
+ binding.recyclerview.let {
+ it.layoutManager = GridLayoutManager(this, 2)
+ it.adapter = adapter
}
- adapter = createAdapter()
- binding.recyclerview.layoutManager = GridLayoutManager(this, 2)
// 添加间距装饰(12dp)
- binding.recyclerview.addItemDecoration(
- GridSpacingItemDecoration(
- spanCount = 2,
- spacing = dpToPx(30),
- includeEdge = false // 包含边缘间距
- )
- )
- binding.recyclerview.adapter = adapter
+ //binding.recyclerview.addItemDecoration(
+ // GridSpacingItemDecoration(
+ // spanCount = 2,
+ // spacing = dpToPx(30),
+ // includeEdge = false // 包含边缘间距
+ // )
+ //)
+ //binding.recyclerview.adapter = adapter
binding.tvFoodName.setOnClickListener {
SensorScaleUtils.zero()
}
binding.tvRescan.setOnClickListener {
debouncer.debounce { recognizeFood() }
}
+ binding.btnPay.setOnClickListener {
+ startActivity(Intent(this, PayActivity::class.java).apply {
+ putExtra(PayActivity.FOOD_INFO, checkedItem)
+ })
+ }
}
fun updateCurrentFood(foodInfo: FoodInfo?) {
@@ -204,7 +240,23 @@ class MainActivity : BaseActivity() {
// }
lifecycleScope.launch {
viewModel.identifiedFoodInfoList.collect { list ->
- adapter.updateData(list)
+ //adapter.updateData(list)
+ searchFoodList.clear()
+ searchFoodList.addAll(list)
+ adapter.notifyDataSetChanged()
+
+ //TODO 暂时写死数据测试---------------------------
+ binding.flPay.visible()
+ binding.recyclerview.visible()
+ searchFoodList.clear()
+ searchFoodList.add(FoodInfo(foodName = "岐山臊子面"))
+ searchFoodList.add(FoodInfo(foodName = "肉末干拌面"))
+ searchFoodList.add(FoodInfo(foodName = "雪菜肉丝面"))
+ searchFoodList.add(FoodInfo(foodName = "康帅博方便面"))
+ searchFoodList.add(FoodInfo(foodName = "担担面"))
+ searchFoodList.add(FoodInfo(foodName = "四合一干拌面"))
+ adapter.notifyDataSetChanged()
+
if (list.isNotEmpty()) {
checkedItem = list[0]
checkedItem!!.photoUri = lastPhotoUri
@@ -213,7 +265,8 @@ class MainActivity : BaseActivity() {
}
}
}
- SensorScaleUtils.startScale { weight ->
+
+ SensorScaleUtils.addWeightListener { weight ->
Timber.d("registerDataChange weight = $weight")
presentation?.updateWeight(weight)
@@ -281,6 +334,7 @@ class MainActivity : BaseActivity() {
}
}
+ @SuppressLint("NotifyDataSetChanged")
private fun updateFoodInfo(list: List, scoreList: List) {
Timber.d("registerDataChange识别后查询接口数据：${GsonUtils.toJson(list)}")
list.forEach { foodInfo ->
@@ -288,7 +342,10 @@ class MainActivity : BaseActivity() {
val score = scoreItem?.score ?: 0.0
foodInfo.score = ((1 - score) * 10000).roundToInt()
}
- adapter.updateData(list)
+ searchFoodList.clear()
+ searchFoodList.addAll(list)
+ adapter.notifyDataSetChanged()
+ //adapter.updateData(list)
if (list.isNotEmpty()) {
checkedItem = list[0]
checkedItem!!.photoUri = lastPhotoUri
@@ -298,33 +355,33 @@ class MainActivity : BaseActivity() {
}
}
- private fun createAdapter(): GenericItemAdapter {
- return GenericItemAdapter(
- items = emptyList(),
- bindingInflater = ItemFoodInfoBinding::inflate,
- bindCallback = { item, position ->
- val score = (item.score / 100.0).format2String(2)
- this.tvName.text = "${item.foodName}\n${score}%"
- if (item.id != checkedItem?.id) {
- this.tvName.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
- this.tvName.setTextColor(resources.getColor(R.color.identify_normal))
- this.llRoot.setBackgroundResource(R.drawable.grid_item_normal)
- } else {
- this.tvName.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
- this.tvName.setTextColor(resources.getColor(R.color.identify_checked))
- this.llRoot.setBackgroundResource(R.drawable.grid_item_checked)
- }
-//
- this.llRoot.setOnClickListener {
- Timber.d("itemClick ${item.foodName}, position = $position")
- item.photoUri = null
- checkedItem = item
- adapter.notifyDataSetChanged()
- updateCurrentFood(item)
- }
- }
- )
- }
+// private fun createAdapter(): GenericItemAdapter {
+// return GenericItemAdapter(
+// items = emptyList(),
+// bindingInflater = ItemFoodInfoBinding::inflate,
+// bindCallback = { item, position ->
+// val score = (item.score / 100.0).format2String(2)
+// this.tvName.text = "${item.foodName}\n${score}%"
+// if (item.id != checkedItem?.id) {
+// this.tvName.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
+// this.tvName.setTextColor(resources.getColor(R.color.identify_normal))
+// this.llRoot.setBackgroundResource(R.drawable.grid_item_normal)
+// } else {
+// this.tvName.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
+// this.tvName.setTextColor(resources.getColor(R.color.identify_checked))
+// this.llRoot.setBackgroundResource(R.drawable.grid_item_checked)
+// }
+////
+// this.llRoot.setOnClickListener {
+// Timber.d("itemClick ${item.foodName}, position = $position")
+// item.photoUri = null
+// checkedItem = item
+// adapter.notifyDataSetChanged()
+// updateCurrentFood(item)
+// }
+// }
+// )
+// }
private fun setupCamera() {
Timber.d("setupCamera")
@@ -496,15 +553,24 @@ class MainActivity : BaseActivity() {
}
}
+ @SuppressLint("NotifyDataSetChanged")
fun clearFoodList() {
- adapter.updateData(listOf())
+ //adapter.updateData(listOf())
+ searchFoodList.clear()
adapter.notifyDataSetChanged()
}
override fun onDestroy() {
- SensorScaleUtils.closeScale()
+ //SensorScaleUtils.closeScale()
presentation?.dismiss()
super.onDestroy()
shutdownCamera()
}
+
+ private fun updateDateTime() {
+ val formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日 EEEE", Locale.CHINA)
+ val dateTime = formatter.format(LocalDateTime.now(ZoneId.of("Asia/Shanghai")))
+ binding.tvTitleTime.text = dateTime
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/activity/PayActivity.kt b/app/src/main/java/com/sw/dualscreen/activity/PayActivity.kt
new file mode 100644
index 0000000..ed19bae
--- /dev/null
+++ b/app/src/main/java/com/sw/dualscreen/activity/PayActivity.kt
@@ -0,0 +1,128 @@
+package com.sw.dualscreen.activity
+
+import android.view.View
+import androidx.activity.viewModels
+import androidx.fragment.app.Fragment
+import com.sw.dualscreen.R
+import com.sw.dualscreen.activity.fragment.CashPayFragment
+import com.sw.dualscreen.activity.fragment.FacePayFragment
+import com.sw.dualscreen.activity.fragment.NumberPayFragment
+import com.sw.dualscreen.activity.fragment.PayResultFragment
+import com.sw.dualscreen.activity.fragment.QrCodePayFragment
+import com.sw.dualscreen.databinding.ActivityPayBinding
+import com.sw.dualscreen.model.response.FoodInfo
+import com.sw.dualscreen.viewmodel.BaseViewModel
+import com.sw.dualscreen.viewmodel.UserViewModel
+
+class PayActivity : BaseActivity() {
+
+ companion object {
+
+ const val FOOD_INFO = "foodInfo"
+ const val TAG_PAY_QR_CODE = "tagPayQrCode"
+ const val TAG_PAY_CASH = "tagPayCash"
+ const val TAG_PAY_NUMBER = "tagPayNumber"
+ const val TAG_PAY_FACE = "tagPayFace"
+ const val TAG_PAY_RESULT = "tagPayResult"
+ }
+
+ private val viewModel by viewModels()
+
+ override fun getViewModel(): BaseViewModel {
+ return viewModel
+ }
+
+ override fun inflateViewBinding(): ActivityPayBinding {
+ return ActivityPayBinding.inflate(layoutInflater)
+ }
+
+ var foodInfo: FoodInfo? = null
+
+ private var qrCodePayFragment: QrCodePayFragment? = null
+ private var cashPayFragment: CashPayFragment? = null
+ private var numberPayFragment: NumberPayFragment? = null
+ private var facePayFragment: FacePayFragment? = null
+ private var payResultFragment: PayResultFragment? = null
+
+ @Suppress("DEPRECATION")
+ override fun initialize() {
+ super.initialize()
+ foodInfo = intent.getParcelableExtra(FOOD_INFO)
+ binding.tvFoodName.text = foodInfo?.foodName
+ binding.include.ivPageBack.setOnClickListener { finish() }
+ binding.include.tvPageTitle.text = "下单结算"
+ val payQrCodeClickListener = View.OnClickListener {
+ if (qrCodePayFragment == null) {
+ qrCodePayFragment = QrCodePayFragment()
+ }
+ addFragment(qrCodePayFragment!!, TAG_PAY_QR_CODE)
+ switchButton(true, false, false, false)
+ }
+ binding.btnPayQrCode.setOnClickListener(payQrCodeClickListener)
+ binding.btnPayCash.setOnClickListener {
+ if (cashPayFragment == null) {
+ cashPayFragment = CashPayFragment()
+ }
+ addFragment(cashPayFragment!!, TAG_PAY_CASH)
+ switchButton(false, true, false, false)
+ }
+ binding.btnPayNumber.setOnClickListener {
+ if (numberPayFragment == null) {
+ numberPayFragment = NumberPayFragment()
+ }
+ addFragment(numberPayFragment!!, TAG_PAY_NUMBER)
+ switchButton(false, false, true, false)
+ }
+ binding.btnPayFace.setOnClickListener {
+ showFacePay()
+ }
+
+ payQrCodeClickListener.onClick(binding.btnPayQrCode)
+ }
+
+ private fun switchButton(vararg arr: Boolean) {
+ binding.btnPayQrCode.isChecked = arr[0]
+ binding.btnPayCash.isChecked = arr[1]
+ binding.btnPayNumber.isChecked = arr[2]
+ binding.btnPayFace.isChecked = arr[3]
+ }
+
+ fun showFacePay() {
+ if (facePayFragment == null) {
+ facePayFragment = FacePayFragment()
+ }
+ addFragment(facePayFragment!!, TAG_PAY_FACE)
+ switchButton(false, false, false, true)
+ }
+
+ private fun addFragment(currentFragment: Fragment, tag: String) {
+ runCatching {
+ supportFragmentManager.beginTransaction().apply {
+ val existFragment = supportFragmentManager.findFragmentByTag(tag)
+ if (existFragment == null) {
+ add(R.id.fragmentContainerView, currentFragment, tag)
+ }
+ val fragments = supportFragmentManager.fragments
+ fragments.forEach {
+ it?.let { fragment ->
+ if (fragment != currentFragment) {
+ hide(fragment)
+ }
+ }
+ }
+ show(currentFragment)
+ commitAllowingStateLoss()
+ }
+ }.onFailure {
+ it.printStackTrace()
+ }
+ }
+
+ fun showPayResult() {
+ if (payResultFragment == null) {
+ payResultFragment = PayResultFragment()
+ }
+ addFragment(payResultFragment!!, TAG_PAY_RESULT)
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/activity/SettingActivity.kt b/app/src/main/java/com/sw/dualscreen/activity/SettingActivity.kt
new file mode 100644
index 0000000..977bd4d
--- /dev/null
+++ b/app/src/main/java/com/sw/dualscreen/activity/SettingActivity.kt
@@ -0,0 +1,71 @@
+package com.sw.dualscreen.activity
+
+import android.content.Intent
+import androidx.activity.viewModels
+import androidx.fragment.app.Fragment
+import com.sw.dualscreen.R
+import com.sw.dualscreen.activity.fragment.BusinessFragment
+import com.sw.dualscreen.activity.fragment.CollectFragment
+import com.sw.dualscreen.databinding.ActivitySettingBinding
+import com.sw.dualscreen.model.response.FoodInfo
+import com.sw.dualscreen.viewmodel.BaseViewModel
+import com.sw.dualscreen.viewmodel.UserViewModel
+import kotlin.collections.get
+import kotlin.text.replace
+
+class SettingActivity : BaseActivity() {
+
+ private val viewModel by viewModels()
+ override fun getViewModel(): BaseViewModel {
+ return viewModel
+ }
+
+ override fun inflateViewBinding(): ActivitySettingBinding {
+ return ActivitySettingBinding.inflate(layoutInflater)
+ }
+
+ private val fragmentList = mutableListOf().apply {
+ add(BusinessFragment())
+ add(CollectFragment())
+ }
+
+ override fun initialize() {
+ super.initialize()
+ binding.include.let {
+ it.ivPageBack.setOnClickListener {
+ val intent = Intent(this, MainActivity::class.java)
+ startActivity(intent)
+ finish()
+ }
+ it.tvPageTitle.text = "设置"
+ }
+ binding.rgSetting.setOnCheckedChangeListener { group, checkedId ->
+ if (checkedId == R.id.rbBusiness) {
+ showFragment(fragmentList[0])
+ return@setOnCheckedChangeListener
+ }
+ if (checkedId == R.id.rbCollect) {
+
+ showFragment(fragmentList[1])
+ return@setOnCheckedChangeListener
+ }
+ }
+ binding.rgSetting.check(R.id.rbBusiness)
+ }
+
+ private fun showFragment(fragment: Fragment) {
+ runCatching {
+ supportFragmentManager.beginTransaction().apply {
+ replace(R.id.fragmentContainerView, fragment)
+ commit()
+ }
+ }.onFailure {
+ it.printStackTrace()
+ }
+ }
+
+ fun searchByFoodName(foodName:String, action: (List) -> Unit) {
+ viewModel.searchByFoodName(foodName, action)
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/activity/fragment/BaseFragment.kt b/app/src/main/java/com/sw/dualscreen/activity/fragment/BaseFragment.kt
new file mode 100644
index 0000000..4559989
--- /dev/null
+++ b/app/src/main/java/com/sw/dualscreen/activity/fragment/BaseFragment.kt
@@ -0,0 +1,32 @@
+package com.sw.dualscreen.activity.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.viewbinding.ViewBinding
+
+abstract class BaseFragment: Fragment() {
+
+ protected lateinit var binding: VB
+
+ protected abstract fun inflateViewBinding(): VB
+
+ abstract fun initialize()
+
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+ binding = inflateViewBinding()
+ return binding.root
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ initialize()
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/activity/fragment/BusinessFragment.kt b/app/src/main/java/com/sw/dualscreen/activity/fragment/BusinessFragment.kt
new file mode 100644
index 0000000..1144834
--- /dev/null
+++ b/app/src/main/java/com/sw/dualscreen/activity/fragment/BusinessFragment.kt
@@ -0,0 +1,42 @@
+package com.sw.dualscreen.activity.fragment
+
+import android.view.LayoutInflater
+import com.sw.dualscreen.GlobalKey
+import com.sw.dualscreen.R
+import com.sw.dualscreen.databinding.FragmentBusinessBinding
+import com.sw.dualscreen.sdk.SensorScaleUtils
+import com.sw.dualscreen.utils.SPUtil
+import kotlin.math.roundToInt
+
+class BusinessFragment: BaseFragment() {
+
+ override fun inflateViewBinding(): FragmentBusinessBinding {
+ return FragmentBusinessBinding.inflate(LayoutInflater.from(context))
+ }
+
+ override fun initialize() {
+ binding.rgCharge.let {
+ it.setOnCheckedChangeListener { group, checkedId ->
+ val mode = if (checkedId == R.id.rbChargeYes) 0 else 1
+ SPUtil.getInstance().put(GlobalKey.KEY_CHARGE_MODE, mode)
+ }
+ val mode = SPUtil.getInstance().get(GlobalKey.KEY_CHARGE_MODE, 0)
+ it.check(if (mode == 0) R.id.rbChargeYes else R.id.rbChargeNot)
+ }
+ binding.rgTakeFood.let {
+ it.setOnCheckedChangeListener { group, checkedId ->
+ val mode = if (checkedId == R.id.rbPickAndPlace) 0 else 1
+ SPUtil.getInstance().put(GlobalKey.KEY_PICKUP_MODE, mode)
+ }
+ val mode = SPUtil.getInstance().get(GlobalKey.KEY_PICKUP_MODE, 0)
+ it.check(if (mode == 0) R.id.rbPickAndPlace else R.id.rbSurplusCalculate)
+ }
+ binding.btnClearZero.setOnClickListener {
+ SensorScaleUtils.tare()
+ }
+ SensorScaleUtils.addWeightListener { value ->
+ val realWeight = (value * 1000).roundToInt()
+ binding.tvFoodWeight.text = "$realWeight"
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/activity/fragment/CashPayFragment.kt b/app/src/main/java/com/sw/dualscreen/activity/fragment/CashPayFragment.kt
new file mode 100644
index 0000000..64e5b32
--- /dev/null
+++ b/app/src/main/java/com/sw/dualscreen/activity/fragment/CashPayFragment.kt
@@ -0,0 +1,25 @@
+package com.sw.dualscreen.activity.fragment
+
+import android.text.Spanned
+import android.text.SpannedString
+import android.text.style.AbsoluteSizeSpan
+import androidx.core.text.buildSpannedString
+import com.sw.dualscreen.databinding.FragmentCashPayBinding
+
+class CashPayFragment: BaseFragment() {
+
+ override fun inflateViewBinding(): FragmentCashPayBinding {
+ return FragmentCashPayBinding.inflate(layoutInflater)
+ }
+
+ override fun initialize() {
+ binding.tvRealAmount.text = getAmountText("36.8")
+ }
+
+ private fun getAmountText(amount:String): SpannedString {
+ return buildSpannedString {
+ append("¥", AbsoluteSizeSpan(36, true), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+ append(amount, AbsoluteSizeSpan(60, true), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/activity/fragment/CollectFragment.kt b/app/src/main/java/com/sw/dualscreen/activity/fragment/CollectFragment.kt
new file mode 100644
index 0000000..4db19cd
--- /dev/null
+++ b/app/src/main/java/com/sw/dualscreen/activity/fragment/CollectFragment.kt
@@ -0,0 +1,285 @@
+package com.sw.dualscreen.activity.fragment
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.view.LayoutInflater
+import android.view.View
+import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputMethodManager
+import android.widget.Toast
+import androidx.camera.view.PreviewView
+import androidx.core.net.toUri
+import androidx.core.view.updateLayoutParams
+import androidx.recyclerview.widget.GridLayoutManager
+import com.sw.dualscreen.R
+import com.sw.dualscreen.activity.CollectedFoodActivity
+import com.sw.dualscreen.activity.SettingActivity
+import com.sw.dualscreen.adapter.FoodCollectionAdapter
+import com.sw.dualscreen.adapter.SearchFoodAdapter
+import com.sw.dualscreen.databinding.FragmentCollectBinding
+import com.sw.dualscreen.databinding.LayoutCameraPreviewBinding
+import com.sw.dualscreen.ext.clickWithDebounce
+import com.sw.dualscreen.ext.dp
+import com.sw.dualscreen.model.response.FoodInfo
+import com.sw.dualscreen.objbox.Food
+import com.sw.dualscreen.objbox.FoodCollectionBean
+import com.sw.dualscreen.objbox.FoodModule
+import com.sw.dualscreen.objbox.ObjectBox
+import com.sw.dualscreen.utils.BitmapSaver
+import com.sw.dualscreen.utils.CameraUtils
+import com.sw.dualscreen.utils.Debouncer
+import com.sw.dualscreen.utils.ImageUtil
+import com.sw.plate.utils.ToastUtils
+import io.objectbox.Box
+import io.objectbox.kotlin.boxFor
+import timber.log.Timber
+import kotlin.getValue
+
+class CollectFragment : BaseFragment() {
+
+ companion object {
+ const val MAX_COUNT = 5
+ }
+ private var selectedFoodId: String? = ""
+ private var selectedFoodName: String? = ""
+
+ private var box: Box? = null
+ private val foodCollectionList = mutableListOf().apply {
+ repeat(MAX_COUNT) {
+ add(FoodCollectionBean(isShowCamera = true))
+ }
+ }
+
+ private val searchFoodList = mutableListOf()
+ private var settingActivity: SettingActivity?=null
+ private var checkedItem: FoodInfo? = null
+ private val searchFoodAdapter by lazy {
+ SearchFoodAdapter(searchFoodList).apply {
+ setOnItemClickListener { adapter, view, position ->
+ checkedItem = searchFoodList[position]
+ selectedFoodId = checkedItem!!.id
+ val isChecked = checkedItem!!.isChecked
+ searchFoodList[position].isChecked = isChecked.not()
+ notifyItemChanged(position)
+ }
+ }
+ }
+ private val debouncer = Debouncer(2000)
+ private lateinit var previewView: PreviewView
+ private val cameraUtils: CameraUtils by lazy {
+ CameraUtils(requireActivity())
+ }
+
+ private val collectionAdapter: FoodCollectionAdapter by lazy {
+ FoodCollectionAdapter(foodCollectionList).apply {
+ addOnItemChildClickListener(R.id.ivDelete) { _, _, position ->
+ foodCollectionList[position].let {
+ it.bitmap = null
+ it.isShowCamera = true
+ it.isFinish = false
+ }
+ notifyItemChanged(position)
+ }
+ }
+ }
+ override fun inflateViewBinding(): FragmentCollectBinding {
+ return FragmentCollectBinding.inflate(LayoutInflater.from(context))
+ }
+
+
+ private val cameraCallback: (Uri) -> Unit = { uri ->
+ val index = foodCollectionList.indexOfFirst { it.bitmap == null }
+ if (index == -1) {
+ ToastUtils.showToast("每次只允许保存${MAX_COUNT}条数据")
+ rerurn@cameraCallback
+ }
+ ImageUtil.uriToBitmap(requireActivity(), uri)?.let { bitmap ->
+// val cropBitmap = BitmapCropper.cropCenter(
+// original = bitmap,
+// targetWidth = 1300, targetHeight = 900,
+// //offsetX = 30, offsetY = 100
+// )
+ val file = BitmapSaver.saveToAppFilesDir(
+ bitmap, requireActivity(), "IMG_CROP_${System.currentTimeMillis()}.jpg"
+ )
+ Timber.d("${this.javaClass.simpleName}-cameraCallback-裁剪bitmap保存文件路径：${file?.absolutePath}")
+
+ foodCollectionList[index].let {
+ it.bitmap = bitmap
+ it.isShowCamera = false
+ it.imageUri = file?.toUri()
+ }
+ collectionAdapter.notifyItemChanged(index)
+ }
+ }
+
+ @SuppressLint("NotifyDataSetChanged")
+ private fun takePhoto() {
+ val count = foodCollectionList.count { it.bitmap != null }
+ if (count >= MAX_COUNT) {
+ ToastUtils.showToast("每次只允许保存${MAX_COUNT}条数据")
+ return
+ }
+ cameraUtils.takePhoto(cameraCallback)
+ }
+
+ override fun initialize() {
+ settingActivity = activity as SettingActivity
+ cameraUtils.initCamera()
+ val previewBinding =
+ LayoutCameraPreviewBinding.inflate(layoutInflater, binding.flCameraPreview)
+ previewView = previewBinding.previewView.also {
+ it.updateLayoutParams {
+ width = 456.dp
+ height = 342.dp
+ }
+ }
+ cameraUtils.setPreviewController(previewView)
+
+ binding.rvFoodList.let {
+ it.layoutManager = GridLayoutManager(requireActivity(), 3, GridLayoutManager.VERTICAL, false)
+ it.adapter = collectionAdapter
+ }
+
+ binding.btnFoodSearch.setOnClickListener {
+ searchInfo()
+ }
+
+ binding.btnSave.setOnClickListener {
+ if (selectedFoodName.isNullOrBlank()) {
+ Toast.makeText(requireActivity(), "请选择菜品名称", Toast.LENGTH_SHORT).show()
+ return@setOnClickListener
+ }
+ if (foodCollectionList.size <= 1) {
+ Toast.makeText(requireActivity(), "请拍摄菜品照片", Toast.LENGTH_SHORT).show()
+ return@setOnClickListener
+ }
+ vectorThread()
+ }
+
+ binding.editFoodName.setOnEditorActionListener { v, actionId, event ->
+ if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+ searchInfo()
+ val imm =
+ v.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+ imm.hideSoftInputFromWindow(v.windowToken, 0)
+ true
+ } else {
+ false
+ }
+ }
+
+ binding.btnCollectedFood.setOnClickListener {
+ startActivity(Intent(requireActivity(), CollectedFoodActivity::class.java))
+ }
+ binding.btnTakePhoto.clickWithDebounce {
+ val count = foodCollectionList.count { it.bitmap != null }
+ if (count >= MAX_COUNT) {
+ ToastUtils.showToast("每次只允许保存${MAX_COUNT}条数据")
+ return@clickWithDebounce
+ }
+ takePhoto()
+ }
+ binding.btnClearData.setOnClickListener { clearData() }
+ binding.rvSearchFood.let {
+ it.layoutManager = GridLayoutManager(context, 2)
+ it.adapter = searchFoodAdapter
+ }
+ }
+
+ private fun vectorThread() {
+ settingActivity?.showWaitingDialog("加载中……")
+ Thread {
+ foodCollectionList
+ .filter { it.bitmap != null }
+ .forEachIndexed { index, it ->
+ image2VectorTask(it, index)
+ }
+ activity?.runOnUiThread {
+ binding.root.postDelayed({
+ settingActivity?.hideWaitingDialog()
+ }, 1000)
+ }
+ }.start()
+ }
+
+ private fun initBox() {
+ if (box == null) {
+ box = ObjectBox.boxStore.boxFor(Food::class)
+ }
+ }
+
+ private fun image2VectorTask(item: FoodCollectionBean, position: Int) {
+ initBox()
+ val imageVector = FoodModule.bitmap2FloatArray(item.bitmap!!)
+
+// val base64Str = FloatBase64Utils.floatArrayToBase64(imageVector)
+// Timber.tag("mzf1").e(base64Str)
+//// viewModel.postImageData(
+//// context,
+//// foodId = selectedFoodId.toString(),
+//// foodName = selectedFoodName.toString(),
+//// foodVector = base64Str,
+//// uri = item.imageUri!!
+//// )
+ box?.put(Food(name = checkedItem!!.foodName, foodIdx = 0, foodVector = imageVector))
+ foodCollectionList[position].let {
+ it.imageVector = imageVector
+ it.isFinish = true
+ }
+
+ activity?.runOnUiThread {
+ collectionAdapter.notifyItemChanged(position)
+ }
+ }
+
+
+ @SuppressLint("NotifyDataSetChanged")
+ private fun searchInfo() {
+ debouncer.debounce {
+ settingActivity?.searchByFoodName(binding.editFoodName.text.toString()) {
+ searchFoodList.clear()
+ searchFoodList.addAll(it)
+ searchFoodAdapter.notifyDataSetChanged()
+ }
+ }
+ }
+
+ private var clickIndex = -1
+
+ @SuppressLint("NotifyDataSetChanged")
+ private fun clearData() {
+ foodCollectionList.forEach {
+ it.bitmap = null
+ it.isShowCamera = true
+ it.isFinish = false
+ }
+ collectionAdapter.notifyDataSetChanged()
+
+ clickIndex = -1
+ binding.editFoodName.setText("")
+// foodList.clear()
+// foodAdapter.updateData(mutableListOf())
+// foodAdapter.notifyDataSetChanged()
+ //loadEmptyView()
+ }
+
+ override fun onResume() {
+ super.onResume()
+ cameraUtils.bind()
+ binding.llCameraFlag.run {
+ visibility = View.VISIBLE
+ postDelayed({
+ visibility = View.GONE
+ }, 3000)
+ }
+ }
+
+ override fun onPause() {
+ super.onPause()
+ cameraUtils.unbind()
+ binding.llCameraFlag.visibility = View.VISIBLE
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/activity/fragment/FacePayFragment.kt b/app/src/main/java/com/sw/dualscreen/activity/fragment/FacePayFragment.kt
new file mode 100644
index 0000000..f89df12
--- /dev/null
+++ b/app/src/main/java/com/sw/dualscreen/activity/fragment/FacePayFragment.kt
@@ -0,0 +1,19 @@
+package com.sw.dualscreen.activity.fragment
+
+import com.sw.dualscreen.activity.PayActivity
+import com.sw.dualscreen.databinding.FragmentFacePayBinding
+
+class FacePayFragment : BaseFragment() {
+
+ override fun inflateViewBinding(): FragmentFacePayBinding {
+ return FragmentFacePayBinding.inflate(layoutInflater)
+ }
+
+ private var payActivity: PayActivity? = null
+ override fun initialize() {
+ payActivity = activity as PayActivity
+ binding.tvFaceState.setOnClickListener {
+ payActivity?.showPayResult()
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/activity/fragment/NumberPayFragment.kt b/app/src/main/java/com/sw/dualscreen/activity/fragment/NumberPayFragment.kt
new file mode 100644
index 0000000..a8ab754
--- /dev/null
+++ b/app/src/main/java/com/sw/dualscreen/activity/fragment/NumberPayFragment.kt
@@ -0,0 +1,15 @@
+package com.sw.dualscreen.activity.fragment
+
+import com.sw.dualscreen.databinding.FragmentNumberPayBinding
+import com.sw.dualscreen.ext.hideKeyboard
+
+class NumberPayFragment: BaseFragment() {
+
+ override fun inflateViewBinding(): FragmentNumberPayBinding {
+ return FragmentNumberPayBinding.inflate(layoutInflater)
+ }
+
+ override fun initialize() {
+ binding.root.hideKeyboard()
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/activity/fragment/PayResultFragment.kt b/app/src/main/java/com/sw/dualscreen/activity/fragment/PayResultFragment.kt
new file mode 100644
index 0000000..9cdb82b
--- /dev/null
+++ b/app/src/main/java/com/sw/dualscreen/activity/fragment/PayResultFragment.kt
@@ -0,0 +1,28 @@
+package com.sw.dualscreen.activity.fragment
+
+import com.sw.dualscreen.activity.PayActivity
+import com.sw.dualscreen.databinding.FragmentPayResultBinding
+
+class PayResultFragment: BaseFragment() {
+
+ override fun inflateViewBinding(): FragmentPayResultBinding {
+ return FragmentPayResultBinding.inflate(layoutInflater)
+ }
+
+
+ private var payActivity: PayActivity? = null
+ override fun initialize() {
+ payActivity = activity as PayActivity
+ binding.btnBack.setOnClickListener {
+ payActivity?.showFacePay()
+ }
+ }
+
+ override fun onHiddenChanged(hidden: Boolean) {
+ super.onHiddenChanged(hidden)
+ //显示时重新查询接口
+ if (hidden.not()) {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/activity/fragment/QrCodePayFragment.kt b/app/src/main/java/com/sw/dualscreen/activity/fragment/QrCodePayFragment.kt
new file mode 100644
index 0000000..f19b823
--- /dev/null
+++ b/app/src/main/java/com/sw/dualscreen/activity/fragment/QrCodePayFragment.kt
@@ -0,0 +1,29 @@
+package com.sw.dualscreen.activity.fragment
+
+import android.text.Spanned
+import android.text.SpannedString
+import android.text.style.AbsoluteSizeSpan
+import androidx.core.text.buildSpannedString
+import com.sw.dualscreen.R
+import com.sw.dualscreen.databinding.FragmentQrcodePayBinding
+
+class QrCodePayFragment: BaseFragment() {
+
+ override fun inflateViewBinding(): FragmentQrcodePayBinding {
+ return FragmentQrcodePayBinding.inflate(layoutInflater)
+ }
+
+ override fun initialize() {
+ binding.tvRealAmount.text = getAmountText("36.8")
+ binding.ivPayQrCode.setImageResource(R.drawable.ic_qrcode)
+ binding.tvPayResult.text = "待支付(60s)..."
+ }
+
+ private fun getAmountText(amount:String): SpannedString {
+ return buildSpannedString {
+ append("¥", AbsoluteSizeSpan(36, true), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+ append(amount, AbsoluteSizeSpan(60, true), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/adapter/CollectedFoodAdapter.kt b/app/src/main/java/com/sw/dualscreen/adapter/CollectedFoodAdapter.kt
index c1471ef..fe24e3b 100644
--- a/app/src/main/java/com/sw/dualscreen/adapter/CollectedFoodAdapter.kt
+++ b/app/src/main/java/com/sw/dualscreen/adapter/CollectedFoodAdapter.kt
@@ -1,34 +1,34 @@
-package com.sw.dualscreen.adapter
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import com.chad.library.adapter4.BaseQuickAdapter
-import com.chad.library.adapter4.viewholder.QuickViewHolder
-import com.sw.dualscreen.R
-import com.sw.dualscreen.databinding.ListItemCollectedDataBinding
-import com.sw.dualscreen.databinding.ListItemFoodCollectionBinding
-import com.sw.dualscreen.objbox.CollectedFoodBean
-import com.sw.dualscreen.objbox.FoodCollectionBean
-
-class CollectedFoodAdapter (var list: MutableList) :
- BaseQuickAdapter(list) {
-
- inner class VH(var binding: ListItemCollectedDataBinding) : QuickViewHolder(binding.root)
-
- override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
- val inflater = LayoutInflater.from(context)
- val binding = ListItemCollectedDataBinding.inflate(inflater, parent, false)
- return VH(binding)
- }
-
- override fun onBindViewHolder(holder: VH, position: Int, item: CollectedFoodBean?) {
- holder.binding.tvFoodName.text = item?.foodName
- holder.binding.divider.run {
- visibility = if (position == list.size - 1) View.GONE else View.VISIBLE
- }
- }
-
-}
\ No newline at end of file
+//package com.sw.dualscreen.adapter
+//
+//import android.content.Context
+//import android.view.LayoutInflater
+//import android.view.View
+//import android.view.ViewGroup
+//import android.widget.ImageView
+//import com.chad.library.adapter4.BaseQuickAdapter
+//import com.chad.library.adapter4.viewholder.QuickViewHolder
+//import com.sw.dualscreen.R
+//import com.sw.dualscreen.databinding.ListItemCollectedDataBinding
+//import com.sw.dualscreen.databinding.ListItemFoodCollectionBinding
+//import com.sw.dualscreen.objbox.CollectedFoodBean
+//import com.sw.dualscreen.objbox.FoodCollectionBean
+//
+//class CollectedFoodAdapter (var list: MutableList) :
+// BaseQuickAdapter(list) {
+//
+// inner class VH(var binding: ListItemCollectedDataBinding) : QuickViewHolder(binding.root)
+//
+// override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+// val inflater = LayoutInflater.from(context)
+// val binding = ListItemCollectedDataBinding.inflate(inflater, parent, false)
+// return VH(binding)
+// }
+//
+// override fun onBindViewHolder(holder: VH, position: Int, item: CollectedFoodBean?) {
+// holder.binding.tvFoodName.text = item?.foodName
+// holder.binding.divider.run {
+// visibility = if (position == list.size - 1) View.GONE else View.VISIBLE
+// }
+// }
+//
+//}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/adapter/CollectedFoodNewAdapter.kt b/app/src/main/java/com/sw/dualscreen/adapter/CollectedFoodNewAdapter.kt
new file mode 100644
index 0000000..17901ab
--- /dev/null
+++ b/app/src/main/java/com/sw/dualscreen/adapter/CollectedFoodNewAdapter.kt
@@ -0,0 +1,27 @@
+package com.sw.dualscreen.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.chad.library.adapter4.BaseQuickAdapter
+import com.chad.library.adapter4.viewholder.QuickViewHolder
+import com.sw.dualscreen.databinding.ListItemCollectedFoodBinding
+import com.sw.dualscreen.objbox.CollectedFoodBean
+
+class CollectedFoodNewAdapter(var list: MutableList) :
+ BaseQuickAdapter(list) {
+
+ inner class VH(var binding: ListItemCollectedFoodBinding) : QuickViewHolder(binding.root)
+
+ override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+ val inflater = LayoutInflater.from(context)
+ val binding = ListItemCollectedFoodBinding.inflate(inflater, parent, false)
+ return VH(binding)
+ }
+
+ override fun onBindViewHolder(holder: VH, position: Int, item: CollectedFoodBean?) {
+ holder.binding.tvFoodName.text = item?.foodName
+ holder.binding.tvCollectedNum.text = "已采集153"
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/adapter/FoodCollectionAdapter.kt b/app/src/main/java/com/sw/dualscreen/adapter/FoodCollectionAdapter.kt
index 306112c..ea86512 100644
--- a/app/src/main/java/com/sw/dualscreen/adapter/FoodCollectionAdapter.kt
+++ b/app/src/main/java/com/sw/dualscreen/adapter/FoodCollectionAdapter.kt
@@ -9,7 +9,9 @@ import com.chad.library.adapter4.BaseQuickAdapter
import com.chad.library.adapter4.viewholder.QuickViewHolder
import com.sw.dualscreen.R
import com.sw.dualscreen.databinding.ListItemFoodCollectionBinding
+import com.sw.dualscreen.ext.dp
import com.sw.dualscreen.objbox.FoodCollectionBean
+import com.sw.dualscreen.utils.GlideUtils
class FoodCollectionAdapter (var list: MutableList) :
BaseQuickAdapter(list) {
@@ -30,11 +32,20 @@ class FoodCollectionAdapter (var list: MutableList) :
binding.imageView.run {
if (it.isShowCamera) {
scaleType = ImageView.ScaleType.CENTER
- setImageResource(R.drawable.ic_camera256)
+ setImageResource(R.drawable.ic_camera_default)
} else {
- scaleType = ImageView.ScaleType.FIT_CENTER
+ //scaleType = ImageView.ScaleType.FIT_CENTER
+ scaleType = ImageView.ScaleType.CENTER_CROP
//setImageURI(it.imageUri)
- setImageBitmap(it.bitmap)
+ //setImageBitmap(it.bitmap)
+ it.bitmap?.let { bitmap ->
+ GlideUtils.loadRoundCornerWitBitmap(
+ context,
+ url = bitmap,
+ imageView = this,
+ radius = 8.dp
+ )
+ }
}
}
}
diff --git a/app/src/main/java/com/sw/dualscreen/adapter/SearchFoodAdapter.kt b/app/src/main/java/com/sw/dualscreen/adapter/SearchFoodAdapter.kt
new file mode 100644
index 0000000..f2f0078
--- /dev/null
+++ b/app/src/main/java/com/sw/dualscreen/adapter/SearchFoodAdapter.kt
@@ -0,0 +1,35 @@
+package com.sw.dualscreen.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.chad.library.adapter4.BaseQuickAdapter
+import com.chad.library.adapter4.viewholder.QuickViewHolder
+import com.sw.dualscreen.databinding.ListItemSearchFoodBinding
+import com.sw.dualscreen.ext.format2String
+import com.sw.dualscreen.model.response.FoodInfo
+
+class SearchFoodAdapter(var list: MutableList) :
+ BaseQuickAdapter(list) {
+
+ inner class VH(var binding: ListItemSearchFoodBinding) : QuickViewHolder(binding.root)
+
+ override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+ val inflater = LayoutInflater.from(context)
+ val binding = ListItemSearchFoodBinding.inflate(inflater, parent, false)
+ return VH(binding)
+ }
+
+ override fun onBindViewHolder(holder: VH, position: Int, item: FoodInfo?) {
+ holder.binding.tvFoodName.run {
+ if (item!!.score == 0) {
+ text = item.foodName
+ } else {
+ val score = (item.score / 100.0).format2String(2)
+ text = "${item.foodName}\n${score}%"
+ }
+ isChecked = item.isChecked
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/ext/CommonExt.kt b/app/src/main/java/com/sw/dualscreen/ext/CommonExt.kt
index 4725fe8..d3529c7 100644
--- a/app/src/main/java/com/sw/dualscreen/ext/CommonExt.kt
+++ b/app/src/main/java/com/sw/dualscreen/ext/CommonExt.kt
@@ -120,3 +120,15 @@ fun View.clickWithDebounce(delay: Long = 500, action: () -> Unit) {
}
}
}
+
+fun View.visible() {
+ visibility = View.VISIBLE
+}
+
+fun View.invisible() {
+ visibility = View.INVISIBLE
+}
+
+fun View.gone() {
+ visibility = View.GONE
+}
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 7b584cc..0f1fc7a 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
@@ -39,7 +39,8 @@ data class FoodInfo(
val stFoodInfoSetting: StFoodInfoSetting? = StFoodInfoSetting(),
@SerializedName("stFoodInfoSpecificationList")
val stFoodInfoSpecificationList: List? = listOf(),
- var score: Int = 0
+ var score: Int = 0,
+ var isChecked: Boolean = false
) : Parcelable {
@Parcelize
data class FoodTypeAndRealIntakeVo(
diff --git a/app/src/main/java/com/sw/dualscreen/sdk/SensorScaleUtils.kt b/app/src/main/java/com/sw/dualscreen/sdk/SensorScaleUtils.kt
index 04402f0..6ad5388 100644
--- a/app/src/main/java/com/sw/dualscreen/sdk/SensorScaleUtils.kt
+++ b/app/src/main/java/com/sw/dualscreen/sdk/SensorScaleUtils.kt
@@ -4,8 +4,10 @@ import com.sw.plate.utils.ToastUtils
import com.wabon.wbintelligenthardwaresdk.api.SensorScale
import com.wabon.wbintelligenthardwaresdk.api.SensorScale.OnScaleResult
import timber.log.Timber
+import kotlin.math.roundToInt
typealias Callback = (Double) -> Unit
+typealias WeightCallback = (Double) -> Unit
private const val TAG = "SensorScaleUtils"
@@ -41,6 +43,10 @@ object SensorScaleUtils {
lastWeight = value
callback?.invoke(value)
}
+
+ weightCallbackList.forEach {
+ it.invoke(value)
+ }
}
/**
@@ -60,7 +66,7 @@ object SensorScaleUtils {
* 开启称重
* @param autoScale 是否开启自动读取
*/
- fun startScale(autoScale: Boolean = true, callback: Callback?) {
+ fun startScale(autoScale: Boolean = true, callback: Callback? = null) {
Timber.d("startScale isOpened = $isOpened")
if (isOpened) {
startContinuousRead(callback = callback)
@@ -112,6 +118,13 @@ object SensorScaleUtils {
mSensorScale?.readWeight()
}
+ private var weightCallbackList: MutableList = mutableListOf()
+ fun addWeightListener(weightCallback: WeightCallback) {
+ if (weightCallbackList.contains(weightCallback).not()) {
+ weightCallbackList.add(weightCallback)
+ }
+ }
+
/**
* 零位标定
*/
diff --git a/app/src/main/java/com/sw/dualscreen/utils/ActivityManager.kt b/app/src/main/java/com/sw/dualscreen/utils/ActivityManager.kt
new file mode 100644
index 0000000..0937ba8
--- /dev/null
+++ b/app/src/main/java/com/sw/dualscreen/utils/ActivityManager.kt
@@ -0,0 +1,57 @@
+package com.sw.dualscreen.utils
+
+import android.app.Activity
+import android.os.Process
+import java.util.Stack
+
+object ActivityManager {
+
+ private val activityStack = Stack()
+
+ // 添加Activity到栈
+ fun addActivity(activity: Activity) {
+ activityStack.add(activity)
+ }
+
+ // 移除指定Activity
+ fun removeActivity(activity: Activity) {
+ activityStack.remove(activity)
+ }
+
+ // 获取当前Activity
+ fun currentActivity(): Activity? {
+ return if (activityStack.isEmpty()) null else activityStack.lastElement()
+ }
+
+ // 结束指定Activity
+ fun finishActivity(activity: Activity) {
+ if (!activity.isFinishing) {
+ activity.finish()
+ }
+ }
+
+ // 结束所有Activity
+ fun finishAllActivity() {
+ activityStack.forEach {
+ if (!it.isFinishing) {
+ it.finish()
+ }
+ }
+ activityStack.clear()
+ }
+
+ // 退出应用程序
+ fun exitApp() {
+ finishAllActivity()
+ Process.killProcess(Process.myPid())
+ }
+
+ fun getActivityStack(): Stack{
+ return activityStack
+ }
+
+ fun isEmpty() : Boolean {
+ return activityStack.isEmpty()
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/dualscreen/utils/GlideUtils.kt b/app/src/main/java/com/sw/dualscreen/utils/GlideUtils.kt
index a0aa45f..3581e75 100644
--- a/app/src/main/java/com/sw/dualscreen/utils/GlideUtils.kt
+++ b/app/src/main/java/com/sw/dualscreen/utils/GlideUtils.kt
@@ -104,6 +104,21 @@ object GlideUtils {
.into(imageView)
}
+ fun loadRoundCornerWitBitmap(
+ context: Context,
+ url: Bitmap,
+ imageView: ImageView,
+ radius: Int,
+ @DrawableRes placeholderResId: Int = 0,
+ @DrawableRes errorResId: Int = 0
+ ) {
+ val requestBuilder = Glide.with(context)
+ .load(url)
+ .apply(RequestOptions.bitmapTransform(RoundedCorners(radius)))
+
+ applyPlaceholder(requestBuilder, placeholderResId, errorResId)
+ .into(imageView)
+ }
/**
* 加载图片并获取Bitmap
* @param context 上下文
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 abf66d1..724eb91 100644
--- a/app/src/main/java/com/sw/dualscreen/viewmodel/UserViewModel.kt
+++ b/app/src/main/java/com/sw/dualscreen/viewmodel/UserViewModel.kt
@@ -158,12 +158,14 @@ class UserViewModel : BaseViewModel() {
/**
* 搜索食物
*/
- fun searchByFoodName(foodName: String) {
+ fun searchByFoodName(foodName: String, action: (List) -> Unit = {}) {
Timber.d("searchByFoodName foodName = $foodName")
launchWithLoading {
val response = repository.getRestInfoFoodsByType(foodName = foodName)
if (parseResponse(response)) {
- _searchFoodInfoList.value = response.result ?: emptyList()
+ val list = response.result ?: emptyList()
+ action(list)
+ _searchFoodInfoList.value = list
}
}
}
diff --git a/app/src/main/res/color/color_search_food.xml b/app/src/main/res/color/color_search_food.xml
new file mode 100644
index 0000000..e6c6fd0
--- /dev/null
+++ b/app/src/main/res/color/color_search_food.xml
@@ -0,0 +1,5 @@
+
+
+ NK23io9ssPc^;(&h!mvuVq3dCf0
z>5@U{lGcr$UTVe&7>LVRT#cSWyfBIz;C_-JTI=cAkl+)PCwNQ{5uih!L7}LwT(CjR
z>SK^(eku(i5j`blF;bh$BuvOC#D0O`(wR8T_6=eg0@2n6raH!Q^FFBVKv1{VB6phqyql<$lHkS%&b$U0P`qhfkx1!)EA#>
z_m!cX;1obKI8eesqP%VZcj`fKUIu}M8$2^$Zi^7*c8LKJIvC(XSM7^}O~S)l0W@^BX;y~Jg}7=H537GrQtlb7LYr5x&h4^;IG+8iAh5q4LP1A
z3xNWYu1_`}>bU?6K3t3=Fi6y{;+0R^hjkp1XB^oGpH=VW70IV9R8aZATn4OqB*L*{
zYrr=K5N=kdfHQ{m4aC0P0{{jLdF7@uzN>~4Q^7}U=hL4m)J5|(EY;tbO_UBH%zK9x
zPo;@K7l&F5<%*x6fq4P)k^ssaI1nuL!>}X`%KI|pDd>Cx*Z`$ML#J@o
zq7Uvgs!y1NX8_3$vQk{VUI+FgA_N%JSxRwJFf7&v%}SQSVL~!k831-7wv4HC5*tBi
zKYfOH8hZ>;MfE&$9W2Ix3Ms7NgRAN8tbrZbiK`;QVgs3eCIS|QG$s^!G&iUkj
zdyVAi>xhWpT9NL)NxoBhaKO1^#(I&3XVpFJf(53QJKhMt?=5RBvLMX33lFD(KHWS!u$kK!;#p4Pz-FwfI6zFA0~J-wADOk87Uarq!ct-2x_1lVY*KS
z_ZScyNR<$70uiw16Y!nd+ICDt(
zX6j$zGHR52GB`02b$UJVEn%E+Xc|LF5O4MHV?{6xcou<0G{C2srJXOulMh
zmo$TawFuS#^Lgzeo?kpNv?g3#6S?~e}2z;x72?&yv9MmzGl;gYg&2^p<
zN$g6^Qe=7Rhign8=MvZZCI$mehDv{05DNA>P^~wF-FK0sfHepGUGy=J1I-_Q`#xhW
z00FE4bYn!%jB!)q#|V1PC3BGG)#<`0ST}KkA-3s0eE&e|)Jc%Ok<@h>5|F;@LCgkf
z3UP8J;yKu-ya6(~8P+1k5Scsg{C6?-6s%+2X_+(`)OH^TCmqPDH^}O5LS9wXfzvYr
zN|`u!7lq!3@&KA9f{3^PRvy}?!Gy*~#DU$Xkqz{8st)!70OaZbrdEl`;F)4Hf^=>W
zb_x*(;?CStD#Qe(m^U__5<2U&DItSl7IA}?cBx1A3fPCEIvHrVfg%7m(B$bP_W3x2{XjK-J=a_FEPOWxQ1-fIOJ;>sX$*^Jrm5PeJ6<){z&9Mg
z`|^3#E5~3O;7J%rE`xEoYkUAFoM{Ed(ECEsFW21hpMQXPoUHx{@cy>*?Z`UBf%7-a
zKeznuX8x=1KwGr2v@J1g?*Qk(d#HT(C0&^+0N9hS3X6@^5ZLAjSQ;z_(H-q9$EC%)
z_r>R1MLl50l%GJ{Sp0hEI8yM6$iReMgk&L1Jn%@tL;5DA&A^Zg}YXx5*200%BPd9@hz$BCQdQN)LUdAXW$7z8z
zIE|L7tHTU@%jC5$yOji99i9Z)Cmu$)A3y+2cBd$h0trnrf*Ft_6D+Kz#C9413s1~hB?Gd0nY;1u<3ovN2CDaF@a&K
zm7;!$cLBZzVAcmfgxwI~HK3+gGN}>j)+iu$_|6eVn5zyR84dh=qw6Kk&EPOo^O?86
z%+F7Ow3iAmz}dmp8;o}_HKfx4DFLgNMf?Hk1F}k;0p#r&1mAlRU#f#48P0<3iw)qk
zWrV?u1X5vcYLuJGglYzPyJNC9NqGVk$Z(u+Q*jwUOng4@x=<4<)pF2IUz$*5*a#vf
zvIYgRC<5J_GK!UMu2X}{6ut)HzmP2+iKC;Qyuhs272nPBzwF-@I4N@VwzzH}jdeW=
z5*l%374E`!z}LP6MNU7xL$k(#j=kQVVf|ejZ{8X?*(`H$eWHN~l-JIF2pSep<-a3r{rK~yf7
z#vONMfxj#phkT1iDj3yv^Qu!y0O>ua)j0=kat|o-NZATQ={e;&%2;XQiwx
z$)iG-32By^r2-;rYqd1zlFaY|TbgK+RFtNOxY9}!nBp}Rle~cniXwts{;!Yi(%Jd`
z{=f78KhEQEwkaaQ`}KamUeDVbv)`iJF!6oG{+?q`ds8hK7inaW=`t^m`kf|1TfwR)
z8e~DHFYdKHDIm6I#V<4ip`7+mCoe6uV>~!nH6lbceK^b}1N2%{o#>)_(t`aI0SXs{
z-=&q}6%TpIxF$F~EU}LRL_uBn#N_4WS8e_a2MkM+S*j0W(pQ)>Ev-q<(QyXeikt2M%8QVZTuXf}J5kD01=s6L
zs<_i{A|&;_H&3%PYRgJUr!Hs3KVLcUCRTh;sjJ_ouF>eORs|x8jRkY$2}#!|#gwXM
zAY|mI_0+(_+}xQ>_~fq!{JN-df>{50;hQeFnwM}(=9&7U)GxI^Sbj3ux7$&I1~ML{
z(bD8eX&7@ua(_PZ$lBU@wPmNtF07-}75&jGLJ4bLGCBWgDz&-n1+K8VFLc&R|h@>1Q|9UIVi{
zcjEgKd#F*Jy9K(Z$F}8~i><8<(BL2`I{>o;NF{ZaqG=xri)BpnU6>S^GtUhi2Biix
zT|tr!5gw|6O|f?^*d>mW*#KBh?;1sCSag$4Pb}2wJw`{-
z4()rIlFP&%-f8)V%df$ndN#z54LdP$JL}eiDwp0BH!Ifl&897U=@60i8v5O5I+RN-r#^||M5mKFrpzk+-}*x?yX$XeDtAM%%ZD&>vP
zPicR8#iELM9#q%0kixC*O6jVVA6)9w{Q7>6kL&)(HX*C}_kjL8uNi4qq5~DbUx<(u
zP@h>5RBySFHmU0x|K+DWHvA0T2#vdTl8YrNoy;o={q64V0*^b`{UHD*7+UxOlc^8U
zUzLHFw*`U-WI3tubsoekz}^mE8*@@HfJYLN0x^l%G@ynZBoHCS9lDv^dy3|Eid=U~
z627oQ9sbzke_T9BdrWJO*52JpH;AT|-$H_=*G?8)hWze46${4i#_u#+XRhaQN=a(-
z`r}|MMcl0uf@{Iv#b5!K@^3ASH5#Eah#??Q0Z2z@!32vySfFnLRqe?>5$
z)HM?DQM4E20~y6bpa399fZq8Swk1Rfiy0_KdU9xb5VK0ShTD#vi(v2}r3qQw3%ek(
z<@lmD{YQfMW2f-^ce2^lps$}EI*10>g(ifWhq3Ht)C!sk$k{-A)vsL(?aMomZN{8m-}5rK026UbjMjR)}3oQ;Aw
zi%a+%q=OdbvHStP2jZPv3X!B4T7S$8A^>P&6Spl2#e1V^8!cw74r9>Yg_#N{0~ln4
ztuU;BQRCotj7#;3(Gv1=a5jEOy23h1e*ob>3=Ak&%aQ?V5+5U618#*GDWp|QJiw_K
zvkN_RKR_t+!SrXmgVn&43gQG87|^k<`eG!`iVu2{Pcdyk!x%3?hC^9Z8OB9l=OS$K
zdH`u|ls5P*GdCe%l4dJ?JyJq}F6ZauLJEa3|P=fKRumBzQO=+1aydT
zNk>3ZxDA?R;;mp&DiZlYBs4?w3CsuxNTDeL=y@A7gD@@W0R*O>*aJv3FV}F{+m*i&
zX86m1BZFZk+o8O;#~U<$;HLqZ|D^}p68E#g$OF6#B-VgpySVyOKyUSspo2IPK_U)M
zCh3QzL{NV?F8V+v@dcfITa#qh+-)GUq>^2*%n)#i30Vq(r^xplVNwM@9FPcL;X^FP
zpdg0)!BQ^(WPvqp1G6U(0E0|U2%z0
zDIN>}6=6hx!YfWiPy=N68IeL#Q88f2Fv%M7w*d#*RLlmdjmER0AR!8f&JY2DK-BRh
z72Kwa2@_rj?6(M3*;{r%l95ZaDo}zbEqmJO=lHD;szHehv?Bb?9*H4HvL-S)e%{843yq+LQyu^oq?A;>cYU#{dK%cl>?
z`vQ&(aJIOb3_vgd!$HQxMOUy107=y@gspemroAm20~szvJ*9Q(WP-VjcRHFk5T@
zvDI1(JrGkQ?Q7?QL+b-qZ_i2^+v;*!{Vn070eR;0TyS)Kg=pj$E^
zRj@l|%4RAZ!Q`$jw&ep1WdPW*7d956G`)douYMec_OxW@Joe5w9^P9KWN4(Xgz3|FFfY)u
z8${j^fCLpRXrE=j1JDs@Jp0~NC;+Efw5Wav=N98r7_ZOec}c^&cOt`0uR+P6r^&
zK!kq}qCMD5Dq(;Pzz)t*-)Pk?g!4Y73WUY&8<>cBVQh!jjVS*M77=YfgvUlmH7&SS
z5fdh|1sxZdB3ws34{V*`NUuOUm3F>!(6R^gRe!=z|c3nT`OuNo_P~CFSR}Zc=
z2vUIWtf5Jt6d(o1V6=mV3h3o++O`M2VQh5s1L_r)QWP<=?ppNJ8smO}(0
zys3M?e+bFd2&6q_0MZ6d+Oh
zd%Xs5y4kRs!*vwW>Mo;=+Xv2_O>RUIFZ}*_IggpVL1zAJg*Jb%@Q4rM>2}caTkXsr
zMIpqcyMA`7<*un$c%|vDkZFi{j`8Anc)&pzZAbQmI1Y$;hxeO;eF4cL0yGhX;Q*on
zMiFyWF5Yw_zhFQ-Aarq2Apelg@Y^f^*Erk+vomr?d`<^O7lCUb-3S6xL|{mi?o!b;
zh!6Ay7loM2!2Y~`gvWG-!-56&VH|i_5m5t}{b8Mhqp^hrhvJcuki^kq1_sIw0ydBk
z0obS8o1`s^0SyH|R{MBdb-exs_2-0*oVS&*F$DJ~WCw>eh>M4j1nVs5#LMFcffQdCNo?_QXk_>bTp19vKMbZYL-
zisa9>X`NXDFzswJ1xkfiAwLFG9w6y*5rNmSg$Qv0?GT$DN|#VQGZwo+1j6P+vm`5K
z(0#y(i|83Nh>#xIE+90J)(J^b&;|0$>fzyU@C%=TsmZvlIj2BXU|iRU#La=Z<_gfo
zkciRQ4#2hy`bSW%LGGGwCR{~uPD>aiu!h2#Mwu-{0`x=>M+
zLM!nvn8a_-cAE8Z{o0p6kzar8rTO%i$1Xt%Ic>fu?Df_B96!}5#F@^MP%Y3}A=#pP
zF(Aq(ur4u_n~?J=7+lIa^|*P|!DaHHfm!9t2!x&lfcwjQaBPC}+n4fia{2D2U$KBW
zNCX}LX%Nt}jmUux8Pf&Z1)^>|Y|^ij%<1s41%ZRZg*4_Dp7^@bHMw`8sOydg$VI+b
z3e7&K9KiHNz9KR7Ad(@{VT~)OKMbWt!s}#+git+%
z-Vs%fNSVZr9^<;6kAZ2jiN{Ii>?-^RQb{UVSbK0)!j$
zAbVEUvh8{9C<1GnI0jPvAh9xpEdz!R9P_C4(3&h$V8HR|
z1N|*zieTFM9HEf_DJAV+_@;t6hqt823CHmOcRq09GVe*SO2>EZg}6>ggGGWZ717{B
zQ3OE<6mtAhoL!K3F-`p6Ac6yup`mFHHkU9}JCJZNu(;5amyoPPDBwc`7#2YK;>rke
za#<^?Mm($qWsd!@4FO?r=ToFDP`tH?SOdKXXq{z!-6{7RPd&XcjpUq^Kt7I@sfh=7
zc@&eMI_j}W`Ew^A770sKoe#uQLBr;h3`QRU@rCIe=YGG0XtE$g*>VITmtD%NwIIDHy{^Py)fXUmV0vhw;
zz!xX79?~u$!e9v9W}pPp0(Fc0LZn>|Z}b?3uqO_`FxHWRR`R!JLPQvkZNB6sVi=@-
z#4-<^J0u^6gBv%S+@s*Yd
z6I)N5XD`ctNBnpw0_M^pbMD87a+DSaW5q6$kdL;QF0@D-)70fqCF+g%qKsYQdq?tM
z)K1p#Cf46`zC%)x#Fkg>6Qs@BW5n~JyewYf-5t}
z2r0VFZ?)(vWw7f{j##Z#za_5^zfiN}6`><{8cjw5c93hc)`2hhA^2?0cq~!f^LRB)
zE%?!M-(&sW+Or6|>6!DT%ir|7+sluld@}Z-&yB1
zu?%N+dt|20g)^y^{JNe82T`$D^0}ktzwmu%4ZRZ=B|*<__hy+*;Q7flp^;?0XKP>c
zw|tqlVc>5|eKx#e!TCJrkBDIs+zpnZsrR#W;)J@_&<@WArn9Q|BW9neW$+E-YT3r*
z7niZ_d)2J#zw|>IJk#aZz|B+&2B*tv?T5tvacXr}AFl_et>9HN;8swM_1{ekiHrA=
z{7Yylvrc=p{N&;51LMn&fiQ?%GXobjbiQkD{C)%ySUdMCf*9BvbQ|qzowJ_;e7=$?
zB*(ub`Pw_*H3#a6?RKQmJ8Q?=hv55XY0D&S`dEI
zJ9B}5MQ?q4NFb?DYtw*w!8BT43qck~Xn0eY;#iV*Gb8|GHCfG215c`Zg^GovHIAkL
zxHPJuXe7I-2f}+2Rc0ALsjNsas;lw{!6p>Huyuj18=cH_05PC12}G3P;Btq1T~4%d
zAUPQhtpRg?A3jLkv*1HXJCrgPndR;=IdeqI8^|@OI|1sv+m?R?IhtK{tH%{{d-2t`
zz(>$G7~+@t`Vj~U{fD7qW$i`6cq^giG|li&N(ZU-QBLf9Xr=-(2w?=)+gM8hzo9
zW66Je_1J0FX8`u~r+t9JpAP`ttibfX(Ujw?1ECpY@j|{d4`lu@x~A=g``x64UdeFD
zo^9d_KoCJ{?1rPAs{}e*urgE$;y|HHzVd+F$>XlekrYgdO^w?;dW8TYoHIY98z=fl
zCY>N&5t1`at+Q#mxm|p>b$is87dnn^WF=-b!))o53q#?j?vP@{c#w)DlWt1PgTOwp
z^^MA6BhqC>9DJ
zJkXRG+y~0k5R7J~!u9B)1i26?q9~6!XG9tV({fhxAjihH-%)^v)b|&Nm{;y818saj
z=)oKi(`c+YfVV~F*?1J_A`z!Vp0_LGMW7m}IER@a>Oi8jVMHSBXT_*kWKhyBS{te#
z>}Hnl)M7h5n*@BL31jpL`g~
znIltkFo5WhZXW5|;f!J+c{xoqf4Hy$B!i_*>Eyfzkin)5Qa6K_DkLsxCo{TmVG(y>
zJ9q#Hx2W3%$Pi_|1X|;0NTEyI>nm{Dgb<#}Xo9r&3wJNTAcig{U4gK9XeuC88e-Pw
z+UW2pAwT^z(`@nK)YWbs9X?~(%G#DGXF}#N!~lZtg$b==dytb3f}%h5b73Qt8>1-<
z5m^98F^n0PR>N#*UpR7t_9CGwI`sMA2VkLsY;Z^@+5|~hRfw`E_*63t#QLDZ0>Dol
z+$dqt(LvS$m~6x{4-xR^Ha0J{`!s8y!T;F(|L<-kq%ncZnCCqamFe?Z+vD&3-g_X;
z%d?o*YJa(X@ugno4+7H{-x+xCCiTlxmXB^w>dhM>bcVS;VWlrpXJEHJ3KzLPO|=sw
zsfm&-L*>7eJ$04BY~sLCN*hmi40!~Kx9h`aHE*e0mp$v{6X%p;h@wzuFa9T3O_1=o0VNI^ykx{njY&ax~`JnNEBevklR
zX)v5)woLvmLfrwn=o^G>~bE2UkMad
zBSC~gD?lX;hW3IdkR6t&+Up`zTw{5E&PI~nAjTAcDfYAnuLKdo-$~RwuXw-b2}oN0
z>I;Y(gg?@Xs{LR-fomN~fo+3}U64N|go;=hLGJ=mu0^@IS5+CJcLTl-Cg4Dwy8yLb
zC58FqBd{w(j35v@c;k_g*c_eq987332#+LdwhCKC#|yUmjU#CoAR=FkyaF_AC~ocx
z2Z;D#5N=nsMjuyRV}T(ZW?e+dBc+^W_nZdl?SpNrLBfj!ZGc;%;K%&_yy{J(my>V6
zbfha?=j<3BLtaxz2F42hdap%01q7udxvB^f8pwvJO$3V66>fn
z+M+~+$rvP>X!yex$o2$B8{}mGPx=-}89`CRhQVf3V0NRxB;hm|_gg(byZxHae_WpZ
zN6Gi^wTi&$PTN6ZgHuk<{{0UV#G{p41OL18Soa>{@X*-}HWx0QjpT)=W_cE+ACl-G
zE4EILCbwdOoD$c7oc9+!GJm&JI@<=>^^he=#v-`MiO+aIE~dSR@2z%3!YE-Vhq)W3
zU&s#LMuBLBrUC_Mwvc7zGUCjGod0QzZ*4BGv{L!g?O(BgtVMltu}KQ{$Jvt9POtLT
z#bD9?A>{pIcopUtTL6ngWcqvee@J&djT(lm6H{^vZIWFllFBD@U$Qv$Uy9psXaANw3
zkO)+dnx^REgAl)A25~dyI%Jf#!<|O3MGQ+plKJpc3&qsRf`CyVd3_KKGY<5XaJ>lN
zSbiO#+V|oBGze2Zh{!>_45zvP99=*Kw0$rK_p*R^J|yw@b*Z#(C%6!4MfoiXX7ur9
zxQ(I8wH$6GfN(M*z@2PRhY>VTX-JyRVu1h+4O%@Zyb>sw(c|p}y<-4Awu{8Dq$%!9
zCQv?+N*r)FRPZXlT4Zw_uUT-YIqa&b|6om9LH_vHTR2Pg?ue
z$VQ@La4G5O{`WWMpuM)b@O#2;@mH~2l_Exb7yByri_g&KJuK-$G^%@<&BPY1#wONJ
zIgB+H+VFQ4xQ^_03g*RRW1=d@pKmc)b00=7E$1GfwzGW#)tvo;{XtK2Tn+XUoHfZ!
z<=73OAwL<$H-yq}@;CEh+Bmh8Ve3%gS0YAg%lEDtC0&^38s56jtsHZoc`Z9Alh-7?
z?}#zc{b}$^IYP2;$G06%GEi%@hg|GA!h2V-&nNt*L91pO{rN8?r=t(7xw3?L?X=e;
z*R9KUSxM{v;~zdWtHk?@5BufOFaIOOykz9e;t%=YtY%*6d_*D8Q{WkYf6O!4@)q;|
z^5f{ZXT6rY=OvS83*pgx_pMLZFJ8>=KZ?9G_^)T}OX_A`3AIRXZ;EJ3Z5Cd!HxFOy
zw4=6Je)v47vGyv4KilOvSe$E%oeQ0fWDO~*+rRD4nbjGZE!*Nn_LvbDBn_B
z?nDPWqaQW*0g5SBDz+rFd6)Yaq_*#kkIF?WLza*dG-XpUv#wcr4dq^I^IaydA8CvI
zrt0jnMn$hufd+~nycSGxit82dJKJ|e!$#c}*O{>I#g
zw)HVBUk^Eznz^>~Bk$XNu)!5`KVd!)fAjUM_nlNR+34vU-PgROAquI1=Kngy9!MI}+K$t2k`vmnDb&yt%8;J%Ew|81u|~Q-#*Oe<
z?HX!>*nxv-dpz!hn^qY3U12Vzf%lx@J@m0wbGlnJhR2TZb~;KLyiqD8pJ%|{G#?`J
zYpD))zKwxSu;dA!)8~iE;LT87KVU)`Y(%>mSm%>OQG{X#_36G=&-~f*$(7k*f_u*S
z&X2LFedDqBl_;~pGk-pvjXvaS9g6?Sz!^i0?%=P&H-)s0v8L2UCxTk-)Xt{0Q#a3l
z#rfj1=i=*uwQCZvEOCD7kTiB<7Fvm7DzP{D4NWdl!L?}krDVx_!RG$hrhvK((LXvJ
zr(=$v4`DW7Z|`Gb8v}wiVzBgC&7qmSH+f63sqJGMoPzTjyn7q_iG|K%8&o5^SxIGO
z&x%qv^L_Y~MuR;%x`s>*y{wHVsxUbmBNZ}7j
zu%Or9INjt8mB#YeN*gfN<{td_Wxrl{TIDyMq|F-mIgxoF*zNb4?20{L4ja#tMD6j#
zTg~w1QYEvc)*{ODQipN0lq4uuzfUAA7K~j_JtzokvigP78QlDo>>#VIia>=bN`dQzSw8+WP=@`;?*DYa^eTq>>
zmY_{?q~vtbnk%fkMR}=c7AekWz@^Z-zwWf&tA;x2ckFrXBOGgfcIxQ^HeP7>)6pCE
zFvpxeVP3Q>ljPiP*$~VOgmtn(=v*#&BY5>H;cb*ib^_b{`5@nmZzys;sk@H3mwlr=
zA(wX^oA`E8?manc_B=P`x>s|6TK<+Xk`R(eyr*kI7
z=_p=IC_%f@ZkUl;W8B@-hBIZ|NAW`mB39~}FqJ66{m-!2RA+PRUq9TZq*SgKsY
zpOG^0iE$sk2pdlj`aFhTV;G{(r_;96jp|0Mv)#4n3r#N5;-m!4F5_-!Hs|Fm6U$EIQq*5}RX)w}
ztPXXJcAo}lDY9xv;@P#DSw_Eunr<46F?MKJh3xTxjscB6iFZoNjEV|n{WNg&z%?4N
zF~>fVs_|)d)Fd^pf+*zO~qKJGlbJiOAEk8JQ^w9!;j1!>~eY2xH$n8e2JiH
z>q)|q=ji9v>xM~}ByRcmU2b*Qo;Iiw8wOY?L#bBJbt>DjHusvH0O1Ee0dAygy2DfXXR-U
zW_|Cd3t!ZOy!`4lR|YKFQLo4j{+i+EP&G4;s7Z7q1s-mu2t@6!KOcK`fpyo#hd)Yw
z+my^Vz!mACwi%N5RqtEUF>OZm@PP&Gs{>|xQ~t9*+Xu;YzObW(vdw{{RRhZtFJYq8
ztNF9L<}dfOz#^+4MyZc{cdUNk%}3j4l4HZZA&j6kqy*jDbDLC#y|Xz5HbGI??ewIL
zb@H&*F{g?ahfK7>>w0Sdjx!Qld%LUWjEL)>_UG|UxanQINJ~088n)8QvUB2!dG5St
ze!K@w_krqE=;CpQO|3Dcv-8r0d2a+uP}AhRAUJaz1}o6|lO!EENnbI#+i>X<+=Q&5
zeABba;@ck4tK$B`x>$QpUQ{P9GcPM}#@@abrXMOADNWqx)A6lnlT*b|L~AlJgh|mC
z3zG7kpEy!A$(0$}x5w$4(rR0G-aL*}Ly2Ql-yVNIsOoiX&awbS|EVXsYDyz>9G9|D
z(mb(xG>Ei{=D)<3Pmxk?j~_n!2D(?6J$RXj8O_0vHWRC_J!~Pul}hLRHhc<|!yk4D
zT3th|{>prTXD?~MlH)sxA96AB4*R}B(?40EwbRj|IHUW$zs$bv819y1renTI#@@HF
zb2IEsaYK1d`ZkBqrqhKIEGu2eQ#O*BnJ7xf$y@ru9PYE69(Zf+?8Hq>te(FNK~1#1
zBSX(6tvg1BAYRSIx!6dYXbVYgciBPo`kFh0r8}3dbfkX6h21D8GE%gfLMK8i;nhHd
z>n}I;O)a)j5jRdBwv?pZl?E~Y&@?@R_2lPB<5n^9U|F)-KAtR?;os?$mj2Q(F?px;
z3(peKU0xl(_Ha|YHCLp;NK+So+-gQ0gr7x%ldcw!qW`@`>t6Ek*uQ<{m(FXkHx!=s
z8vOMM|JWizZx~PzzwoDW%cid7>be|^`TEK@^upbR8#0u6K|EP^TM}uAtz$(7ZeaNg
zYm+L!!VnX?|he|qQib7b~{}&MvvEUr^unRF)a~;e15h}ATRdF@9t?BXWZn)
z3`w`RMOWS*=i+3MhqM~`PzdA3k-m-a3P{ZvbarZ+qpat6r7H?>M_JE~_1Z(k#+dK!
zN75v9&f!h!E%2MTM+$Bn@NE=VB;8(6RwwpG;%WtRJvpwLfGBgUg(4Qnbv34i;)}NG
z7vD?Dda|r6k))OHn5#&O;__z$y*kPj;_J5KjHI%aj&^SFQpM@oi?-z}%LDgQJ=oBb
z%#}b*(dS)JPMra=;D#7zQnAv;O<$u46;m;x@f-8a&}=1z7PxB4tf`y#ODgJ|^IgxY
z37^AfVBHze*MVj3Y`a&U{jQ?$#(|kJMv89-d=9vXR>#a*<|g5q1kLUZp{)4rTxjf2
zwM6Uyd=}796Q|&^N1RK!E!NoK$iX}d`3&|pS8F7?ij*IdHzs)j@x+`q2fpSeHi+NW-YZ()#;t74nE>@~O6Bs71Hd_Flh
z(M#E3B;s%*6D!y+sO7~pD2E%H9);cF9dbKl8kTZW?~|{$;yEQ>@p*x)d2oUSWtx|k
z3tyd^AO!bh``ZyaGEj!}hmp$ujiIa*x21ek^ibB*oYb0HedDH?d<)!k_>bH7IKN^6
z+rM6H+U8$b-m>!F+qYk85jhp~Yp+-@*4`hB2AQ&EJhnP6o-PO0qzo+?ftzcMvknU{
zmswTpfux}SZ65o>kH0)?y(rt!xM%M<8kKMVLH7fl)YY@FK0}6bzS4Syvyz$|W8>fi
z6!2#w7}OckD~1d_j=VrmYRcfF<1%m`H#+K{jBiK_n^xEnZ9Gx%M?_cN#s+mcMoB|b
zFX8N5_&ae_+i{q;^NHX1#dI18*8K8c=DtnrTG$23lXGF=!BkX^>Fz21C~H3zCI-z#
zTRv(!rf(w*??Ly;p@fdT(1AX2jCFU@kejhLd54I@qVHi{v3nZw9S`9ZxW>05Wef6hZ6;#xt2#oca#S81
zT9yypa(Gt)j97`2)7ahTwuZ?pgNNpw?orvmK$EQQMoQiJfmf1iDT>K($Sd!tU0!FU
zqz2+R4hOYMy?aGvXnlDgKii*rKblK6HHsZ@nfqz_Eu8@zj2!C><6r(GL7)?BHfB{)
zT${ZtECH*Iz26j4*Y+S?$ZxR0xQR9{;kp@}<;-}q
z(0*dQTJ6pj&YN1y)VzK?jfNd)Bwy<(4y;AT`0$~OZ{?k#*WJcShC&AE{+2U^HrQF4
zOy(h?HQ-N;N=dzH75~X76R;sZT4~*hk6i*=qxd?eJ1n6wfU3#ul7=O;+1J4-7rTTs
zo&M0+6k;jH@HBu^!3hR<6aJ^1FxWUzwRtuZi64FKsb`02ZCL4b<3((*;YLF;{Kt?J
zE495iHf9!JF+vE;+Tt7nY_$CL47vlUBupDKgzENL>d3l-MIZF-N5S0g2>W^lU9vkh
z8QaE|Wuu3&PMvrhYYWSVp2e@ZH_n(P{4Iafl4dg8l~^_#?;fqE0G1w#^Z@!cBhC9}WiCKu(%qP0`#`d!)mKkv|c<-(dR~
zC^%9=Bm1h_aFWOP@hcI1mhib#Xi?T05|jnJjp*r-y>w(;wEISj>5f!<5VIK#?`34f
zH1|kfInEpl`XiYS+6j;(fap@Lx4KLl%8{L?$uWAf;gZlfe@PF+YP&rKx|dK~
zfsyVoP56wdG1$ZLNp`cbgXIf>#BF1T#cyy+z7qW)69fXLz>DeIH`uZ68&UN7gygQ~
z*r(Unu)u}Rl%1GlM$hOqhl51e^0@PVA*wSrK$L`_ijkRyGtw<2@3+fa{ib6YA_ag4
zZ3;GQiCfVhrp<|kX&deZoMi44bT89DO((RCm*He#w+uz`jl!!RVYcI2yU&|#BBrq$
zD&~{j43vrn)*yb`75PT-3~YB-f-r8V{T3TmPMFKLD5j;I28o90(*Od%!k-Vda&cYm
z^SPD9m_KG!7?t$4K{LEA>dr~ooS(%vs;&EdhTkQ@^Cc9hHJhoc?p-HyOn(cS-
z