Merge remote-tracking branch 'origin/dev_xf_' into dev_xf_

app/src/main/java/com/xx/merchanthbh/ui/home/HomeViewModel.java

@@ -19,6 +19,7 @@ import com.xx.merchanthbh.ui.assistant.AssistantManagementActivity;
 import com.xx.merchanthbh.ui.login.LoginViewModel;
 import com.xx.merchanthbh.ui.merchantenter.MerchantEnterActivity;
 import com.xx.merchanthbh.ui.merchantinfo.MaterialInfoActivity;
+import com.xx.merchanthbh.ui.msg.MessageActivity;
 import com.xx.merchanthbh.ui.order.OrderActivity;
 import com.xx.merchanthbh.ui.ordercreate.OrderCreateActivity;
 import com.xx.merchanthbh.ui.point.StorePointsActivity;
@@ -89,7 +90,14 @@ public class HomeViewModel extends BaseViewModel<HomeRequest> {
         }
 
     });
+    //跳转消息中心界面
+    public BindingCommand goMessage = new BindingCommand(new BindingAction() {
+        @Override
+        public void call() {
+            startActivity(MessageActivity.class);
+        }
 
+    });
     //跳转诉求反馈
     public BindingCommand goAppeal = new BindingCommand(new BindingAction() {
         @Override

app/src/main/java/com/xx/merchanthbh/ui/huanbohai/HuanBoHaiViewModel.java

@@ -162,14 +162,7 @@ public class HuanBoHaiViewModel extends BaseViewModel<HuanBoHaiRequest> {
         }
 
     });
