首页根据高保真进行调整

app/src/main/java/com/grkj/iscs/view/activity/HomeActivity.kt

@@ -23,17 +23,24 @@ class HomeActivity : BaseMvpActivity<IHomeView, HomePresenter, ActivityHomeBindi
         get() = ActivityHomeBinding.inflate(layoutInflater)
 
     override fun initView() {
+        mBinding?.itemSetting?.ivIcon?.setBackgroundResource(R.mipmap.settings)
+        mBinding?.itemSetting?.tvName?.text = getString(R.string.settings)
+        mBinding?.itemSetting?.root?.setOnClickListener {
+
+        }
+
         mMenuList = mutableListOf(
-            Menu(getString(R.string.job_management), fragment = JobManagementFragment()),
-            Menu(getString(R.string.material_management), fragment = MaterialManagementFragment())
+            Menu(getString(R.string.job_management), R.mipmap.job_management, JobManagementFragment()),
+            Menu(getString(R.string.material_management), R.mipmap.material_management, MaterialManagementFragment())
         )
 
         mBinding?.vp?.isUserInputEnabled = false
         mBinding?.vp?.adapter = MenuAdapter(supportFragmentManager, lifecycle, mMenuList)
 
         mBinding?.rvMenu?.adapter = object : CommonAdapter<Menu>(this, R.layout.item_rv_menu, mMenuList) {
-            override fun convert(holder: ViewHolder, data: Menu?, position: Int) {
-                holder.setText(R.id.tv_number, data?.title)
+            override fun convert(holder: ViewHolder, data: Menu, position: Int) {
+                holder.setText(R.id.tv_name, data.title)
+                holder.setBackgroundRes(R.id.iv_icon, data.icon!!)
                 holder.setOnClickListener(R.id.root) {
                     mBinding?.vp?.currentItem = position
                     notifyDataSetChanged()
@@ -50,5 +57,5 @@ class HomeActivity : BaseMvpActivity<IHomeView, HomePresenter, ActivityHomeBindi
         return HomePresenter()
     }
 
-    data class Menu(val title: String? = null, val icon: String? = null, val fragment: BaseFragment<*>)
+    data class Menu(val title: String? = null, val icon: Int? = null, val fragment: BaseFragment<*>)
 }

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

@@ -5,15 +5,16 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/main_color"
+    android:background="@mipmap/main_bg"
     tools:context=".view.activity.HomeActivity">
 
     <RelativeLayout
         android:id="@+id/rl_menu"
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:padding="@dimen/menu_padding"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintHorizontal_weight="40"
+        app:layout_constraintHorizontal_weight="267"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toLeftOf="@id/rl_page"
         app:layout_constraintTop_toTopOf="parent">
@@ -22,15 +23,16 @@
             android:id="@+id/tv_app_title"
             style="@style/CommonTextView"
             android:layout_centerHorizontal="true"
-            android:padding="@dimen/menu_padding"
-            android:text="@string/app_title" />
+            android:text="@string/app_title"
+            android:textSize="@dimen/common_text_size_big"
+            android:textStyle="bold" />
 
         <View
             android:id="@+id/v_divider_title"
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_width"
             android:layout_below="@id/tv_app_title"
-            android:layout_margin="@dimen/divider_line_margin"
+            android:layout_marginVertical="@dimen/divider_line_margin"
             android:background="@color/white" />
 
         <TextClock
@@ -39,15 +41,14 @@
             android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
             android:format12Hour="yyyy-MM-dd\nhh:mm"
-            android:format24Hour="yyyy-MM-dd\nhh:mm"
-            android:padding="@dimen/menu_padding" />
+            android:format24Hour="yyyy-MM-dd\nhh:mm" />
 
         <View
             android:id="@+id/v_divider_time"
             android:layout_width="match_parent"
             android:layout_height="@dimen/divider_line_width"
             android:layout_above="@id/tc_time"
-            android:layout_margin="@dimen/divider_line_margin"
+            android:layout_marginVertical="@dimen/divider_line_margin"
             android:background="@color/white" />
 
         <include
@@ -70,7 +71,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintHorizontal_weight="200"
+        app:layout_constraintHorizontal_weight="1653"
         app:layout_constraintLeft_toRightOf="@id/rl_menu"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -78,6 +79,6 @@
         <androidx.viewpager2.widget.ViewPager2
             android:id="@+id/vp"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent" />
     </RelativeLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_width="@dimen/item_rv_menu_size"
+    android:layout_height="@dimen/item_rv_menu_size"
+    android:gravity="center"
     android:orientation="vertical">
 
+    <ImageView
+        android:id="@+id/iv_icon"
+        android:layout_width="@dimen/item_rv_menu_icon_size"
+        android:layout_height="@dimen/item_rv_menu_icon_size" />
+
     <TextView
-        android:id="@+id/tv_number"
-        style="@style/CommonTextView" />
+        android:id="@+id/tv_name"
+        style="@style/CommonTextView"
+        android:layout_marginTop="8dp" />
 </LinearLayout>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/root"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical">
 

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="common_text_size">15sp</dimen>
+    <dimen name="common_text_size">10sp</dimen>
+    <dimen name="common_text_size_big">14sp</dimen>
     <dimen name="common_font_txt_size_page_title">14dp</dimen>
     <dimen name="common_radius">1dp</dimen>
 
@@ -52,9 +53,9 @@
     <dimen name="dialog_card_login_width">320dp</dimen>
     <dimen name="dialog_card_login_height">180dp</dimen>
 
-    <dimen name="menu_padding">10dp</dimen>
+    <dimen name="menu_padding">15dp</dimen>
     <dimen name="divider_line_width">1dp</dimen>
-    <dimen name="divider_line_margin">3dp</dimen>
+    <dimen name="divider_line_margin">5dp</dimen>
     <dimen name="fragment_padding">20dp</dimen>
     <dimen name="item_rv_technology_height">160dp</dimen>
     <dimen name="item_rv_technology_width">100dp</dimen>
@@ -66,4 +67,6 @@
     
     <dimen name="item_rv_step_width">45dp</dimen>
     <dimen name="item_rv_step_height">80dp</dimen>
+    <dimen name="item_rv_menu_size">58dp</dimen>
+    <dimen name="item_rv_menu_icon_size">20dp</dimen>
 </resources>

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

@@ -104,6 +104,7 @@
     <string name="app_title">Mars\n智能锁控</string>
     <string name="job_management">作业管理</string>
     <string name="material_management">物资管理</string>
+    <string name="settings">设置</string>
     <string name="workshop">车间岗位</string>
     <string name="technology_sop">工艺SOP</string>
     <string name="job_execution">作业执行</string>