diff --git a/app/src/main/java/com/example/tyre/maintenance/WorkExecuteActivity.java b/app/src/main/java/com/example/tyre/maintenance/WorkExecuteActivity.java index dd79922..5c2b562 100644 --- a/app/src/main/java/com/example/tyre/maintenance/WorkExecuteActivity.java +++ b/app/src/main/java/com/example/tyre/maintenance/WorkExecuteActivity.java @@ -57,9 +57,7 @@ public class WorkExecuteActivity extends BaseActivity { super.onCreate(savedInstanceState); binding = DataBindingUtil.setContentView(this, R.layout.activity_work_execute); initRFID(); - Intent intent = getIntent(); - carNo = intent.getStringExtra("carNo"); binding.setCarNo(carNo); tyreMap = new HashMap<>(); diff --git a/app/src/main/java/com/example/tyre/maintenance/dialog/TireUpdateDialog.java b/app/src/main/java/com/example/tyre/maintenance/dialog/TireUpdateDialog.java index 83732f9..af3e8bf 100644 --- a/app/src/main/java/com/example/tyre/maintenance/dialog/TireUpdateDialog.java +++ b/app/src/main/java/com/example/tyre/maintenance/dialog/TireUpdateDialog.java @@ -120,6 +120,9 @@ public class TireUpdateDialog extends Dialog { } }); + filesList=new ArrayList<>(); + disposalFileAdapter.setList(filesList); + binding.setAdapter1(disposalFileAdapter); } // 换新胎了 @@ -161,7 +164,7 @@ public class TireUpdateDialog extends Dialog { // 重置ui // photoState.set(false); binding.dialogUpdatePhoto.setImageResource(R.mipmap.ic_xiangji); - filesList=new ArrayList<>(); + show(); } diff --git a/app/src/main/res/layout/dialog_tire_update.xml b/app/src/main/res/layout/dialog_tire_update.xml index d86a120..e3f68e9 100644 --- a/app/src/main/res/layout/dialog_tire_update.xml +++ b/app/src/main/res/layout/dialog_tire_update.xml @@ -16,7 +16,9 @@ - +