商户App 消息中心ui完善

app/src/main/java/com/xx/merchanthbh/activity/adapter/MessageListAdapter.java

@@ -3,9 +3,11 @@ package com.xx.merchanthbh.activity.adapter;
 
 import android.content.Context;
 import android.util.Log;
+import android.view.View;
 
 import com.xx.merchanthbh.R;
 import com.xx.merchanthbh.data.http.respons.MessageBean;
+import com.xx.merchanthbh.data.staticdata.StaticData;
 import com.xx.merchanthbh.databinding.ItemMessageListBinding;
 import com.xx.xxviewlibrary.base.xxBaseRecyclerViewAdapter;
 
@@ -25,7 +27,17 @@ public class MessageListAdapter extends xxBaseRecyclerViewAdapter<ItemMessageLis
     protected void covert(ItemMessageListBinding dataBind, MessageBean data, int position) {
         //   将接口调出来的布局遍历上去
         dataBind.setMessageBean(data);
-        Log.v("积分订单列表的重要信息:", String.valueOf(data));
+        Log.v("消息列表的重要信息:", String.valueOf(data));
+        /*根据状态判断显示已读还是未读图标*/
+        if (StaticData.flag == 0) {
+            /*显示未读按钮*/
+            dataBind.idRead.setVisibility(View.GONE);
+            dataBind.idUnread.setVisibility(View.VISIBLE);
+        } else {
+            /*显示已读按钮*/
+            dataBind.idUnread.setVisibility(View.GONE);
+            dataBind.idRead.setVisibility(View.VISIBLE);
+        }
     }
 
 }

app/src/main/java/com/xx/merchanthbh/data/staticdata/StaticData.kt

@@ -12,4 +12,9 @@ object StaticData {
      * 订单详情-状态位  订单状态 1-待付款 2-已完成 3-已关闭
      */
     lateinit var filePath:String
+    /**
+     * 活动中心-状态位  flag 0-未读 1-已读
+     */
+    @JvmField
+    var flag: Int = 0
 }
\ No newline at end of file

app/src/main/java/com/xx/merchanthbh/ui/msg/MessageActivity.java

@@ -11,6 +11,7 @@ import com.xx.merchanthbh.R;
 import com.xx.merchanthbh.activity.adapter.MessageListAdapter;
 import com.xx.merchanthbh.data.http.requst.MessageRequest;
 import com.xx.merchanthbh.data.http.respons.MessageBean;
+import com.xx.merchanthbh.data.staticdata.StaticData;
 import com.xx.merchanthbh.databinding.ActivityMessageBinding;
 import com.xx.xxviewlibrary.base.xxBaseRecyclerViewAdapter;
 
@@ -59,19 +60,24 @@ public class MessageActivity extends BaseActivity<ActivityMessageBinding, Messag
         /*调消息列表接口*/
         viewModel.getMessageList();
 
+
         /*切换状态Tab*/
         binding.tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
