From b2da602fae49ac3a1054bcf10bd2d2ff1b328b6e Mon Sep 17 00:00:00 2001 From: fyf Date: Mon, 4 Dec 2023 17:18:33 +0800 Subject: [PATCH] 1111 --- .../home/adapter/gongxubuzhou_adapter1.java | 12 +++++++++- .../modules/home/fragment/HomeFragmentPR.java | 21 ++++++++++++++++++ .../home/fragment/HomeFragmentSBKZ.java | 5 +++++ .../home/fragment/from/DishTestActivity.java | 9 +++++++- .../home/fragment/mode/newhuoli_control.java | 4 +++- .../layout/activity_bottom_navigation_new.xml | 8 +++++-- .../main/res/layout/activity_bunkersetup.xml | 1 + app/src/main/res/layout/activity_cooking.xml | 3 ++- .../res/layout/activity_cookingsimulated.xml | 3 ++- app/src/main/res/layout/activity_dishtest.xml | 4 +++- .../main/res/layout/fragment_home_sbkz.xml | 21 +++++++++++++++--- .../main/res/layout/item/layout/plcstatus.xml | 14 ++++++++++++ app/src/main/res/mipmap-xxxhdpi/plc1.png | Bin 0 -> 11796 bytes app/src/main/res/mipmap-xxxhdpi/plc2.png | Bin 0 -> 10188 bytes 14 files changed, 94 insertions(+), 11 deletions(-) create mode 100644 app/src/main/res/layout/item/layout/plcstatus.xml create mode 100644 app/src/main/res/mipmap-xxxhdpi/plc1.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/plc2.png diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/gongxubuzhou_adapter1.java b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/gongxubuzhou_adapter1.java index cb21024e..e60c5627 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/gongxubuzhou_adapter1.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/gongxubuzhou_adapter1.java @@ -16,6 +16,7 @@ import com.bonait.bnframework.common.constant.DataBus; import com.bonait.bnframework.common.db.mode.BPA_GOODSRECIPE; import com.bonait.bnframework.common.helper.I.MyClickListener; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; @@ -51,7 +52,16 @@ public class gongxubuzhou_adapter1 extends ArrayAdapter { //分别获取 image view 和 textview 的实例 TextView text = view.findViewById(R.id.text); - text.setText((position+1)+"、"+lc.processms); + + if(lc.processname.equals("液体料")) + { + text.setText((new DecimalFormat("00").format(datas.size()- position)) + +"、"+lc.processname+" " +lc.processvalue); + }else + { + text.setText((new DecimalFormat("00").format(datas.size()- position)) + +"、"+lc.processname+" "+" " +lc.processvalue); + } return view; } } \ No newline at end of file diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/HomeFragmentPR.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/HomeFragmentPR.java index c1a0a5be..9bdd5366 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/HomeFragmentPR.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/HomeFragmentPR.java @@ -121,6 +121,27 @@ public class HomeFragmentPR extends BaseFragment { private void initTopBar() { mTopBar.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.topbj1)); mTopBar.setTitle("菜谱"); + mTopBar.addRightTextButton("设备状态:"+(ConfigName.getInstance().PlcIsConnect ? "已连接" : "未连接"),R.id.status_image); + + new Thread(new Runnable() { + @Override + public void run() { + while (true) + { + try { + activity.runOnUiThread(new Runnable() { + @Override + public void run() { + mTopBar.removeAllRightViews(); + mTopBar.addRightTextButton("设备状态:"+(ConfigName.getInstance().PlcIsConnect ? "已连接" : "未连接"),R.id.status_image); + } + }); + Thread.sleep(1000); + } catch (InterruptedException e) { + } + } + } + }).start(); /** * 刷新菜品 */ diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/HomeFragmentSBKZ.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/HomeFragmentSBKZ.java index c9649056..b45e623a 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/HomeFragmentSBKZ.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/HomeFragmentSBKZ.java @@ -44,6 +44,9 @@ import butterknife.OnClick; public class HomeFragmentSBKZ extends BaseFragment { //region 变量 + @BindView(R.id.plcstatus1) + ImageView plcstatus1; + @BindView(R.id.zidongqingxi) RelativeLayout zidongqingxi; @@ -251,6 +254,8 @@ public class HomeFragmentSBKZ extends BaseFragment { } else { chaoguo_wendu.setText("??°C"); } + + plcstatus1.setImageResource(ConfigName.getInstance().PlcIsConnect ? R.mipmap.plc1 : R.mipmap.plc2); } }); } diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DishTestActivity.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DishTestActivity.java index 0b5d2227..9cee879a 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DishTestActivity.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DishTestActivity.java @@ -54,6 +54,7 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import butterknife.BindView; @@ -275,7 +276,13 @@ public class DishTestActivity extends BaseActivity { runOnUiThread(new Runnable() { @Override public void run() { - gxbz_adapter = new gongxubuzhou_adapter1(getContext(), R.layout.newgx_item, DataBus.getInstance().bpa_goodsrecipes); + ArrayList cipe=new ArrayList<>(); + for (BPA_GOODSRECIPE item:DataBus.getInstance().bpa_goodsrecipes) + { + cipe.add(item); + } + Collections.reverse(cipe); + gxbz_adapter = new gongxubuzhou_adapter1(getContext(), R.layout.newgx_item, cipe); datatab_gxbz.setAdapter(gxbz_adapter); gxbz_adapter2=new gongxubuzhou_adapter2(getContext(), R.layout.newgx_item1, DataBus.getInstance().bpa_goodsrecipes); diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/newhuoli_control.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/newhuoli_control.java index 920f1a22..fd6a8485 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/newhuoli_control.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/newhuoli_control.java @@ -82,7 +82,6 @@ public class newhuoli_control extends LinearLayout { ImageViews.get(0).setVisibility(View.GONE); ImageViews.get(1).setVisibility(View.GONE); ImageViews.get(2).setVisibility(View.GONE); - ImageViews.get(3).setVisibility(View.GONE); if(ConfigName.getInstance().HeatingGear.get(ConfigName.getInstance().HuoLi)!=null) @@ -157,9 +156,11 @@ public class newhuoli_control extends LinearLayout { public void SetLevel(int value) { level=value; + colse.setVisibility(View.VISIBLE); if(value==1) { Status=true; + colse.setImageResource(R.mipmap.huoli_open); hl1.setImageResource(R.mipmap.hl1); hl2.setImageResource(R.mipmap.hl2); @@ -259,6 +260,7 @@ public class newhuoli_control extends LinearLayout { }else { Status=false; + colse.setVisibility(View.INVISIBLE); colse.setImageResource(R.mipmap.huoli_close); hl1.setImageResource(R.mipmap.hl2); hl2.setImageResource(R.mipmap.hl2); diff --git a/app/src/main/res/layout/activity_bottom_navigation_new.xml b/app/src/main/res/layout/activity_bottom_navigation_new.xml index 2484cb1d..83a3af6c 100644 --- a/app/src/main/res/layout/activity_bottom_navigation_new.xml +++ b/app/src/main/res/layout/activity_bottom_navigation_new.xml @@ -45,7 +45,9 @@ android:layout_height="match_parent" android:fitsSystemWindows="false" android:background="@color/topbj1" - android:visibility="gone"> + android:visibility="gone" + android:focusable="true" + android:clickable="true"> @@ -57,7 +59,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" - android:visibility="gone"> + android:visibility="gone" + android:focusable="true" + android:clickable="true"> diff --git a/app/src/main/res/layout/activity_bunkersetup.xml b/app/src/main/res/layout/activity_bunkersetup.xml index 9e5f206e..593be080 100644 --- a/app/src/main/res/layout/activity_bunkersetup.xml +++ b/app/src/main/res/layout/activity_bunkersetup.xml @@ -88,6 +88,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_cookingsimulated.xml b/app/src/main/res/layout/activity_cookingsimulated.xml index c8132406..1689fee0 100644 --- a/app/src/main/res/layout/activity_cookingsimulated.xml +++ b/app/src/main/res/layout/activity_cookingsimulated.xml @@ -136,7 +136,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_marginLeft="140dp" + android:layout_marginRight="200dp" + android:layout_alignParentRight="true" android:layout_marginBottom="180dp" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_dishtest.xml b/app/src/main/res/layout/activity_dishtest.xml index 5f430bf5..50be0224 100644 --- a/app/src/main/res/layout/activity_dishtest.xml +++ b/app/src/main/res/layout/activity_dishtest.xml @@ -135,7 +135,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_marginLeft="140dp" + android:layout_marginRight="200dp" + android:layout_alignParentRight="true" android:layout_marginBottom="180dp" android:orientation="vertical"> @@ -723,6 +724,7 @@ @@ -102,13 +103,15 @@ + android:layout_marginTop="20dp" + > + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item/layout/plcstatus.xml b/app/src/main/res/layout/item/layout/plcstatus.xml new file mode 100644 index 00000000..f4a2dc11 --- /dev/null +++ b/app/src/main/res/layout/item/layout/plcstatus.xml @@ -0,0 +1,14 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-xxxhdpi/plc1.png b/app/src/main/res/mipmap-xxxhdpi/plc1.png new file mode 100644 index 0000000000000000000000000000000000000000..e89eeb276a9b6fe2b54fbae048e3e6b531dff17e GIT binary patch literal 11796 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/plc2.png b/app/src/main/res/mipmap-xxxhdpi/plc2.png new file mode 100644 index 0000000000000000000000000000000000000000..7c98843ce2904ccd9d5a6a52ebb5c8574e5fd4a6 GIT binary patch literal 10188 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 literal 0 HcmV?d00001