瀏覽代碼

1.添加有未读消息状态接口和UI

王鹏鹏 2 年之前
父節點
當前提交
4485a37795

+ 1 - 0
.idea/misc.xml

@@ -63,6 +63,7 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/selector_train_radio_unchecked.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/selector_train_report_tab_left.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/selector_train_report_tab_right.xml" value="0.2265" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/shape_ract_gold.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/tips_shadow_bg.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_free_train.xml" value="0.176" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_leisure_brain.xml" value="0.22826086956521738" />

+ 15 - 0
workbenches/src/main/java/com/yingyang/workbenches/WorkbenchesActivity.kt

@@ -171,6 +171,8 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
         getCountTrain()
         //查询是否有进行中的任务
         getFindMyTask()
+        //获取未读消息数量
+        getCountMyMsg()
     }
 
     /**
@@ -245,5 +247,18 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
         })
     }
 
+    /**
+     * 获取未读消息数量
+     */
+    private fun getCountMyMsg() {
+        viewModel.getCountMyMsg(fail = {
+            it.toast()
+        }, success = {
+            if (it.isNullOrEmpty().not()) {
+                val num = it.toInt()
+                binding.unReadLayout.show(num > 0)
+            }
+        })
+    }
 
 }

+ 13 - 0
workbenches/src/main/java/com/yingyang/workbenches/WorkbenchesViewModel.kt

@@ -64,4 +64,17 @@ class WorkbenchesViewModel : BaseViewModel() {
         success,
         fail
     )
+
+    /**
+     * 获取未读消息数量
+     */
+    fun getCountMyMsg(
+        fail: ((msg: String) -> Unit)? = null,
+        success: ((success: String) -> Unit)? = null,
+    ) = launchFlow(true) {
+        WORKBENCHES_API.getCountMyMsg()
+    }.runUI(
+        success,
+        fail
+    )
 }

+ 6 - 0
workbenches/src/main/java/com/yingyang/workbenches/net/WorkbenchesApiService.kt

@@ -75,4 +75,10 @@ interface WorkbenchesApiService {
     @POST("app/task/selectTaskDetailById")
     suspend fun getSelectTaskDetailById(@Query("taskId") taskId: String): BaseResp<List<TrainContentDetailsBean>>
 
+    /**
+     * 获取未读消息数量
+     */
+    @POST("app/warn/countMyMsg")
+    suspend fun getCountMyMsg(): BaseResp<String>
+
 }

+ 6 - 0
workbenches/src/main/res/drawable/shape_ract_gold.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <!--指定了形状内部的填充颜色-->
+    <solid android:color="@color/color_FFFF2B2B" />
+</shape>

+ 24 - 6
workbenches/src/main/res/layout/activity_workbenches.xml

@@ -104,7 +104,7 @@
                         android:text="@string/help" />
                 </LinearLayout>
 
-                <LinearLayout
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/layoutNotify"
                     style="@style/workbenches_operate_btn"
                     android:gravity="center_horizontal"
@@ -113,17 +113,35 @@
                     tools:ignore="MissingConstraints">
 
                     <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/notifyImage"
                         android:layout_width="@dimen/divider_34px"
                         android:layout_height="@dimen/divider_40px"
                         android:layout_marginTop="@dimen/divider_37px"
                         android:background="@mipmap/icon_notify"
-                        android:scaleType="centerInside" />
+                        android:scaleType="centerInside"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <View
+                        android:id="@+id/unReadLayout"
+                        android:layout_width="@dimen/divider_14px"
+                        android:layout_height="@dimen/divider_14px"
+                        android:layout_marginStart="@dimen/divider_10px"
+                        android:layout_marginTop="@dimen/divider_37px"
+                        android:background="@drawable/shape_ract_gold"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <androidx.appcompat.widget.AppCompatTextView
                         style="@style/workbenches_home_text"
                         android:layout_marginTop="@dimen/divider_8px"
-                        android:text="@string/notify" />
-                </LinearLayout>
+                        android:text="@string/notify"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/notifyImage" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <LinearLayout
                     android:id="@+id/layoutServicePackage"
@@ -175,8 +193,8 @@
                 android:layout_marginStart="@dimen/divider_53px"
                 android:layout_marginTop="@dimen/divider_12px"
                 android:layout_weight="1"
-                android:visibility="gone"
-                android:background="@drawable/bg_home_task">
+                android:background="@drawable/bg_home_task"
+                android:visibility="gone">
 
                 <ImageView
                     android:id="@+id/taskImage"

+ 1 - 0
workbenches/src/main/res/values/colors.xml

@@ -36,4 +36,5 @@
     <color name="color_FFCFD9FF" tools:ignore="ResourceName">#FFCFD9FF</color>
     <color name="color_FF383838" tools:ignore="ResourceName">#FF383838</color>
     <color name="color_FFF2F5FF" tools:ignore="ResourceName">#FFF2F5FF</color>
+    <color name="color_FFFF2B2B" tools:ignore="MissingDefaultResource,ResourceName">#FFFF2B2B</color>
 </resources>