-            /*订单状态 1-待付款 2-已完成 3-已关闭*/
+            /*消息状态 1-未读 2-已读*/
             public void onTabSelected(TabLayout.Tab tab) {
                 messageListAdapter.mList.clear();
                 switch (tab.getPosition()) {
                     case 0:
                         viewModel.flag = "0";
+                        /*flag 0-未读 1-已读*/
+                        StaticData.flag = 0;
                         viewModel.getMessageList();
                         break;
                     case 1:
                         viewModel.flag = "1";
+                        /*flag 0-未读 1-已读*/
+                        StaticData.flag = 1;
                         viewModel.getMessageList();
                         break;
                 }

app/src/main/java/com/xx/merchanthbh/ui/msg/MessageDetailViewModel.java

@@ -7,9 +7,12 @@ import androidx.databinding.ObservableField;
 
 import com.xx.merchanthbh.data.http.requst.MessageDetailRequest;
 import com.xx.merchanthbh.data.http.requst.MessageRequest;
+import com.xx.merchanthbh.ui.home.HomeActivity;
 
 import io.reactivex.rxjava3.annotations.NonNull;
 import me.goldze.mvvmhabit.base.BaseViewModel;
+import me.goldze.mvvmhabit.binding.command.BindingAction;
+import me.goldze.mvvmhabit.binding.command.BindingCommand;
 
 public class MessageDetailViewModel extends BaseViewModel<MessageRequest> {
 
@@ -29,5 +32,11 @@ public class MessageDetailViewModel extends BaseViewModel<MessageRequest> {
     public MessageDetailViewModel(@NonNull Application application, MessageRequest model) {
         super(application, model);
     }
-
+    //跳转首页
+    public BindingCommand goHome = new BindingCommand(new BindingAction() {
+        @Override
+        public void call() {
+            startActivity(HomeActivity.class);
+        }
+    });
 }

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

 <?xml version="1.0" encoding="utf-8"?>
-<layout
+<layout xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:binding="http://schemas.android.com/apk/res-auto">
-    <data>
+
+
+<!--消息中心页面-->
+<data>
         <variable
             name="messageViewModel"
             type="com.xx.merchanthbh.ui.msg.MessageViewModel" />
@@ -13,19 +16,40 @@
         <import type="me.goldze.mvvmhabit.binding.viewadapter.recyclerview.LineManagers" />
     </data>
 
-    <LinearLayout
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/bg_grey"
+        android:background="@color/white"
+        android:fitsSystemWindows="true">
 
-        android:orientation="vertical">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
             <com.xx.xxviewlibrary.witget.XxBar
+                android:id="@+id/bar"
+                bar_title="@{@string/message_center}"
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
                 on_click="@{messageViewModel.clickFinish}"
-            app:bar_title='@{@string/message_center}' />
+                app:layout_constraintTop_toTopOf="parent"
+                tools:layout_editor_absoluteX="0dp" />
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="55dp"
+                android:orientation="vertical">
+                <!--灰色背景-->
+                <com.google.android.material.appbar.AppBarLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@color/bg_grey"
+                    android:orientation="vertical">
+
+                    <!--导航标题-->
                     <com.google.android.material.tabs.TabLayout
                         android:id="@+id/tabs"
                         app:tabTextAppearance="@style/tablayout_comm_style"
@@ -48,8 +72,6 @@
                             android:text="已读"
                             android:id="@+id/tab_aal_tobe_submit"/>
                     </com.google.android.material.tabs.TabLayout>
-
-
                     <!--内容切换-->
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv_Order_list"
@@ -60,7 +82,13 @@
                         android:layout_marginBottom="17dp"
                         android:orientation="vertical"
                         binding:layoutManager="@{LayoutManagers.linear(1,false)}" />
-
+                </com.google.android.material.appbar.AppBarLayout>
             </LinearLayout>
+        </RelativeLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+
+
 
 </layout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
-<layout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:binding="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
@@ -35,12 +35,18 @@
                 app:layout_constraintTop_toTopOf="parent" />
             <!--        滚动轮-->
             <!-- 底部导航栏 -->
-            <androidx.core.widget.NestedScrollView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginTop="55dp"
-                android:background="@color/bg_grey">
+                android:background="#F3F3F3"
+                android:orientation="vertical">
 
+                <androidx.core.widget.NestedScrollView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="17dp"
+                    android:background="#ffffff">
                     <!--订单正文-->
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -49,70 +55,100 @@
                         android:layout_marginTop="13dp"
                         android:layout_marginRight="17dp"
                         android:layout_marginBottom="17dp"
-                        android:background="@drawable/bg_white_radius_12"
                         android:orientation="vertical"
                         android:paddingLeft="13dp"
                         android:paddingRight="13dp">
-                        <!--商品总价-->
+                        <!--消息标题-->
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="21dp"
-                            android:layout_marginBottom="21dp"
                             android:orientation="horizontal">
+
                             <TextView
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
-                                android:text="@={messageDetailViewModel.createTime}"
-                                android:textColor="#666666"
-                                android:textSize="14sp"/>
+                                android:text="@={messageDetailViewModel.messageType}"
+                                android:textColor="#333333"
+                                android:textSize="20dp"
+                                android:textStyle="bold" />
                         </LinearLayout>
-
-                        <!--分割线-->
-                        <View
-                            android:layout_width="wrap_content"
-                            android:layout_height="1dp"
-                            android:layout_marginTop="1dp"
-                            android:background="@drawable/divider"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            tools:ignore="MissingConstraints" />
-
-                        <!--消息标题-->
+                        <!--消息创建时间-->
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="21dp"
+                            android:layout_marginBottom="21dp"
                             android:orientation="horizontal">
 
                             <TextView
-                                android:layout_width="match_parent"
+                                android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:text="@={messageDetailViewModel.messageType}"
-                                android:textColor="#333333"
-                                android:textStyle="bold"
-                                android:textSize="16sp" />
+                                android:layout_marginRight="11dp"
+                                android:gravity="center"
+                                android:text="系统推送"
+                                android:textColor="#AEAEAE"
+                                android:textSize="14sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginRight="11dp"
+                                android:gravity="center"
+                                android:text="|"
+                                android:textColor="#AEAEAE"
+                                android:textSize="14sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:gravity="center"
+                                android:text="@={messageDetailViewModel.createTime}"
+                                android:textColor="#AEAEAE"
+                                android:textSize="14sp" />
                         </LinearLayout>
                         <!--消息内容-->
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="21dp"
                             android:layout_marginBottom="21dp"
                             android:orientation="horizontal">
+
                             <TextView
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
                                 android:text="@={messageDetailViewModel.messageContent}"
-                                android:textColor="#666666"
+                                android:textColor="#333333"
                                 android:textSize="16sp" />
                         </LinearLayout>
                     </LinearLayout>
-
-
                 </androidx.core.widget.NestedScrollView>
+            </LinearLayout>
         </RelativeLayout>
+        <!--        返回首页-->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="92dp"
+            android:background="@color/white"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:padding="17dp"
+            app:layout_constraintBottom_toBottomOf="parent">
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:layout_marginLeft="5dp"
+                android:layout_weight="1"
+                android:background="@drawable/bg_forground_radius_24"
+                android:text="返回首页"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                binding:onClickCommand="@{messageDetailViewModel.goHome}" />
+
+        </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

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

 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="MissingDefaultResource">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
     <!--环渤海模块-资讯信息-子布局-->
     <data>
 
@@ -13,15 +10,15 @@
     </data>
 
     <LinearLayout
-        android:background="@drawable/bg_white_radius_12"
         android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginTop="13dp"
+        android:background="@drawable/bg_white_radius_12"
+        android:orientation="vertical"
         android:paddingLeft="13dp"
         android:paddingTop="17dp"
         android:paddingRight="13dp"
-        android:paddingBottom="19dp"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:paddingBottom="19dp">
         <!--上半拉订单信息-->
         <LinearLayout
             android:layout_width="match_parent"
@@ -31,70 +28,61 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:gravity="center"
                 android:orientation="horizontal">
+                <!--未读图标-->
+                <ImageView
+                    android:id="@+id/id_unread"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:gravity="left"
+                    android:src="@mipmap/wode_icon_weiduxiaoxi" />
+
+                <!--已读图标-->
+                <ImageView
+                    android:id="@+id/id_read"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:gravity="left"
+                    android:src="@mipmap/wode_icon_yiduxiaoxi" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginLeft="11dp"
                     android:gravity="left"
-                    android:text="@={messageBean.messageType}" />
+                    android:text="@={messageBean.messageType}"
+                    android:textColor="#333333"
+                    android:textSize="16dp"
+                    android:textStyle="bold" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="right"
-                    android:text="@={messageBean.createTime}" />
+                    android:text="@={messageBean.createTime}"
+                    android:textColor="#AEAEAE"
+                    android:textSize="14dp" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="10dp"
                 android:orientation="horizontal">
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
                     android:maxLines="2"
-                    android:text="@{messageBean.messageContent}" />
+                    android:text="@{messageBean.messageContent}"
+                    android:textColor="#757575"
+                    android:textSize="14dp" />
             </LinearLayout>
         </LinearLayout>
-        <!--分割线-->
-        <View
-            android:layout_width="wrap_content"
-            android:layout_height="1dp"
-            android:layout_marginTop="1dp"
-            android:background="@drawable/divider"
-            app:layout_constraintBottom_toBottomOf="parent"
-            tools:ignore="MissingConstraints" />
-
-        <!--商品信息-->
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="right"
-            android:layout_marginTop="16dp"
-            android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="left"
-                    android:text="查看详情"
-                    android:textColor="#5971A4"
-                    android:textSize="14sp"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="right"
-                    android:text=">"
-                    android:textColor="@color/gray"
-                    android:textSize="14sp"/>
-
-        </LinearLayout>
     </LinearLayout>
 
 </layout>