From bd1ee7c917cafbdccdde1b3998c85452d3c9ff69 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Sat, 17 Jan 2026 00:28:18 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/operation/OutCabinet.java | 37 +++++++++++++- .../SampleRetentionRecordActivity.java | 9 ++-- app/src/main/res/layout/activity_login.xml | 4 +- .../main/res/layout/activity_out_record.xml | 49 +++++++++++++++++++ app/src/main/res/layout/activity_record.xml | 4 +- app/src/main/res/values/colors.xml | 3 +- 6 files changed, 95 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/bonus/canteen/activity/operation/OutCabinet.java b/app/src/main/java/com/bonus/canteen/activity/operation/OutCabinet.java index a88aace..6c03759 100644 --- a/app/src/main/java/com/bonus/canteen/activity/operation/OutCabinet.java +++ b/app/src/main/java/com/bonus/canteen/activity/operation/OutCabinet.java @@ -40,6 +40,7 @@ import com.bonus.canteen.core.BaseActivity; import com.bonus.canteen.db.AppDatabase; import com.bonus.canteen.db.entity.base.DeviceInfo; import com.bonus.canteen.entity.KitchenSampleDishesRecord; +import com.bonus.canteen.entity.SpinnerBean; import com.bonus.canteen.utils.DateTimeHelper; import com.bonus.canteen.utils.OkHttpService; import com.bonus.canteen.utils.ThreadPoolManager; @@ -52,6 +53,7 @@ import com.xuexiang.xui.utils.XToastUtils; import com.xuexiang.xui.widget.dialog.DialogLoader; import com.xuexiang.xui.widget.dialog.materialdialog.MaterialDialog; import com.xuexiang.xui.widget.picker.widget.TimePickerView; +import com.xuexiang.xui.widget.picker.widget.builder.TimePickerBuilder; import org.easydarwin.easypusher.R; import org.easydarwin.easypusher.databinding.ActivityOutRecordBinding; @@ -99,7 +101,8 @@ public class OutCabinet extends BaseActivity { WidgetUtils.initRecyclerView(recyclerView); recyclerView.setAdapter(adapter = new OutRecordAdapter(this, kitchenSampleDishesRecords)); swipeRefreshLayout = findViewById(R.id.refreshLayout); - + showDatePickerDialog(); + initSpinners(); titleView = findViewById(R.id.page_title); temperatureView = findViewById(R.id.temperature); temperatureView.setText(String.valueOf(serialPortManger.getTemperature())); @@ -147,7 +150,39 @@ public class OutCabinet extends BaseActivity { super.onResume(); setupImmersiveMode(); } + private void showDatePickerDialog() { + mDatePicker = new TimePickerBuilder(this, (date, v) -> { + String dayTime = DateTimeHelper.format(date,"yyyy-MM-dd"); + binding.macQueryTime.setText(dayTime); + }).setTimeSelectChangeListener(date -> Log.i("pvTime", "onTimeSelectChanged")).setTitleText("日期选择") + .setType(true, true, true, false, false, false) + .build(); + } + private void initSpinners() { + //设置入库类型选择器 + List inboundTypes = new ArrayList<>(); + inboundTypes.add(new SpinnerBean("0", "全部")); + inboundTypes.add(new SpinnerBean("1", "早餐")); + inboundTypes.add(new SpinnerBean("2", "午餐")); + inboundTypes.add(new SpinnerBean("4", "晚餐")); + binding.statusSpinner.setItems(inboundTypes); + binding.statusSpinner.setOnItemSelectedListener((view12, position, id, item) -> { + if (item instanceof SpinnerBean) { + SpinnerBean selectedType = (SpinnerBean) item; + Log.d(TAG, "Selected Inbound Type: " + selectedType.getName()); + } else { + Log.e(TAG, "Selected item is not a SpinnerBean"); + } + }); + binding.statusSpinner.setSelectedIndex(0); + } private void initListener() { + binding.btnSearch.setOnClickListener(v -> { + Log.e(TAG, "Query button clicked"); + swipeRefreshLayout.setRefreshing(true); + resetQueryParams(); + loadDataAsync(); + }); Button selectAllButton = findViewById(R.id.select_all); Button enterCabinetButton = findViewById(R.id.enter_cabinet); selectAllButton.setOnClickListener(view -> { diff --git a/app/src/main/java/com/bonus/canteen/activity/operation/SampleRetentionRecordActivity.java b/app/src/main/java/com/bonus/canteen/activity/operation/SampleRetentionRecordActivity.java index 4473bd6..48ae50c 100644 --- a/app/src/main/java/com/bonus/canteen/activity/operation/SampleRetentionRecordActivity.java +++ b/app/src/main/java/com/bonus/canteen/activity/operation/SampleRetentionRecordActivity.java @@ -102,10 +102,9 @@ public class SampleRetentionRecordActivity extends BaseActivity inboundTypes = new ArrayList<>(); inboundTypes.add(new SpinnerBean("0", "全部")); - inboundTypes.add(new SpinnerBean("1", "未入柜")); - inboundTypes.add(new SpinnerBean("2", "在柜")); - inboundTypes.add(new SpinnerBean("3", "离柜")); - inboundTypes.add(new SpinnerBean("4", "超时自动离柜")); + inboundTypes.add(new SpinnerBean("1", "早餐")); + inboundTypes.add(new SpinnerBean("2", "午餐")); + inboundTypes.add(new SpinnerBean("4", "晚餐")); binding.statusSpinner.setItems(inboundTypes); binding.statusSpinner.setOnItemSelectedListener((view12, position, id, item) -> { if (item instanceof SpinnerBean) { @@ -153,7 +152,7 @@ public class SampleRetentionRecordActivity extends BaseActivity + android:text="Bonus$2026" /> + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 8e23c49..92e7e32 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,7 +6,8 @@ #299EE3 #FFF1F1F1 - + #E3F2FD + #EEEEEE @color/xui_config_color_white