完善我的页面

consumer/src/main/AndroidManifest.xml

@@ -39,6 +39,22 @@
             </intent-filter>
         </activity>
 
+        <!--   消息中心-->
+        <activity
+            android:name=".ui.messagecenter.MessageCenterActivity"
+            android:exported="true"/>
+
+        <!--   订单详情-->
+        <activity
+            android:name=".ui.order.OrderDetailActivity"
+            android:exported="true"/>
+
+        <!--   积分兑换-->
+        <activity
+            android:name=".ui.mycollection.MyCollectionActivity"
+            android:exported="true"/>
+
+
         <!--   积分兑换-->
         <activity
             android:name=".ui.credit.CreditsGoodsDetailActivity"

consumer/src/main/java/com/xx/hbhconsumer/adapter/MessageAdapter.java

+package com.xx.hbhconsumer.adapter;
+
+import android.content.Context;
+
+import com.xx.hbhconsumer.R;
+import com.xx.hbhconsumer.data.http.respons.OrderBean;
+import com.xx.hbhconsumer.databinding.ItemMessageBinding;
+import com.xx.hbhconsumer.databinding.ItemOrderGoodsBinding;
+import com.xx.xxviewlibrary.base.xxBaseRecyclerViewAdapter;
+
+
+public class MessageAdapter extends xxBaseRecyclerViewAdapter<ItemMessageBinding, OrderBean> {
+
+    public MessageAdapter(Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    @Override
+    public int initLayout() {
+        return R.layout.item_message;
+    }
+
+    @Override
+    protected void covert(ItemMessageBinding dataBind, OrderBean data, int position) {
+        //   将接口调出来的布局遍历上去
+        dataBind.setOrderBean(data);
+    }
+}

consumer/src/main/java/com/xx/hbhconsumer/adapter/OrderGoodsAdapter.java

+package com.xx.hbhconsumer.adapter;
+
+import android.content.Context;
+
+import com.xx.hbhconsumer.R;
+import com.xx.hbhconsumer.data.http.respons.OrderBean;
+import com.xx.hbhconsumer.databinding.ItemCreditGoodsBinding;
+import com.xx.hbhconsumer.databinding.ItemOrderBinding;
+import com.xx.hbhconsumer.databinding.ItemOrderGoodsBinding;
+import com.xx.xxviewlibrary.base.xxBaseRecyclerViewAdapter;
+
+
+public class OrderGoodsAdapter extends xxBaseRecyclerViewAdapter<ItemOrderGoodsBinding, OrderBean> {
+
+    public OrderGoodsAdapter(Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    @Override
+    public int initLayout() {
+        return R.layout.item_order_goods;
+    }
+
+    @Override
+    protected void covert(ItemOrderGoodsBinding dataBind, OrderBean data, int position) {
+        //   将接口调出来的布局遍历上去
+        dataBind.setOrderBean(data);
+    }
+}

consumer/src/main/java/com/xx/hbhconsumer/ui/messagecenter/MessageCenterActivity.java

+package com.xx.hbhconsumer.ui.messagecenter;
+
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager2.adapter.FragmentStateAdapter;
+import androidx.viewpager2.widget.ViewPager2;
+
+import com.google.android.material.tabs.TabLayout;
+import com.google.android.material.tabs.TabLayoutMediator;
+import com.xx.hbhconsumer.BR;
+import com.xx.hbhconsumer.R;
+import com.xx.hbhconsumer.data.http.requst.LoginRequest;
+import com.xx.hbhconsumer.databinding.ActivityMessageCenterBinding;
+import com.xx.hbhconsumer.databinding.ActivityOrderBinding;
+import com.xx.hbhconsumer.ui.order.OrderListFragment;
+
+import me.goldze.mvvmhabit.base.BaseActivity;
+
+public class MessageCenterActivity extends BaseActivity<ActivityMessageCenterBinding, MessageCenterViewModel> {
+    final String[] tabs = new String[]{"未读", "已读"};
+    private TabLayoutMediator mediator;
+    TabLayout tabLayout;
+    ViewPager2 viewPager2;
+    @Override
+    public int initContentView(Bundle savedInstanceState) {
+        return R.layout.activity_message_center;
+    }
+
+    @Override
+    public void initData() {
+        super.initData();
+        // 初始化底部导航栏
+        tabLayout = findViewById(R.id.tabLayout);
+        viewPager2 = findViewById(R.id.viewPager2);
+        tabLayout.setLongClickable(false);
+        viewPager2.setOffscreenPageLimit(ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT);
+        //Adapter
+        viewPager2.setAdapter(new FragmentStateAdapter(getSupportFragmentManager(), getLifecycle()) {
+            @NonNull
+            @Override
+            public Fragment createFragment(int position) {
+                //FragmentStateAdapter内部自己会管理已实例化的fragment对象。
+                // 所以不需要考虑复用的问题
+                return MessageListFragment.newInstance(position);
+            }
+            @Override
+            public int getItemCount() {
+                return tabs.length;
+            }
+        });
+        //viewPager 页面切换监听监听
+
+        mediator = new TabLayoutMediator(tabLayout, viewPager2, (tab, position) -> tab.setText(tabs[position]));
+        //要执行这一句才是真正将两者绑定起来
+        mediator.attach();
+
+    }
+    @Override
+    public int initVariableId() {
+        return BR.messageCenterViewModel;
+    }
+
+    @Override
+    public void onPointerCaptureChanged(boolean hasCapture) {
+        super.onPointerCaptureChanged(hasCapture);
+    }
+
+    @Override
+    public MessageCenterViewModel initViewModel() {
+        LoginRequest loginRequest = new LoginRequest();
+        return new MessageCenterViewModel(getApplication(), loginRequest);
+    }
+}

consumer/src/main/java/com/xx/hbhconsumer/ui/messagecenter/MessageCenterViewModel.java

+package com.xx.hbhconsumer.ui.messagecenter;
+
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+
+import com.xx.hbhconsumer.data.http.requst.LoginRequest;
+
+import me.goldze.mvvmhabit.base.BaseViewModel;
+
+public class MessageCenterViewModel extends BaseViewModel<LoginRequest> {
+
+    public MessageCenterViewModel(@NonNull Application application, LoginRequest model) {
+        super(application, model);
+    }
+
+
+}
+
+

consumer/src/main/java/com/xx/hbhconsumer/ui/messagecenter/MessageListFragment.java

+package com.xx.hbhconsumer.ui.messagecenter;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.annotation.Nullable;
+
+import com.xx.hbhconsumer.BR;
+import com.xx.hbhconsumer.R;
+import com.xx.hbhconsumer.adapter.MessageAdapter;
+import com.xx.hbhconsumer.adapter.OrderAdapter;
+import com.xx.hbhconsumer.data.http.requst.LoginRequest;
+import com.xx.hbhconsumer.data.http.respons.OrderBean;
+import com.xx.hbhconsumer.databinding.FragmentMessageListBinding;
+import com.xx.hbhconsumer.databinding.FragmentOrderListBinding;
+import com.xx.hbhconsumer.databinding.ItemMessageBinding;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import me.goldze.mvvmhabit.base.BaseFragment;
+
+public class MessageListFragment extends BaseFragment<FragmentMessageListBinding, MessageListViewModel> {
+
+    public static MessageListFragment newInstance(Integer orderType) {
+        Bundle args = new Bundle();
+        args.putInt("orderType", orderType);
+        MessageListFragment fragment = new MessageListFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void initData() {
+        List<OrderBean> orderBeanList = new ArrayList<>();
+        OrderBean orderBean = new OrderBean("", "", 0, 0);
+        orderBeanList.add(orderBean);
+        orderBeanList.add(orderBean);
+        orderBeanList.add(orderBean);
+        orderBeanList.add(orderBean);
+
+        //获取适配器上下文
+        MessageAdapter orderListAdapter = new MessageAdapter(getActivity());
+
+        //把adapterset进去
+        binding.rvMessageList.setAdapter(orderListAdapter);
+        orderListAdapter.mList = orderBeanList;
+
+        orderListAdapter.setOnItemClick((position, data) -> viewModel.goOrderDetail(position));
+    }
+
+    @Override
+    public int viewModelType() {
+        return 1;
+    }
+
+    @Override
+    public int initContentView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return R.layout.fragment_message_list;
+    }
+
+    @Override
+    public int initVariableId() {
+        return BR.messageListViewModel;
+    }
+
+    @Override
+    public MessageListViewModel initViewModel() {
+        LoginRequest model = new LoginRequest();
+        return new MessageListViewModel(getActivity().getApplication(), model);
+    }
+}

consumer/src/main/java/com/xx/hbhconsumer/ui/messagecenter/MessageListViewModel.java

+package com.xx.hbhconsumer.ui.messagecenter;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+
+import com.xx.hbhconsumer.data.http.requst.LoginRequest;
+import com.xx.hbhconsumer.ui.order.OrderDetailActivity;
+
+import me.goldze.mvvmhabit.base.BaseViewModel;
+
+public class MessageListViewModel extends BaseViewModel<LoginRequest> {
+
+    public MessageListViewModel(@NonNull Application application, LoginRequest model) {
+        super(application, model);
+    }
+    public void goOrderDetail(int position) {
+        startActivity(OrderDetailActivity.class);
+    }
+
+}
+
+

consumer/src/main/java/com/xx/hbhconsumer/ui/mine/MineViewModel.java

@@ -7,6 +7,8 @@ import androidx.databinding.ObservableField;
 
 import com.xx.hbhconsumer.data.http.requst.MineRequest;
 import com.xx.hbhconsumer.data.local.LocalData;
+import com.xx.hbhconsumer.ui.messagecenter.MessageCenterActivity;
+import com.xx.hbhconsumer.ui.mycollection.MyCollectionActivity;
 import com.xx.hbhconsumer.ui.order.OrderActivity;
 import com.xx.hbhconsumer.ui.phone.PhoneActivity;
 import com.xx.hbhconsumer.ui.pwd.PwdActivity;
@@ -48,6 +50,25 @@ public class MineViewModel extends BaseViewModel<MineRequest> {
         }
 
     });
