Pārlūkot izejas kodu

1.优化布局UI

王鹏鹏 2 gadi atpakaļ
vecāks
revīzija
926fc3c603

+ 1 - 1
workbenches/src/main/java/com/yingyang/workbenches/orderlist/OrderListActivity.kt

@@ -26,7 +26,7 @@ class OrderListActivity : BaseMVVMActivity<ActivityOrderListBinding, OrderListVi
     }
 
     override fun initListener() {
-        binding.layoutHead.setOnSingleClickListener {
+        binding.backLayout.setOnSingleClickListener {
             finish()
         }
     }

+ 3 - 1
workbenches/src/main/java/com/yingyang/workbenches/traincontent/TrainContentFragment.kt

@@ -10,6 +10,8 @@ import com.yingyang.workbenches.widget.SpinnerTextFormatter
 import com.yingyangfly.baselib.ext.show
 import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMFragment
+import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.JumpUtil
 import com.yingyangfly.baselib.utils.RxBusCodes
 import gorden.rxbus2.Subscribe
 import gorden.rxbus2.ThreadMode
@@ -30,7 +32,7 @@ class TrainContentFragment :
         binding {
             rvTrainingContent.adapter = adapter
             adapter.onTrainContentClickListener = { bean ->
-//                JumpUtil.jumpActivityWithUrl(RouterUrlCommon.trainContentDetails, bean.id, mContext)
+                JumpUtil.jumpActivityWithUrl(RouterUrlCommon.trainContentDetails, bean.id, mContext)
             }
         }
     }

+ 22 - 5
workbenches/src/main/res/layout/activity_order_list.xml

@@ -9,13 +9,30 @@
         android:background="@mipmap/icon_uniform_background">
 
         <LinearLayout
-            android:id="@+id/layoutHead"
-            style="@style/back_home_layout"
-            tools:ignore="MissingConstraints">
+            android:id="@+id/backLayout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/divider_65px"
+            android:layout_marginTop="@dimen/divider_35px"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="@dimen/divider_48px"
+                android:layout_height="@dimen/divider_48px"
+                android:background="@mipmap/icon_back" />
 
-            <androidx.appcompat.widget.AppCompatImageView style="@style/back_home_image" />
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_14px"
+                android:text="@string/back_pager"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_28px"
+                android:textStyle="bold" />
 
-            <androidx.appcompat.widget.AppCompatTextView style="@style/back_home_text" />
         </LinearLayout>
 
         <androidx.appcompat.widget.AppCompatTextView

+ 22 - 5
workbenches/src/main/res/layout/activity_train_content_details.xml

@@ -14,13 +14,30 @@
         android:background="@mipmap/icon_uniform_background">
 
         <LinearLayout
-            android:id="@+id/layoutHead"
-            style="@style/back_home_layout"
-            tools:ignore="MissingConstraints">
+            android:id="@+id/backLayout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/divider_65px"
+            android:layout_marginTop="@dimen/divider_35px"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="@dimen/divider_48px"
+                android:layout_height="@dimen/divider_48px"
+                android:background="@mipmap/icon_back" />
 
-            <androidx.appcompat.widget.AppCompatImageView style="@style/back_home_image" />
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/divider_14px"
+                android:text="@string/back_pager"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_28px"
+                android:textStyle="bold" />
 
-            <androidx.appcompat.widget.AppCompatTextView style="@style/back_home_text" />
         </LinearLayout>
 
         <androidx.cardview.widget.CardView