556

app/src/main/AndroidManifest.xml

@@ -35,145 +35,96 @@
         tools:replace="android:icon">
         <activity
             android:name=".modules.home.fragment.from.fragment.JiaoYan_sdkz_fragment"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.fragment.JiaoYan_zdqx_fragment"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.fragment.JiaoYan_wdsz_fragment"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.fragment.JiaoYan_lsjy_fragment"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.fragment.JiaoYan_dzcjy_fragment"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.OrderListActivity"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.SalesStatisticsActivity"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.DeviceInformationActivity"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.ImageSourceActivity"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.SystemParameterActivity"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.fragment.PlcControl_kz_fragment"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.fragment.PlcControl_pz_fragment"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.RealTimeActivity"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.LogActivity"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.PlcControlActivity"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.GoodPeiFangActivity"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.SilosActivity"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.fragment.Jcsjgl_sxgl_fragment"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.fragment.Jcsjgl_wl_fragment"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.from.JcsjglActivity"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.SheZhifragment"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.GuanLifragment"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.DingDanfragment"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.JiaoYanFragment"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.GongnengFragment"
-            android:exported="false" />
+            android:exported="false" tools:ignore="Instantiatable"/>
         <activity
             android:name=".modules.home.fragment.MakeGoodFragment"
-            android:exported="false" />
+            android:exported="false"
+            tools:ignore="Instantiatable" />
         <activity
             android:name=".modules.home.activity.BottomNavigationMainActivity"
             android:exported="false" />
-        <activity
-            android:name=".modules.home.fragment.from.fragment.SystemCsPLCFragment"
-            android:exported="false"
-            tools:ignore="Instantiatable" />
         <activity
             android:name=".modules.home.fragment.from.FileActivity"
             android:exported="false" />
         <activity
             android:name=".modules.home.fragment.from.ImageChooseActivity"
             android:exported="false" />
-        <activity
-            android:name=".modules.home.fragment.from.DiyUpdateActivity"
-            android:exported="false" />
         <activity
             android:name=".modules.home.fragment.mode.fragment_gx"
             android:exported="false"
             tools:ignore="Instantiatable" />
-        <activity
-            android:name=".modules.home.fragment.from.fragment.SystemCsFltlFragment"
-            android:exported="false"
-            tools:ignore="Instantiatable" />
-        <activity
-            android:name=".modules.home.fragment.from.fragment.SystemCsMonitorFragment"
-            android:exported="false"
-            tools:ignore="Instantiatable" />
-        <activity
-            android:name=".modules.home.fragment.from.fragment.SystemCsControlFragment"
-            android:exported="false"
-            tools:ignore="Instantiatable" />
-        <activity
-            android:name=".modules.home.fragment.from.fragment.SystemSeasoningsetFragment"
-            android:exported="false"
-            tools:ignore="Instantiatable" />
-        <activity
-            android:name=".modules.home.fragment.from.fragment.SystemSystemsetFragment"
-            android:exported="false"
-            tools:ignore="Instantiatable" />
-        <activity
-            android:name=".modules.home.fragment.from.fragment.SystemDeviceinFragment"
-            android:exported="false"
-            tools:ignore="Instantiatable" />
-        <activity
-            android:name=".modules.home.fragment.from.fragment.systeminternetfragment"
-            android:exported="false"
-            tools:ignore="Instantiatable" />
-        <activity
-            android:name=".modules.home.fragment.from.CpxzActivity"
-            android:exported="false" />
-        <activity
-            android:name=".modules.home.fragment.from.SzActivity"
-            android:exported="false" />
-        <activity
-            android:name=".modules.home.fragment.from.WhActivity"
-            android:exported="false" />
-        <activity
-            android:name=".modules.home.fragment.from.CpActivity"
-            android:exported="false" />
-        <activity
-            android:name=".modules.home.fragment.from.DiyActivity"
-            android:exported="false" />
         <activity
             android:name=".modules.mine.fragment.from.NoticeActivity"
             android:exported="false" />
@@ -217,8 +168,7 @@
             </intent-filter>
             -->
         </activity>
-        <activity android:name=".modules.home.activity.BottomNavigation2Activity" />
-        <activity android:name=".modules.home.activity.BottomNavigationActivity" /> <!-- <service android:name="org.eclipse.paho.android.service.MqttService" /> -->
+        <!-- <service android:name="org.eclipse.paho.android.service.MqttService" /> -->
         <receiver
             android:name=".common.base.BootReceiver"
             android:exported="true">

app/src/main/java/com/bonait/bnframework/business/ConfigData.java