+
+    //跳转我的收藏
+    public BindingCommand goMessageCenter = new BindingCommand(new BindingAction() {
+        @Override
+        public void call() {
+            startActivity(MessageCenterActivity.class);
+        }
+
+    });
+
+    //跳转我的收藏
+    public BindingCommand goMyCollection = new BindingCommand(new BindingAction() {
+        @Override
+        public void call() {
+            startActivity(MyCollectionActivity.class);
+        }
+
+    });
+
     //跳转修改手机号界面
     public BindingCommand goSettings = new BindingCommand(new BindingAction() {
         @Override

consumer/src/main/java/com/xx/hbhconsumer/ui/mycollection/MyCollectionActivity.java

+package com.xx.hbhconsumer.ui.mycollection;
+
+import android.os.Bundle;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+
+import com.xx.hbhconsumer.R;
+import com.xx.hbhconsumer.adapter.NewProductsGoodsAdapter;
+import com.xx.hbhconsumer.data.http.respons.OrderBean;
+import com.xx.hbhconsumer.databinding.ActivityMyCollectionBinding;
+import com.xx.hbhconsumer.databinding.ActivityNewProductsBinding;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import me.goldze.mvvmhabit.base.BaseActivity;
+import me.tatarka.bindingcollectionadapter2.BR;
+
+public class MyCollectionActivity extends BaseActivity<ActivityMyCollectionBinding, MyCollectionViewModel> {
+    @Override
+    public int initContentView(Bundle savedInstanceState) {
+        return R.layout.activity_my_collection;
+    }
+
+    @Override
+    public int initVariableId() {
+        return BR.myCollectionViewModel;
+    }
+
+    @Override
+    public void initData() {
+        super.initData();
+        List<OrderBean> orderBeanList = new ArrayList<>();
+        OrderBean orderBean = new OrderBean("", "", 0, 0);
+        orderBeanList.add(orderBean);
+        orderBeanList.add(orderBean);
+        orderBeanList.add(orderBean);
+        orderBeanList.add(orderBean);
+
+        GridLayoutManager manager = new GridLayoutManager(this,2);
+        binding.rvGoodsList.setLayoutManager(manager);
+
+
+        //获取适配器上下文
+        NewProductsGoodsAdapter orderListAdapter = new NewProductsGoodsAdapter(this);
+
+        //把adapterset进去
+        binding.rvGoodsList.setAdapter(orderListAdapter);
+        orderListAdapter.mList = orderBeanList;
+    }
+}

consumer/src/main/java/com/xx/hbhconsumer/ui/mycollection/MyCollectionViewModel.java

+package com.xx.hbhconsumer.ui.mycollection;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+
+import com.xx.hbhconsumer.data.http.requst.PhoneRequest;
+
+import me.goldze.mvvmhabit.base.BaseViewModel;
+
+public class MyCollectionViewModel extends BaseViewModel<PhoneRequest> {
+    public MyCollectionViewModel(@NonNull Application application) {
+        super(application);
+    }
+
+    public MyCollectionViewModel(@NonNull Application application, PhoneRequest model) {
+        super(application, model);
+    }
+}

consumer/src/main/java/com/xx/hbhconsumer/ui/order/OrderDetailActivity.java

+package com.xx.hbhconsumer.ui.order;
+
+import android.os.Bundle;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+
+import com.xx.hbhconsumer.R;
+import com.xx.hbhconsumer.adapter.CreditGoodsAdapter;
+import com.xx.hbhconsumer.adapter.OrderGoodsAdapter;
+import com.xx.hbhconsumer.data.http.respons.OrderBean;
+import com.xx.hbhconsumer.databinding.ActivityCreditsGoodsDetailBinding;
+import com.xx.hbhconsumer.databinding.ActivityOrderBinding;
+import com.xx.hbhconsumer.databinding.ActivityOrderDetailBinding;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import me.goldze.mvvmhabit.base.BaseActivity;
+import me.tatarka.bindingcollectionadapter2.BR;
+
+public class OrderDetailActivity extends BaseActivity<ActivityOrderDetailBinding, OrderDetailViewModel> {
+
+    @Override
+    public void initData() {
+        super.initData();
+
+        List<OrderBean> orderBeanList = new ArrayList<>();
+        OrderBean orderBean = new OrderBean("", "", 0, 0);
+        orderBeanList.add(orderBean);
+        orderBeanList.add(orderBean);
+        orderBeanList.add(orderBean);
+
+        //获取适配器上下文
+        OrderGoodsAdapter creditGoodsAdapter = new OrderGoodsAdapter(this);
+        //把adapterset进去
+        binding.rvGoodsList.setAdapter(creditGoodsAdapter);
+        creditGoodsAdapter.mList = orderBeanList;
+    }
+
+    @Override
+    public int initContentView(Bundle savedInstanceState) {
+        return R.layout.activity_order_detail;
+    }
+
+    @Override
+    public int initVariableId() {
+        return BR.orderDetailViewModel;
+    }
+
+}

consumer/src/main/java/com/xx/hbhconsumer/ui/order/OrderDetailViewModel.java

+package com.xx.hbhconsumer.ui.order;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+
+import com.xx.hbhconsumer.data.http.requst.PhoneRequest;
+
+import me.goldze.mvvmhabit.base.BaseViewModel;
+
+public class OrderDetailViewModel extends BaseViewModel<PhoneRequest> {
+    public OrderDetailViewModel(@NonNull Application application) {
+        super(application);
+    }
+
+    public OrderDetailViewModel(@NonNull Application application, PhoneRequest model) {
+        super(application, model);
+    }
+}

consumer/src/main/java/com/xx/hbhconsumer/ui/order/OrderListFragment.java

@@ -42,6 +42,8 @@ public class OrderListFragment extends BaseFragment<FragmentOrderListBinding, Or
         //把adapterset进去
         binding.rvOrderList.setAdapter(orderListAdapter);
         orderListAdapter.mList = orderBeanList;
+
+        orderListAdapter.setOnItemClick((position, data) -> viewModel.goOrderDetail(position));
     }
 
     @Override

consumer/src/main/java/com/xx/hbhconsumer/ui/order/OrderListViewModel.java

@@ -5,6 +5,8 @@ import android.app.Application;
 import androidx.annotation.NonNull;
 
 import com.xx.hbhconsumer.data.http.requst.LoginRequest;
+import com.xx.hbhconsumer.ui.credit.CreditsGoodsDetailActivity;
+
 import me.goldze.mvvmhabit.base.BaseViewModel;
 
 public class OrderListViewModel extends BaseViewModel<LoginRequest> {
@@ -12,7 +14,9 @@ public class OrderListViewModel extends BaseViewModel<LoginRequest> {
     public OrderListViewModel(@NonNull Application application, LoginRequest model) {
         super(application, model);
     }
-
+    public void goOrderDetail(int position) {
+        startActivity(OrderDetailActivity.class);
+    }
 
 }
 

consumer/src/main/res/drawable/bg_brown_all_radius_12.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#635240"/>
+    <corners android:radius="24dp" />
+</shape>
\ No newline at end of file

consumer/src/main/res/drawable/button_bottom_nomal_24.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke android:width="1dp" android:color="#FFAEAEAE" />
+    <!--  颜色-->
+    <solid android:color="#ffffff" />
+    <!--    圆角-->
+    <corners android:radius="24dp" />
+</shape>
\ No newline at end of file

consumer/src/main/res/drawable/selector_menu_activity.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@mipmap/tab_icon_huodong_seclected" android:state_checked="true" />
+    <item android:drawable="@mipmap/tab_icon_huodong_default" android:state_checked="false"  />
+</selector>
\ No newline at end of file

consumer/src/main/res/drawable/selector_menu_goods.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@mipmap/tab_icon_shangpin_default" android:state_checked="true" />
+    <item android:drawable="@mipmap/tab_icon_shangpin_default" android:state_checked="false"  />
+</selector>
\ No newline at end of file

consumer/src/main/res/drawable/selector_menu_shop.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@mipmap/tab_icon_dianou_seclected" android:state_checked="true" />
+    <item android:drawable="@mipmap/tab_icon_dianou_default" android:state_checked="false"  />
+</selector>
\ No newline at end of file

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

@@ -26,6 +26,9 @@
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:background="@drawable/bg_mid_radius_12"
+            app:itemTextAppearanceActive="@style/bottom_selected_text"
+            app:itemTextAppearanceInactive="@style/bottom_normal_text"
+            app:labelVisibilityMode="labeled"
             app:itemIconTint="#5971A4"
             app:itemTextColor="#5971A4"
             android:textSize="13dp"

consumer/src/main/res/layout/activity_message_center.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:binding="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <variable
+            name="messageCenterViewModel"
+            type="com.xx.hbhconsumer.ui.messagecenter.MessageCenterViewModel" />
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.xx.xxviewlibrary.witget.XxBar
+            android:id="@+id/bar"
+            bar_title="@{@string/my_order}"
+            android:layout_width="match_parent"
+            android:layout_height="55dp"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tabLayout"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:background="@color/white"
+            android:paddingBottom="7dp"
+            app:tabIndicatorColor="#5971A4"
+            app:tabIndicatorHeight="2dp"
+            app:tabIndicatorFullWidth="false"
+            app:tabMode="fixed"
+            app:tabGravity="fill"
+            app:tabMaxWidth="0dp"
+            app:tabSelectedTextColor="#5971A4"
+            android:layout_below="@id/bar"
+            app:tabTextColor="@color/black"
+            app:tabBackground="@null"
+            app:tabRippleColor="@null"
+            app:tabPaddingBottom="4dp">
+
+        </com.google.android.material.tabs.TabLayout>
+
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/viewPager2"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/tabLayout" />
+    </RelativeLayout>
+
+</layout>
\ No newline at end of file

consumer/src/main/res/layout/activity_my_collection.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"
+    >
+    <data>
+        <variable
+            name="myCollectionViewModel"
+            type="com.xx.hbhconsumer.ui.mycollection.MyCollectionViewModel" />
+    </data>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/bg_grey">
+
+        <com.xx.xxviewlibrary.witget.XxBar
+            android:id="@+id/bar"
+            bar_title="@{@string/navigation_sea}"
+            android:layout_width="match_parent"
+            android:layout_height="55dp"/>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_goods_list"
+            android:layout_below="@id/bar"
+            android:layout_marginTop="21dp"
+            android:layout_marginLeft="17dp"
+            android:layout_marginRight="17dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file

consumer/src/main/res/layout/fragment_message_list.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:binding="http://schemas.android.com/apk/res-auto">
+    <data>
+        <variable
+            name="messageListViewModel"
+            type="com.xx.hbhconsumer.ui.messagecenter.MessageListViewModel" />
+        <import type="me.goldze.mvvmhabit.binding.viewadapter.recyclerview.LayoutManagers" />
+
+        <import type="me.goldze.mvvmhabit.binding.viewadapter.recyclerview.LineManagers" />
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#F3F3F3">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_message_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="17dp"
+            android:orientation="vertical"
+            binding:layoutManager="@{LayoutManagers.linear(1,false)}"/>
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file

consumer/src/main/res/layout/fragment_mine.xml

@@ -43,86 +43,93 @@
 
                     <ImageView
                         android:id="@+id/iv_notify"
+                        onClickCommand="@{mineViewModel.goMessageCenter}"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:src="@mipmap/wode_icon_shezhi"/>
+                        android:layout_marginRight="30dp"
+                        android:layout_toLeftOf="@id/iv_setting"
+                        android:src="@mipmap/wode_icon_xiaoxi1"/>
 
                 </RelativeLayout>
 
                 <!--今日卡片-->
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="180dp"
-                    android:padding="13dp">
+                    android:layout_height="wrap_content"
+                    android:padding="17dp">
 
-                    <LinearLayout
+                    <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
-                        android:paddingTop="50dp"
+                        android:layout_marginTop="23dp"
                         tools:ignore="MissingConstraints">
 
                         <ImageView
-                            android:layout_width="78dp"
-                            android:layout_height="78dp"
-                            android:src="@mipmap/wode_icon_nvtouxiang"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintLeft_toLeftOf="parent"
-                            app:layout_constraintTop_toTopOf="parent"
-                            android:contentDescription="TODO"
-                            tools:ignore="ContentDescription,HardcodedText" />
+                            android:id="@+id/iv_avatar"
+                            android:layout_width="80dp"
+                            android:layout_height="80dp"
+                            android:layout_centerVertical="true"
+                            android:src="@mipmap/wode_img_morentouxiang"/>
 
-                        <LinearLayout
+                        <RelativeLayout
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_toRightOf="@id/iv_avatar"
+                            android:layout_marginLeft="14dp"
+                            android:layout_marginTop="8dp"
                             android:orientation="vertical"
                             tools:ignore="MissingConstraints">
 
-                            <LinearLayout
+                            <TextView
+                                android:id="@+id/tv_nickname"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_centerVertical="true"
+                                android:text="浴缸里的猫"
+                                android:textSize="20sp"
+                                android:textColor="#FF222222"/>
+
+                            <ImageView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:gravity="center"
-                                android:layout_marginTop="3dp"
-                                android:orientation="horizontal"
-                                tools:ignore="MissingConstraints">
-
-                                <TextView
-                                    style="@style/CommText"
-                                    android:id="@+id/nickName"
-                                    android:layout_marginStart="16dp"
-                                    android:textColor="@color/black"
-                                    android:text="@={mineViewModel.nickName}"
-                                    android:textSize="20sp"
-                                    android:textStyle="bold"
-                                    app:layout_constraintRight_toRightOf="@+id/tv_ame_num1"
-                                    app:layout_constraintTop_toTopOf="parent" />
-
-                                <TextView
-                                    android:layout_width="38dp"
-                                    android:layout_height="20dp"
-                                    android:layout_marginStart="11dp"
-                                    android:background="@drawable/bg_red_radius_4"
-                                    android:gravity="center"
-                                    android:text="@={mineViewModel.roleName}"
-                                    android:textColor="@color/white"
-                                    android:textSize="13sp"
-                                    android:textStyle="bold"
-                                    app:layout_constraintLeft_toLeftOf="parent"
-                                    app:layout_constraintTop_toTopOf="parent" />
-
-                            </LinearLayout>
+                                android:layout_centerVertical="true"
+                                android:layout_marginLeft="11dp"
+                                android:layout_toRightOf="@id/tv_nickname"
+                                android:src="@mipmap/wode_icon_xiugai"/>
+
+                        </RelativeLayout>
+
+                        <RelativeLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_toRightOf="@id/iv_avatar"
+                            android:layout_marginLeft="14dp"
+                            android:layout_alignParentBottom="true">
 
                             <TextView
-                                style="@style/CommText"
-                                android:layout_marginStart="17dp"
-                                android:layout_marginTop="21dp"
-                                android:text="@={mineViewModel.createTime}"
-                                android:textColor="@color/black"
-                                android:textSize="14sp"
-                                app:layout_constraintRight_toRightOf="@+id/tv_ame_num1"
-                                app:layout_constraintTop_toTopOf="parent" />
-                        </LinearLayout>
-                    </LinearLayout>
+                                android:id="@+id/iv_member_name"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_centerVertical="true"
+                                android:layout_marginLeft="8dp"
+                                android:paddingLeft="25dp"
+                                android:paddingRight="8dp"
+                                android:paddingBottom="2dp"
+                                android:background="@drawable/bg_brown_all_radius_12"
+                                android:text="青铜会员"
+                                android:textSize="13sp"
+                                android:textColor="#EBB47B"/>
+
+                            <ImageView
+                                android:id="@+id/iv_member_icon"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_centerVertical="true"
+                                android:src="@mipmap/wode_icon_huiyuan"/>
+                        </RelativeLayout>
+
+                    </RelativeLayout>
 
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -197,6 +204,7 @@
                     android:layout_marginLeft="17dp"
                     android:layout_marginRight="17dp"
                     android:layout_marginTop="24dp"
+                    onClickCommand="@{mineViewModel.goMyCollection}"
                     android:background="@drawable/bg_white_radius_12">
 
                     <TextView
@@ -393,6 +401,7 @@
                     android:layout_marginLeft="17dp"
                     android:layout_marginRight="17dp"
                     android:layout_marginTop="13dp"
+                    android:layout_marginBottom="17dp"
                     android:background="@drawable/bg_white_radius_12"
                     android:orientation="vertical">
 

consumer/src/main/res/layout/item_message.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:binding="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <variable
+            name="orderBean"
+            type="com.xx.hbhconsumer.data.http.respons.OrderBean" />
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="17dp"
+        android:layout_marginRight="17dp"
+        android:layout_marginBottom="17dp"
+        android:paddingLeft="13dp"
+        android:paddingRight="13dp"
+        android:background="@drawable/bg_white_radius_12">
+
+        <RelativeLayout
+            android:id="@+id/rl_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+
+            android:layout_marginTop="21dp">
+            <ImageView
+                android:id="@+id/iv_message_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:src="@mipmap/wode_icon_weiduxiaoxi"/>
+
+            <TextView
+                android:id="@+id/tv_news_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@id/iv_message_icon"
+                android:layout_marginLeft="11dp"
+                android:textStyle="bold"
+                android:textSize="16sp"
+                android:textColor="#333333"
+                android:text="订单信息"/>
+
+            <TextView
+                android:id="@+id/tv_message_create_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentRight="true"
+                android:text="2023-05-31  18:03:18"
+                android:textSize="14sp"
+                android:textColor="#FFAEAEAE"/>
+
+
+        </RelativeLayout>
+
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/rl_title"
+            android:layout_marginTop="21dp"
+            android:layout_marginBottom="21dp"
+            android:text="您的订单号2023050812080854321已确认付款!如有疑问，请立即查看详情！"
+            android:textSize="14sp"
+            android:textColor="#FF757575"
+            />
+
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file

consumer/src/main/res/layout/item_order_goods.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:binding="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <variable
+            name="orderBean"
+            type="com.xx.hbhconsumer.data.http.respons.OrderBean" />
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="17dp"
+        android:layout_marginRight="17dp"
+        android:background="@color/white">
+
+        <ImageView
+            android:id="@+id/iv_news_img"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:layout_marginBottom="13dp"
+            android:layout_marginTop="13dp"
+            android:src="@mipmap/home_img_rexiaoqu"/>
+
+        <TextView
+            android:id="@+id/tv_news_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/iv_news_img"
+            android:layout_toLeftOf="@id/ll_price"
+            android:layout_marginRight="10dp"
+            android:layout_marginTop="32dp"
+            android:layout_marginLeft="11dp"
+            android:textSize="16sp"
+            android:textColor="#333333"
+            android:text="现代简约沙发现代简约沙发现代简约沙..."/>
+
+
+        <LinearLayout
+            android:id="@+id/ll_price"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_marginTop="32dp"
+            android:background="@drawable/bg_white_radius_24"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/price_black"
+                android:textSize="10sp"
+                android:text="¥"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/price_black"
+                android:textSize="16sp"
+                android:text="3499"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/price_black"
+                android:textSize="10sp"
+                android:text=".00"/>
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/ll_price"
+            android:text="x1"
+            android:textSize="14sp"
+            android:textColor="#FF333333"/>
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file

consumer/src/main/res/menu/bottom_nav_menu.xml

@@ -7,20 +7,20 @@
 
     <item
         android:id="@+id/menu_shop"
-        android:icon="@drawable/selector_menu_huanbohai"
+        android:icon="@drawable/selector_menu_shop"
         android:title="@string/navigation_shop" />
     <item
         android:id="@+id/menu_activity"
-        android:icon="@drawable/selector_menu_wode"
+        android:icon="@drawable/selector_menu_activity"
         android:title="@string/navigation_activity" />
 
     <item
         android:id="@+id/menu_good"
-        android:icon="@drawable/selector_menu_wode"
+        android:icon="@drawable/selector_menu_goods"
         android:title="@string/navigation_good" />
 
     <item
         android:id="@+id/menu_shopping_cart"
-        android:icon="@drawable/selector_menu_wode"
-        android:title="@string/navigation_shopping_cart" />
+        android:icon="@drawable/selector_menu_mine"
+        android:title="@string/navigation_mine" />
 </menu>
\ No newline at end of file