Преглед изворни кода

feat 增加对锁单主体的视觉区分

RobinTan1024 пре 4 година
родитељ
комит
63e8b49204

+ 6 - 1
app/src/main/java/com/doverfuelingsolutions/issp/view/adapter/OrderListAdapter.kt

@@ -5,6 +5,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.doverfuelingsolutions.issp.R
 import com.doverfuelingsolutions.issp.utils.StringUtil
+import com.doverfuelingsolutions.issp.utils.sp.SPUtil
 import com.wayne.www.waynelib.fdc.message.DeviceClass
 import kotlinx.android.synthetic.main.adapter_order_item.view.*
 
@@ -36,9 +37,13 @@ class OrderListAdapter(
             }
         }
 
+        holder.itemView.iconStatus.visibility = View.VISIBLE
         when {
             order.isLock -> {
-                holder.itemView.iconStatus.setImageResource(R.drawable.ic_lock)
+                holder.itemView.iconStatus.setImageResource(
+                    if (SPUtil.isLockByThis(order)) R.drawable.ic_lock
+                    else R.drawable.ic_lock_red
+                )
             }
             order.releaseTokenElement == null || order.releaseTokenAttribute == null -> {
                 holder.itemView.iconStatus.setImageResource(R.drawable.ic_error)

+ 15 - 0
app/src/main/res/drawable/ic_lock_red.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M512,85.33c-117.33,0 -213.33,96 -213.33,213.33v85.33h85.33v-85.33c0,-70.4 57.6,-128 128,-128s128,57.6 128,128v85.33h85.33v-85.33c0,-117.33 -96,-213.33 -213.33,-213.33z"
+      android:fillColor="#9F2626"/>
+  <path
+      android:pathData="M768,938.67H256c-46.93,0 -85.33,-38.4 -85.33,-85.33V469.33c0,-46.93 38.4,-85.33 85.33,-85.33h512c46.93,0 85.33,38.4 85.33,85.33v384c0,46.93 -38.4,85.33 -85.33,85.33z"
+      android:fillColor="#D32F2F"/>
+  <path
+      android:pathData="M512,661.33m-64,0a64,64 0,1 0,128 0,64 64,0 1,0 -128,0Z"
+      android:fillColor="#FFFFFF"/>
+</vector>