-    //跳转诉求详情界面
-    public BindingCommand goDetail = new BindingCommand(new BindingAction() {
-        @Override
-        public void call() {
-            startActivity(AppealDetailActivity.class);
-        }
 
-    });
 
     //跳转资讯列表界面
     public BindingCommand goConsultation = new BindingCommand(new BindingAction() {

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

@@ -115,6 +115,8 @@
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv_assistant_list"
                         android:layout_width="match_parent"
+                        android:layout_marginBottom="20dp"
+                        android:layout_marginTop="10dp"
                         android:layout_height="wrap_content"
                         binding:layoutManager="@{LayoutManagers.linear(1,false)}" />
                 </LinearLayout>

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

@@ -87,8 +87,6 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="17dp"
                         android:layout_marginRight="17dp"
-                        android:layout_marginBottom="17dp"
-                        android:orientation="vertical"
                         binding:layoutManager="@{LayoutManagers.linear(1,false)}" />
                 </com.google.android.material.appbar.AppBarLayout>
             </LinearLayout>

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

@@ -17,14 +17,48 @@
         android:fitsSystemWindows="true">
 
 
-        <com.xx.xxviewlibrary.witget.XxBar
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/bar"
             android:layout_width="match_parent"
             android:layout_height="55dp"
-            on_click="@{homeViewModel.clickFinish}"
-            app:layout_constraintTop_toTopOf="parent"
-            app:bar_title='@{@string/home_title}'
-            />
+            app:layout_constraintTop_toTopOf="parent" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/home_title"
+                android:textStyle="bold"
+                android:textColor="@color/black"
+                android:textSize="19sp"
+                binding:layout_constraintTop_toTopOf="parent"
+                binding:layout_constraintBottom_toBottomOf="parent"
+                binding:layout_constraintLeft_toLeftOf="parent"
+                android:layout_marginLeft="150dp"/>
+
+            <ImageView
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                binding:layout_constraintTop_toTopOf="parent"
+                binding:layout_constraintBottom_toBottomOf="parent"
+                binding:layout_constraintRight_toLeftOf="@+id/iv_bar_msg"
+                android:layout_marginRight="30.5dp"
+                android:src="@mipmap/home_icon_saoyisao"
+                />
+
+            <ImageView
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                binding:onClickCommand="@{homeViewModel.goMessage}"
+                android:id="@+id/iv_bar_msg"
+                binding:layout_constraintTop_toTopOf="parent"
+                binding:layout_constraintBottom_toBottomOf="parent"
+                binding:layout_constraintRight_toRightOf="parent"
+                android:layout_marginRight="17dp"
+                android:src="@mipmap/home_icon_wuxiaoxi"
+                />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
         <!--        滚动轮-->
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"

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

@@ -22,13 +22,24 @@
         android:background="@color/white"
         android:fitsSystemWindows="true">
 
-        <com.xx.xxviewlibrary.witget.XxBar
+        <LinearLayout
+            android:orientation="vertical"
+            android:gravity="center"
             android:id="@+id/bar"
             android:layout_width="match_parent"
             android:layout_height="55dp"
-            on_click="@{huanbohaiViewModel.clickFinish}"
-            app:bar_title='@{@string/navigation_sea}'
-            app:layout_constraintTop_toTopOf="parent" />
+            tools:ignore="MissingConstraints">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/navigation_sea"
+                android:textStyle="bold"
+                android:textColor="@color/black"
+                android:textSize="19sp"
+                android:gravity="center"/>
+
+        </LinearLayout>
         <!--        滚动轮-->
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
@@ -49,16 +60,7 @@
                     android:id="@+id/banner_hbh"
                     android:layout_width="match_parent"
                     android:layout_height="188dp" />
-                <Button
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    binding:onClickCommand="@{huanbohaiViewModel.goMessage}"
-                    android:text="@string/message_center"/>
-                <Button
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    binding:onClickCommand="@{huanbohaiViewModel.goDetail}"
-                    android:text="诉求详情"/>
+
                 <!--活动中心模块-->
                 <LinearLayout
                     android:layout_width="fill_parent"

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

@@ -14,9 +14,10 @@
     <LinearLayout
         android:background="@drawable/bg_white_radius_12"
         android:layout_width="match_parent"
-        android:layout_marginTop="13dp"
         android:paddingLeft="13dp"
         android:paddingTop="17dp"
+        android:layout_marginTop="7dp"
+        android:layout_marginBottom="7dp"
         android:paddingRight="13dp"
         android:paddingBottom="19dp"
         android:layout_height="wrap_content"

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeallist/AppealListAdapter.kt

@@ -84,7 +84,6 @@ class AppealListAdapter(context:Context,val viewModel: AppealListViewModel): xxB
             //todo 跳转编辑页面
             val intent = Intent(mContext, AppealAllocationActivity::class.java)
             mContext.startActivity(intent)
-
         }
 
         dataBind?.btnIalAllocationAgain?.setOnClickListener()

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/appeallist/OrderAppealListAdapter.kt

@@ -2,6 +2,7 @@ package com.xx.hbhbcompany.ui.appeallist
 
 import android.app.ActionBar.LayoutParams
 import android.content.Context
+import android.content.Intent
 import android.view.View
 import android.widget.ImageView
 import com.bumptech.glide.Glide
@@ -11,6 +12,7 @@ import com.xx.hbhbcompany.R
 import com.xx.hbhbcompany.data.http.requst.AppealListRequest
 import com.xx.hbhbcompany.data.http.respons.AppealListBean
 import com.xx.hbhbcompany.databinding.ItemAppealListBinding
+import com.xx.hbhbcompany.ui.appeal.AppealAllocationActivity
 import com.xx.xxviewlibrary.base.xxBaseRecyclerViewAdapter
 import me.jessyan.autosize.utils.AutoSizeUtils
 
@@ -62,6 +64,8 @@ class OrderAppealListAdapter(context:Context): xxBaseRecyclerViewAdapter<ItemApp
         dataBind?.btnIalBack?.setOnClickListener()
         {
             //todo 跳转编辑页面
+            val intent = Intent(mContext, AppealAllocationActivity::class.java)
+            mContext.startActivity(intent)
         }
 
 

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/home/HomeActivity.java

@@ -7,7 +7,7 @@ import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.xx.hbhbcompany.R;
 import com.xx.hbhbcompany.databinding.ActivityHomeBinding;
 import com.xx.hbhbcompany.ui.mine.MineFragment;
-import com.xx.hbhbcompany.ui.work.WorkFragment;
+import com.xx.hbhbcompany.ui.qualityauditinfo.work.WorkFragment;
 
 import me.goldze.mvvmhabit.base.BaseActivity;
 

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/home/HomeViewModel.java

@@ -175,14 +175,7 @@ public class HomeViewModel extends BaseViewModel<HomeRequest> {
         }
 
     });
