From 4576011ed357463e454bbd57f93055fa1bd895f7 Mon Sep 17 00:00:00 2001
From: liup <1454939542@qq.com>
Date: Tue, 21 May 2024 13:36:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/adapter/loadinggood_adapter.java     | 101 +++++++++---------
 .../home/fragment/MakeGoodFragment.java       |   1 +
 .../main/res/layout/fragment_make_good.xml    |  15 +--
 .../item/layout/dialog_add_makegood.xml       |   5 +
 .../layout/item/layout/loadinggood_item.xml   |   2 +-
 .../res/layout/item/layout/newmakegood.xml    |   4 +-
 6 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/loadinggood_adapter.java b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/loadinggood_adapter.java
index 643d1c7b..a83eeab5 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/loadinggood_adapter.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/loadinggood_adapter.java
@@ -80,57 +80,56 @@ public class loadinggood_adapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-        if (holder instanceof MyViewHolder) {
-            MyViewHolder myViewHolder = (MyViewHolder) holder;
-            ResGoodsMake goodsMake =datas.get(position);
-            // 设置要显示的图片和文字
-            myViewHolder.loading_ProgressBar.setProgress(goodsMake.makeProcess);
-            myViewHolder.loading_name.setText(goodsMake.good.name);
-            myViewHolder.loading_status.setText(goodsMake.makeStatus.name());
-            myViewHolder.loading_zuofa.setText(goodsMake.subOrder.exp);
-
-            DecimalFormat decimalFormat =new DecimalFormat("00");
-            myViewHolder.loading_xuhao.setText(decimalFormat.format(position+1));
+        LogUtils.error("****","刷新 position="+position);
+        MyViewHolder myViewHolder = (MyViewHolder) holder;
+        ResGoodsMake goodsMake =datas.get(position);
+        // 设置要显示的图片和文字
+        myViewHolder.loading_ProgressBar.setProgress(goodsMake.makeProcess);
+        myViewHolder.loading_name.setText(goodsMake.good.name);
+        myViewHolder.loading_status.setText(goodsMake.makeStatus.name());
+        myViewHolder.loading_zuofa.setText(goodsMake.subOrder.exp);
+
+        DecimalFormat decimalFormat =new DecimalFormat("00");
+        myViewHolder.loading_xuhao.setText(decimalFormat.format(position+1));
 //            myViewHolder.loading_time.setText(new SimpleDateFormat("HH:mm:ss").format(Date.parse(goodsMake.subOrder.createTime)));
-            switch (goodsMake.makeStatus.name())
-            {
-                case "等待中":
-                    //myViewHolder.quxiaozhizuo.setVisibility(View.GONE);
-                    //myViewHolder.loading_status.setTextColor(conmain.getResources().getColor(R.color.text4));
-                    break;
-                case "制作中":
-                   // myViewHolder.quxiaozhizuo.setVisibility(View.VISIBLE);//取消制作
-                    myViewHolder.loading_status.setTextColor(myViewHolder.loading_status.getContext().getResources().getColor(R.color.green_primary_dark));
-                    break;
-                case "制作完成":
-                   // myViewHolder.quxiaozhizuo.setVisibility(View.VISIBLE);//取消制作
-                    //myViewHolder.loading_status.setTextColor(conmain.getResources().getColor(R.color.tab_text_normal));
-                    break;
+        switch (goodsMake.makeStatus.name())
+        {
+            case "等待中":
+                //myViewHolder.quxiaozhizuo.setVisibility(View.GONE);
+                //myViewHolder.loading_status.setTextColor(conmain.getResources().getColor(R.color.text4));
+                break;
+            case "制作中":
+                // myViewHolder.quxiaozhizuo.setVisibility(View.VISIBLE);//取消制作
+                myViewHolder.loading_status.setTextColor(myViewHolder.loading_status.getContext().getResources().getColor(R.color.green_primary_dark));
+                break;
+            case "制作完成":
+                // myViewHolder.quxiaozhizuo.setVisibility(View.VISIBLE);//取消制作
+                //myViewHolder.loading_status.setTextColor(conmain.getResources().getColor(R.color.tab_text_normal));
+                break;
+        }
+        myViewHolder.loading_main.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if(mListener!=null) mListener.clickListener(view,goodsMake);
             }
-            myViewHolder.loading_main.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    if(mListener!=null) mListener.clickListener(view,goodsMake);
-                }
-            });
-
-            myViewHolder.quxiaozhizuo.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    String title = "温馨提示！";
-                    String message = "客官确定要取消制作【"+goodsMake.good.name+"】吗？";
-                    AlertDialogUtils.showDialog( mLayoutInflater.getContext(), title, message, new QMUIDialogAction.ActionListener() {
-                        @Override
-                        public void onClick(QMUIDialog dialog, int index) {
-                            DataBus.getInstance().DeleteGoodsMake(goodsMake.subOrder.id);
-                            ToastUtils.info("取消订单制作成功！");
-                            dialog.dismiss();
-                        }
-                    });
+        });
+
+        myViewHolder.quxiaozhizuo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String title = "温馨提示！";
+                String message = "客官确定要取消制作【"+goodsMake.good.name+"】吗？";
+                AlertDialogUtils.showDialog( myViewHolder.quxiaozhizuo.getContext(), title, message, new QMUIDialogAction.ActionListener() {
+                    @Override
+                    public void onClick(QMUIDialog dialog, int index) {
+                        DataBus.getInstance().DeleteGoodsMake(goodsMake.subOrder.id);
+                        ToastUtils.info("取消订单制作成功！");
+                        dialog.dismiss();
+                    }
+                });
 