@@ -111,6 +111,7 @@ public class ConfigData {
         LoadingPZ();
         //3.初始化业务
         //4.初始化日志上报adad
+        PLC_Init();
     }
 
     /**

app/src/main/java/com/bonait/bnframework/business/MainInit.java

@@ -31,6 +31,7 @@ import com.bonait.bnframework.common.notification.MainNotification;
 import com.bonait.bnframework.common.utils.AppUtils;
 import com.bonait.bnframework.common.utils.NetworkUtils;
 import com.bonait.bnframework.common.utils.PreferenceUtils;
+import com.bonait.bnframework.common.utils.ToastUtils;
 import com.bonait.bnframework.common.utils.WifiInterceptor;
 import com.bonait.bnframework.manager.ActivityLifecycleManager;
 import com.lzy.okgo.OkGo;
@@ -100,6 +101,7 @@ public class MainInit {
         InitDBdata();
         ConfigData.getInstance().LoadingCloud();//加载云端数据
 
+        DataBus.getInstance().GetTodayNoMake();
         //设置连接到有线网络
        // NetworkUtils.connetEnternet(app);
 
@@ -240,6 +242,7 @@ public class MainInit {
             public void UserMsg(UserLogEnum type, String msg) {
                 BPA_LOG log = new BPA_LOG();
                 log.userID = ConfigName.getInstance().user.userID;
+                ToastUtils.info(msg);
                 switch (type.toString())
                 {
                     case "登录日志":log.type=1;

app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java

@@ -26,6 +26,7 @@ import com.bonait.bnframework.common.helper.I.MyClickListener;
 import com.bonait.bnframework.common.helper.MessageLog;
 import com.bonait.bnframework.common.helper.mode.OrderA;
 import com.bonait.bnframework.common.helper.mode.ResultA;
+import com.bonait.bnframework.modules.home.adapter.loadinggood_adapter;
 import com.bonait.bnframework.modules.home.adapter.lsjy_adapter;
 import com.bonait.bnframework.modules.home.adapter.wdsz_adapter;
 import com.bonait.bnframework.modules.home.fragment.mode.sdkz_control;
@@ -94,6 +95,18 @@ public class DataBus {
      * 商品制作列表
      */
     public ArrayList<ResGoodsMake> GoodsMake = new ArrayList<ResGoodsMake>();
+
+    public loadinggood_adapter loadinggoodAdapter=null;
+    public void GetTodayNoMake()
+    {
+        GoodsMake.clear();
+        ArrayList<BPA_SUBORDER> suborders=  QueryDB.GetSubOrdersTodayNoMake();
+        for (BPA_SUBORDER item:suborders)
+        {
+            AddGoodsMake(item);
+        }
+    }
+
     /**
      * 增加一个订单商品
      * @param suborder
@@ -126,6 +139,7 @@ public class DataBus {
             GoodsMake.add(make);
             MessageLog.ShowUserMessage(UserLogEnum.订单处理日志, "[" + make.good.name + "]准备配料!");
 
+            if(loadinggoodAdapter!=null)loadinggoodAdapter.refresh();
         }catch(Exception e){
             MessageLog.ShowInfo( "增加订单异常！"+e.getMessage());
         }
@@ -153,7 +167,10 @@ public class DataBus {
 
                     GoodsMake.get(m).makeStatus= MakeStatus.制作中;
                     GoodsMake.get(m).makeMs=makeMs;
-                    GoodsMake.get(m).makeProcess=(count/ GoodsMake.get(m).recipes.size())*100;
+                    GoodsMake.get(m).makeProcess=(int)(((count*1.00)/ GoodsMake.get(m).recipes.size())*100);
+
+                    if(loadinggoodAdapter!=null)loadinggoodAdapter.refresh();
+
                     return;
                 }
             }
@@ -185,6 +202,9 @@ public class DataBus {
             {
                 GoodsMake.remove(good);
             }
+
+            if(loadinggoodAdapter!=null)loadinggoodAdapter.refresh();
+
         }catch(Exception e){
         }
     }

app/src/main/java/com/bonait/bnframework/common/db/QueryDB.java

@@ -1212,6 +1212,29 @@ public class QueryDB {
             return null;
         }
     }
+
+    /**
+     * 做法ID查询配方关联表
+     *
+     * @param
+     * @return
+     */
+    public static BPA_GOODSRECIPENAME GetGoodsRecipeNameDesignId(String zfid) {
+        try {
+            String orderby = Desc_Time_Up;//出料顺序
+            String where = "isDelete=? and design=?";
+            String[] args = new String[]{"0", zfid};
+            ArrayList<BPA_GOODSRECIPENAME> data = new ArrayList<>();
+            ArrayList<Object> obj = Get(BPA_GOODSRECIPENAME.class, where, args, orderby);
+            for (Object k : obj) {
+                data.add((BPA_GOODSRECIPENAME) k);
+            }
+            return data.size()>0?data.get(0):null;
+        } catch (Exception e) {
+            Log.d("商品ID查询配方信息", "商品ID查询配方信息异常: " + e.getMessage());
+            return null;
+        }
+    }
     //endregion
 
     //region BPA_GOODSRECIPE 商品配方明细表
@@ -1561,7 +1584,25 @@ public class QueryDB {
         }
         return data;
     }
