From d2caf5fbbfaf688d499b372255b64998e4b55fcd Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Wed, 24 Jan 2024 14:12:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/linktab/TopItemDecoration.java     |  66 ++++++++++--------
 .../linktab/makegood/MakeGoodLeftAdapter.java |   7 +-
 .../home/fragment/MakeGoodFragment.java       |   2 +-
 app/src/main/res/mipmap-xxxhdpi/silos22.png   | Bin 0 -> 4837 bytes
 4 files changed, 45 insertions(+), 30 deletions(-)
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/silos22.png

diff --git a/app/src/main/java/com/bonait/bnframework/common/linktab/TopItemDecoration.java b/app/src/main/java/com/bonait/bnframework/common/linktab/TopItemDecoration.java
index 0438ff62..3b6001c9 100644
--- a/app/src/main/java/com/bonait/bnframework/common/linktab/TopItemDecoration.java
+++ b/app/src/main/java/com/bonait/bnframework/common/linktab/TopItemDecoration.java
@@ -6,6 +6,7 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
+import android.util.Log;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -22,7 +23,7 @@ public class TopItemDecoration extends RecyclerView.ItemDecoration{
 
     public Context mContext;
     //间隔高度
-    private int mHeight = 60;
+    private int mHeight = 50;
     //矩形画笔
     private Paint mPaint=new Paint();
     //标签画笔
@@ -46,20 +47,29 @@ public class TopItemDecoration extends RecyclerView.ItemDecoration{
         int left = parent.getPaddingLeft();
         int right =parent.getWidth() - parent.getPaddingLeft();
         int childCount = parent.getChildCount();
-        for(int i=0;i<childCount;i++)
+        try
         {
-            View childView = parent.getChildAt(i);
-            int bottom = childView.getTop();
-            int top = bottom - mHeight;
-
-            //绘制矩形间隔
-            c.drawRect(left, top, right, bottom, mPaint);
-            //根据位置获取当前item的标签
-            String tag =typeListener.get(parent.getChildAdapterPosition(childView));
-
-            //绘制标签文本内容
-            textPaint.getTextBounds(tag, 0, tag.length(), mRound);
-            c.drawText(tag, left + textPaint.getTextSize(), bottom - mHeight / 2 + mRound.height() / 2, textPaint);
+            for(int i=0;i<childCount;i++)
+            {
+                View childView = parent.getChildAt(i);
+                int bottom = childView.getTop();
+                int top = bottom - mHeight;
+
+                //绘制矩形间隔
+                c.drawRect(left, top, right, bottom, mPaint);
+                //根据位置获取当前item的标签
+                int index= parent.getChildAdapterPosition(childView);
+                if(index<typeListener.size())
+                {
+                    String tag =typeListener.get(index);
+                    //绘制标签文本内容
+                    textPaint.getTextBounds(tag, 0, tag.length(), mRound);
+                    c.drawText(tag, left + textPaint.getTextSize(), bottom - mHeight / 2 + mRound.height() / 2, textPaint);
+                }
+            }
+        }catch (Exception ex)
+        {
+            Log.e("异常", "onDraw: "+ex.getMessage());
         }
     }
 
@@ -78,19 +88,19 @@ public class TopItemDecoration extends RecyclerView.ItemDecoration{
         int right =parent.getWidth() - parent.getPaddingLeft();
 
         LinearLayoutManager manager = (LinearLayoutManager)parent.getLayoutManager();
-        //第一个可见item位置
-        int index = manager.findFirstVisibleItemPosition();
-        if (index != -1) {
-            //获取指定位置item的View信息
-            View childView = parent.findViewHolderForLayoutPosition(index).itemView;
-            int top = parent.getPaddingTop();
-            String tag = typeListener.get(index);
-            int bottom = parent.getPaddingTop() + mHeight;
-            //悬浮置顶判断，其实也就是一直在绘制一个矩形加文本内容(上滑时取值bottom，下滑时取值childView.bottom.toFloat())
-            bottom = min(childView.getBottom(), bottom);
-            c.drawRect(0f, top, right, bottom, mPaint);
-            textPaint.getTextBounds(tag, 0, tag.length(), mRound);
-            c.drawText(tag, left + textPaint.getTextSize(), bottom - mHeight / 2 + mRound.height() / 2, textPaint);
-        }
+//        //第一个可见item位置
+//        int index = manager.findFirstVisibleItemPosition();
+//        if (index != -1) {
+//            //获取指定位置item的View信息
+//            View childView = parent.findViewHolderForLayoutPosition(index).itemView;
+//            int top = parent.getPaddingTop();
+//            String tag = typeListener.get(index);
+//            int bottom = parent.getPaddingTop() + mHeight;
+//            //悬浮置顶判断，其实也就是一直在绘制一个矩形加文本内容(上滑时取值bottom，下滑时取值childView.bottom.toFloat())
+//            bottom = min(childView.getBottom(), bottom);
+//            c.drawRect(0f, top, right, bottom, mPaint);
+//            textPaint.getTextBounds(tag, 0, tag.length(), mRound);
+//            c.drawText(tag, left + textPaint.getTextSize(), bottom - mHeight / 2 + mRound.height() / 2, textPaint);
+//        }
     }
 }
diff --git a/app/src/main/java/com/bonait/bnframework/common/linktab/makegood/MakeGoodLeftAdapter.java b/app/src/main/java/com/bonait/bnframework/common/linktab/makegood/MakeGoodLeftAdapter.java
index be7e4266..0be7652e 100644
--- a/app/src/main/java/com/bonait/bnframework/common/linktab/makegood/MakeGoodLeftAdapter.java
+++ b/app/src/main/java/com/bonait/bnframework/common/linktab/makegood/MakeGoodLeftAdapter.java
@@ -81,7 +81,12 @@ public class MakeGoodLeftAdapter extends BaseQuickAdapter<LinkMode, BaseViewHold
         for (LinkMode it : Fdata) {
             it.isChoose = false;
         }
-        Fdata.get(position).isChoose = true;
+
+        if(position<Fdata.size())
+        {
+            Fdata.get(position).isChoose = true;
+        }
+
         notifyDataSetChanged();
     }
 }
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java
index e8a42a9a..ff8ba2a9 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java
@@ -326,7 +326,7 @@ public class MakeGoodFragment extends BaseFragment {
 
         mTopBar.setTitle("智慧菠萝点餐系统"+ConfigName.getInstance().Version);
 
-        mTopBar.addLeftImageButton(R.mipmap.silos11,1).setOnClickListener(new View.OnClickListener() {
+        mTopBar.addLeftImageButton(R.mipmap.silos22,1).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 add_manguan.SetData();
diff --git a/app/src/main/res/mipmap-xxxhdpi/silos22.png b/app/src/main/res/mipmap-xxxhdpi/silos22.png
new file mode 100644
index 0000000000000000000000000000000000000000..34990a39f251ccd020b2af0a91593d6321c0df2d
GIT binary patch
literal 4837
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

literal 0
HcmV?d00001