From 6d09d60770489f29f48e1c59fb81b06e35d68081 Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Mon, 6 Nov 2023 17:04:31 +0800
Subject: [PATCH] 333

---
 .../bnframework/common/constant/DataBus.java  |   2 +-
 .../bnframework/common/db/res/MakeStatus.java |   2 +-
 .../common/db/res/ResGoodsMake.java           |   2 +-
 .../common/linktab/TopItemDecoration.java     |   2 +-
 .../home/adapter/loadinggood_adapter.java     |  21 +++-
 .../home/fragment/MakeGoodFragment.java       | 118 ++++++++----------
 app/src/main/res/drawable/progressbar.xml     |   8 +-
 .../main/res/layout/fragment_make_good.xml    | 104 ++++++++-------
 .../layout/item/layout/item_left_makegood.xml |   9 +-
 .../layout/item/layout/loadinggood_item.xml   |  91 ++++++--------
 .../res/layout/item/layout/newmakegood.xml    |   9 +-
 app/src/main/res/mipmap-xxxhdpi/user.png      | Bin 0 -> 1073 bytes
 12 files changed, 181 insertions(+), 187 deletions(-)
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/user.png

diff --git a/app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java b/app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java
index e4eb2161..9148023b 100644
--- a/app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java
+++ b/app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java
@@ -199,7 +199,7 @@ public class DataBus {
             }
 
             make.subOrder=suborder;
-            make.makeStatus= MakeStatus.等待制作;
+            make.makeStatus= MakeStatus.等待中;
             make.makeMs="等待下发物料！";
             make.makeProcess=0;
             GoodsMake.add(make);
diff --git a/app/src/main/java/com/bonait/bnframework/common/db/res/MakeStatus.java b/app/src/main/java/com/bonait/bnframework/common/db/res/MakeStatus.java
index 52a91039..23d7b798 100644
--- a/app/src/main/java/com/bonait/bnframework/common/db/res/MakeStatus.java
+++ b/app/src/main/java/com/bonait/bnframework/common/db/res/MakeStatus.java
@@ -1,7 +1,7 @@
 package com.bonait.bnframework.common.db.res;
 
 public enum MakeStatus {
-    等待制作,
+    等待中,
     制作中,
     制作完成
 }