+//
+    /**
+     * 根据条件查询子订单
+     *
+     * @return
+     */
+    public static ArrayList<BPA_SUBORDER> GetSubOrdersTodayNoMake() {
+        String orderby = Desc_Time_Down;//先按排序 创建时间倒序
+        String sta=new SimpleDateFormat("yyyy-MM-dd 00:00:00").format(new Date());
+        String where = "isDelete=? and createTime>=? and status=0";
+        String[] args = new String[]{"0", sta};
 
+        ArrayList<BPA_SUBORDER> data = new ArrayList<>();
+        ArrayList<Object> obj = Get(BPA_SUBORDER.class, where, args, orderby);
+        for (Object k : obj) {
+            data.add((BPA_SUBORDER)k);
+        }
+        return data;
+    }
     /**
      * 根据条件查询子订单
      *

app/src/main/java/com/bonait/bnframework/common/tabbar/MainNavigateTabBar.java

@@ -374,6 +374,4 @@ public class MainNavigateTabBar extends LinearLayout implements View.OnClickList
     public int getCurrentSelectedTab() {
         return mCurrentSelectedTab;
     }
-
-
 }

app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationMainActivity.java

@@ -21,6 +21,13 @@ import com.bonait.bnframework.common.modbus.ModbusTcpServer;
 import com.bonait.bnframework.common.tabbar.MainNavigateTabBar;
 import com.bonait.bnframework.common.utils.NetworkUtils;
 import com.bonait.bnframework.modules.home.adapter.FragmentAdapter;
+import com.bonait.bnframework.modules.home.fragment.DingDanfragment;
+import com.bonait.bnframework.modules.home.fragment.GongnengFragment;
+import com.bonait.bnframework.modules.home.fragment.GuanLifragment;
+import com.bonait.bnframework.modules.home.fragment.JiaoYanFragment;
+import com.bonait.bnframework.modules.home.fragment.MakeGoodFragment;
+import com.bonait.bnframework.modules.home.fragment.SheZhifragment;
+import com.bonait.bnframework.modules.mine.fragment.MyFragment;
 import com.qmuiteam.qmui.widget.QMUIViewPager;
 
 import java.util.ArrayList;
@@ -65,16 +72,19 @@ public class BottomNavigationMainActivity extends BaseActivity {
         super.onDestroy();
     }
 
-    private List<Fragment> fragmentList;
+    private List<Fragment> fragmentList=new ArrayList<Fragment>();
     /**
      * viewPager里添加fragment
      */
     private void initFragment() {
         fragmentList = new ArrayList<>();
-        for (Fragment item:ConfigName.getInstance().fragmentList)
-        {
-            fragmentList.add(item);
-        }
+        fragmentList.add(new GongnengFragment());
+        fragmentList.add(new JiaoYanFragment());
+        fragmentList.add(new DingDanfragment());
+        fragmentList.add(new MakeGoodFragment());
+        fragmentList.add(new GuanLifragment());
+        fragmentList.add(new SheZhifragment());
+        fragmentList.add(new MyFragment());
         ConfigName.getInstance().fragmentAdapter = new FragmentAdapter(getSupportFragmentManager(),fragmentList);
         viewPager.setAdapter(ConfigName.getInstance().fragmentAdapter);
         ConfigName.getInstance().fragmentAdapter.SetViewPage(viewPager);
@@ -82,7 +92,6 @@ public class BottomNavigationMainActivity extends BaseActivity {
         viewPager.addOnPageChangeListener(pageChangeListener);
         // 设置viewPager缓存多少个fragment
         viewPager.setOffscreenPageLimit(7);
-
         // 再来一杯
         viewPager.setCurrentItem(3);
     }

app/src/main/java/com/bonait/bnframework/modules/home/adapter/loadinggood_adapter.java

@@ -1,62 +1,165 @@
 package com.bonait.bnframework.modules.home.adapter;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.ContextWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.bonait.bnframework.R;
+import com.bonait.bnframework.business.ExecuteTheRecipe;
+import com.bonait.bnframework.common.constant.DataBus;
+import com.bonait.bnframework.common.db.QueryDB;
 import com.bonait.bnframework.common.db.mode.BPA_MATERIAL;
 import com.bonait.bnframework.common.db.mode.BPA_SUBORDER;
+import com.bonait.bnframework.common.db.res.MakeStatus;
+import com.bonait.bnframework.common.db.res.ResGoodsMake;
 import com.bonait.bnframework.common.helper.I.MyClickListener;
+import com.bonait.bnframework.common.utils.AlertDialogUtils;
+import com.bonait.bnframework.common.utils.ToastUtils;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class loadinggood_adapter extends ArrayAdapter<BPA_SUBORDER> {
+public class loadinggood_adapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>  {
     /**
      * 内部点击事件
      */
     private MyClickListener mListener;
-    private ArrayList<BPA_SUBORDER> datas;
+    private ArrayList<ResGoodsMake> datas= DataBus.getInstance().GoodsMake;
     int resource1;
-    public loadinggood_adapter(@NonNull Context context, int resource, @NonNull ArrayList<BPA_SUBORDER> objects, MyClickListener listener) {
-        super(context, resource, objects);
-        mListener = listener;
-        datas=objects;
-        this.resource1=resource;
+    public Context conmain;
+    public Activity activity;
+
+    private final LayoutInflater mLayoutInflater;
+
+
+    public loadinggood_adapter(Context context,MyClickListener myClickListener,Activity ac) {
+        this.conmain = context;
+        activity=ac;
+        mListener=myClickListener;
+        mLayoutInflater = LayoutInflater.from(context);
+    }
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View inflate = mLayoutInflater.inflate(R.layout.loadinggood_item, parent, false);
+        return new MyViewHolder(inflate);
+
     }
-    //每个子项被滚动到屏幕内的时候会被调用
-    @NonNull
+
     @Override
-    public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
-        BPA_SUBORDER bpa_suborder = (BPA_SUBORDER) getItem(position);//得到当前项选中item实例
-        //为每一个子项加载设定的布局
-        View view = LayoutInflater.from(getContext()).inflate(resource1, parent, false);
-        //分别获取 image view 和 textview 的实例
-//        TextView name = view.findViewById(R.id.name);
-//        Button button = view.findViewById(R.id.button_item);
-//        // 设置要显示的图片和文字
-//        name.setText(bpa_material.name);
-//        name.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View view) {
-//                if(mListener!=null) mListener.clickListener(view,bpa_material);
-//            }
-//        });
-//
-//        button.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View view) {
-//                if(mListener!=null) mListener.clickListener(view,bpa_material);
-//            }
-//        });
-        return view;
+    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);
+            myViewHolder.loading_time.setText(goodsMake.subOrder.createTime);
+
+            switch (goodsMake.makeStatus.name())
+            {
+                case "等待制作":
+                    myViewHolder.loading_status.setTextColor(conmain.getResources().getColor(R.color.text4));
+                    break;
+                case "制作中":
+                    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));
+                    break;
+            }
+            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(conmain, title, message, new QMUIDialogAction.ActionListener() {
+                        @Override
+                        public void onClick(QMUIDialog dialog, int index) {
+                            DataBus.getInstance().DeleteGoodsMake(goodsMake.subOrder.id);
+                            dialog.dismiss();
+                        }
+                    });
+
+                }
+            });
+        }
+    }
+
+    private Activity findActivity(@NonNull Context context) {
+        if (context instanceof Activity) {
+            return (Activity) context;
+        } else if (context instanceof ContextWrapper) {
+            return findActivity(((ContextWrapper) context).getBaseContext());
+        } else {
+            return null;
+        }
+    }
+    /**
+     * 刷新
+     *
+     * @param
+     */
+    public void refresh() {
+        activity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    notifyDataSetChanged();
+                } catch (Exception e) {
+
+                }
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return datas.size();
+    }
+
+    static class MyViewHolder extends RecyclerView.ViewHolder {
+        RelativeLayout loading_main;
+        ProgressBar loading_ProgressBar;
+        TextView loading_name;
+        TextView loading_zuofa;
+        TextView loading_status;
+        TextView loading_time;
+
+        Button quxiaozhizuo;
+        public MyViewHolder(View view) {
+            super(view);
+            loading_main = view.findViewById(R.id.loading_main);
+            loading_ProgressBar = view.findViewById(R.id.loading_ProgressBar);
+            loading_name = view.findViewById(R.id.loading_name);
+            loading_zuofa = view.findViewById(R.id.loading_zuofa);
+            loading_status = view.findViewById(R.id.loading_status);
+            loading_time= view.findViewById(R.id.loading_time);
+            quxiaozhizuo= view.findViewById(R.id.quxiaozhizuo);
+        }
     }
 }

