- 在设置页面添加调料配置按钮和设备切换功能 - 将设备配置页面标题从"设备配置"改为"设备切换" - 新增SeasoningConfigFragment调料配置片段 - 将秤数据监控按钮可见性从gone改为visible - 优化collectFragment布局加载方式 - 在DeviceConfigActivity中添加调试日志输出 - 重构SettingActivity中的按钮样式管理逻辑 - 调整fragment列表顺序和点击事件处理 - 修改列表项高度以改善界面显示效果 - 注释掉DeviceConfigFragment中未使用的viewModel相关代码
139 lines
5.2 KiB
XML
139 lines
5.2 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="vertical"
|
|
tools:background="@drawable/bg_other_page"
|
|
tools:ignore="HardcodedText">
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="600dp"
|
|
android:layout_marginStart="30dp"
|
|
android:layout_marginEnd="30dp"
|
|
android:background="@drawable/shape_white_30_corners"
|
|
android:orientation="vertical">
|
|
|
|
<FrameLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="106dp"
|
|
android:layout_marginStart="30dp"
|
|
android:layout_marginEnd="30dp"
|
|
android:background="@drawable/bg_bottom_line">
|
|
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="start|center_vertical"
|
|
android:text="菜品模式设置"
|
|
android:textStyle="bold"
|
|
android:textColor="@color/black"
|
|
android:textSize="28sp" />
|
|
|
|
<TextView
|
|
android:id="@+id/tvSetting"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="end|center_vertical"
|
|
android:text="配置终端默认模式"
|
|
android:textColor="@color/gray_b4"
|
|
android:textSize="28sp" />
|
|
</FrameLayout>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/modeRadioGroup"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="vertical">
|
|
|
|
<RadioButton
|
|
android:id="@+id/rbModeCook"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="0dp"
|
|
android:layout_weight="1"
|
|
android:layout_marginStart="30dp"
|
|
android:layout_marginEnd="30dp"
|
|
android:button="@null"
|
|
android:drawableEnd="@drawable/mode_select"
|
|
android:background="@drawable/bg_bottom_line"
|
|
android:textSize="36sp"
|
|
tools:text="制作模式" />
|
|
|
|
<RadioButton
|
|
android:id="@+id/rbModeSampling"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="0dp"
|
|
android:layout_weight="1"
|
|
android:layout_marginStart="30dp"
|
|
android:layout_marginEnd="30dp"
|
|
android:button="@null"
|
|
android:drawableEnd="@drawable/mode_select"
|
|
android:background="@drawable/bg_bottom_line"
|
|
android:textSize="36sp"
|
|
tools:text="采样模式" />
|
|
|
|
<RadioButton
|
|
android:id="@+id/rbModeQuality"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="0dp"
|
|
android:layout_weight="1"
|
|
android:layout_marginStart="30dp"
|
|
android:layout_marginEnd="30dp"
|
|
android:button="@null"
|
|
android:drawableEnd="@drawable/ic_dish_disable"
|
|
android:enabled="false"
|
|
android:textColor="@color/gray_b4"
|
|
android:textSize="36sp"
|
|
tools:text="品控模式" />
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="30dp"
|
|
android:layout_marginBottom="60dp"
|
|
android:background="@drawable/shape_white_30_corners"
|
|
android:orientation="vertical"
|
|
android:gravity="center_vertical"
|
|
android:layout_marginStart="30dp"
|
|
android:layout_marginEnd="30dp"
|
|
android:visibility="gone">
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="40dp"
|
|
android:layout_marginStart="30dp"
|
|
android:layout_marginEnd="30dp">
|
|
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="start"
|
|
android:text="@string/seasoning_setting"
|
|
android:textColor="@color/black666"
|
|
android:textSize="28sp" />
|
|
|
|
<TextView
|
|
android:layout_width="0dp"
|
|
android:layout_weight="1"
|
|
android:layout_height="wrap_content"
|
|
android:gravity="end"
|
|
android:text="@string/seasoning_setting2"
|
|
android:textColor="@color/gray_b4"
|
|
android:textSize="28sp" />
|
|
</LinearLayout>
|
|
|
|
<include
|
|
android:id="@+id/include"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
layout="@layout/layout_grid"/>
|
|
|
|
</LinearLayout>
|
|
|
|
</LinearLayout>
|