20 changed files with 485 additions and 457 deletions
Split View
Diff Options
-
+110 -46app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java
-
+1 -1app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java
-
+2 -0app/src/main/java/com/bonait/bnframework/modules/home/fragment/SilosSettingFragment.java
-
+17 -7app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SilosNewActivity.java
-
+6 -38app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_silos_ck.java
-
+3 -32app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_silos_ck_edit.java
-
+2 -2app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_yijian_controlextends.java
-
+4 -0app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java
-
+38 -33app/src/main/res/layout/activity_silos_new.xml
-
+4 -4app/src/main/res/layout/fragment_silos_setting.xml
-
+165 -173app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
-
+32 -23app/src/main/res/layout/item/layout/dialog_add_yijian.xml
-
+10 -16app/src/main/res/layout/item/layout/layout_device_back.xml
-
+6 -4app/src/main/res/layout/item/layout/layout_device_left.xml
-
+7 -5app/src/main/res/layout/item/layout/layout_device_right.xml
-
+14 -14app/src/main/res/layout/item/layout/layout_device_top.xml
-
+64 -59app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml
-
BIN
-
BIN
-
BIN
+ 110
- 46
app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java
View File
| @@ -565,35 +565,94 @@ public class ConfigName { | |||
| add(new Res_PLCADDRESS("按钮配料启动", "I0.0", 1, 0)); | |||
| add(new Res_PLCADDRESS("清洗模式", "M1.0", 0, 1)); | |||
| add(new Res_PLCADDRESS("外置仓", "-------------", 0, 0)); | |||
| for (int i=1;i<=5;i++){ | |||
| add(new Res_PLCADDRESS("外置仓"+i+"出料时间", "VW"+(98+(i*2)), 0, 1)); | |||
| add(new Res_PLCADDRESS("外置仓"+i+"启停控制", "M10."+(i-1), 1, 1)); | |||
| } | |||
| add(new Res_PLCADDRESS("加热仓", "-------------", 0, 0)); | |||
| add(new Res_PLCADDRESS("加热仓16出料时间", "VW110", 0, 1)); | |||
| add(new Res_PLCADDRESS("加热仓16启停控制", "M10.5", 1, 1)); | |||
| add(new Res_PLCADDRESS("加热仓17出料时间", "VW112", 0, 1)); | |||
| add(new Res_PLCADDRESS("加热仓17启停控制", "M10.6", 1, 1)); | |||
| add(new Res_PLCADDRESS("粉料仓", "-------------", 0, 0)); | |||
| for (int i=1;i<=6;i++){ | |||
| add(new Res_PLCADDRESS("粉料仓"+(i+5)+"出料时间", "VW"+(112+(i*2)), 0, 1)); | |||
| add(new Res_PLCADDRESS("粉料仓"+(i+5)+"启停控制", Unity.GetSiemensBitSingleAdd("M",7+i,10), 1, 1)); | |||
| } | |||
| add(new Res_PLCADDRESS("液体仓", "-------------", 0, 0)); | |||
| for (int i=1;i<=4;i++){ | |||
| add(new Res_PLCADDRESS("液体仓"+(i+11)+"出料时间", "VW"+(124+(i*2)), 0, 1)); | |||
| add(new Res_PLCADDRESS("液体仓"+(i+11)+"启停控制", Unity.GetSiemensBitSingleAdd("M",5+i,11), 1, 1)); | |||
| } | |||
| add(new Res_PLCADDRESS("备用仓", "-------------", 0, 0)); | |||
| for (int i=1;i<=9;i++){ | |||
| add(new Res_PLCADDRESS("备用仓"+i+"出料时间", "VW"+(132+(i*2)), 0, 1)); | |||
| add(new Res_PLCADDRESS("备用仓"+i+"启停控制", Unity.GetSiemensBitSingleAdd("M",1+i,12), 1, 1)); | |||
| } | |||
| add(new Res_PLCADDRESS("通道", "-------------", 0, 0)); | |||
| add(new Res_PLCADDRESS("通道1启停控制", "M10.0", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道1出料时间", "VW100", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道2启停控制", "M10.1", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道2出料时间", "VW102", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道3启停控制", "M10.2", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道3出料时间", "VW104", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道4启停控制", "M10.3", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道4出料时间", "VW106", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道5启停控制", "M10.4", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道5出料时间", "VW108", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道6启停控制", "M10.5", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道6出料时间", "VW110", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道7启停控制", "M10.6", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道7出料时间", "VW112", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道8启停控制", "M10.7", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道8出料时间", "VW114", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道9启停控制", "M11.0", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道9出料时间", "VW116", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道10启停控制", "M11.1", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道10出料时间", "VW118", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道11启停控制", "M11.2", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道11出料时间", "VW120", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道12启停控制", "M11.3", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道12出料时间", "VW122", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道13启停控制", "M11.4", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道13出料时间", "VW124", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道14启停控制", "M11.5", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道14出料时间", "VW126", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道15启停控制", "M11.6", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道15出料时间", "VW128", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道16启停控制", "M11.7", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道16出料时间", "VW130", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道17启停控制", "M12.0", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道17出料时间", "VW132", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道18启停控制", "M12.1", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道18出料时间", "VW134", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道19启停控制", "M12.2", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道19出料时间", "VW136", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道20启停控制", "M12.3", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道20出料时间", "VW138", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道21启停控制", "M12.4", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道21出料时间", "VW140", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道22启停控制", "M12.5", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道22出料时间", "VW142", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道23启停控制", "M12.6", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道23出料时间", "VW144", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道24启停控制", "M12.7", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道24出料时间", "VW146", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道25启停控制", "M13.0", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道25出料时间", "VW148", 1, 1)); | |||
| add(new Res_PLCADDRESS("通道26启停控制", "M13.1", 0, 1)); | |||
| add(new Res_PLCADDRESS("通道26出料时间", "VW150", 1, 1)); | |||
| // add(new Res_PLCADDRESS("外置仓", "-------------", 0, 0)); | |||
| // for (int i=1;i<=5;i++){ | |||
| // add(new Res_PLCADDRESS("外置仓"+i+"出料时间", "VW"+(98+(i*2)), 0, 1)); | |||
| // add(new Res_PLCADDRESS("外置仓"+i+"启停控制", "M10."+(i-1), 1, 1)); | |||
| // } | |||
| // | |||
| // add(new Res_PLCADDRESS("加热仓", "-------------", 0, 0)); | |||
| // add(new Res_PLCADDRESS("加热仓16出料时间", "VW110", 0, 1)); | |||
| // add(new Res_PLCADDRESS("加热仓16启停控制", "M10.5", 1, 1)); | |||
| // add(new Res_PLCADDRESS("加热仓17出料时间", "VW112", 0, 1)); | |||
| // add(new Res_PLCADDRESS("加热仓17启停控制", "M10.6", 1, 1)); | |||
| // | |||
| // add(new Res_PLCADDRESS("粉料仓", "-------------", 0, 0)); | |||
| // for (int i=1;i<=6;i++){ | |||
| // add(new Res_PLCADDRESS("粉料仓"+(i+5)+"出料时间", "VW"+(112+(i*2)), 0, 1)); | |||
| // add(new Res_PLCADDRESS("粉料仓"+(i+5)+"启停控制", Unity.GetSiemensBitSingleAdd("M",7+i,10), 1, 1)); | |||
| // } | |||
| // | |||
| // add(new Res_PLCADDRESS("液体仓", "-------------", 0, 0)); | |||
| // for (int i=1;i<=4;i++){ | |||
| // add(new Res_PLCADDRESS("液体仓"+(i+11)+"出料时间", "VW"+(124+(i*2)), 0, 1)); | |||
| // add(new Res_PLCADDRESS("液体仓"+(i+11)+"启停控制", Unity.GetSiemensBitSingleAdd("M",5+i,11), 1, 1)); | |||
| // } | |||
| // | |||
| // add(new Res_PLCADDRESS("备用仓", "-------------", 0, 0)); | |||
| // for (int i=1;i<=9;i++){ | |||
| // add(new Res_PLCADDRESS("备用仓"+i+"出料时间", "VW"+(132+(i*2)), 0, 1)); | |||
| // add(new Res_PLCADDRESS("备用仓"+i+"启停控制", Unity.GetSiemensBitSingleAdd("M",1+i,12), 1, 1)); | |||
| // } | |||
| //电子秤校验 | |||
| add(new Res_PLCADDRESS("电子秤", "-------------", 0, 0)); | |||
| @@ -615,27 +674,32 @@ public class ConfigName { | |||
| * 配料吧台料仓模型 | |||
| */ | |||
| public List<ResSilosModel> Silos_配料吧台 = new ArrayList<ResSilosModel>() {{ | |||
| int num=0; | |||
| for(int i=1;i<=5;i++){ | |||
| num++; | |||
| add(new ResSilosModel("外置仓",num , num )); | |||
| } | |||
| for(int i=1;i<=6;i++){ | |||
| num++; | |||
| add(new ResSilosModel("粉料仓",num, num )); | |||
| } | |||
| for(int i=1;i<=4;i++){ | |||
| for(int i=1;i<=26;i++){ | |||
| num++; | |||
| add(new ResSilosModel("液体仓",num, num )); | |||
| add(new ResSilosModel("通道",num , num )); | |||
| } | |||
| for(int i=1;i<=2;i++){ | |||
| num++; | |||
| add(new ResSilosModel("加热仓",num, num )); | |||
| } | |||
| // int num=0; | |||
| // for(int i=1;i<=5;i++){ | |||
| // num++; | |||
| // add(new ResSilosModel("外置仓",num , num )); | |||
| // } | |||
| // | |||
| // for(int i=1;i<=6;i++){ | |||
| // num++; | |||
| // add(new ResSilosModel("粉料仓",num, num )); | |||
| // } | |||
| // | |||
| // for(int i=1;i<=4;i++){ | |||
| // num++; | |||
| // add(new ResSilosModel("液体仓",num, num )); | |||
| // } | |||
| // | |||
| // for(int i=1;i<=2;i++){ | |||
| // num++; | |||
| // add(new ResSilosModel("加热仓",num, num )); | |||
| // } | |||
| }}; | |||
| /** | |||
+ 1
- 1
app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java
View File
| @@ -730,7 +730,7 @@ public class MakeGoodFragment extends BaseFragment { | |||
| //总量大于0 绑定了物料 告警值设置了 告警大于余量 告警 | |||
| if(item.siloszl>0 && !item.materialId.isEmpty() && item.warningValue>0 && item.warningValue >= item.silosmargin) | |||
| { | |||
| title+="料仓"+item.num+"-"+item.materialName+"|"; | |||
| title+="通道"+item.num+"-"+item.materialName+"|"; | |||
| } | |||
| } | |||
+ 2
- 0
app/src/main/java/com/bonait/bnframework/modules/home/fragment/SilosSettingFragment.java
View File
| @@ -9,6 +9,7 @@ import androidx.annotation.Nullable; | |||
| import com.bonait.bnframework.R; | |||
| import com.bonait.bnframework.common.base.BaseFragment; | |||
| import com.bonait.bnframework.common.utils.DisplayManager; | |||
| import com.bonait.bnframework.databinding.FragmentSilosSettingBinding; | |||
| import com.bonait.bnframework.event.SilosClickEvent; | |||
| import com.orhanobut.logger.Logger; | |||
| @@ -34,6 +35,7 @@ public class SilosSettingFragment extends BaseFragment { | |||
| @Override | |||
| protected View onCreateView() { | |||
| viewBinding = FragmentSilosSettingBinding.inflate(getLayoutInflater()); | |||
| DisplayManager.scaleViewGroup(viewBinding.getRoot()); | |||
| return viewBinding.getRoot(); | |||
| } | |||
+ 17
- 7
app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SilosNewActivity.java
View File
| @@ -7,6 +7,9 @@ import android.content.Context; | |||
| import android.os.Bundle; | |||
| import android.view.View; | |||
| import androidx.viewpager.widget.ViewPager; | |||
| import com.apkfuns.logutils.LogUtils; | |||
| import com.bonait.bnframework.R; | |||
| import com.bonait.bnframework.common.base.BaseActivity; | |||
| import com.bonait.bnframework.common.constant.ConfigName; | |||
| @@ -58,7 +61,7 @@ public class SilosNewActivity extends BaseActivity { | |||
| QMUITabSegment tabs;//料仓分类 | |||
| @BindView(R.id.viewpager_silos) | |||
| QMUIViewPager viewpager_silos;//料仓 | |||
| ViewPager viewpager_silos;//料仓 | |||
| /** | |||
| * 查看料仓 | |||
| @@ -196,15 +199,11 @@ public class SilosNewActivity extends BaseActivity { | |||
| @Override | |||
| public int getCount() { | |||
| return 4; | |||
| // return DataBus.getInstance().SilosData.size(); | |||
| } | |||
| @Override | |||
| public QMUIFragment createFragment(int position) { | |||
| SilosSettingFragment silosSettingFragment = SilosSettingFragment.newInstance(position+1); | |||
| return silosSettingFragment; | |||
| // Silos_item_fragment fragment = new Silos_item_fragment(); | |||
| // fragment.SetData(position,activity); | |||
| // return fragment; | |||
| } | |||
| @Override | |||
| public CharSequence getPageTitle(int position) { | |||
| @@ -220,7 +219,6 @@ public class SilosNewActivity extends BaseActivity { | |||
| } | |||
| return "设备"; | |||
| // return DataBus.getInstance().SilosData.get(position).type.toString(); | |||
| } | |||
| }; | |||
| viewpager_silos.setAdapter(adapter); | |||
| @@ -274,7 +272,19 @@ public class SilosNewActivity extends BaseActivity { | |||
| //接收图片选择事件 | |||
| @Subscribe(threadMode = ThreadMode.MAIN) | |||
| public void onChannelClickEvent(SilosClickEvent event){ | |||
| //TODO | |||
| try{ | |||
| if(DataBus.getInstance().SilosData!=null && !DataBus.getInstance().SilosData.isEmpty()){ | |||
| int num = Integer.parseInt(event.channel.substring(2)); | |||
| LinkMode linkMode = DataBus.getInstance().SilosData.get(0); | |||
| add_silos.SetData((lcMode) linkMode.content.get(num-1)); | |||
| add_silos.setVisibility(View.VISIBLE); | |||
| } | |||
| }catch (Exception e){ | |||
| LogUtils.d(" onChannelClickEvent Exception "+e.getMessage()); | |||
| e.printStackTrace(); | |||
| } | |||
| } | |||
| @Override | |||
+ 6
- 38
app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_silos_ck.java
View File
| @@ -64,9 +64,6 @@ public class add_silos_ck extends LinearLayout { | |||
| @BindView(R.id.buchongyuanliao) | |||
| Button buchongyuanliao; | |||
| @BindView(R.id.manguan) | |||
| Button manguan; | |||
| @BindView(R.id.shezhi) | |||
| Button shezhi; | |||
| @@ -164,8 +161,6 @@ public class add_silos_ck extends LinearLayout { | |||
| spinner.setAdapter(adapter); | |||
| } | |||
| boolean ismanguan = false; | |||
| private void initEvent() { | |||
| buchongyuanliao.setOnClickListener(new OnClickListener() { | |||
| @Override | |||
| @@ -218,33 +213,6 @@ public class add_silos_ck extends LinearLayout { | |||
| .show(); | |||
| } | |||
| }); | |||
| manguan.setOnClickListener(new OnClickListener() { | |||
| @Override | |||
| public void onClick(View view) { | |||
| if (ismanguan == false) { | |||
| ismanguan = true; | |||
| StartTime(); | |||
| ExecuteTheRecipe.WritePLC("手自切换", false, null); | |||
| int time = lcMode.bValue <= 0 ? 10 : lcMode.bValue;//默认10秒 | |||
| ExecuteTheRecipe.WritePLC("手动控制" + lcMode.num, true, null); | |||
| new Handler().postDelayed(new Runnable() { | |||
| @Override | |||
| public void run() { | |||
| ExecuteTheRecipe.WritePLC("手动控制" + lcMode.num, false, null); | |||
| ToastUtils.info("满管成功!!!"); | |||
| ismanguan = false; | |||
| StopTime(); | |||
| } | |||
| }, time * 1000); | |||
| //满管 | |||
| if (mListener != null) { | |||
| mListener.clickListenerNew(view, 2, lcMode); | |||
| } | |||
| } else { | |||
| ToastUtils.warning("满管中,请稍后!!!"); | |||
| } | |||
| } | |||
| }); | |||
| shezhi.setOnClickListener(new OnClickListener() { | |||
| @Override | |||
| public void onClick(View view) { | |||
| @@ -428,14 +396,14 @@ public class add_silos_ck extends LinearLayout { | |||
| public void SetData(lcMode _good) { | |||
| lcMode = _good; | |||
| control_switch.setChecked(_good.status == 0 ? true : false); | |||
| title.setText("查看料仓-(" + lcMode.name + ")"); | |||
| title.setText("通道" + lcMode.num + ""); | |||
| xuhao.setText(lcMode.exp + ""); | |||
| if (lcMode.name.equals("外置仓")) { | |||
| control_huishou.setVisibility(View.VISIBLE); | |||
| } else { | |||
| control_huishou.setVisibility(View.GONE); | |||
| } | |||
| // if (lcMode.name.equals("外置仓")) { | |||
| // control_huishou.setVisibility(View.VISIBLE); | |||
| // } else { | |||
| // control_huishou.setVisibility(View.GONE); | |||
| // } | |||
| name.setText(lcMode.materialName.isEmpty() ? "未设置" : (lcMode.materialName + "")); | |||
| if (lcMode.materialName.isEmpty() || lcMode.materialName.equals("未设置")) { | |||
+ 3
- 32
app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_silos_ck_edit.java
View File
| @@ -52,9 +52,6 @@ public class add_silos_ck_edit extends LinearLayout { | |||
| @BindView(R.id.buchongyuanliao) | |||
| Button buchongyuanliao; | |||
| @BindView(R.id.manguan) | |||
| Button manguan; | |||
| @BindView(R.id.shezhi) | |||
| Button shezhi; | |||
| @@ -147,8 +144,8 @@ public class add_silos_ck_edit extends LinearLayout { | |||
| } | |||
| public void SetAdapter(Spinner spinner, List<String> map) { | |||
| ArrayAdapter<String> adapter = new ArrayAdapter<>(getContext(), R.layout.spinner_text_item, map); | |||
| adapter.setDropDownViewResource(R.layout.spinner_dropdown_item); | |||
| ArrayAdapter<String> adapter = new ArrayAdapter<>(getContext(), R.layout.spinner_text32_item, map); | |||
| adapter.setDropDownViewResource(R.layout.spinner_dropdown32_item); | |||
| spinner.setAdapter(adapter); | |||
| } | |||
| @@ -206,33 +203,7 @@ public class add_silos_ck_edit extends LinearLayout { | |||
| .show(); | |||
| } | |||
| }); | |||
| manguan.setOnClickListener(new OnClickListener() { | |||
| @Override | |||
| public void onClick(View view) { | |||
| if (ismanguan == false) { | |||
| ismanguan = true; | |||
| StartTime(); | |||
| ExecuteTheRecipe.WritePLC("手自切换", false, null); | |||
| int time = lcMode.bValue <= 0 ? 10 : lcMode.bValue;//默认10秒 | |||
| ExecuteTheRecipe.WritePLC("手动控制" + lcMode.num, true, null); | |||
| new Handler().postDelayed(new Runnable() { | |||
| @Override | |||
| public void run() { | |||
| ExecuteTheRecipe.WritePLC("手动控制" + lcMode.num, false, null); | |||
| ToastUtils.info("满管成功!!!"); | |||
| ismanguan = false; | |||
| StopTime(); | |||
| } | |||
| }, time * 1000); | |||
| //满管 | |||
| if (mListener != null) { | |||
| mListener.clickListenerNew(view, 2, lcMode); | |||
| } | |||
| } else { | |||
| ToastUtils.warning("满管中,请稍后!!!"); | |||
| } | |||
| } | |||
| }); | |||
| shezhi.setOnClickListener(new OnClickListener() { | |||
| @Override | |||
| public void onClick(View view) { | |||
+ 2
- 2
app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_yijian_controlextends.java
View File
| @@ -125,7 +125,7 @@ public class add_yijian_controlextends extends LinearLayout { | |||
| case 2://一键加满 | |||
| image_gz.SetShowImage(R.mipmap.silos2); | |||
| miaoshutext.setText("一键加满操作，请确认所有原料补充完毕后点击此操作"); | |||
| quzhizuo.setText("一键加满"); | |||
| quzhizuo.setText("一键加满所有通道"); | |||
| jishiqi.setVisibility(View.GONE); | |||
| image_gz.setVisibility(View.VISIBLE); | |||
| liaochang.setVisibility(View.GONE); | |||
| @@ -145,7 +145,7 @@ public class add_yijian_controlextends extends LinearLayout { | |||
| image_gz.setVisibility(View.GONE); | |||
| image_gz.SetShowImage(R.mipmap.silos4); | |||
| miaoshutext.setText(""); | |||
| quzhizuo.setText("一键设置"); | |||
| quzhizuo.setText("一键设置所有通道"); | |||
| jishiqi.setVisibility(View.GONE); | |||
| liaochang.setVisibility(View.VISIBLE); | |||
| miaoshu.setVisibility(View.GONE); | |||
+ 4
- 0
app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java
View File
| @@ -35,6 +35,7 @@ import com.bonait.bnframework.common.helper.I.MyClickListener; | |||
| import com.bonait.bnframework.common.helper.MessageLog; | |||
| import com.bonait.bnframework.common.utils.AlertDialogUtils; | |||
| import com.bonait.bnframework.common.utils.ToastUtils; | |||
| import com.bonait.bnframework.databinding.SilosJiaoyanItemEditBinding; | |||
| import com.qmuiteam.qmui.widget.dialog.QMUIDialog; | |||
| import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction; | |||
| @@ -86,11 +87,13 @@ public class silos_jiaoyan extends LinearLayout { | |||
| // @BindView(R.id.controlStatus) | |||
| // TextView controlStatus; | |||
| //endregion | |||
| private SilosJiaoyanItemEditBinding viewBinding; | |||
| public silos_jiaoyan(Context context, @Nullable AttributeSet attrs) { | |||
| super(context, attrs); | |||
| root= LayoutInflater.from(context).inflate(R.layout.silos_jiaoyan_item_edit, this); | |||
| viewBinding = SilosJiaoyanItemEditBinding.bind(root); | |||
| ButterKnife.bind(this, root); | |||
| //初始化界面控件的事件 | |||
| initEvent(); | |||
| @@ -104,6 +107,7 @@ public class silos_jiaoyan extends LinearLayout { | |||
| private void initData() | |||
| { | |||
| title_bc.setText(lcMode.num+" "+lcMode.materialName); | |||
| viewBinding.jiaozhunTitle.setText("通道"+lcMode.num+"校准"); | |||
| } | |||
| private void initEvent() | |||
+ 38
- 33
app/src/main/res/layout/activity_silos_new.xml
View File
| @@ -9,7 +9,7 @@ | |||
| android:orientation="vertical" | |||
| android:background="@color/white" | |||
| android:fitsSystemWindows="true"> | |||
| <LinearLayout | |||
| <FrameLayout | |||
| android:layout_marginTop="54dp" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| @@ -18,8 +18,7 @@ | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="0dp" | |||
| android:layout_weight="1" | |||
| android:layout_height="match_parent" | |||
| android:orientation="horizontal"> | |||
| @@ -33,72 +32,60 @@ | |||
| android:layout_width="match_parent" | |||
| android:layout_height="50dp" | |||
| android:background="@drawable/qmui_list_item_bg_with_border_bottom" | |||
| android:textSize="16sp" | |||
| android:textSize="32sp" | |||
| app:qmui_tab_has_indicator="true" | |||
| app:qmui_tab_indicator_height="2dp" | |||
| app:qmui_tab_indicator_top="false" | |||
| app:qmui_tab_normal_text_size="14sp" | |||
| app:qmui_tab_selected_text_size="16sp" /> | |||
| app:qmui_tab_normal_text_size="24sp" | |||
| app:qmui_tab_selected_text_size="26sp" /> | |||
| <RelativeLayout | |||
| android:layout_marginTop="45dp" | |||
| android:layout_marginTop="50dp" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:orientation="vertical"> | |||
| <com.qmuiteam.qmui.widget.QMUIViewPager | |||
| <androidx.viewpager.widget.ViewPager | |||
| android:id="@+id/viewpager_silos" | |||
| android:layout_width="1050dp" | |||
| android:layout_height="750dp" | |||
| android:layout_marginBottom="40dp"/> | |||
| android:layout_height="650dp" | |||
| android:layout_marginTop="15dp" | |||
| /> | |||
| <RelativeLayout | |||
| android:layout_alignParentBottom="true" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="30dp"> | |||
| android:layout_height="wrap_content"> | |||
| <LinearLayout | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_centerInParent="true"> | |||
| <ImageView | |||
| android:layout_width="20dp" | |||
| android:layout_height="20dp" | |||
| android:layout_width="30dp" | |||
| android:layout_height="30dp" | |||
| android:layout_gravity="center_vertical" | |||
| android:src="@mipmap/zhuyi"/> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="点击料仓图形设置或控制料仓" | |||
| android:textSize="26sp" | |||
| android:textColor="@color/red_primary_dark"/> | |||
| <ImageView | |||
| android:layout_marginLeft="20dp" | |||
| android:layout_width="20dp" | |||
| android:layout_height="20dp" | |||
| android:layout_width="30dp" | |||
| android:layout_height="30dp" | |||
| android:layout_gravity="center_vertical" | |||
| android:src="@mipmap/zhuyi"/> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="料仓物料低于最低值会警示" | |||
| android:textSize="26sp" | |||
| android:textColor="@color/red_primary_dark"/> | |||
| </LinearLayout> | |||
| </RelativeLayout> | |||
| <com.bonait.bnframework.modules.home.fragment.mode.add_yijian_controlextends | |||
| android:id="@+id/add_yijian" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:visibility="gone"/> | |||
| <com.bonait.bnframework.modules.home.fragment.mode.add_silos_ck | |||
| android:id="@+id/add_silos" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:visibility="gone" | |||
| /> | |||
| <com.bonait.bnframework.modules.home.fragment.mode.silos_jiaoyan | |||
| android:id="@+id/silos_jz" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:visibility="gone"/> | |||
| </RelativeLayout> | |||
| @@ -152,7 +139,25 @@ | |||
| </LinearLayout> | |||
| </LinearLayout> | |||
| <com.bonait.bnframework.modules.home.fragment.mode.add_yijian_controlextends | |||
| android:id="@+id/add_yijian" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:visibility="gone"/> | |||
| <com.bonait.bnframework.modules.home.fragment.mode.add_silos_ck | |||
| android:id="@+id/add_silos" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:visibility="gone" | |||
| /> | |||
| <com.bonait.bnframework.modules.home.fragment.mode.silos_jiaoyan | |||
| android:id="@+id/silos_jz" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:visibility="gone"/> | |||
| </FrameLayout> | |||
| <com.qmuiteam.qmui.widget.QMUITopBarLayout | |||
| android:id="@+id/topbar" | |||
+ 4
- 4
app/src/main/res/layout/fragment_silos_setting.xml
View File
| @@ -1,7 +1,7 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" | |||
| android:layout_width="1050dp" | |||
| android:layout_height="750dp" | |||
| <com.qmuiteam.qmui.widget.QMUIWindowInsetLayout xmlns:android="http://schemas.android.com/apk/res/android" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| xmlns:tools="http://schemas.android.com/tools"> | |||
| <include | |||
| @@ -32,4 +32,4 @@ | |||
| layout="@layout/layout_device_back" | |||
| android:visibility="gone" | |||
| /> | |||
| </FrameLayout> | |||
| </com.qmuiteam.qmui.widget.QMUIWindowInsetLayout> | |||
+ 165
- 173
app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
View File
| @@ -1,18 +1,23 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <RelativeLayout | |||
| xmlns:android="http://schemas.android.com/apk/res/android" | |||
| <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | |||
| xmlns:app="http://schemas.android.com/apk/res-auto" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| xmlns:tools="http://schemas.android.com/tools" | |||
| tools:layout_height="650dp" | |||
| tools:layout_width="1050dp" | |||
| android:background="@color/dialogbj" | |||
| android:focusable="true" | |||
| android:clickable="true"> | |||
| <RelativeLayout | |||
| android:layout_centerInParent="true" | |||
| android:layout_margin="20dp" | |||
| android:layout_width="500dp" | |||
| android:layout_height="400dp" | |||
| android:layout_marginStart="30dp" | |||
| android:layout_marginEnd="30dp" | |||
| android:layout_marginTop="30dp" | |||
| android:layout_marginBottom="30dp" | |||
| android:layout_width="900dp" | |||
| android:layout_height="600dp" | |||
| android:background="@drawable/common_bg_with_radius_and_border"> | |||
| <RelativeLayout | |||
| @@ -22,8 +27,8 @@ | |||
| </RelativeLayout> | |||
| <Button | |||
| android:id="@+id/close_from" | |||
| android:layout_width="50dp" | |||
| android:layout_height="50dp" | |||
| android:layout_width="80dp" | |||
| android:layout_height="80dp" | |||
| android:layout_alignParentRight="true" | |||
| android:layout_alignParentTop="true" | |||
| android:layout_marginRight="@dimen/dp_10" | |||
| @@ -35,21 +40,21 @@ | |||
| android:id="@+id/title" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="查看料仓" | |||
| android:textSize="20dp" | |||
| android:text="通道" | |||
| android:textSize="32sp" | |||
| android:layout_marginTop="@dimen/dp_10" | |||
| android:layout_marginLeft="30dp"> | |||
| </TextView> | |||
| <RelativeLayout | |||
| android:layout_marginBottom="20dp" | |||
| android:layout_marginBottom="32sp" | |||
| android:layout_marginTop="46dp" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent"> | |||
| <LinearLayout | |||
| android:layout_marginLeft="30dp" | |||
| android:layout_marginRight="30dp" | |||
| android:layout_marginStart="30dp" | |||
| android:layout_marginEnd="30dp" | |||
| android:orientation="vertical" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent"> | |||
| @@ -66,12 +71,14 @@ | |||
| android:layout_alignParentBottom="true" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="1dp" | |||
| android:layout_marginEnd="80dp" | |||
| android:background="@color/color3" /> | |||
| <RelativeLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent"> | |||
| <RelativeLayout | |||
| android:layout_marginTop="20dp" | |||
| android:layout_centerHorizontal="true" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content"> | |||
| @@ -90,12 +97,12 @@ | |||
| android:fontFamily="serif" | |||
| android:text="1" | |||
| android:textAlignment="center" | |||
| android:textSize="20dp" | |||
| android:textSize="32sp" | |||
| android:textStyle="bold" /> | |||
| <ImageView | |||
| android:id="@+id/wuliaoimage" | |||
| android:layout_width="160dp" | |||
| android:layout_height="160dp" | |||
| android:layout_width="200dp" | |||
| android:layout_height="200dp" | |||
| android:src="@mipmap/newsilos"/> | |||
| <TextView | |||
| @@ -103,19 +110,22 @@ | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:text="调和油" | |||
| android:paddingTop="5dp" | |||
| android:paddingBottom="5dp" | |||
| android:textColor="@color/blue" | |||
| android:textAlignment="center" | |||
| android:textSize="19dp"/> | |||
| android:textSize="42sp"/> | |||
| <TextView | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:text="(点击名称设置物料)" | |||
| android:textAlignment="center" | |||
| android:textSize="10dp" | |||
| android:textSize="22sp" | |||
| android:textColor="@color/red_primary"/> | |||
| </LinearLayout> | |||
| <LinearLayout | |||
| android:layout_marginTop="90dp" | |||
| android:layout_marginTop="110dp" | |||
| android:layout_centerHorizontal="true" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content"> | |||
| @@ -126,7 +136,7 @@ | |||
| android:layout_height="wrap_content" | |||
| android:fontFamily="sans-serif-medium" | |||
| android:text="30%" | |||
| android:textSize="24dp" /> | |||
| android:textSize="32sp" /> | |||
| </LinearLayout> | |||
| </RelativeLayout> | |||
| @@ -139,38 +149,38 @@ | |||
| android:orientation="vertical"> | |||
| <!-- <Button--> | |||
| <!-- android:id="@+id/control_switch_shoudong"--> | |||
| <!-- android:layout_width="120dp"--> | |||
| <!-- android:layout_width="132sp"--> | |||
| <!-- android:layout_height="70dp"--> | |||
| <!-- android:layout_centerHorizontal="true"--> | |||
| <!-- android:background="@drawable/silosbuttonbj"--> | |||
| <!-- android:text="出料"--> | |||
| <!-- android:textColor="@color/white"--> | |||
| <!-- android:textSize="18sp"/>--> | |||
| <!-- android:textSize="32sp"/>--> | |||
| <Button | |||
| android:layout_marginTop="@dimen/dp_10" | |||
| android:id="@+id/control_huishou" | |||
| android:layout_width="120dp" | |||
| android:layout_width="132sp" | |||
| android:layout_height="70dp" | |||
| android:layout_centerHorizontal="true" | |||
| android:background="@drawable/silosbuttonbj" | |||
| android:text="回收" | |||
| android:textColor="@color/white" | |||
| android:textSize="18sp"/> | |||
| android:textSize="32sp"/> | |||
| </LinearLayout> | |||
| <LinearLayout | |||
| android:layout_marginTop="10dp" | |||
| android:layout_marginTop="30dp" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:orientation="vertical"> | |||
| <TextView | |||
| android:layout_width="match_parent" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="启用/禁用" | |||
| android:textAlignment="center" | |||
| android:textSize="16dp" | |||
| android:textSize="26sp" | |||
| android:textColor="#65DD754B"/> | |||
| <com.suke.widget.SwitchButton | |||
| app:sb_uncheck_color="@color/app_color_blue" | |||
| @@ -186,162 +196,144 @@ | |||
| android:layout_alignParentBottom="true" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:orientation="vertical"> | |||
| <LinearLayout | |||
| android:layout_alignParentBottom="true" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content"> | |||
| <Button | |||
| android:id="@+id/buchongyuanliao" | |||
| android:layout_width="0dp" | |||
| android:layout_weight="1" | |||
| android:layout_height="40dp" | |||
| android:layout_centerHorizontal="true" | |||
| android:background="@drawable/bg" | |||
| android:text="补充原料" | |||
| android:textColor="@color/white" | |||
| android:textSize="18sp"/> | |||
| <Button | |||
| android:id="@+id/manguan" | |||
| android:layout_marginLeft="10dp" | |||
| android:layout_width="0dp" | |||
| android:layout_weight="1" | |||
| android:layout_height="40dp" | |||
| android:layout_centerHorizontal="true" | |||
| android:background="@drawable/bg" | |||
| android:text="满管" | |||
| android:visibility="gone" | |||
| android:textColor="@color/white" | |||
| android:textSize="18sp"/> | |||
| <Button | |||
| android:id="@+id/control_switch_shoudong" | |||
| android:layout_marginLeft="10dp" | |||
| android:layout_width="0dp" | |||
| android:layout_weight="1" | |||
| android:layout_height="40dp" | |||
| android:layout_centerHorizontal="true" | |||
| android:background="@drawable/bg" | |||
| android:text="出料" | |||
| android:visibility="visible" | |||
| android:textColor="@color/white" | |||
| android:textSize="18sp"/> | |||
| android:orientation="horizontal"> | |||
| <Button | |||
| android:id="@+id/buchongyuanliao" | |||
| android:layout_width="0dp" | |||
| android:layout_weight="1" | |||
| android:layout_height="100dp" | |||
| android:layout_centerHorizontal="true" | |||
| android:background="@drawable/bg" | |||
| android:text="补充原料" | |||
| android:textColor="@color/white" | |||
| android:textSize="32sp"/> | |||
| </LinearLayout> | |||
| <Button | |||
| android:id="@+id/control_switch_shoudong" | |||
| android:layout_marginLeft="10dp" | |||
| android:layout_width="0dp" | |||
| android:layout_weight="1" | |||
| android:layout_height="100dp" | |||
| android:layout_centerHorizontal="true" | |||
| android:background="@drawable/bg" | |||
| android:text="出料" | |||
| android:visibility="visible" | |||
| android:textColor="@color/white" | |||
| android:textSize="32sp"/> | |||
| <LinearLayout | |||
| android:layout_marginTop="@dimen/dp_10" | |||
| android:layout_alignParentBottom="true" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content"> | |||
| <Button | |||
| android:id="@+id/shezhi" | |||
| android:layout_width="0dp" | |||
| android:layout_weight="1" | |||
| android:layout_height="40dp" | |||
| android:layout_centerHorizontal="true" | |||
| android:background="@drawable/bg" | |||
| android:text="设置" | |||
| android:textColor="@color/white" | |||
| android:textSize="18sp"/> | |||
| <Button | |||
| android:id="@+id/jiaozhun" | |||
| android:layout_marginLeft="10dp" | |||
| android:layout_width="0dp" | |||
| android:layout_weight="1" | |||
| android:layout_height="40dp" | |||
| android:layout_centerHorizontal="true" | |||
| android:background="@drawable/bg" | |||
| android:text="校准" | |||
| android:textColor="@color/white" | |||
| android:textSize="18sp"/> | |||
| </LinearLayout> | |||
| </LinearLayout> | |||
| <RelativeLayout | |||
| android:visibility="gone" | |||
| android:id="@+id/liaochang_sz" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:background="@color/white"> | |||
| <Button | |||
| android:id="@+id/shezhi" | |||
| android:layout_width="0dp" | |||
| android:layout_weight="1" | |||
| android:layout_height="100dp" | |||
| android:layout_marginLeft="10dp" | |||
| android:layout_centerHorizontal="true" | |||
| android:background="@drawable/bg" | |||
| android:text="设置" | |||
| android:textColor="@color/white" | |||
| android:textSize="32sp"/> | |||
| <LinearLayout | |||
| android:layout_marginTop="30dp" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:orientation="vertical"> | |||
| <TextView | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:text="选择物料" | |||
| android:textSize="16dp" | |||
| android:textAlignment="center" | |||
| /> | |||
| <Spinner | |||
| android:id="@+id/editsp_wl" | |||
| style="@style/commonSpinnerStyle" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="26dp" | |||
| android:layout_centerVertical="true"/> | |||
| <TextView | |||
| android:layout_marginTop="@dimen/dp_10" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:text="料仓容量(g)" | |||
| android:textSize="16dp" | |||
| android:textAlignment="center" | |||
| /> | |||
| <EditText | |||
| android:id="@+id/edittext1" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="26dp" | |||
| android:background="@drawable/input_bj" | |||
| android:hint="请输入" | |||
| android:inputType="number" | |||
| android:layout_marginLeft="5dp" | |||
| android:maxLines="1" | |||
| android:padding="3dp" | |||
| android:textSize="12dp" | |||
| android:text="0"/> | |||
| <Button | |||
| android:id="@+id/jiaozhun" | |||
| android:layout_marginLeft="10dp" | |||
| android:layout_width="0dp" | |||
| android:layout_weight="1" | |||
| android:layout_height="100dp" | |||
| android:layout_centerHorizontal="true" | |||
| android:background="@drawable/bg" | |||
| android:text="校准" | |||
| android:textColor="@color/white" | |||
| android:textSize="32sp"/> | |||
| </LinearLayout> | |||
| <TextView | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginTop="@dimen/dp_10" | |||
| android:text="报警值(g)" | |||
| android:textAlignment="center" | |||
| android:textSize="16dp" /> | |||
| <EditText | |||
| android:id="@+id/edittext2" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="26dp" | |||
| android:background="@drawable/input_bj" | |||
| android:layout_marginLeft="5dp" | |||
| android:hint="请输入" | |||
| android:inputType="number" | |||
| android:maxLines="1" | |||
| android:padding="3dp" | |||
| android:textSize="12dp" | |||
| android:text="0"/> | |||
| <Button | |||
| android:id="@+id/queren" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="40dp" | |||
| android:layout_marginTop="20dp" | |||
| android:layout_centerHorizontal="true" | |||
| android:background="@drawable/bg" | |||
| android:text="确认" | |||
| android:textColor="@color/white" | |||
| android:textSize="18sp"/> | |||
| </LinearLayout> | |||
| </RelativeLayout> | |||
| </RelativeLayout> | |||
| </LinearLayout> | |||
| <RelativeLayout | |||
| android:visibility="gone" | |||
| tools:visibility="visible" | |||
| android:layout_marginTop="30dp" | |||
| android:id="@+id/liaochang_sz" | |||
| android:layout_marginStart="30dp" | |||
| android:layout_marginEnd="30dp" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:background="@color/white"> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:orientation="vertical"> | |||
| <TextView | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:text="选择物料" | |||
| android:textSize="32sp" | |||
| android:textAlignment="center" | |||
| /> | |||
| <Spinner | |||
| android:id="@+id/editsp_wl" | |||
| style="@style/commonSpinnerStyle" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="70dp" | |||
| android:dropDownVerticalOffset="40dp" | |||
| android:layout_centerVertical="true"/> | |||
| <TextView | |||
| android:layout_marginTop="@dimen/dp_10" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:text="料仓容量(g)" | |||
| android:textSize="32sp" | |||
| android:textAlignment="center" | |||
| /> | |||
| <EditText | |||
| android:id="@+id/edittext1" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="70dp" | |||
| android:background="@drawable/input_bj" | |||
| android:hint="请输入" | |||
| android:inputType="number" | |||
| android:layout_marginLeft="5dp" | |||
| android:maxLines="1" | |||
| android:padding="3dp" | |||
| android:textSize="32sp" | |||
| android:text="0"/> | |||
| <TextView | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginTop="@dimen/dp_10" | |||
| android:text="报警值(g)" | |||
| android:textAlignment="center" | |||
| android:textSize="32sp" /> | |||
| <EditText | |||
| android:id="@+id/edittext2" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="70dp" | |||
| android:background="@drawable/input_bj" | |||
| android:layout_marginLeft="5dp" | |||
| android:hint="请输入" | |||
| android:inputType="number" | |||
| android:maxLines="1" | |||
| android:padding="3dp" | |||
| android:textSize="32sp" | |||
| android:text="0"/> | |||
| <Button | |||
| android:id="@+id/queren" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="70dp" | |||
| android:layout_marginTop="32sp" | |||
| android:layout_centerHorizontal="true" | |||
| android:background="@drawable/bg" | |||
| android:text="确认" | |||
| android:textColor="@color/white" | |||
| android:textSize="32sp"/> | |||
| </LinearLayout> | |||
| </RelativeLayout> | |||
| </RelativeLayout> | |||
| </RelativeLayout> | |||
+ 32
- 23
app/src/main/res/layout/item/layout/dialog_add_yijian.xml
View File
| @@ -1,30 +1,30 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <RelativeLayout | |||
| xmlns:android="http://schemas.android.com/apk/res/android" | |||
| <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| xmlns:tools="http://schemas.android.com/tools" | |||
| android:background="@color/dialogbj" | |||
| xmlns:app="http://schemas.android.com/apk/res-auto" | |||
| android:focusable="true" | |||
| android:clickable="true" | |||
| > | |||
| android:clickable="true"> | |||
| <RelativeLayout | |||
| android:layout_centerInParent="true" | |||
| android:layout_margin="50dp" | |||
| android:layout_width="500dp" | |||
| android:layout_height="300dp" | |||
| android:layout_width="800dp" | |||
| android:layout_height="600dp" | |||
| android:gravity="center" | |||
| 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_width="70dp" | |||
| android:layout_height="70dp" | |||
| android:layout_alignParentRight="true" | |||
| android:layout_alignParentTop="true" | |||
| android:layout_marginRight="@dimen/dp_10" | |||
| android:layout_marginTop="@dimen/dp_10" | |||
| android:background="@mipmap/newdelete" | |||
| android:textSize="14dp" | |||
| android:textSize="32sp" | |||
| android:textColor="@color/white"/> | |||
| <RelativeLayout | |||
| @@ -40,6 +40,7 @@ | |||
| <com.bonait.bnframework.modules.home.fragment.mode.ImageButtonControl | |||
| android:id="@+id/image_gz" | |||
| android:visibility="gone" | |||
| tools:visibility="visible" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="100dp" | |||
| app:imagesrc="@mipmap/silos1" | |||
| @@ -59,6 +60,7 @@ | |||
| android:layout_height="wrap_content"> | |||
| <RelativeLayout | |||
| android:visibility="gone" | |||
| tools:visibility="gone" | |||
| android:id="@+id/miaoshu" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| @@ -70,11 +72,13 @@ | |||
| android:layout_marginTop="20dp" | |||
| android:layout_marginBottom="20dp" | |||
| android:text="请将原料装满料筒后执行该操作,\n此操作将会全仓满管" | |||
| android:textSize="26sp" | |||
| android:textAlignment="center"></TextView> | |||
| </RelativeLayout> | |||
| <LinearLayout | |||
| android:visibility="gone" | |||
| tools:visibility="visible" | |||
| android:id="@+id/liaochang" | |||
| android:layout_marginTop="50dp" | |||
| android:layout_width="match_parent" | |||
| @@ -84,34 +88,37 @@ | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:text="选择料仓" | |||
| android:textSize="16dp" | |||
| android:textSize="32sp" | |||
| android:visibility="gone" | |||
| android:textAlignment="center" | |||
| /> | |||
| <Spinner | |||
| android:id="@+id/editsp_fl" | |||
| style="@style/commonSpinnerStyle" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="26dp" | |||
| android:layout_height="70dp" | |||
| android:visibility="gone" | |||
| android:layout_centerVertical="true"/> | |||
| <TextView | |||
| android:layout_marginTop="@dimen/dp_10" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:text="料仓容量(g)" | |||
| android:textSize="16dp" | |||
| android:textSize="32sp" | |||
| android:textAlignment="center" | |||
| /> | |||
| <EditText | |||
| android:id="@+id/edittext1" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="26dp" | |||
| android:layout_height="70dp" | |||
| android:background="@drawable/input_bj" | |||
| android:hint="请输入" | |||
| android:inputType="number" | |||
| android:layout_marginLeft="5dp" | |||
| android:gravity="center_horizontal|bottom" | |||
| android:maxLines="1" | |||
| android:padding="3dp" | |||
| android:textSize="12dp" | |||
| android:textSize="32sp" | |||
| android:text="0"/> | |||
| <TextView | |||
| @@ -120,18 +127,19 @@ | |||
| android:layout_marginTop="@dimen/dp_10" | |||
| android:text="报警值(g)" | |||
| android:textAlignment="center" | |||
| android:textSize="16dp" /> | |||
| android:textSize="32sp" /> | |||
| <EditText | |||
| android:id="@+id/edittext2" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="26dp" | |||
| android:layout_height="70dp" | |||
| android:background="@drawable/input_bj" | |||
| android:layout_marginLeft="5dp" | |||
| android:hint="请输入" | |||
| android:inputType="number" | |||
| android:maxLines="1" | |||
| android:padding="3dp" | |||
| android:textSize="12dp" | |||
| android:gravity="center_horizontal|bottom" | |||
| android:textSize="32sp" | |||
| android:text="0"/> | |||
| </LinearLayout> | |||
| @@ -150,14 +158,14 @@ | |||
| android:layout_height="wrap_content" | |||
| android:text="用时: " | |||
| android:textColor="@color/black" | |||
| android:textSize="24dp"/> | |||
| android:textSize="32sp"/> | |||
| <Chronometer | |||
| android:id="@+id/runtime" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:textColor="@color/purple_primary" | |||
| android:textStyle="bold|italic" | |||
| android:textSize="30dp" | |||
| android:textSize="32sp" | |||
| /> | |||
| <com.qmuiteam.qmui.widget.textview.QMUILinkTextView | |||
| @@ -165,7 +173,7 @@ | |||
| android:layout_height="wrap_content" | |||
| android:text=" 秒" | |||
| android:textColor="@color/white" | |||
| android:textSize="24dp"/> | |||
| android:textSize="32sp"/> | |||
| </LinearLayout> | |||
| </RelativeLayout> | |||
| @@ -178,11 +186,12 @@ | |||
| <Button | |||
| android:id="@+id/quzhizuo" | |||
| android:layout_width="200dp" | |||
| android:layout_height="45dp" | |||
| android:layout_width="450dp" | |||
| android:layout_height="70dp" | |||
| android:layout_centerInParent="true" | |||
| android:background="@drawable/bg" | |||
| android:text="一键满管" | |||
| android:text="一键设置所有通道" | |||
| android:textSize="32sp" | |||
| android:textColor="@color/white" /> | |||
| </RelativeLayout> | |||
+ 10
- 16
app/src/main/res/layout/item/layout/layout_device_back.xml
View File
| @@ -1,22 +1,24 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | |||
| android:layout_width="1050dp" | |||
| android:layout_height="750dp" | |||
| android:layout_height="650dp" | |||
| android:background="@color/white" | |||
| xmlns:app="http://schemas.android.com/apk/res-auto"> | |||
| <ImageView | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:layout_width="450dp" | |||
| android:layout_height="650dp" | |||
| android:src="@mipmap/silos_device_back" | |||
| android:layout_marginStart="500dp" | |||
| android:scaleType="fitCenter" | |||
| app:layout_constraintLeft_toLeftOf="parent" | |||
| android:scaleY="3" | |||
| android:scaleX="3" | |||
| app:layout_constraintRight_toRightOf="parent" | |||
| app:layout_constraintTop_toTopOf="parent" | |||
| /> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:textSize="48sp" | |||
| android:textSize="32sp" | |||
| android:gravity="center" | |||
| android:textColor="#7B7774" | |||
| android:text="左侧液体仓" | |||
| @@ -207,16 +209,8 @@ | |||
| app:layout_constraintLeft_toLeftOf="parent" | |||
| app:layout_constraintTop_toTopOf="parent" | |||
| android:layout_marginTop="230dp" | |||
| android:layout_marginStart="850dp" | |||
| android:layout_marginStart="830dp" | |||
| /> | |||
| <TextView | |||
| android:layout_width="60dp" | |||
| android:layout_height="40dp" | |||
| android:background="#92918F" | |||
| app:layout_constraintLeft_toLeftOf="parent" | |||
| app:layout_constraintTop_toTopOf="parent" | |||
| android:layout_marginTop="290dp" | |||
| android:layout_marginStart="850dp" | |||
| /> | |||
| </androidx.constraintlayout.widget.ConstraintLayout> | |||
+ 6
- 4
app/src/main/res/layout/item/layout/layout_device_left.xml
View File
| @@ -1,21 +1,23 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | |||
| android:layout_width="1050dp" | |||
| android:layout_height="750dp" | |||
| android:layout_height="650dp" | |||
| android:background="@color/white" | |||
| xmlns:app="http://schemas.android.com/apk/res-auto"> | |||
| <ImageView | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:layout_width="1050dp" | |||
| android:layout_height="650dp" | |||
| android:src="@mipmap/silos_device_left" | |||
| android:scaleType="fitCenter" | |||
| android:scaleX="1.8" | |||
| android:scaleY="1.8" | |||
| app:layout_constraintLeft_toLeftOf="parent" | |||
| app:layout_constraintTop_toTopOf="parent" | |||
| /> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:textSize="48sp" | |||
| android:textSize="32sp" | |||
| android:gravity="center" | |||
| android:textColor="#7B7774" | |||
| android:text="设备左视图" | |||
+ 7
- 5
app/src/main/res/layout/item/layout/layout_device_right.xml
View File
| @@ -1,21 +1,23 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | |||
| android:layout_width="1050dp" | |||
| android:layout_height="750dp" | |||
| android:layout_height="650dp" | |||
| android:background="@color/white" | |||
| xmlns:app="http://schemas.android.com/apk/res-auto"> | |||
| <ImageView | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:layout_width="1050dp" | |||
| android:layout_height="650dp" | |||
| android:src="@mipmap/silos_device_right" | |||
| android:scaleType="fitCenter" | |||
| android:scaleY="1.8" | |||
| android:scaleX="1.8" | |||
| app:layout_constraintLeft_toLeftOf="parent" | |||
| app:layout_constraintEnd_toEndOf="parent" | |||
| app:layout_constraintTop_toTopOf="parent" | |||
| /> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:textSize="48sp" | |||
| android:textSize="32sp" | |||
| android:gravity="center" | |||
| android:textColor="#7B7774" | |||
| android:text="设备右视图" | |||
+ 14
- 14
app/src/main/res/layout/item/layout/layout_device_top.xml
View File
| @@ -1,12 +1,12 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | |||
| android:layout_width="1050dp" | |||
| android:layout_height="750dp" | |||
| android:layout_height="650dp" | |||
| android:background="@color/white" | |||
| xmlns:app="http://schemas.android.com/apk/res-auto"> | |||
| <ImageView | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:layout_width="1050dp" | |||
| android:layout_height="650dp" | |||
| android:src="@mipmap/silos_device_top" | |||
| android:scaleType="fitCenter" | |||
| android:scaleX="1.8" | |||
| @@ -21,7 +21,7 @@ | |||
| android:gravity="center" | |||
| android:textColor="@color/white" | |||
| android:text="设备俯视图\n可放置鸡精、味精、盐等粉料" | |||
| android:layout_marginTop="35dp" | |||
| android:layout_marginTop="15dp" | |||
| app:layout_constraintLeft_toLeftOf="parent" | |||
| app:layout_constraintRight_toRightOf="parent" | |||
| app:layout_constraintTop_toTopOf="parent" | |||
| @@ -36,7 +36,7 @@ | |||
| android:text="通道6" | |||
| android:background="@drawable/bg_device_position_btn" | |||
| android:layout_marginLeft="180dp" | |||
| android:layout_marginTop="180dp" | |||
| android:layout_marginTop="130dp" | |||
| app:layout_constraintLeft_toLeftOf="parent" | |||
| app:layout_constraintTop_toTopOf="parent" | |||
| /> | |||
| @@ -51,9 +51,9 @@ | |||
| android:text="通道7" | |||
| android:background="@drawable/bg_device_position_btn" | |||
| android:layout_marginLeft="180dp" | |||
| android:layout_marginTop="300dp" | |||
| android:layout_marginTop="20dp" | |||
| app:layout_constraintLeft_toLeftOf="parent" | |||
| app:layout_constraintTop_toTopOf="parent" | |||
| app:layout_constraintTop_toBottomOf="@id/channel6" | |||
| /> | |||
| <TextView | |||
| @@ -66,9 +66,9 @@ | |||
| android:text="通道8" | |||
| android:background="@drawable/bg_device_position_btn" | |||
| android:layout_marginLeft="180dp" | |||
| android:layout_marginTop="420dp" | |||
| android:layout_marginTop="20dp" | |||
| app:layout_constraintLeft_toLeftOf="parent" | |||
| app:layout_constraintTop_toTopOf="parent" | |||
| app:layout_constraintTop_toBottomOf="@id/channel7" | |||
| /> | |||
| <TextView | |||
| @@ -81,7 +81,7 @@ | |||
| android:text="通道9" | |||
| android:background="@drawable/bg_device_position_btn" | |||
| android:layout_marginLeft="650dp" | |||
| android:layout_marginTop="180dp" | |||
| android:layout_marginTop="130dp" | |||
| app:layout_constraintLeft_toLeftOf="parent" | |||
| app:layout_constraintTop_toTopOf="parent" | |||
| /> | |||
| @@ -95,9 +95,9 @@ | |||
| android:text="通道10" | |||
| android:background="@drawable/bg_device_position_btn" | |||
| android:layout_marginLeft="650dp" | |||
| android:layout_marginTop="300dp" | |||
| android:layout_marginTop="20dp" | |||
| app:layout_constraintLeft_toLeftOf="parent" | |||
| app:layout_constraintTop_toTopOf="parent" | |||
| app:layout_constraintTop_toBottomOf="@id/channel9" | |||
| /> | |||
| <TextView | |||
| android:id="@+id/channel11" | |||
| @@ -109,8 +109,8 @@ | |||
| android:text="通道11" | |||
| android:background="@drawable/bg_device_position_btn" | |||
| android:layout_marginLeft="650dp" | |||
| android:layout_marginTop="420dp" | |||
| android:layout_marginTop="20dp" | |||
| app:layout_constraintLeft_toLeftOf="parent" | |||
| app:layout_constraintTop_toTopOf="parent" | |||
| app:layout_constraintTop_toBottomOf="@id/channel10" | |||
| /> | |||
| </androidx.constraintlayout.widget.ConstraintLayout> | |||
+ 64
- 59
app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml
View File
| @@ -1,5 +1,5 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | |||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | |||
| xmlns:app="http://schemas.android.com/apk/res-auto" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| @@ -12,20 +12,24 @@ | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:layout_centerInParent="true" | |||
| android:layout_margin="10dp" | |||
| android:layout_marginStart="50dp" | |||
| android:layout_marginTop="50dp" | |||
| android:layout_marginBottom="50dp" | |||
| android:layout_marginEnd="50dp" | |||
| android:background="@drawable/common_bg_with_radius_and_border"> | |||
| <LinearLayout | |||
| android:layout_marginLeft="10dp" | |||
| android:layout_marginStart="10dp" | |||
| android:layout_marginTop="5dp" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content"> | |||
| <TextView | |||
| android:id="@+id/jiaozhun_title" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="通道校准" | |||
| android:textSize="20dp" | |||
| android:textSize="32sp" | |||
| android:textStyle="bold" /> | |||
| <TextView | |||
| @@ -33,31 +37,31 @@ | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginLeft="60dp" | |||
| android:text="当前重量：" | |||
| android:textSize="20sp"/> | |||
| android:textSize="26sp"/> | |||
| <TextView | |||
| android:id="@+id/current_weight" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| tools:text="100g" | |||
| android:textSize="20sp"/> | |||
| android:textSize="26sp"/> | |||
| <Button | |||
| android:id="@+id/btn_clear" | |||
| android:layout_width="90dp" | |||
| android:layout_height="wrap_content" | |||
| android:layout_width="100dp" | |||
| android:layout_height="70dp" | |||
| android:background="@drawable/bg_btn_login_selected" | |||
| android:text="清零" | |||
| android:layout_marginLeft="20dp" | |||
| android:text="清 零" | |||
| android:layout_marginLeft="32sp" | |||
| android:textColor="@color/white" | |||
| android:textSize="20sp"/> | |||
| android:textSize="32sp"/> | |||
| </LinearLayout> | |||
| <Button | |||
| android:id="@+id/close_from" | |||
| android:layout_width="32dp" | |||
| android:layout_height="32dp" | |||
| android:layout_width="70dp" | |||
| android:layout_height="70dp" | |||
| android:layout_alignParentTop="true" | |||
| android:layout_alignParentRight="true" | |||
| android:layout_marginTop="@dimen/dp_10" | |||
| @@ -66,20 +70,19 @@ | |||
| android:textColor="@color/white" | |||
| android:textSize="14dp" /> | |||
| <TextView | |||
| android:layout_marginRight="80dp" | |||
| android:layout_marginEnd="120dp" | |||
| android:layout_alignParentRight="true" | |||
| android:id="@+id/title_bc" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginLeft="20dp" | |||
| android:layout_marginTop="15dp" | |||
| android:text="11 豆瓣酱" | |||
| android:textAlignment="center" | |||
| android:textSize="20dp" | |||
| android:textColor="@color/app_color_blue"/> | |||
| android:textSize="32sp" | |||
| android:textColor="@color/orange_primary_dark"/> | |||
| <RelativeLayout | |||
| android:layout_marginTop="55dp" | |||
| android:layout_marginTop="80dp" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:orientation="vertical"> | |||
| @@ -105,10 +108,12 @@ | |||
| android:layout_height="match_parent"> | |||
| <LinearLayout | |||
| android:layout_width="wrap_content" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_centerHorizontal="true" | |||
| android:layout_centerVertical="true" | |||
| android:layout_marginStart="50dp" | |||
| android:layout_marginEnd="50dp" | |||
| android:orientation="vertical"> | |||
| <LinearLayout | |||
| @@ -133,12 +138,12 @@ | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="最小出料时间：" | |||
| android:textSize="20sp"/> | |||
| android:textSize="32sp"/> | |||
| <EditText | |||
| android:id="@+id/min_time" | |||
| android:layout_width="120dp" | |||
| android:layout_height="wrap_content" | |||
| android:layout_width="200dp" | |||
| android:layout_height="70dp" | |||
| android:layout_centerInParent="true" | |||
| android:background="@drawable/edit_bord" | |||
| android:digits="0123456789." | |||
| @@ -147,25 +152,25 @@ | |||
| android:maxLines="1" | |||
| android:padding="3dp" | |||
| android:text="2" | |||
| android:textSize="20sp"/> | |||
| android:textSize="32sp"/> | |||
| </LinearLayout> | |||
| <LinearLayout | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginTop="20dp" | |||
| android:layout_marginTop="32sp" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="最小出料重量：" | |||
| android:textSize="20sp"/> | |||
| android:textSize="32sp"/> | |||
| <EditText | |||
| android:id="@+id/min_weight" | |||
| android:layout_width="120dp" | |||
| android:layout_height="wrap_content" | |||
| android:layout_width="200dp" | |||
| android:layout_height="70dp" | |||
| android:layout_centerInParent="true" | |||
| android:background="@drawable/edit_bord" | |||
| android:digits="0123456789." | |||
| @@ -174,19 +179,19 @@ | |||
| android:maxLines="1" | |||
| android:padding="3dp" | |||
| android:text="2" | |||
| android:textSize="20sp"/> | |||
| android:textSize="32sp"/> | |||
| </LinearLayout> | |||
| <Button | |||
| android:id="@+id/btn_min_standard" | |||
| android:layout_width="match_parent" | |||
| android:layout_marginTop="20dp" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginTop="32sp" | |||
| android:layout_height="70dp" | |||
| android:background="@drawable/bg_btn_login_selected" | |||
| android:text="最小校准" | |||
| android:textColor="@color/white" | |||
| android:textSize="20sp"/> | |||
| android:textSize="32sp"/> | |||
| </LinearLayout> | |||
| <LinearLayout | |||
| @@ -205,12 +210,12 @@ | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="最大出料时间：" | |||
| android:textSize="20sp"/> | |||
| android:textSize="32sp"/> | |||
| <EditText | |||
| android:id="@+id/max_time" | |||
| android:layout_width="120dp" | |||
| android:layout_height="wrap_content" | |||
| android:layout_width="200dp" | |||
| android:layout_height="70dp" | |||
| android:layout_centerInParent="true" | |||
| android:background="@drawable/edit_bord" | |||
| android:digits="0123456789." | |||
| @@ -219,25 +224,25 @@ | |||
| android:maxLines="1" | |||
| android:padding="3dp" | |||
| android:text="2" | |||
| android:textSize="20sp"/> | |||
| android:textSize="32sp"/> | |||
| </LinearLayout> | |||
| <LinearLayout | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_marginTop="20dp" | |||
| android:layout_marginTop="32sp" | |||
| android:orientation="horizontal"> | |||
| <TextView | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="最大出料重量：" | |||
| android:textSize="20sp"/> | |||
| android:textSize="32sp"/> | |||
| <EditText | |||
| android:id="@+id/max_weight" | |||
| android:layout_width="120dp" | |||
| android:layout_height="wrap_content" | |||
| android:layout_width="200dp" | |||
| android:layout_height="70dp" | |||
| android:layout_centerInParent="true" | |||
| android:background="@drawable/edit_bord" | |||
| android:digits="0123456789." | |||
| @@ -246,50 +251,50 @@ | |||
| android:maxLines="1" | |||
| android:padding="3dp" | |||
| android:text="2" | |||
| android:textSize="20sp"/> | |||
| android:textSize="32sp"/> | |||
| </LinearLayout> | |||
| <Button | |||
| android:layout_marginTop="20dp" | |||
| android:layout_marginTop="32sp" | |||
| android:id="@+id/btn_max_standard" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_height="70dp" | |||
| android:background="@drawable/bg_btn_login_selected" | |||
| android:text="最大校准" | |||
| android:textColor="@color/white" | |||
| android:textSize="20sp" /> | |||
| android:textSize="32sp" /> | |||
| </LinearLayout> | |||
| </LinearLayout> | |||
| <View | |||
| android:layout_width="650dp" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="1dp" | |||
| android:layout_marginTop="20dp" | |||
| android:layout_marginTop="32sp" | |||
| android:background="@color/gray"/> | |||
| <Button | |||
| android:layout_marginTop="20dp" | |||
| android:layout_marginTop="32sp" | |||
| android:id="@+id/btn_save" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_height="70dp" | |||
| android:background="@drawable/bg_btn_login_selected" | |||
| android:text="保存参数" | |||
| android:textColor="@color/white" | |||
| android:textSize="20sp" /> | |||
| android:textSize="32sp" /> | |||
| <View | |||
| android:layout_width="650dp" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="1dp" | |||
| android:layout_marginTop="20dp" | |||
| android:layout_marginTop="32sp" | |||
| android:background="@color/gray"/> | |||
| <LinearLayout | |||
| android:layout_width="match_parent" | |||
| android:layout_height="match_parent" | |||
| android:layout_marginTop="20dp" | |||
| android:layout_marginTop="32sp" | |||
| android:orientation="horizontal"> | |||
| <LinearLayout | |||
| @@ -300,12 +305,12 @@ | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:text="模拟出料重量：" | |||
| android:textSize="20sp"/> | |||
| android:textSize="32sp"/> | |||
| <EditText | |||
| android:id="@+id/sim_discharge_weight" | |||
| android:layout_width="120dp" | |||
| android:layout_height="wrap_content" | |||
| android:layout_width="200dp" | |||
| android:layout_height="70dp" | |||
| android:layout_centerInParent="true" | |||
| android:background="@drawable/edit_bord" | |||
| android:digits="0123456789." | |||
| @@ -314,19 +319,19 @@ | |||
| android:maxLines="1" | |||
| android:padding="3dp" | |||
| android:text="10" | |||
| android:textSize="20sp"/> | |||
| android:textSize="32sp"/> | |||
| </LinearLayout> | |||
| <Button | |||
| android:id="@+id/btn_sim_discharge" | |||
| android:layout_width="match_parent" | |||
| android:layout_height="wrap_content" | |||
| android:layout_height="70dp" | |||
| android:layout_marginLeft="50dp" | |||
| android:background="@drawable/bg_btn_login_selected" | |||
| android:text="模拟出料" | |||
| android:textColor="@color/white" | |||
| android:textSize="20sp" /> | |||
| android:textSize="32sp" /> | |||
| </LinearLayout> | |||
| @@ -339,7 +344,7 @@ | |||
| <!-- android:layout_width="match_parent"--> | |||
| <!-- android:layout_height="match_parent"--> | |||
| <!-- android:text="控制状态："--> | |||
| <!-- android:textSize="20sp"/>--> | |||
| <!-- android:textSize="32sp"/>--> | |||
| </LinearLayout> | |||
| @@ -350,4 +355,4 @@ | |||
| </RelativeLayout> | |||
| </RelativeLayout> | |||
| </RelativeLayout> | |||
| </LinearLayout> | |||