app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java

@@ -8,17 +8,23 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ListView;
 
 import com.bonait.bnframework.R;
+import com.bonait.bnframework.business.ConfigData;
+import com.bonait.bnframework.business.ExecuteTheRecipe;
 import com.bonait.bnframework.common.base.BaseFragment;
+import com.bonait.bnframework.common.constant.DataBus;
 import com.bonait.bnframework.common.constant.MessageName;
 import com.bonait.bnframework.common.db.QueryDB;
 import com.bonait.bnframework.common.db.mode.BPA_GOODS;
 import com.bonait.bnframework.common.db.mode.BPA_GOODSTYPE;
+import com.bonait.bnframework.common.db.res.ResGoodsMake;
+import com.bonait.bnframework.common.helper.I.MyClickListener;
 import com.bonait.bnframework.common.linktab.LinkMode;
 import com.bonait.bnframework.common.linktab.TopItemDecoration;
 import com.bonait.bnframework.common.linktab.good.GoodLeftAdapter;
@@ -27,11 +33,17 @@ import com.bonait.bnframework.common.linktab.makegood.MakeGoodLeftAdapter;
 import com.bonait.bnframework.common.linktab.makegood.MakeGoodRightAdapter;
 import com.bonait.bnframework.common.message.MessageLooper;
 import com.bonait.bnframework.common.message.MessageManager;
+import com.bonait.bnframework.common.utils.AlertDialogUtils;
 import com.bonait.bnframework.common.utils.ToastUtils;
+import com.bonait.bnframework.modules.home.adapter.loadinggood_adapter;
 import com.bonait.bnframework.modules.home.adapter.wl_adapter;