diff --git a/app/src/main/java/com/bonait/bnframework/common/db/res/ResGoodsMake.java b/app/src/main/java/com/bonait/bnframework/common/db/res/ResGoodsMake.java
index f4d9d67b..8975a874 100644
--- a/app/src/main/java/com/bonait/bnframework/common/db/res/ResGoodsMake.java
+++ b/app/src/main/java/com/bonait/bnframework/common/db/res/ResGoodsMake.java
@@ -52,7 +52,7 @@ public class ResGoodsMake {
         good=new BPA_GOODS();
         subOrder=new BPA_SUBORDER();
         recipes=new ArrayList<>();
-        makeStatus=MakeStatus.等待制作;
+        makeStatus=MakeStatus.等待中;
         makeMs="";
         makeProcess=0;
         IsMake=true;
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 5788bb87..427a5a2e 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
@@ -36,7 +36,7 @@ public class TopItemDecoration extends RecyclerView.ItemDecoration{
         mContext=_context;
         mPaint.setColor(ContextCompat.getColor(mContext, R.color.main_background));
         textPaint.setColor(ContextCompat.getColor(mContext, R.color.black));
-        textPaint.setTextSize(26f);
+        textPaint.setTextSize(19f);
         typeListener=type;
     }
 
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 115ceaf3..cd343b43 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
@@ -33,7 +33,10 @@ import com.bonait.bnframework.common.utils.ToastUtils;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
 
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 public class loadinggood_adapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>  {
@@ -71,18 +74,23 @@ public class loadinggood_adapter extends RecyclerView.Adapter<RecyclerView.ViewH
             myViewHolder.loading_name.setText(goodsMake.good.name);
             myViewHolder.loading_status.setText(goodsMake.makeStatus.name());
             myViewHolder.loading_zuofa.setText(goodsMake.subOrder.exp);
-            myViewHolder.loading_time.setText(goodsMake.subOrder.createTime);
 
+            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.loading_status.setTextColor(conmain.getResources().getColor(R.color.text4));
+                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(conmain.getResources().getColor(R.color.green_primary_dark));
                     break;
                 case "制作完成":
-                    myViewHolder.loading_status.setTextColor(conmain.getResources().getColor(R.color.tab_text_normal));
+                    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() {
@@ -95,7 +103,6 @@ public class loadinggood_adapter extends RecyclerView.Adapter<RecyclerView.ViewH
             myViewHolder.quxiaozhizuo.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-
                     String title = "温馨提示！";
                     String message = "客官确定要取消制作【"+goodsMake.good.name+"】吗？";
                     AlertDialogUtils.showDialog(conmain, title, message, new QMUIDialogAction.ActionListener() {
@@ -159,7 +166,7 @@ public class loadinggood_adapter extends RecyclerView.Adapter<RecyclerView.ViewH
         TextView loading_zuofa;
         TextView loading_status;
         TextView loading_time;
-
+        TextView loading_xuhao;
         Button quxiaozhizuo;
         public MyViewHolder(View view) {
             super(view);
@@ -170,6 +177,8 @@ public class loadinggood_adapter extends RecyclerView.Adapter<RecyclerView.ViewH
             loading_status = view.findViewById(R.id.loading_status);
             loading_time= view.findViewById(R.id.loading_time);
             quxiaozhizuo= view.findViewById(R.id.quxiaozhizuo);
+
+            loading_xuhao= view.findViewById(R.id.loading_xuhao);
         }
     }
 }
\ No newline at end of file
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 c0fed398..b1d94b8c 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
@@ -89,7 +89,7 @@ public class MakeGoodFragment extends BaseFragment {
     /**
      * 商品类型
      */
-    ArrayList<BPA_GOODSTYPE> goodstypes=new ArrayList<>();
+    ArrayList<BPA_GOODSTYPE> goodstypes = new ArrayList<>();
 
     /**
      * 商品制作列表
@@ -114,7 +114,7 @@ public class MakeGoodFragment extends BaseFragment {
      */
     @BindView(R.id.wendu1)
     TextView wendu1;
-//    @BindView(R.id.pf_ms)
+    //    @BindView(R.id.pf_ms)
 //    TextView pf_ms;
     @BindView(R.id.plc_status)
     TextView plc_status;
@@ -140,14 +140,14 @@ public class MakeGoodFragment extends BaseFragment {
         Initdata();
         Run();
     }
+
     public List<LinkMode> Fdata = new ArrayList<>();
+
     /**
      * 初始化数据
      */
-    public void Initdata()
-    {
-        if(isAdded())
-        {
+    public void Initdata() {
+        if (isAdded()) {
             new Thread(new Runnable() {
                 @Override
                 public void run() {
@@ -163,17 +163,16 @@ public class MakeGoodFragment extends BaseFragment {
 
                                 Fdata.clear();
 
-                                int i=0;
-                                for(BPA_GOODSTYPE item :goodstypes)
-                                {
-                                    ArrayList<BPA_GOODS> goodsm= QueryDB.GetGoodsTypeId(item.id);
-                                    Fdata.add(new LinkMode(item, Arrays.asList(goodsm.toArray()), i==0?true:false));
+                                int i = 0;
+                                for (BPA_GOODSTYPE item : goodstypes) {
+                                    ArrayList<BPA_GOODS> goodsm = QueryDB.GetGoodsTypeId(item.id);
+                                    Fdata.add(new LinkMode(item, Arrays.asList(goodsm.toArray()), i == 0 ? true : false));
                                     i++;
                                 }
 
                                 LinearLayoutManager manager = (LinearLayoutManager) rv_right.getLayoutManager();
-                                MakeGoodLeftAdapter leftAdapter = new MakeGoodLeftAdapter(R.layout.item_left_makegood, Fdata,getResources(),manager);
-                                MakeGoodRightAdapter rightAdapter = new MakeGoodRightAdapter(R.layout.item_right_lc, Fdata,getResources());
+                                MakeGoodLeftAdapter leftAdapter = new MakeGoodLeftAdapter(R.layout.item_left_makegood, Fdata, getResources(), manager);
+                                MakeGoodRightAdapter rightAdapter = new MakeGoodRightAdapter(R.layout.item_right_lc, Fdata, getResources());
                                 rv_left.setAdapter(leftAdapter);
                                 rv_right.setAdapter(rightAdapter);
 
@@ -184,8 +183,7 @@ public class MakeGoodFragment extends BaseFragment {
                                     typeListener.add(((BPA_GOODSTYPE) item.type).name);
                                 }
 
-                                if(rv_right.getItemDecorationCount()>0)
-                                {
+                                if (rv_right.getItemDecorationCount() > 0) {
                                     rv_right.removeItemDecorationAt(0);
                                 }
                                 TopItemDecoration top = new TopItemDecoration(context, typeListener);
@@ -213,21 +211,18 @@ public class MakeGoodFragment extends BaseFragment {
                     }
                 }
             }).start();
-
         }
-
     }
 
     /**
      * 加载商品
      */
-    public void LoadingGood()
-    {
-        LinearLayoutManager layoutManager=new LinearLayoutManager(context);
+    public void LoadingGood() {
+        LinearLayoutManager layoutManager = new LinearLayoutManager(context);
         layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
         datatab_paiduishangping.setLayoutManager(layoutManager);
 
-        DataBus.getInstance().loadinggoodAdapter = new loadinggood_adapter(context, myClickListener,getActivity());
+        DataBus.getInstance().loadinggoodAdapter = new loadinggood_adapter(context, myClickListener, getActivity());
         datatab_paiduishangping.setAdapter(DataBus.getInstance().loadinggoodAdapter);
     }
 
@@ -235,68 +230,57 @@ public class MakeGoodFragment extends BaseFragment {
     /**
      * 点击商品 开始制作
      */
-    public MyClickListener myClickListener=new MyClickListener() {
+    public MyClickListener myClickListener = new MyClickListener() {
         @Override
         public void clickListener(View v, Object data) {
-            ResGoodsMake makegood=(ResGoodsMake)data;
-            if(!ConfigName.getInstance().PlcIsConnect)
-            {
+            ResGoodsMake makegood = (ResGoodsMake) data;
+            if (!ConfigName.getInstance().PlcIsConnect) {
                 ToastUtils.warning("设备已离线,请检查设备...");
                 return;
             }
 
-            if(DataBus.getInstance().ZDQX_IsStart)
-            {
+            if (DataBus.getInstance().ZDQX_IsStart) {
                 ToastUtils.warning("自动清洗中,请等待清洗完成！");
                 return;
             }
 
-            if(ExecuteTheRecipe.IsMakeGood)
-            {
+            if (ExecuteTheRecipe.IsMakeGood) {
                 ToastUtils.warning("请耐心等待上一商品制作完成...");
                 return;
             }
 
-            if(makegood.subOrder.status==1)
-            {
-                ToastUtils.warning("商品:"+makegood.good.name+",已在制作中...");
+            if (makegood.subOrder.status == 1) {
+                ToastUtils.warning("商品:" + makegood.good.name + ",已在制作中...");
                 return;
             }
 
-            if(makegood.subOrder.status==2)
-            {
-                ToastUtils.warning("商品:"+makegood.good.name+",已制作完成...");
+            if (makegood.subOrder.status == 2) {
+                ToastUtils.warning("商品:" + makegood.good.name + ",已制作完成...");
                 return;
             }
 
-            if (!ExecuteTheRecipe.IsCup)
-            {
+            if (!ExecuteTheRecipe.IsCup) {
                 ToastUtils.warning("出料口没有检测到器皿！");
                 return;
             }
 
 
             String title = "温馨提示！";
-            String message = "客官确定要开始制作【"+makegood.good.name+"】吗？";
+            String message = "客官确定要开始制作【" + makegood.good.name + "】吗？";
             AlertDialogUtils.showDialog(context, title, message, new QMUIDialogAction.ActionListener() {
                 @Override
                 public void onClick(QMUIDialog dialog, int index) {
 
                     //判断温度是否到达
-                    if (!ConfigName.getInstance().versionSelectionEnum.equals("配料吧台"))
-                    {
-                        if(makegood.Gt1)
-                        {
-                            if(ExecuteTheRecipe.SugarTempLeft<ExecuteTheRecipe.SugarTempLeft_SZ)
-                            {
+                    if (!ConfigName.getInstance().versionSelectionEnum.equals("配料吧台")) {
+                        if (makegood.Gt1) {
+                            if (ExecuteTheRecipe.SugarTempLeft < ExecuteTheRecipe.SugarTempLeft_SZ) {
                                 ToastUtils.warning("果糖左仓温度未达到设置值,不允许出料...");
                                 return;
                             }
                         }
-                        if(makegood.Gt2)
-                        {
-                            if(ExecuteTheRecipe.SugarTempRight<ExecuteTheRecipe.SugarTempRight_SZ)
-                            {
+                        if (makegood.Gt2) {
+                            if (ExecuteTheRecipe.SugarTempRight < ExecuteTheRecipe.SugarTempRight_SZ) {
                                 ToastUtils.warning("果糖右仓温度未达到设置值,不允许出料...");
                                 return;
                             }
@@ -306,13 +290,13 @@ public class MakeGoodFragment extends BaseFragment {
                         @Override
                         public void run() {
                             //设置清洗模式
-                            ExecuteTheRecipe.WritePLC("清洗模式",false,null);
-                            ExecuteTheRecipe.WritePLC("砝码校准模式",false,null);
+                            ExecuteTheRecipe.WritePLC("清洗模式", false, null);
+                            ExecuteTheRecipe.WritePLC("砝码校准模式", false, null);
                             ExecuteTheRecipe.WritePLC("手自切换", true, null);
                         }
                     }).start();
                     ExecuteTheRecipe.Execute(makegood);
-                    ToastUtils.warning("商品:"+makegood.good.name+",开始制作");
+                    ToastUtils.warning("商品:" + makegood.good.name + ",开始制作");
                     dialog.dismiss();
                 }
             });
@@ -323,12 +307,13 @@ public class MakeGoodFragment extends BaseFragment {
 
         }
     };
+
     /**
      * 初始化TopBar
      */
     private void initTopBar() {
         mTopBar.setTitle("智慧菠萝点餐系统");
-        mTopBar.addRightTextButton("料仓满管",1).setOnClickListener(new View.OnClickListener() {
+        mTopBar.addRightTextButton("料仓满管", 1).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 add_manguan.SetData();
@@ -340,14 +325,14 @@ public class MakeGoodFragment extends BaseFragment {
             @Override
             public void onMessage(Object msg) {
                 if (msg != null) {
-                    BPA_GOODS goods=(BPA_GOODS) msg;
+                    BPA_GOODS goods = (BPA_GOODS) msg;
 
                     add_makegood.SetData(goods);
                     add_makegood.setVisibility(View.VISIBLE);
                 }
             }
         });
-        add_manguan.mListener=new MyClickListener() {
+        add_manguan.mListener = new MyClickListener() {
             @Override
             public void clickListener(View v, Object data) {
 
@@ -358,24 +343,23 @@ public class MakeGoodFragment extends BaseFragment {
                 add_manguan.setVisibility(View.GONE);
             }
         };
-        add_makegood.mListener=new MyClickListener() {
+        add_makegood.mListener = new MyClickListener() {
             @Override
             public void clickListener(View v, Object data) {
             }
 
             @Override
             public void clickListenerNew(View v, int k, Object data) {
-                if(k==0)
-                {
+                if (k == 0) {
                     add_makegood.setVisibility(View.GONE);
-                }else
-                {
+                } else {
                     add_makegood.setVisibility(View.GONE);
                 }
             }
         };
     }
-    @OnClick({R.id.good_gengxin,R.id.cheng_clear})
+
+    @OnClick({R.id.good_gengxin, R.id.cheng_clear})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.good_gengxin://刷新
@@ -387,6 +371,7 @@ public class MakeGoodFragment extends BaseFragment {
                     public void onSuccess() {
                         ToastUtils.info("清零成功！");
                     }
+
                     @Override
                     public void onFailure(String ErrorMsg) {
                         ToastUtils.error("清零失败！");
@@ -401,10 +386,10 @@ public class MakeGoodFragment extends BaseFragment {
         public void handleMessage(Message msg) {
             switch (msg.what) {
                 case 0:
-                    plc_status.setText(ConfigName.getInstance().PlcIsConnect?"正常":"异常");
-                    plc_status.setTextColor(ConfigName.getInstance().PlcIsConnect? Color.parseColor("#4CAF50"):Color.parseColor("#D32F2F"));
-                    wendu1.setText(ExecuteTheRecipe.WaterTemp+"°C");
-                    dianzichen.setText(String.valueOf((int)ExecuteTheRecipe.OutletWeigh / 10.0) + " g");
+                    plc_status.setText(ConfigName.getInstance().PlcIsConnect ? "正常" : "异常");
+                    plc_status.setTextColor(ConfigName.getInstance().PlcIsConnect ? Color.parseColor("#4CAF50") : Color.parseColor("#D32F2F"));
+                    wendu1.setText(ExecuteTheRecipe.WaterTemp + "°C");
+                    dianzichen.setText(String.valueOf((int) ExecuteTheRecipe.OutletWeigh / 10.0) + " g");
                     break;
                 case 1:
 
@@ -416,6 +401,7 @@ public class MakeGoodFragment extends BaseFragment {
 
         }
     };
+
     /**
      * 实时显示线程
      */
@@ -423,8 +409,7 @@ public class MakeGoodFragment extends BaseFragment {
         new Thread(new Runnable() {
             @Override
             public void run() {
-                while (true)
-                {
+                while (true) {
                     try {
                         mHandler.sendEmptyMessage(0);
                         Thread.sleep(200);
@@ -436,6 +421,7 @@ public class MakeGoodFragment extends BaseFragment {
         }).start();
 
     }
+
     @Override
     public void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/res/drawable/progressbar.xml b/app/src/main/res/drawable/progressbar.xml
index de5d2d4f..ddf7b30c 100644
--- a/app/src/main/res/drawable/progressbar.xml
+++ b/app/src/main/res/drawable/progressbar.xml
@@ -6,8 +6,8 @@
             <gradient
                 android:angle="270"
                 android:centerY="0"
-                android:endColor="#0701BFFF"
-                android:startColor="#0701BFFF"
+                android:endColor="#E5E5E5"
+                android:startColor="#E5E5E5"
                  />
         </shape>
     </item>
@@ -34,8 +34,8 @@
                 <gradient
                     android:angle="270"
                     android:centerY="0"
-                    android:endColor="#2D01BFFF"
-                    android:startColor="#2D01BFFF" />
+                    android:endColor="#00A8E1"
+                    android:startColor="#00A8E1" />
             </shape>
 
         </clip>
diff --git a/app/src/main/res/layout/fragment_make_good.xml b/app/src/main/res/layout/fragment_make_good.xml
index 7af7d7b7..a4a72a00 100644
--- a/app/src/main/res/layout/fragment_make_good.xml
+++ b/app/src/main/res/layout/fragment_make_good.xml
@@ -10,33 +10,31 @@
         android:layout_height="match_parent"
         android:layout_marginTop="?attr/qmui_topbar_height"
         android:background="@color/main_background">
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:orientation="horizontal"
-            >
+            android:orientation="horizontal">
             <LinearLayout
-                android:layout_width="120dp"
+                android:layout_width="90dp"
                 android:layout_height="match_parent"
-                android:orientation="vertical"
+                android:layout_marginBottom="35dp"
                 android:background="@color/white"
-                android:layout_marginBottom="35dp">
+                android:orientation="vertical">
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_left"
                     android:layout_width="match_parent"
-                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                     android:layout_height="0dp"
                     android:layout_weight="1"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
                 <Button
-                    android:layout_marginTop="@dimen/dp_10"
                     android:id="@+id/good_gengxin"
                     android:layout_width="match_parent"
                     android:layout_height="30dp"
                     android:layout_centerInParent="true"
+                    android:layout_marginTop="@dimen/dp_10"
                     android:background="@drawable/bg_btn_login_selected"
                     android:text="刷新"
                     android:textColor="@color/white"
@@ -45,10 +43,10 @@
 
             <LinearLayout
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:layout_marginBottom="35dp">
+                android:layout_marginBottom="35dp"
+                android:layout_weight="1"
+                android:orientation="vertical">
 
                 <RelativeLayout
                     android:layout_width="match_parent"
@@ -57,35 +55,43 @@
                     app:layout_constraintLeft_toRightOf="@+id/rv_left"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent">
+
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv_right"
                         android:layout_width="match_parent"
+                        android:layout_height="match_parent"
                         android:orientation="vertical"
-                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                        android:layout_height="match_parent"/>
-
+                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
 
                 </RelativeLayout>
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="260dp"
+                android:layout_marginRight="@dimen/dp_10"
+                android:layout_width="200dp"
                 android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:layout_marginBottom="35dp">
+                android:layout_marginBottom="10dp"
+                android:orientation="vertical">
+                <ImageView
+                    android:layout_marginTop="10dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@mipmap/user"/>
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
+
                     <ScrollView
-                        android:layout_height="match_parent"
                         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:layout_height="wrap_content" />
                     </ScrollView>
                 </RelativeLayout>
             </LinearLayout>
@@ -96,70 +102,74 @@
             android:id="@+id/add_makegood"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:visibility="gone"/>
+            android:visibility="gone" />
         <com.bonait.bnframework.modules.home.fragment.mode.add_manguan_control
             android:id="@+id/add_manguan"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:visibility="gone"/>
+            android:visibility="gone" />
         <LinearLayout
-            android:layout_marginLeft="10dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true">
+            android:layout_alignParentBottom="true"
+            android:layout_marginLeft="10dp">
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_margin="5dp"
                 android:text="设备:"
-                android:textSize="@dimen/TitleSize"
-                android:layout_margin="5dp"/>
+                android:textSize="@dimen/TitleSize" />
+
             <TextView
                 android:id="@+id/plc_status"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/green_primary"
-                android:textSize="@dimen/TitleSize"
+                android:layout_margin="5dp"
                 android:text="正常"
-                android:layout_margin="5dp"/>
+                android:textColor="@color/green_primary"
+                android:textSize="@dimen/TitleSize" />
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_margin="5dp"
                 android:text="水箱:"
-                android:textSize="@dimen/TitleSize"
-                android:layout_margin="5dp"/>
+                android:textSize="@dimen/TitleSize" />
+
             <TextView
                 android:id="@+id/wendu1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/green_primary"
-                android:textSize="@dimen/TitleSize"
+                android:layout_margin="5dp"
                 android:text="89.9°C"
-                android:layout_margin="5dp"/>
+                android:textColor="@color/green_primary"
+                android:textSize="@dimen/TitleSize" />
 
             <TextView
                 android:id="@+id/cheng_clear"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_margin="5dp"
                 android:text="称(单击清零):"
-                android:textSize="@dimen/TitleSize"
-                android:layout_margin="5dp"/>
+                android:textSize="@dimen/TitleSize" />
 
             <TextView
                 android:id="@+id/dianzichen"
                 android:layout_width="70dp"
                 android:layout_height="wrap_content"
-                android:textColor="@color/green_primary"
-                android:textSize="@dimen/TitleSize"
+                android:layout_margin="5dp"
                 android:text="11.9g"
-                android:layout_margin="5dp"/>
-<!--            <TextView-->
-<!--                android:id="@+id/pf_ms"-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:paddingLeft="10dp"-->
-<!--                android:textColor="#730080"-->
-<!--                android:text="信息配方：正在制作过程中..."-->
-<!--                android:layout_margin="5dp"/>-->
+                android:textColor="@color/green_primary"
+                android:textSize="@dimen/TitleSize" />
+            <!--            <TextView-->
+            <!--                android:id="@+id/pf_ms"-->
+            <!--                android:layout_width="match_parent"-->
+            <!--                android:layout_height="wrap_content"-->
+            <!--                android:paddingLeft="10dp"-->
+            <!--                android:textColor="#730080"-->
+            <!--                android:text="信息配方：正在制作过程中..."-->
+            <!--                android:layout_margin="5dp"/>-->
 
         </LinearLayout>
     </RelativeLayout>
@@ -167,5 +177,5 @@
         android:id="@+id/topbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/app_color_blue"/>
+        android:background="@color/app_color_blue" />
 </com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item/layout/item_left_makegood.xml b/app/src/main/res/layout/item/layout/item_left_makegood.xml
index 3464c521..af6c5701 100644
--- a/app/src/main/res/layout/item/layout/item_left_makegood.xml
+++ b/app/src/main/res/layout/item/layout/item_left_makegood.xml
@@ -10,14 +10,15 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
+
         <TextView
             android:id="@+id/tv_type"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
             android:gravity="center"
-            android:textSize="18dp"
             android:text="柠檬茶"
-            android:layout_centerInParent="true"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:textSize="16dp" />
         <RelativeLayout
             android:layout_alignParentBottom="true"
             android:id="@+id/tv_image"
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 9940a2cb..46ba02f7 100644
--- a/app/src/main/res/layout/item/layout/loadinggood_item.xml
+++ b/app/src/main/res/layout/item/layout/loadinggood_item.xml
@@ -10,7 +10,7 @@
     <RelativeLayout
         android:id="@+id/loading_main"
         android:layout_width="match_parent"
-        android:layout_height="100dp">
+        android:layout_height="70dp">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -36,15 +36,12 @@
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
                     android:layout_marginLeft="10dp"
-                    android:text="01"
-                    android:textColor="@color/text4"
-                    android:textSize="19dp"
-                    android:textStyle="bold"></TextView>
+                    android:text="01"></TextView>
             </RelativeLayout>
 
             <RelativeLayout
-                android:layout_marginLeft="0dp"
-                android:layout_width="wrap_content"
+                android:layout_marginRight="60dp"
+                android:layout_width="match_parent"
                 android:layout_height="match_parent">
                 <LinearLayout
                     android:layout_centerInParent="true"
@@ -53,67 +50,57 @@
                     android:orientation="vertical">
                     <TextView
                         android:id="@+id/loading_name"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="金牡丹XXXXXXXX奶茶茶饮"
-                        android:textSize="@dimen/text_size_16"
-                        android:textStyle="bold"
-                        android:textColor="@color/text4"
+                        android:text="金牡丹菠萝奶茶茶饮"
+                        android:textAlignment="center"
                         />
+
                     <TextView
                         android:id="@+id/loading_zuofa"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="中杯/去冰/无糖"
-                        android:textSize="@dimen/text_size_16"
-                        android:textColor="@color/tab_text_normal"/>
+                        android:textAlignment="center" />
                     <TextView
-                        android:layout_marginTop="@dimen/dp_10"
+                        android:visibility="gone"
                         android:id="@+id/loading_time"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="2023-33-90 00:00:00"
-                        android:textSize="12dp"
-                        android:textColor="@color/tab_text_normal"/>
+                        android:text="00:00:00"/>
                 </LinearLayout>
             </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-                <TextView
-                    android:id="@+id/loading_status"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginTop="20dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginBottom="30dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="制作中"
-                    android:textSize="19dp"
-                    android:textStyle="bold"
-                    android:textColor="@color/app_color_theme_4"></TextView>
-
-                <Button
-                    android:layout_alignParentBottom="true"
-                    android:id="@+id/quxiaozhizuo"
-                    android:layout_width="80dp"
-                    android:layout_height="30dp"
-                    android:layout_marginRight="20dp"
-                    android:layout_marginBottom="@dimen/dp_10"
-                    android:layout_alignParentRight="true"
-                    android:background="@drawable/bg_btn_login_selected"
-                    android:text="取消制作"
-                    android:textColor="@color/white"
-                    android:textSize="14sp"/>
-            </RelativeLayout>
         </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <TextView
+                android:id="@+id/loading_status"
+                android:layout_alignParentRight="true"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_marginBottom="30dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="制作中"></TextView>
+            <Button
+                android:layout_alignParentBottom="true"
+                android:id="@+id/quxiaozhizuo"
+                android:layout_width="50dp"
+                android:layout_height="30dp"
+                android:layout_marginRight="10dp"
+                android:layout_marginBottom="5dp"
+                android:layout_alignParentRight="true"
+                android:background="@drawable/bg_btn_login_selected"
+                android:text="取消"
+                android:textColor="@color/white"
+                android:textSize="14sp"/>
+        </RelativeLayout>
         <RelativeLayout
             android:layout_alignParentBottom="true"
             android:layout_width="match_parent"
-            android:layout_height="2dp"
+            android:layout_height="1dp"
             android:background="@color/black_50p"/>
-
-
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item/layout/newmakegood.xml b/app/src/main/res/layout/item/layout/newmakegood.xml
index 4ce4ef19..c2d3e035 100644
--- a/app/src/main/res/layout/item/layout/newmakegood.xml
+++ b/app/src/main/res/layout/item/layout/newmakegood.xml
@@ -25,15 +25,16 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
+
             <TextView
-                android:layout_centerInParent="true"
                 android:id="@+id/Tag_text"
-                android:layout_marginLeft="5dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                tools:ignore="MissingConstraints"
+                android:layout_centerInParent="true"
+                android:layout_marginLeft="5dp"
+                android:text="清炒三月瓜"
                 android:textColor="@color/gray_deep"
-                android:text="清炒三月瓜"/>
+                tools:ignore="MissingConstraints" />
         </RelativeLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/mipmap-xxxhdpi/user.png b/app/src/main/res/mipmap-xxxhdpi/user.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d2b664cf2b09043e13f5d28d0b47ddc7979f21f
GIT binary patch
literal 1073
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`ol6-Q7zG1-LR^8|%HraRk`f>ZL{&va
z<%NaiKz314B@h5b!0ZYj7a|B(SzHWM2^9pgfwCnf4Gj$-qhM+(fP%TXAT>a9z=A+o
zpdd&w5ET`*XJ(d_l>sfS1&agKl$VqM$(qtqh?9Wqib4>87~TLh4JZP0ObO6Tup@zL
zs)1TcOMzxq7ZsJ3mIBQLGJpuk0BHeRR}Azi&?N;0m4$^>KsCk1K-(*UjQo6v^MIt%
zk7=#IK#491@(X78@9^nCM~zLo@ZH=Jg9~3%_q@;7T|Mc$ojF(e{+gG^MR(ku`fTyh
zd2bF0%4{&d5#c|>Cvds92WK}6-|6}gKW?>uO09iMtt4V(i<}osP!oxiv^Q|&wH0rO
zzZU$+H<W>asl?O8F{EP7+v%Cnw*mxO-wTL2epBksS+qcDUF)jSmD{c@4c)!|-+%ce
zo`=uWEQNhOOfK4Im_E<Ee6DrJ%4JoNUQ?f|r-?ZIRqb6-a(i}*kp1}yAu1Nn7bPZ^
zJblDy$y)1WX4+inC&cG>;bv&8%%Tv10Evb?rh<J8d>6yruig5#f3f+!1$HdCD>d(T
z9}Zk@>lnzfN=wpHQr5-RZL2-smK5W#WSJKnO=(O1pL>`wU*du`N0n~vb<Nqy4zC5S
zSSGM7d9D8>MX_BY^OtsB_BHX0EgqHILt7R|FdLaKXV=-|QOH(ew8i;A*2AN5EpxWL
z{Kp>0*R16`;r7}YdR8(#9Bb1(t6ngbT3*<B+&rH#V<vO%j-dXf<_rs1*oAc6)6Q<n
zVsLr$`1`?m(=E5I31#_plrPiU_jLY-`374LHyv?TUAykcN7hT%A}-9FBo_K8lVelu
zX}zy~+RXD0%ADG8ernW|YpEsE9}1YxFq#=8|NqhotGEp^i}E>&=N6~P&RTKEc`@^r
z$XJFM$y*kbhcBzXy2<`X@3R<|eaewBt{sO0pRV4#_=Q>AtotXo9XASapXal)TA(B<
z<d(^rTN`v_PfTK6^(L-R=IDh74+YBC-ha6{_V?7aJ9cZY`L<OcwK`*G+=Myvlhac@
z^L>=gMI`OdDR>rGe01d%;pqx<_U{x~^sYI%WXgtpt>Q<P=})*9zw=pIhWn346PC^K
z_&uSfse^f9#e4oQVKr$E|15rWtT8Kc63Bba<kK6iTrX4W;`6a?*UF#P6RIvR*jGL6
z)15q{SKNghy`r_&4`=gjol$yq;=(O`AN@bOzX<etEBRFES<ipYU*)B%o-eNE`Ji**
UkF|p|Fqt!Wy85}Sb4q9e05gl{B>(^b

literal 0
HcmV?d00001