根据高保真调整车间岗位界面

app/src/main/java/com/grkj/iscs/view/fragment/WorkshopFragment.kt

@@ -1,9 +1,13 @@
 package com.grkj.iscs.view.fragment
 
+import android.widget.ImageView
+import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentWorkshopBinding
 import com.grkj.iscs.view.base.BaseMvpFragment
 import com.grkj.iscs.view.iview.IWorkshopView
 import com.grkj.iscs.view.presenter.WorkshopPresenter
+import com.zhy.adapter.recyclerview.CommonAdapter
+import com.zhy.adapter.recyclerview.base.ViewHolder
 
 /**
  * 车间岗位页
@@ -11,14 +15,31 @@ import com.grkj.iscs.view.presenter.WorkshopPresenter
 class WorkshopFragment :
     BaseMvpFragment<IWorkshopView, WorkshopPresenter, FragmentWorkshopBinding>() {
 
+    private lateinit var jobStatisticList: MutableList<JobStatistics>
+
     override val viewBinding: FragmentWorkshopBinding
         get() = FragmentWorkshopBinding.inflate(layoutInflater)
 
     override fun initView() {
-
+        jobStatisticList = mutableListOf(
+            JobStatistics(R.mipmap.repair, getString(R.string.repair), 0),
+            JobStatistics(R.mipmap.pre_maintenance, getString(R.string.pre_maintenance), 0),
+            JobStatistics(R.mipmap.change_shifts, getString(R.string.change_shifts), 0),
+            JobStatistics(R.mipmap.clean, getString(R.string.clean), 0),
+            JobStatistics(R.mipmap.switch_product, getString(R.string.switch_product), 0),
+        )
+        
+        mBinding?.rvStatistics?.adapter = object : CommonAdapter<JobStatistics>(requireActivity(), R.layout.item_rv_job_management, jobStatisticList) {
+            override fun convert(holder: ViewHolder, statistic: JobStatistics, position: Int) {
+                holder.getView<ImageView>(R.id.iv).setImageResource(statistic.icon)
+                holder.setText(R.id.tv_name, if (statistic.count == 0) statistic.title else "${statistic.title}(${statistic.count})")
+            }
+        }
     }
 
     override fun initPresenter(): WorkshopPresenter {
         return WorkshopPresenter()
     }
+
+    data class JobStatistics(val icon: Int, val title: String, val count: Int)
 }

app/src/main/res/layout/activity_home.xml

@@ -13,6 +13,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:padding="@dimen/menu_padding"
+        android:background="@color/home_menu_bg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintHorizontal_weight="267"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -74,7 +75,8 @@
         app:layout_constraintHorizontal_weight="1653"
         app:layout_constraintLeft_toRightOf="@id/rl_menu"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        android:padding="@dimen/page_padding">
 
         <androidx.viewpager2.widget.ViewPager2
             android:id="@+id/vp"

app/src/main/res/layout/activity_login.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@mipmap/login_bg"
-    android:padding="@dimen/fragment_padding"
+    android:padding="@dimen/page_padding"
     tools:context=".view.activity.LoginActivity">
 
     <androidx.recyclerview.widget.RecyclerView

app/src/main/res/layout/fragment_job_management.xml

@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="@dimen/fragment_padding"
     android:orientation="vertical"
     tools:context=".view.fragment.JobManagementFragment">
 

app/src/main/res/layout/fragment_workshop.xml

@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     tools:context=".view.fragment.WorkshopFragment">
 
-    <com.onlylemi.mapview.library.MapView
-        android:id="@+id/mapview"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv"
+        android:id="@+id/rv_statistics"
         style="@style/CommonRecyclerView"
         android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
         android:orientation="horizontal" />
-</LinearLayout>
+
+    <com.onlylemi.mapview.library.MapView
+        android:id="@+id/mapview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/rv_statistics"
+        android:layout_marginVertical="5dp" />
+</RelativeLayout>

app/src/main/res/layout/item_rv_job_management.xml

@@ -1,16 +1,14 @@
 <?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"
     android:id="@+id/root"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_margin="5dp"
+    android:layout_marginHorizontal="10dp"
     android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/divider_line_margin"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
@@ -29,6 +27,7 @@
         android:id="@+id/v_indicator"
         android:layout_width="match_parent"
         android:layout_height="@dimen/divider_line_width"
+        android:layout_marginTop="@dimen/divider_line_margin"
         android:background="@color/main_color"
         android:visibility="gone" />
 </LinearLayout>

app/src/main/res/values/colors.xml

@@ -24,4 +24,5 @@
     <color name="switch_track_on">#298EFF</color>
     <color name="switch_track_off">#E9E9E9</color>
     <color name="dialog_card_login_bg">#990E57EA</color>
+    <color name="home_menu_bg">#4D2B7AE9</color>
 </resources>

app/src/main/res/values/dimens.xml

@@ -58,7 +58,7 @@
     <dimen name="menu_padding">15dp</dimen>
     <dimen name="divider_line_width">1dp</dimen>
     <dimen name="divider_line_margin">5dp</dimen>
-    <dimen name="fragment_padding">20dp</dimen>
+    <dimen name="page_padding">20dp</dimen>
     <dimen name="item_rv_technology_height">160dp</dimen>
     <dimen name="item_rv_technology_width">100dp</dimen>
     <dimen name="item_rv_technology_type_height">20dp</dimen>

app/src/main/res/values/strings.xml

@@ -110,7 +110,9 @@
     <string name="technology_sop">工艺SOP</string>
     <string name="job_execution">作业执行</string>
     <string name="repair">维修</string>
-    <string name="pm">PM</string>
+    <string name="pre_maintenance">PM</string>
+    <string name="change_shifts">开收班</string>
+    <string name="switch_product">换产</string>
     <string name="clean">清洁</string>
     <string name="back">返回</string>
     <string name="start_the_job">开始作业</string>