+import com.bonait.bnframework.modules.home.fragment.mode.add_makegood_control;
+import com.bonait.bnframework.modules.home.fragment.mode.add_pf_control;
 import com.litao.slider.NiftySlider;
 import com.orhanobut.logger.Logger;
 import com.qmuiteam.qmui.widget.QMUITopBarLayout;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -67,7 +79,13 @@ public class MakeGoodFragment extends BaseFragment {
      * 商品制作列表
      */
     @BindView(R.id.datatab_paiduishangping)
-    ListView datatab_paiduishangping;
+    RecyclerView datatab_paiduishangping;
+
+    /**
+     * 增加配方
+     */
+    @BindView(R.id.add_makegood)
+    add_makegood_control add_makegood;
 
     private Context context;
 
@@ -94,59 +112,114 @@ public class MakeGoodFragment extends BaseFragment {
      */
     public void Initdata()
     {
-        //1.商品类型
-        goodstypes = QueryDB.GetGoodsTypeALL();
+        if(isAdded())
+        {
+            //1.商品类型
+            goodstypes = QueryDB.GetGoodsTypeALL();
 
-        Fdata.clear();
+            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));
-            i++;
-        }
+            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());
-        rv_left.setAdapter(leftAdapter);
-        rv_right.setAdapter(rightAdapter);
+            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());
+            rv_left.setAdapter(leftAdapter);
+            rv_right.setAdapter(rightAdapter);
 
 
-        //添加分组悬浮效果
-        List<String> typeListener = new ArrayList<>();
-        for (LinkMode item : Fdata) {
-            typeListener.add(((BPA_GOODSTYPE) item.type).name);
-        }
+            //添加分组悬浮效果
+            List<String> typeListener = new ArrayList<>();
+            for (LinkMode item : Fdata) {
+                typeListener.add(((BPA_GOODSTYPE) item.type).name);
+            }
 
-        if(rv_right.getItemDecorationCount()>0)
-        {
-            rv_right.removeItemDecorationAt(0);
-        }
-        TopItemDecoration top = new TopItemDecoration(context, typeListener);
-        rv_right.addItemDecoration(top);
+            if(rv_right.getItemDecorationCount()>0)
+            {
+                rv_right.removeItemDecorationAt(0);
+            }
+            TopItemDecoration top = new TopItemDecoration(context, typeListener);
+            rv_right.addItemDecoration(top);
 
-        //左侧联动
-        rv_right.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
-                super.onScrolled(recyclerView, dx, dy);
-                int firstItemPosition = manager.findFirstVisibleItemPosition();
-                if (firstItemPosition != -1 && dy != 0) {
-                    rv_left.smoothScrollToPosition(firstItemPosition);
-                    leftAdapter.setChoose(firstItemPosition);
+            //左侧联动
+            rv_right.addOnScrollListener(new RecyclerView.OnScrollListener() {
+                @Override
+                public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                    super.onScrolled(recyclerView, dx, dy);
+                    int firstItemPosition = manager.findFirstVisibleItemPosition();
+                    if (firstItemPosition != -1 && dy != 0) {
+                        rv_left.smoothScrollToPosition(firstItemPosition);
+                        leftAdapter.setChoose(firstItemPosition);
+                    }
                 }
-            }
-        });
+            });
+
+            LoadingGood();
+        }
+
     }
 
+    /**
+     * 加载商品
+     */
     public void LoadingGood()
     {
-//        wl_adapter adapter = new wl_adapter(context, R.layout.wl_item, bpa_materials, this);
-//        datatab_paiduishangping.setAdapter(adapter);
+
+        LinearLayoutManager layoutManager=new LinearLayoutManager(context);
+        layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+        datatab_paiduishangping.setLayoutManager(layoutManager);
+
+        DataBus.getInstance().loadinggoodAdapter = new loadinggood_adapter(context, myClickListener,getActivity());
+        datatab_paiduishangping.setAdapter(DataBus.getInstance().loadinggoodAdapter);
     }
 
+    /**
+     * 点击商品 开始制作
+     */
+    public MyClickListener myClickListener=new MyClickListener() {
+        @Override
+        public void clickListener(View v, Object data) {
+            ResGoodsMake makegood=(ResGoodsMake)data;
+            if(ExecuteTheRecipe.IsMakeGood)
+            {
+                ToastUtils.warning("请耐心等待上一商品制作完成...");
+                return;
+            }
+
+            if(makegood.subOrder.status==1)
+            {
+                ToastUtils.warning("商品:"+makegood.good.name+",已在制作中...");
+                return;
+            }
+
+            if(makegood.subOrder.status==2)
+            {
+                ToastUtils.warning("商品:"+makegood.good.name+",已制作完成...");
+                return;
+            }
+            String title = "温馨提示！";
+            String message = "客官确定要开始制作【"+makegood.good.name+"】吗？";
+            AlertDialogUtils.showDialog(context, title, message, new QMUIDialogAction.ActionListener() {
+                @Override
+                public void onClick(QMUIDialog dialog, int index) {
+                    ExecuteTheRecipe.Execute(makegood);
+                    ToastUtils.warning("商品:"+makegood.good.name+",开始制作");
+                    dialog.dismiss();
+                }
+            });
+        }
+
+        @Override
+        public void clickListenerNew(View v, int k, Object data) {
+
+        }
+    };
     /**
      * 初始化TopBar
      */