-    //跳转诉求详情界面
-    public BindingCommand goDetail = new BindingCommand(new BindingAction() {
-        @Override
-        public void call() {
-            startActivity(AppealDetailActivity.class);
-        }
 
-    });
     //跳转资讯列表界面
     public BindingCommand goConsultation = new BindingCommand(new BindingAction() {
         @Override

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/work/WorkFragment.java → hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/qualityauditinfo/work/WorkFragment.java

-package com.xx.hbhbcompany.ui.work;
+package com.xx.hbhbcompany.ui.qualityauditinfo.work;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.Nullable;
@@ -10,16 +9,11 @@ import androidx.lifecycle.Observer;
 
 import com.xx.hbhbcompany.BR;
 import com.xx.hbhbcompany.R;
-import com.xx.hbhbcompany.activity.adapter.MessageListAdapter;
 import com.xx.hbhbcompany.activity.adapter.WorkIconsAdapter;
 import com.xx.hbhbcompany.data.http.requst.WorkRequest;
-import com.xx.hbhbcompany.data.http.respons.MessageBean;
-import com.xx.hbhbcompany.data.http.respons.OrderBean;
 import com.xx.hbhbcompany.data.http.respons.WorkIconBean;
-import com.xx.hbhbcompany.data.staticdata.StaticData;
 import com.xx.hbhbcompany.databinding.FragmentWorkBinding;
 import com.xx.xxviewlibrary.base.xxBaseRecyclerViewAdapter;
-import com.xx.xxviewlibrary.witget.model.FileBean;
 
 import java.util.List;
 

hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/work/WorkViewModel.java → hbhbcompany/src/main/java/com/xx/hbhbcompany/ui/qualityauditinfo/work/WorkViewModel.java

-package com.xx.hbhbcompany.ui.work;
+package com.xx.hbhbcompany.ui.qualityauditinfo.work;
 
 import android.app.Application;
 import android.os.Bundle;
@@ -20,7 +20,6 @@ import com.xx.hbhbcompany.ui.appeallist.AppealListActivity;
 import com.xx.hbhbcompany.ui.merchantaudit.MerchantAuditListActivity;
 import com.xx.hbhbcompany.ui.order.OrderActivity;
 import com.xx.hbhbcompany.ui.productlist.ProductListActivity;
-import com.xx.hbhbcompany.ui.pwd.SetPwdActivity;
 
 import java.util.ArrayList;
 import java.util.List;

hbhbcompany/src/main/res/layout/fragment_home.xml

@@ -82,12 +82,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="188dp" />
 
-                <Button
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    binding:onClickCommand="@{homeViewModel.goDetail}"
-                    android:text="诉求详情"/>
-
                 <!--资讯信息模块-->
                 <LinearLayout
                     android:layout_width="fill_parent"

hbhbcompany/src/main/res/layout/fragment_work.xml

@@ -8,7 +8,7 @@
 
         <variable
             name="workViewModel"
-            type="com.xx.hbhbcompany.ui.work.WorkViewModel" />
+            type="com.xx.hbhbcompany.ui.qualityauditinfo.work.WorkViewModel" />
 
         <import type="me.goldze.mvvmhabit.binding.viewadapter.recyclerview.LayoutManagers" />
 
@@ -220,8 +220,7 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:layout_columnWeight="1"
-                                        android:orientation="vertical"
-                                        binding:onClickCommand="@{workViewModel.goAppeal}">
+                                        android:orientation="vertical">
                                         <!--诉求反馈-数量-->
                                         <TextView
                                             android:layout_width="wrap_content"