From 87918cdec8e9e4bb3cfc3328cd972a958ecf17ae Mon Sep 17 00:00:00 2001 From: fyf <11621@LAPTOP-04QQU0AO> Date: Tue, 7 Nov 2023 16:12:40 +0800 Subject: [PATCH] xianc --- .../business/ExecuteTheRecipe.java | 72 +++++----- .../common/constant/ConfigName.java | 32 ++--- .../bnframework/common/constant/DataBus.java | 9 +- .../bonait/bnframework/common/db/QueryDB.java | 13 ++ .../common/linktab/TopItemDecoration.java | 2 +- .../linktab/makegood/MakeGoodLeftAdapter.java | 2 +- .../common/tabbar/MainNavigateTabBar.java | 4 +- .../BottomNavigationMainActivity.java | 2 - .../home/adapter/loadinggood_adapter.java | 7 +- .../modules/home/adapter/newgood_adapter.java | 2 +- .../home/adapter/newmakegood_adapter.java | 2 +- .../home/fragment/MakeGoodFragment.java | 131 ++++++++++++++++-- .../home/fragment/from/SilosNewActivity.java | 12 +- .../fragment/mode/Silos_item_fragment.java | 1 - .../mode/Silos_item_jiaoyan_fragment.java | 9 +- .../mode/add_yijian_controlextends.java | 1 + .../home/fragment/mode/silos_jiaoyan.java | 64 ++++++--- app/src/main/res/drawable/goodpf_bj.xml | 2 +- app/src/main/res/drawable/jcsjgl_bj.xml | 2 +- app/src/main/res/drawable/log_bj.xml | 2 +- app/src/main/res/drawable/plc_bj.xml | 2 +- app/src/main/res/drawable/progressbar.xml | 8 +- app/src/main/res/drawable/sbxx_bj.xml | 2 +- app/src/main/res/drawable/silos_bj.xml | 2 +- app/src/main/res/drawable/ssjk_bj.xml | 2 +- .../main/res/layout/activity_goodpeifang.xml | 17 +-- .../main/res/layout/activity_silos_new.xml | 10 +- app/src/main/res/layout/fragment_dingdan.xml | 6 +- app/src/main/res/layout/fragment_gongneng.xml | 2 +- .../main/res/layout/fragment_make_good.xml | 24 ++-- app/src/main/res/layout/fragment_she_zhi.xml | 44 ++++-- .../res/layout/item/layout/item_left_good.xml | 11 +- .../layout/item/layout/item_left_makegood.xml | 3 +- .../res/layout/item/layout/newgood_bj.xml | 9 +- .../res/layout/item/layout/newmakegood.xml | 10 +- app/src/main/res/mipmap-xxxhdpi/sxsp.png | Bin 0 -> 10538 bytes app/src/main/res/values/colors.xml | 5 +- 37 files changed, 365 insertions(+), 163 deletions(-) create mode 100644 app/src/main/res/mipmap-xxxhdpi/sxsp.png diff --git a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java index 1a026e96..4b587c3f 100644 --- a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java +++ b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java @@ -474,24 +474,26 @@ public class ExecuteTheRecipe { ModbusTcpServer.get().WriteBool(plcaddress.address, (boolean) value, callback); } else if (plcaddress.address.toUpperCase().startsWith("VW"))//short { - ModbusTcpServer.get().WriteShort(plcaddress.address, Short.parseShort(value.toString()), callback); + if(plcaddress.address.contains(".")) + { + String[] res = plcaddress.address.split("[.]"); + String firstAdd = res[0]; //VW100 + int endAdd = Integer.parseInt(res[1]); //1 //第几位 + ModbusTcpServer.get().ReadShort(firstAdd, 1, new IReadCallBack() { + @Override + public void onSuccess(short[] shorts) { + Short val=shorts[0]; + Short valk= ByteHelper.setBit(val,endAdd,(boolean) value); + ModbusTcpServer.get().WriteShort(firstAdd, valk, null); + } + }); + }else + { + ModbusTcpServer.get().WriteShort(plcaddress.address, Short.parseShort(value.toString()), callback); + } }else if (plcaddress.address.toUpperCase().startsWith("VR"))//float { ModbusTcpServer.get().WriteFloat(plcaddress.address, Float.parseFloat(value.toString()), callback); - }else if (plcaddress.address.toUpperCase().startsWith("V") && plcaddress.address.contains("."))//位 - { - String[] res = plcaddress.address.split("[.]"); - String firstAdd = res[0]; //VW100 - int endAdd = Integer.parseInt(res[1]); //1 //第几位 - ModbusTcpServer.get().ReadShort(firstAdd, 1, new IReadCallBack() { - @Override - public void onSuccess(short[] shorts) { - Short val=shorts[0]; - Short valk= ByteHelper.setBit(val,endAdd,(boolean) value); - ModbusTcpServer.get().WriteShort(firstAdd, valk, null); - } - }); - ModbusTcpServer.get().WriteFloat(plcaddress.address, Float.parseFloat(value.toString()), callback); } } } @@ -526,23 +528,26 @@ public class ExecuteTheRecipe { }); } else if (plcaddress.address.toUpperCase().startsWith("VW"))//short { - ModbusTcpServer.get().ReadShort(plcaddress.address, 1, val -> { - ReturnsVariable[0] = val[0]; - }); + if(plcaddress.address.contains(".")) + { + String[] res = plcaddress.address.split("[.]"); + String firstAdd = res[0].replace("V","VW"); //VW194 + int endAdd = Integer.parseInt(res[1]); //1 //第几位 + ModbusTcpServer.get().ReadbcStatus(firstAdd, 1, data -> { + byte status=data[0];//0x92 + ReturnsVariable[0] = ByteHelper.getBit(status,endAdd)==1; + }); + }else + { + ModbusTcpServer.get().ReadShort(plcaddress.address, 1, val -> { + ReturnsVariable[0] = val[0]; + }); + } } else if (plcaddress.address.toUpperCase().startsWith("VR"))//float { ModbusTcpServer.get().ReadFloat(plcaddress.address, 1, val -> { ReturnsVariable[0] = val[0]; }); - }else if (plcaddress.address.toUpperCase().startsWith("V") && plcaddress.address.contains("."))//位 - { - String[] res = plcaddress.address.split("[.]"); - String firstAdd = res[0].replace("V","VW"); //VW194 - int endAdd = Integer.parseInt(res[1]); //1 //第几位 - ModbusTcpServer.get().ReadbcStatus(firstAdd, 1, data -> { - byte status=data[0];//0x92 - ReturnsVariable[0] = ByteHelper.getBit(status,endAdd)==1; - }); } } } @@ -684,12 +689,15 @@ public class ExecuteTheRecipe { if (!plcaddress.address.isEmpty() && ConfigName.getInstance().PlcIsConnect) { ModbusTcpServer.get().ReadString(plcaddress.address, 40, (data) -> { - if (!Code.equals(data)) { - if (!data.isEmpty() && OnScanTheCodeInformationT != null) { - ToastUtils.error("当前扫码信息:" + data); - } - Code = data; + if(!data.isEmpty() && !Code.equals(data) && OnScanTheCodeInformationT != null) + { + Log.d("信息", "扫码数据: "+data); + OnScanTheCodeInformationT.Run(data); + ModbusTcpServer.get().WriteString(plcaddress.address, 40, null); } + + //记录上一次读取PLC 扫码数据 + Code = data; }); } } diff --git a/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java b/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java index 4d155ec6..7d5d20b6 100644 --- a/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java +++ b/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java @@ -378,12 +378,12 @@ public class ConfigName { add(new Res_PLCADDRESS("补偿5时间", "VW176", 1, 1)); add(new Res_PLCADDRESS("补偿6时间", "VW178", 1, 1)); - add(new Res_PLCADDRESS("通道1补偿开关", "V194.0", 1, 1)); - add(new Res_PLCADDRESS("通道2补偿开关", "V194.1", 1, 1)); - add(new Res_PLCADDRESS("通道3补偿开关", "V194.2", 1, 1)); - add(new Res_PLCADDRESS("通道4补偿开关", "V194.3", 1, 1)); - add(new Res_PLCADDRESS("通道5补偿开关", "V194.4", 1, 1)); - add(new Res_PLCADDRESS("通道6补偿开关", "V194.5", 1, 1)); + add(new Res_PLCADDRESS("通道1补偿开关", "VW194.0", 1, 1)); + add(new Res_PLCADDRESS("通道2补偿开关", "VW194.1", 1, 1)); + add(new Res_PLCADDRESS("通道3补偿开关", "VW194.2", 1, 1)); + add(new Res_PLCADDRESS("通道4补偿开关", "VW194.3", 1, 1)); + add(new Res_PLCADDRESS("通道5补偿开关", "VW194.4", 1, 1)); + add(new Res_PLCADDRESS("通道6补偿开关", "VW194.5", 1, 1)); //电子秤校验 add(new Res_PLCADDRESS("电子秤校验", "-------------", 0, 0)); @@ -678,12 +678,12 @@ public class ConfigName { add(new Res_PLCADDRESS("补偿5时间", "VW176", 1, 1)); add(new Res_PLCADDRESS("补偿6时间", "VW178", 1, 1)); - add(new Res_PLCADDRESS("通道1补偿开关", "V194.0", 1, 1)); - add(new Res_PLCADDRESS("通道2补偿开关", "V194.1", 1, 1)); - add(new Res_PLCADDRESS("通道3补偿开关", "V194.2", 1, 1)); - add(new Res_PLCADDRESS("通道4补偿开关", "V194.3", 1, 1)); - add(new Res_PLCADDRESS("通道5补偿开关", "V194.4", 1, 1)); - add(new Res_PLCADDRESS("通道6补偿开关", "V194.5", 1, 1)); + add(new Res_PLCADDRESS("通道1补偿开关", "VW194.0", 1, 1)); + add(new Res_PLCADDRESS("通道2补偿开关", "VW194.1", 1, 1)); + add(new Res_PLCADDRESS("通道3补偿开关", "VW194.2", 1, 1)); + add(new Res_PLCADDRESS("通道4补偿开关", "VW194.3", 1, 1)); + add(new Res_PLCADDRESS("通道5补偿开关", "VW194.4", 1, 1)); + add(new Res_PLCADDRESS("通道6补偿开关", "VW194.5", 1, 1)); //电子秤校验 add(new Res_PLCADDRESS("电子秤校验", "-------------", 0, 0)); @@ -801,10 +801,10 @@ public class ConfigName { add(new ResSilosModel("粉料仓", 7)); add(new ResSilosModel("粉料仓", 8)); add(new ResSilosModel("粉料仓", 9)); - add(new ResSilosModel("酱油仓", 10)); - add(new ResSilosModel("陈醋仓", 11)); - add(new ResSilosModel("猪油仓", 12)); - add(new ResSilosModel("牛油仓", 13)); + add(new ResSilosModel("液料仓", 10)); + add(new ResSilosModel("液料仓", 11)); + add(new ResSilosModel("加热仓", 12)); + add(new ResSilosModel("加热仓", 13)); add(new ResSilosModel("粉料仓", 14)); add(new ResSilosModel("粉料仓", 15)); add(new ResSilosModel("粉料仓", 16)); 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 9148023b..6d2aaf39 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 @@ -202,7 +202,11 @@ public class DataBus { make.makeStatus= MakeStatus.等待中; make.makeMs="等待下发物料！"; make.makeProcess=0; - GoodsMake.add(make); + + if(make.good!=null) + { + GoodsMake.add(make); + } // MessageLog.ShowUserMessage(UserLogEnum.订单处理日志, "[" + make.good.name + "]准备配料!"); if(loadinggoodAdapter!=null) @@ -318,6 +322,9 @@ public class DataBus { m.id = k.id; m.name = k.name; m.isSelect = false; + m.sort=k.sort; + m.foreignKeyRe=k.foreignKeyRe; + m.parentid=k.parentid; _chid.add(m); } re.child = _chid; diff --git a/app/src/main/java/com/bonait/bnframework/common/db/QueryDB.java b/app/src/main/java/com/bonait/bnframework/common/db/QueryDB.java index 28b930cb..8817e4e0 100644 --- a/app/src/main/java/com/bonait/bnframework/common/db/QueryDB.java +++ b/app/src/main/java/com/bonait/bnframework/common/db/QueryDB.java @@ -1660,6 +1660,19 @@ public class QueryDB { } return data.size() > 0; } + + public static boolean GetOrderthirdPartyIDIs(String id) { + boolean isSucess = false; + String orderby = Desc_Time_Up;//出料顺序 + String where = "isDelete=? and thirdPartyID=?"; + String[] args = new String[]{"0", id}; + ArrayList data = new ArrayList<>(); + ArrayList obj = Get(BPA_ORDER.class, where, args, orderby); + for (Object k : obj) { + data.add((BPA_ORDER) k); + } + return data.size() > 0; + } //endregion //region BPA_SUBORDER 订单子表 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 427a5a2e..0438ff62 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(19f); + textPaint.setTextSize(25f); typeListener=type; } diff --git a/app/src/main/java/com/bonait/bnframework/common/linktab/makegood/MakeGoodLeftAdapter.java b/app/src/main/java/com/bonait/bnframework/common/linktab/makegood/MakeGoodLeftAdapter.java index e2514923..be7e4266 100644 --- a/app/src/main/java/com/bonait/bnframework/common/linktab/makegood/MakeGoodLeftAdapter.java +++ b/app/src/main/java/com/bonait/bnframework/common/linktab/makegood/MakeGoodLeftAdapter.java @@ -52,7 +52,7 @@ public class MakeGoodLeftAdapter extends BaseQuickAdapter= 0 && index < mViewHolderList.size()) { ViewHolder holder = mViewHolderList.get(index); showFragment(holder); - - } } diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationMainActivity.java b/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationMainActivity.java index 7def8485..fe3686c0 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationMainActivity.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationMainActivity.java @@ -186,7 +186,6 @@ public class BottomNavigationMainActivity extends BaseActivity { break; } viewPager.setCurrentItem(_postion); - mNavigateTabBar.SetDataResh(_postion); } }; /** @@ -200,7 +199,6 @@ public class BottomNavigationMainActivity extends BaseActivity { @Override public void onPageSelected(int position) { mNavigateTabBar.setCurrentSelectedTab(position); - mNavigateTabBar.SetDataResh(position); } @Override 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 cd343b43..7d36479f 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 @@ -81,15 +81,15 @@ public class loadinggood_adapter extends RecyclerView.Adapter() { + @Override + public void Run(String msg) { + + activity.runOnUiThread(new Runnable() { + @Override + public void run() { + if ((msg != null) && (((String) msg).length() > 2) && ((String) msg).contains("|")) { + //拿到扫码数据 + //例如 ORD001|P0003|A001,M002,T001|2 + // OR001|A001|2,22|1 + + String[] res = ((String) msg).split("[|]"); + if (res.length >= 4) { + String orderid = res[0];//ORD001 + String goodid = res[1];//P0003 商品id + String ggid = res[2];//A001,M002,T001 配方ids + + String ggids = "";//规格id集合 + String names=""; + + if( QueryDB.GetOrderthirdPartyIDIs(orderid)) + { + message="已有订单,重复扫码!"; + mHandler.sendEmptyMessage(1); + return; + } + int num = 1; + try { + num = Integer.parseInt(res[3]); + for(String item:ggid.split("[,]")) + { + for(ResGoodProperty k :DataBus.getInstance().bpa_goodproperties) + { + if(k.child!=null && k.child.size()>0) + { + for (ResGoodProperty chd:k.child) + { + if(chd.foreignKeyRe!=null && !chd.foreignKeyRe.isEmpty() && chd.foreignKeyRe.equals(item)) + { + ggids += chd.id + ","; + names+="/"+chd.name; + } + } + } + + } + } + + if (!ggids.isEmpty()) { + ggids = ggids.substring(0, ggids.length() - 1); + } + } catch (Exception ex) { + } + + BPA_GOODS good=QueryDB.GetGoodsforeignKeyId(goodid); + if(good==null) + { + message="没有查询到该商品!"; + mHandler.sendEmptyMessage(1); + }else + { + BPA_GOODSRECIPENAME goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids,good.id); + if (goodsrecipename != null) { + BPA_ORDER order = new BPA_ORDER(); + order.thirdPartyID =orderid; + order.status = 0; + order.deviceID = ConfigName.getInstance().DeviceId; + order.userID = ConfigName.getInstance().user.userID; + QueryDB.AddOrder(order); + + for (int mm=0;mm= (zl[0] + 2))//当前重量大于2g + if ((ExecuteTheRecipe.OutletWeigh >= (zl[0] + 2)) && isStartMg)//当前重量大于2g { + isStartMg=false; mHandler.sendEmptyMessage(1); } } @@ -373,7 +397,7 @@ public class silos_jiaoyan extends LinearLayout { new Thread(new Runnable() { @Override public void run() { - + ExecuteTheRecipe.WritePLC("通道" + lcMode.num + "校准开关", true, null); if(activity!=null) { activity.runOnUiThread(new Runnable() { @@ -436,7 +460,7 @@ public class silos_jiaoyan extends LinearLayout { R.id.chuliao1, R.id.chuliao2, R.id.chuliao3, R.id.click_mgjz, R.id.click_mgjz_save, R.id.click_wljz, R.id.click_wljz_save, - R.id.control_switch, R.id.click_bcjz_save, + R.id.click_bcjz_save, }) public void onViewClicked(View view) { switch (view.getId()) { @@ -472,18 +496,6 @@ public class silos_jiaoyan extends LinearLayout { case R.id.click_wljz_save://物料校准 保存参数 SaveWLJZ(); break; - - case R.id.control_switch://通道开关 - boolean isopen = control_switch.isChecked(); - if (ConfigName.getInstance().PlcIsConnect) { - lcMode.isOpenbcsf=isopen?1:0; - ExecuteTheRecipe.WritePLC("通道" + lcMode.num + "补偿开关", isopen, null); - QueryDB.UpdateSilosisOpenbcsf(lcMode.id, isopen); - ToastUtils.info(lcMode.name.toString() + (isopen ? "打开" : "关闭") + "成功!"); - } else { - ToastUtils.warning(lcMode.name.toString() + (isopen ? "打开" : "关闭") + "失败!PLC未连接！！"); - } - break; case R.id.click_bcjz_save://补偿校准 保存参数 SaveBCJZ(); break; @@ -542,11 +554,15 @@ public class silos_jiaoyan extends LinearLayout { return; } - if (!ExecuteTheRecipe.IsCup) { - ToastUtils.warning("出料口没有检测到器皿！"); - return; + if (ConfigName.getInstance().versionSelectionEnum.equals("奶茶机")) + { + if (!ExecuteTheRecipe.IsCup) { + ToastUtils.warning("出料口没有检测到器皿！"); + return; + } } + short kkk = (short) ((int) (zl * 10)); new Thread(new Runnable() { @Override @@ -558,6 +574,8 @@ public class silos_jiaoyan extends LinearLayout { @Override public void onSuccess() { ExecuteTheRecipe.WritePLC("配料启动", true, null); + ToastUtils.warning("启动成功......"); + } @Override @@ -630,7 +648,12 @@ public class silos_jiaoyan extends LinearLayout { lcMode.fTime=ftime; lcMode.jTime=stime; lcMode.jValue=zl; - QueryDB.UpdateSilosJZTime(lcMode.id, stime, ftime); + + ArrayList Ss=QueryDB.GetSilosALL(); + for (BPA_SILOS item:Ss) + { + QueryDB.UpdateSilosJZTime(item.id, stime, ftime); + } QueryDB.UpdateJYZ(lcMode.id, zl); ExecuteTheRecipe.WritePLC("基准时间", (short) stime_1, new IWriteCallBack() { @Override @@ -648,6 +671,7 @@ public class silos_jiaoyan extends LinearLayout { //region 物料校准 public void WLJZ() { + //判断是否为果糖->判断温度 if (ConfigName.getInstance().versionSelectionEnum.equals("奶茶机")) { if (lcMode.num == 11) { @@ -743,6 +767,7 @@ public class silos_jiaoyan extends LinearLayout { * 启动定时器 */ public void StartTime() { + isStartMg=true; runtime.setBase(SystemClock.elapsedRealtime()); runtime.start(); new Thread(new Runnable() { @@ -766,6 +791,7 @@ public class silos_jiaoyan extends LinearLayout { public int StopTime() { long elapsedMillis = SystemClock.elapsedRealtime() - runtime.getBase(); runtime.stop(); + isStartMg=false; int time = (int) (elapsedMillis / 1000); new Thread(new Runnable() { @Override diff --git a/app/src/main/res/drawable/goodpf_bj.xml b/app/src/main/res/drawable/goodpf_bj.xml index 61518654..0acc5dbb 100644 --- a/app/src/main/res/drawable/goodpf_bj.xml +++ b/app/src/main/res/drawable/goodpf_bj.xml @@ -20,7 +20,7 @@ - + diff --git a/app/src/main/res/drawable/jcsjgl_bj.xml b/app/src/main/res/drawable/jcsjgl_bj.xml index db6c7ca2..90cab268 100644 --- a/app/src/main/res/drawable/jcsjgl_bj.xml +++ b/app/src/main/res/drawable/jcsjgl_bj.xml @@ -20,7 +20,7 @@ - + diff --git a/app/src/main/res/drawable/log_bj.xml b/app/src/main/res/drawable/log_bj.xml index 1e727544..43fc9c05 100644 --- a/app/src/main/res/drawable/log_bj.xml +++ b/app/src/main/res/drawable/log_bj.xml @@ -20,7 +20,7 @@ - + diff --git a/app/src/main/res/drawable/plc_bj.xml b/app/src/main/res/drawable/plc_bj.xml index 8631a081..fe90ba51 100644 --- a/app/src/main/res/drawable/plc_bj.xml +++ b/app/src/main/res/drawable/plc_bj.xml @@ -20,7 +20,7 @@ - + diff --git a/app/src/main/res/drawable/progressbar.xml b/app/src/main/res/drawable/progressbar.xml index ddf7b30c..04e76919 100644 --- a/app/src/main/res/drawable/progressbar.xml +++ b/app/src/main/res/drawable/progressbar.xml @@ -6,8 +6,8 @@ @@ -34,8 +34,8 @@ + android:endColor="#0088FF" + android:startColor="#0088FF" /> diff --git a/app/src/main/res/drawable/sbxx_bj.xml b/app/src/main/res/drawable/sbxx_bj.xml index bf3bb7b8..c9d4b4ab 100644 --- a/app/src/main/res/drawable/sbxx_bj.xml +++ b/app/src/main/res/drawable/sbxx_bj.xml @@ -20,7 +20,7 @@ - + diff --git a/app/src/main/res/drawable/silos_bj.xml b/app/src/main/res/drawable/silos_bj.xml index 7049fabe..a2fa7dd9 100644 --- a/app/src/main/res/drawable/silos_bj.xml +++ b/app/src/main/res/drawable/silos_bj.xml @@ -20,7 +20,7 @@ - + diff --git a/app/src/main/res/drawable/ssjk_bj.xml b/app/src/main/res/drawable/ssjk_bj.xml index 5b6a45cf..92390bb7 100644 --- a/app/src/main/res/drawable/ssjk_bj.xml +++ b/app/src/main/res/drawable/ssjk_bj.xml @@ -20,7 +20,7 @@ - + diff --git a/app/src/main/res/layout/activity_goodpeifang.xml b/app/src/main/res/layout/activity_goodpeifang.xml index 511b6ad9..a200f66b 100644 --- a/app/src/main/res/layout/activity_goodpeifang.xml +++ b/app/src/main/res/layout/activity_goodpeifang.xml @@ -33,13 +33,13 @@