1.物品采集页面增加查看已采集物品信息,可以与搜索进行切换显示;2.收货已确认未确认显示优化;3.debug和release依赖切换使用问题解决;4其它优化;
This commit is contained in:
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:color="#FF8B8B8B" android:state_checked="false"/>
|
||||
<item android:color="#FF00BC71" android:state_checked="true"/>
|
||||
</selector>
|
||||
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_checked="false" android:drawable="@mipmap/ic_radio_normal"/>
|
||||
<item android:state_checked="true" android:drawable="@mipmap/ic_radio_checked"/>
|
||||
</selector>
|
||||
@@ -54,23 +54,23 @@
|
||||
android:id="@+id/btnAddDefault"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="60dp"
|
||||
android:gravity="center_vertical"
|
||||
android:text="加载默认数据"
|
||||
android:paddingHorizontal="10dp"
|
||||
android:textColor="#FF0032C8"
|
||||
android:background="@drawable/bg_white_stroke_blue_ripple"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingHorizontal="10dp"
|
||||
android:text="加载默认数据"
|
||||
android:textColor="#FF0032C8"
|
||||
android:textSize="18sp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/btnRemoveDefault"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="60dp"
|
||||
android:gravity="center_vertical"
|
||||
android:text="移除默认数据"
|
||||
android:layout_marginStart="20dp"
|
||||
android:layout_marginEnd="20dp"
|
||||
android:paddingHorizontal="10dp"
|
||||
android:background="@drawable/bg_white_stroke_blue_ripple"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingHorizontal="10dp"
|
||||
android:text="移除默认数据"
|
||||
android:textColor="#FF0032C8"
|
||||
android:textSize="18sp" />
|
||||
</LinearLayout>
|
||||
@@ -127,6 +127,70 @@
|
||||
tools:itemCount="6"
|
||||
tools:listitem="@layout/list_item_food_collection" />
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/layoutTab"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="80dp"
|
||||
android:layout_marginHorizontal="20dp"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/rvFoodCollection"
|
||||
app:layout_constraintTop_toTopOf="@id/flCameraPreview">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:text="物品筛选:"
|
||||
android:textColor="#ff333333"
|
||||
android:textSize="24sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<RadioGroup
|
||||
android:id="@+id/radioGroup"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="80dp"
|
||||
android:layout_marginHorizontal="20dp"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/rvFoodCollection"
|
||||
app:layout_constraintTop_toTopOf="@id/flCameraPreview">
|
||||
|
||||
<RadioButton
|
||||
android:id="@+id/rbCollected"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:button="@null"
|
||||
android:drawableStart="@drawable/radio_check"
|
||||
android:drawablePadding="20dp"
|
||||
android:paddingStart="20dp"
|
||||
android:paddingEnd="0dp"
|
||||
android:text="已采集物品"
|
||||
android:textColor="@color/radio_filter"
|
||||
android:textSize="24sp" />
|
||||
|
||||
<RadioButton
|
||||
android:id="@+id/rbSearch"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:button="@null"
|
||||
android:drawableStart="@drawable/radio_check"
|
||||
android:drawablePadding="20dp"
|
||||
android:paddingStart="20dp"
|
||||
android:paddingEnd="0dp"
|
||||
android:text="搜索物品"
|
||||
android:textColor="@color/radio_filter"
|
||||
android:textSize="24sp" />
|
||||
|
||||
</RadioGroup>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/llSearchInput"
|
||||
android:layout_width="0dp"
|
||||
@@ -137,7 +201,8 @@
|
||||
android:orientation="horizontal"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/rvFoodCollection"
|
||||
app:layout_constraintTop_toTopOf="@id/flCameraPreview">
|
||||
app:layout_constraintTop_toBottomOf="@id/layoutTab"
|
||||
android:visibility="gone">
|
||||
|
||||
<EditText
|
||||
android:id="@+id/etGoodsInput"
|
||||
@@ -183,7 +248,7 @@
|
||||
android:overScrollMode="never"
|
||||
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
|
||||
app:spanCount="2"
|
||||
tools:itemCount="8"
|
||||
tools:itemCount="10"
|
||||
tools:listitem="@layout/list_item_goods_search" />
|
||||
|
||||
<com.scwang.smart.refresh.footer.ClassicsFooter
|
||||
|
||||
@@ -147,7 +147,8 @@
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintEnd_toEndOf="@id/btnTakePhoto"
|
||||
app:layout_constraintStart_toStartOf="@id/btnStartPreview"
|
||||
app:layout_constraintTop_toBottomOf="@id/btnTakePhoto" />
|
||||
app:layout_constraintTop_toBottomOf="@id/btnTakePhoto"
|
||||
android:visibility="gone"/>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/llGoodsInfo"
|
||||
|
||||
@@ -28,5 +28,6 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="请检查物品名称,或点击“添加物品”按钮新增物品信息"
|
||||
android:textColor="#ff999999"
|
||||
android:gravity="center"
|
||||
android:textSize="30sp" />
|
||||
</LinearLayout>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 6.4 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 5.0 KiB |
Reference in New Issue
Block a user