@@ -159,7 +232,9 @@ public class MakeGoodFragment extends BaseFragment {
             public void onMessage(Object msg) {
                 if (msg != null) {
                     BPA_GOODS goods=(BPA_GOODS) msg;
-                    ToastUtils.info("商品:"+goods.name+",加入队列中...");
+
+                    add_makegood.SetData(goods);
+                    add_makegood.setVisibility(View.VISIBLE);
                 }
             }
         });
@@ -173,6 +248,23 @@ public class MakeGoodFragment extends BaseFragment {
                 }
             }
         });
+
+        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)
+                {
+                    add_makegood.setVisibility(View.GONE);
+                }else
+                {
+                    add_makegood.setVisibility(View.GONE);
+                }
+            }
+        };
     }
 
 

app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_makegood_control.java

@@ -0,0 +1,245 @@
+package com.bonait.bnframework.modules.home.fragment.mode;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bonait.bnframework.R;
+import com.bonait.bnframework.common.constant.ConfigName;
+import com.bonait.bnframework.common.constant.DataBus;
+import com.bonait.bnframework.common.db.QueryDB;
+import com.bonait.bnframework.common.db.mode.BPA_GOODPROPERTY;
+import com.bonait.bnframework.common.db.mode.BPA_GOODS;
+import com.bonait.bnframework.common.db.mode.BPA_GOODSRECIPE;
+import com.bonait.bnframework.common.db.mode.BPA_GOODSRECIPENAME;
+import com.bonait.bnframework.common.db.mode.BPA_MATERIAL;
+import com.bonait.bnframework.common.db.mode.BPA_ORDER;
+import com.bonait.bnframework.common.db.mode.BPA_SUBORDER;
+import com.bonait.bnframework.common.db.res.ResGoodProperty;
+import com.bonait.bnframework.common.db.res.ResGoodsRecipe;
+import com.bonait.bnframework.common.helper.I.MyClickListener;
+import com.bonait.bnframework.common.utils.ToastUtils;
+import com.bonait.bnframework.common.view.MyLayoutManager;
+import com.bonait.bnframework.modules.home.adapter.newneatril_adapter;
+import com.bonait.bnframework.modules.home.adapter.pfsx_adapter;
+import com.bonait.bnframework.modules.home.adapter.xxpf_adapter;
+
+import java.util.ArrayList;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class add_makegood_control extends LinearLayout implements MyClickListener {
+
+
+    @BindView(R.id.quzhizuo)
+    Button quzhizuo;
+
+    @BindView(R.id.close_from_good)
+    Button close_from_good;
+
+    public BPA_GOODS Good = null;
+
+    @BindView(R.id.datatab_makesx)
+    ListView datatab_makesx;//属性
+
+    @BindView(R.id.makegoodtitle)
+    TextView makegoodtitle;//配方名称
+    /**
+     * 属性数据
+     */
+    ArrayList<ResGoodProperty> bpa_goodproperties = new ArrayList<>();
+    /**
+     * 点击事件
+     */
+    public MyClickListener mListener = null;
+    private View root;
+
+    public add_makegood_control(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        root = LayoutInflater.from(context).inflate(R.layout.dialog_add_makegood, this);
+        ButterKnife.bind(this, root);
+        Init();
+    }
+
+
+    public void Init() {
+        //初始化界面控件的事件
+        initEvent();
+    }
+
+
+    private void initData() {
+        //2.填充规则数据，查询所有属性大类
+        bpa_goodproperties.clear();
+        ArrayList<BPA_GOODPROPERTY> da = QueryDB.GetGoodsPropertyALL("0");
+        for (BPA_GOODPROPERTY item : da) {
+            ResGoodProperty re = new ResGoodProperty();
+            re.id = item.id;
+            re.name = item.name;
+
+            ArrayList<BPA_GOODPROPERTY> zsx = QueryDB.GetGoodsPropertyALL(item.id);
+            re.child = new ArrayList<>();
+
+
+            ArrayList<ResGoodProperty> _chid = new ArrayList<>();
+            for (BPA_GOODPROPERTY k : zsx) {
+                ResGoodProperty m = new ResGoodProperty();
+                m.id = k.id;
+                m.name = k.name;
+                m.isSelect = false;
+                _chid.add(m);
+            }
+            re.child = _chid;
+
+            bpa_goodproperties.add(re);
+        }
+
+        for (ResGoodProperty item : bpa_goodproperties) {
+            int i = 0;
+            for (ResGoodProperty c : item.child) {
+                if (i == 0) {
+                    c.isSelect = true;
+                }
+                i++;
+            }
+        }
+
+
+        pfsx_adapter sxadapter = new pfsx_adapter(getContext(), R.layout.pfsx_item, bpa_goodproperties, this);
+        datatab_makesx.setAdapter(sxadapter);
+    }
+
+    /**
+     * 设置数据
+     *
+     * @param
+     */
+    public void SetData(BPA_GOODS good) {
+        try {
+            Good = good;
+            makegoodtitle.setText(Good.name + "");
+            initData();
+        } catch (Exception ex) {
+
+        }
+    }
+
+
+    private void initEvent() {
+        quzhizuo.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (mListener != null && SaveData()) {
+
+                    mListener.clickListenerNew(view, 1, null);
+                }
+            }
+        });
+        close_from_good.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mListener != null) {
+                    mListener.clickListenerNew(v, 0, null);
+                }
+            }
+        });
+    }
+
+    /**
+     * 保存数据
+     */
+    public boolean SaveData() {
+        if (DataValidation()) {
+
+            BPA_ORDER order = new BPA_ORDER();
+            order.thirdPartyID = "手动下单";
+            order.status = 0;
+            order.deviceID = ConfigName.getInstance().DeviceId;
+            order.userID = ConfigName.getInstance().user.userID;
+            QueryDB.AddOrder(order);
+
+            BPA_SUBORDER suborder = new BPA_SUBORDER();
+            suborder.deviceID = ConfigName.getInstance().DeviceId;
+            suborder.userID = ConfigName.getInstance().user.userID;
+            suborder.orderID = order.id;
+            suborder.goodsID = ((BPA_GOODS) Good).id;
+            suborder.recipeID=goodsrecipename.id;
+            suborder.number = 1;
+            suborder.status = 0;
+            suborder.exp=names;
+            QueryDB.AddSubOrder(suborder);
+
+            DataBus.getInstance().AddGoodsMake(suborder);
+            ToastUtils.info("商品:"+Good.name+",加入队列中...");
+            return true;
+        }else
+        {
+            return false;
+        }
+    }
+
+    BPA_GOODSRECIPENAME goodsrecipename = null;
+    String pfname = "";//配方名称集合
+    String ggids = "";//规格id集合
+    String names="";
+    /**
+     * 数据验证
+     */
+    public boolean DataValidation() {
+        //1.数据名称不能为空
+        ggids = "";names="";
+        for (ResGoodProperty item : bpa_goodproperties) {
+            for (ResGoodProperty k : item.child) {
+                if (k.isSelect) {
+                    ggids += k.id + ",";
+                    names+="/"+k.name;
+                }
+            }
+        }
+
+        if (!ggids.isEmpty()) {
+            ggids = ggids.substring(0, ggids.length() - 1);
+        }
+
+        goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids);
+        if (goodsrecipename == null) {
+            ToastUtils.info("没有查询到配方,不能制作!");
+            return false;
+        }
+        return true;
+    }
+
+
+    /**
+     * 点击事件
+     *
+     * @param v
+     * @param data
+     */
+    @Override
+    public void clickListener(View v, Object data) {
+        switch (v.getId()) {
+            case R.id.name://点击 修改
+
+                break;
+            case R.id.button_item://删除按钮
+
+                break;
+        }
+    }
+
+    @Override
+    public void clickListenerNew(View v, int k, Object data) {
+
+    }
+}