-                }
-            });
-        }
+            }
+        });
     }
 
     private Activity findActivity(@NonNull Context context) {
@@ -149,14 +148,16 @@ public class loadinggood_adapter extends RecyclerView.Adapter<RecyclerView.ViewH
      */
     public void refresh() {
         if(handler!=null){
+            datas = DataBus.getInstance().GoodsMake;
+
             handler.postDelayed(new Runnable() {
                 @Override
                 public void run() {
-                    datas= DataBus.getInstance().GoodsMake;
                     notifyDataSetChanged();
+
                     LogUtils.error("****","刷新 size="+datas.size());
                 }
-            },500);
+            },200);
         }
 
     }
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 1daea0bc..32dbf4f1 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
@@ -165,6 +165,7 @@ public class MakeGoodFragment extends BaseFragment {
     TextView dianzichen;
     @BindView(R.id.loadgoodliebiao)
     RelativeLayout loadgoodliebiao;
+    private loadinggood_adapter loadinggoodAdapter;
 
 
     private Handler handler = new Handler(Looper.getMainLooper()){
diff --git a/app/src/main/res/layout/fragment_make_good.xml b/app/src/main/res/layout/fragment_make_good.xml
index 79689e9c..3908b16c 100644
--- a/app/src/main/res/layout/fragment_make_good.xml
+++ b/app/src/main/res/layout/fragment_make_good.xml
@@ -72,7 +72,6 @@
 
                     <LinearLayout
                         android:layout_alignParentRight="true"
-                        android:layout_marginRight="@dimen/dp_10"
                         android:layout_width="250dp"
                         android:layout_height="wrap_content"
                         android:orientation="vertical">
@@ -87,17 +86,11 @@
                             android:layout_marginTop="@dimen/dp_10"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent">
-                            <ScrollView
+                            <androidx.recyclerview.widget.RecyclerView
+                                android:id="@+id/datatab_paiduishangping"
                                 android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:fadingEdge="vertical"
-                                tools:ignore="Suspicious0dp">
-                                <androidx.recyclerview.widget.RecyclerView
-                                    android:id="@+id/datatab_paiduishangping"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:background="@color/main_background"/>
-                            </ScrollView>
+                                android:layout_height="wrap_content"
+                                android:background="@color/main_background"/>
                         </RelativeLayout>
                     </LinearLayout>
                 </RelativeLayout>
diff --git a/app/src/main/res/layout/item/layout/dialog_add_makegood.xml b/app/src/main/res/layout/item/layout/dialog_add_makegood.xml
index e59997fd..cfd8aa0e 100644
--- a/app/src/main/res/layout/item/layout/dialog_add_makegood.xml
+++ b/app/src/main/res/layout/item/layout/dialog_add_makegood.xml
@@ -30,6 +30,11 @@
             android:layout_height="wrap_content"
             android:text="星星知多少奶茶"
             android:textSize="20dp"
+            android:paddingLeft="43dp"
+            android:gravity="center"
+            android:layout_centerHorizontal="true"
+            android:maxLines="2"
+            android:paddingRight="43dp"
             android:layout_marginLeft="30dp"
             android:layout_marginTop="@dimen/dp_10">
         </TextView>
diff --git a/app/src/main/res/layout/item/layout/loadinggood_item.xml b/app/src/main/res/layout/item/layout/loadinggood_item.xml
index 7d436089..3528a745 100644
--- a/app/src/main/res/layout/item/layout/loadinggood_item.xml
+++ b/app/src/main/res/layout/item/layout/loadinggood_item.xml
@@ -21,7 +21,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:max="100"
-                android:progress="18" />
+                android:progress="0" />
         </RelativeLayout>
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item/layout/newmakegood.xml b/app/src/main/res/layout/item/layout/newmakegood.xml
index 386a741a..d516ae4f 100644
--- a/app/src/main/res/layout/item/layout/newmakegood.xml
+++ b/app/src/main/res/layout/item/layout/newmakegood.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="205dp"
+    android:layout_width="190dp"
     android:layout_height="180dp">
 
 
@@ -36,7 +36,7 @@
                 android:paddingLeft="5dp"
                 android:paddingRight="5dp"
                 tools:text="清炒三月瓜"
-                android:maxLength="2"
+                android:maxLines="2"
                 android:ellipsize="end"
                 android:textColor="@color/black"
                 android:textSize="20sp"