diff --git a/app/src/main/java/com/example/tyre/DownActivity.java b/app/src/main/java/com/example/tyre/DownActivity.java index 6a2c76e..046c293 100644 --- a/app/src/main/java/com/example/tyre/DownActivity.java +++ b/app/src/main/java/com/example/tyre/DownActivity.java @@ -74,7 +74,7 @@ public class DownActivity extends AllBaseActivity { private Toast mToast; private Toast toast; private KeyReceiver keyReceiver; - + private CommonDialog commonDialog; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -91,6 +91,7 @@ public class DownActivity extends AllBaseActivity { } private void bindViews() { + commonDialog = new CommonDialog(DownActivity.this); EPC = binding.epc; car = binding.car; start = binding.start; @@ -100,6 +101,21 @@ public class DownActivity extends AllBaseActivity { th = binding.th; zbh = binding.zbh; patternDepth = binding.patternDepth; + binding.unloadingReason.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + if(position==5){ + binding.unloadingReasonRemark.setVisibility(View.VISIBLE); + }else{ + binding.unloadingReasonRemark.setVisibility(View.GONE); + } + } + + @Override + public void onNothingSelected(AdapterView parent) { + + } + }); } private void setupClickListeners() { @@ -111,22 +127,22 @@ public class DownActivity extends AllBaseActivity { String depth = patternDepth.getText().toString(); if (rfid == null || rfid.isEmpty()) { - new CommonDialog(DownActivity.this).setMessage("请扫描轮胎!").show(); + commonDialog.setMessage("请扫描轮胎!").show(); return; } if (carNo == null || carNo.isEmpty()) { - new CommonDialog(DownActivity.this).setMessage("该轮胎未安装!").show(); + commonDialog.setMessage("该轮胎未安装!").show(); return; } if (millage == null || millage.isEmpty()) { - new CommonDialog(DownActivity.this).setMessage("请输入卸胎里程!").show(); + commonDialog.setMessage("请输入卸胎里程!").show(); return; } if (wheel == null || wheel.isEmpty()) { - new CommonDialog(DownActivity.this).setMessage("该轮胎未安装!").show(); + commonDialog.setMessage("该轮胎未安装!").show(); return; } showLoadingDialog(); @@ -327,7 +343,7 @@ public class DownActivity extends AllBaseActivity { car.setText(carNo); azlw.setText(wheel); }else { - new CommonDialog(DownActivity.this).setMessage("系统无此轮胎!").show(); + commonDialog.setMessage("系统无此轮胎!").show(); th.setText(""); zbh.setText(""); } @@ -343,6 +359,15 @@ public class DownActivity extends AllBaseActivity { } // 删除实时表、卸车记录表 private void down_insert(String rfid,String carNo,String millage,String wheel,String patternDepth) { + String reason = binding.unloadingReason.getSelectedItem().toString(); + if (reason.isEmpty()){ + commonDialog.setMessage("请选择卸胎原因!").show(); + return; + } + if (reason.equals("自定义")){ + reason=binding.unloadingReasonRemark.getText().toString().trim(); + } + OkGo.post(MyUrl.url + "/tyre/install/PdaUnInstallTyre").tag(this) .params("tyreRfid", rfid) .params("mileage", millage) diff --git a/app/src/main/res/layout/activity_down.xml b/app/src/main/res/layout/activity_down.xml index ef4beb5..446d157 100644 --- a/app/src/main/res/layout/activity_down.xml +++ b/app/src/main/res/layout/activity_down.xml @@ -5,293 +5,257 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" + android:background="@color/allbg" tools:context="com.example.tyre.DownActivity"> + + android:layout_height="55dp" + android:text="轮胎卸车" /> + android:layout_height="45dp" + style="@style/layout_t12_s8_style"> + + android:text="扫描EPC:" /> + style="@style/scanTextStyle" + /> + + android:layout_height="45dp" + style="@style/layout_t12_s8_style"> + + style="@style/textView_info_style" + /> + + android:layout_height="45dp" + style="@style/layout_t12_s8_style"> + + style="@style/textView_info_style" /> + + android:layout_height="45dp" + style="@style/layout_t12_s8_style"> + + style="@style/textView_info_style" /> + android:layout_height="45dp" + style="@style/layout_t12_s8_style"> + + android:inputType="number" + style="@style/scanTextStyle" + android:hint="输入终止里程"/> + android:layout_height="45dp" + style="@style/layout_t12_s8_style"> + + style="@style/textView_info_style" /> + android:layout_height="45dp" + style="@style/layout_t12_s8_style"> + + android:inputType="numberDecimal" + /> + android:text="mm" + android:textColor="@color/black" + android:textSize="15sp" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + app:layout_constraintStart_toStartOf="parent"> +