app/src/main/res/drawable/progressbar.xml

@@ -0,0 +1,43 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:id="@android:id/background">
+        <shape >
+            <corners android:radius="0dip" />
+            <gradient
+                android:angle="270"
+                android:centerY="0"
+                android:endColor="#0701BFFF"
+                android:startColor="#0701BFFF"
+                 />
+        </shape>
+    </item>
+
+    <item android:id="@android:id/secondaryProgress">
+
+        <clip >
+            <shape >
+                <corners android:radius="0dip" />
+                <gradient
+                    android:angle="270"
+                    android:centerY="0"
+                    android:endColor="#165CBC"
+                    android:startColor="#85B0E9" />
+            </shape>
+        </clip>
+    </item>
+
+    <item android:id="@android:id/progress">
+
+        <clip >
+            <shape >
+                <corners android:radius="0dip" />
+                <gradient
+                    android:angle="270"
+                    android:centerY="0"
+                    android:endColor="#2D01BFFF"
+                    android:startColor="#2D01BFFF" />
+            </shape>
+
+        </clip>
+    </item>
+</layer-list>

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

@@ -53,26 +53,37 @@
                         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                         android:layout_height="match_parent"/>
 
+                    <com.bonait.bnframework.modules.home.fragment.mode.add_makegood_control
+                        android:id="@+id/add_makegood"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:visibility="gone"></com.bonait.bnframework.modules.home.fragment.mode.add_makegood_control>
+
                 </RelativeLayout>
             </LinearLayout>
 
             <LinearLayout
-                android:layout_width="240dp"
+                android:layout_width="300dp"
                 android:layout_height="match_parent"
                 android:orientation="vertical"
                 android:layout_marginBottom="20dp">
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
-                    <ListView
-                        android:id="@+id/datatab_paiduishangping"
-                        android:layout_width="match_parent"
+                    <ScrollView
                         android:layout_height="match_parent"
-                        android:layout_marginTop="3dp"
-                        android:divider="#00000000"
-                        android:dividerHeight="3dp" />
+                        android:layout_width="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"/>
+                    </ScrollView>
                 </RelativeLayout>
             </LinearLayout>
+
+
         </LinearLayout>
 
     </RelativeLayout>

app/src/main/res/layout/item/layout/dialog_add_makegood.xml

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/dialogbj">
+
+    <RelativeLayout
+        android:layout_centerInParent="true"
+        android:layout_margin="50dp"
+        android:layout_width="500dp"
+        android:layout_height="600dp"
+        android:background="@drawable/common_bg_with_radius_and_border">
+
+        <Button
+            android:id="@+id/close_from_good"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginRight="@dimen/dp_10"
+            android:layout_marginTop="@dimen/dp_10"
+            android:background="@mipmap/close_image"
+            android:textSize="14dp"
+            android:textColor="@color/white"/>
+
+        <TextView
+            android:id="@+id/makegoodtitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="星星知多少奶茶"
+            android:textSize="20dp"
+            android:layout_marginLeft="30dp"
+            android:layout_marginTop="@dimen/dp_10">
+        </TextView>
+
+        <RelativeLayout
+            android:layout_marginTop="46dp"
+            android:layout_marginBottom="50dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_marginLeft="30dp"
+                android:layout_marginRight="30dp"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <!--菜谱名称行-->
+                <LinearLayout
+                    android:layout_marginTop="@dimen/dp_10"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                </LinearLayout>
+
+                <!--边框分割细线-->
+                <LinearLayout
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@color/color3" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1">
+                    <RelativeLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1">
+                        <!-- 商品分类 -->
+                        <ListView
+                            android:id="@+id/datatab_makesx"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_marginTop="40dp"
+                            android:divider="#00000000"
+                            android:dividerHeight="3dp" >
+                        </ListView>
+                    </RelativeLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_marginBottom="@dimen/dp_10"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="当日出杯量"
+                        android:textSize="19dp"/>
+
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:fontFamily="cursive"
+                        android:text="21杯"
+                        android:textAlignment="center"
+                        android:textColor="@color/app_color_blue"
+                        android:textSize="30dp"
+                        android:textStyle="bold" />
+                </LinearLayout>
+            </LinearLayout>
+        </RelativeLayout>
+
+        <Button
+            android:layout_alignParentBottom="true"
+            android:id="@+id/quzhizuo"
+            android:layout_width="120dp"
+            android:layout_height="35dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:background="@drawable/bg_btn_login_selected"
+            android:text="去制作"
+            android:textColor="@color/white"
+            android:textSize="18sp"/>
+    </RelativeLayout>
+</RelativeLayout>

app/src/main/res/layout/item/layout/loadinggood_item.xml

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://schemas.android.com/apk/res/android ">
+
+    <RelativeLayout
+        android:id="@+id/loading_main"
+        android:layout_width="match_parent"
+        android:layout_height="100dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <ProgressBar
+                android:id="@+id/loading_ProgressBar"
+                style="@style/ProgressBar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:max="100"
+                android:progress="18" />
+        </RelativeLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <RelativeLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent">
+                <TextView
+                    android:id="@+id/loading_xuhao"
+                    android:layout_marginLeft="20dp"
+                    android:layout_centerInParent="true"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="01"
+                    android:textSize="19dp"
+                    android:textStyle="bold"
+                    android:textColor="@color/text4"></TextView>
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_marginLeft="10dp"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent">
+                <LinearLayout
+                    android:layout_centerInParent="true"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+                    <TextView
+                        android:id="@+id/loading_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="金牡丹XXXXXXXX奶茶茶饮"
+                        android:textSize="@dimen/text_size_16"
+                        android:textStyle="bold"
+                        android:textColor="@color/text4"
+                        />
+                    <TextView
+                        android:id="@+id/loading_zuofa"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="中杯/去冰/无糖"
+                        android:textSize="@dimen/text_size_16"
+                        android:textColor="@color/tab_text_normal"/>
+                    <TextView
+                        android:layout_marginTop="@dimen/dp_10"
+                        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="@dimen/text_size_16"
+                        android:textColor="@color/tab_text_normal"/>
+                </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_alignParentBottom="true"
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:background="@color/black_50p"/>
+
+
+    </RelativeLayout>
+</RelativeLayout>

app/src/main/res/values/colors.xml

@@ -5,7 +5,7 @@
     <color name="text_color">#969393</color>
     <color name="dialogbj">#A5000000</color>
     <color name="text4">#ADC3E1</color>
-
+    <color name="app_color_blue111">#9F00A8E1</color>
 
     <color name="vifrification">#00000000</color>   <!-- 透明 -->
     <!--<color name="colorPrimary">#008577</color>

app/src/main/res/values/styles.xml

@@ -37,6 +37,14 @@
 
 
 
+    </style>
+
+    <style name="ProgressBar" parent="@android:style/Widget.ProgressBar.Horizontal">
+        <item name="android:maxHeight">50dip</item>
+        <item name="android:minHeight">8dip</item>
+        <item name="android:indeterminateOnly">false</item>
+        <item name="android:indeterminateDrawable">@android:drawable/progress_indeterminate_horizontal</item>
+        <item name="android:progressDrawable">@drawable/progressbar</item>
     </style>
 
     <style name="AppTheme.Launcher" parent="QMUI.Compat.NoActionBar">