diff --git a/app/src/main/java/com/example/tyre/TyreLayoutActivity.java b/app/src/main/java/com/example/tyre/TyreLayoutActivity.java index 5f2bc02..ee89e55 100644 --- a/app/src/main/java/com/example/tyre/TyreLayoutActivity.java +++ b/app/src/main/java/com/example/tyre/TyreLayoutActivity.java @@ -26,6 +26,8 @@ import com.example.tyre.entity.AjaxResult; import com.example.tyre.entity.BaseCar; import com.example.tyre.entity.BaseTyre; import com.example.tyre.entity.EPC; +import com.example.tyre.maintenance.base.MyRecultCall; +import com.example.tyre.maintenance.base.MyResult; import com.example.tyre.util.CarSelectionDialog; import com.example.tyre.util.CommonDialog; import com.example.tyre.util.MyUrl; @@ -162,26 +164,46 @@ public class TyreLayoutActivity extends AppCompatActivity { super.onDestroy(); } private void performSearch(String carNo) { - OkGo.post(MyUrl.url + "/tyre/car/PdaQueryCarList") + OkGo.post(MyUrl.url + "/tyre/car/PdaQueryCarList") .tag(this).params("carNo", carNo) - .execute(new StringCallback() { + .execute( + new MyRecultCall(progressDialog,this){ + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode()==0) { + Gson gson = new Gson(); + + List baseCarList = + gson.fromJson(body.getJson(), new TypeToken>() { + }.getType()); + Log.e("EPC", "listepc:+ " + baseCarList.size()); + if (baseCarList != null && baseCarList.size() > 0) { + List carNoList = new ArrayList<>(); + for (BaseCar car : baseCarList) { + carNoList.add(car.getCarNo()); + } + // 显示自定义弹窗 + showCarSelectionDialog(carNoList); + } + } + } + } + /*new StringCallback() { @Override public void onSuccess(Response response) { hideLoadingDialog(); String body = response.body(); Gson gson=new Gson(); - List baseCarList = gson.fromJson(body, new TypeToken>(){}.getType()); - Log.e("EPC", "listepc:+ " + baseCarList.size()); - if (baseCarList!=null && baseCarList.size()>0){ - List carNoList = new ArrayList<>(); - for (BaseCar car : baseCarList) { - carNoList.add(car.getCarNo()); - } - // 显示自定义弹窗 - showCarSelectionDialog(carNoList); + AjaxResult ajaxResult=gson.fromJson(body, AjaxResult.class); + + + + } } - }); + }*/); } private void showCarSelectionDialog(List carNoList) { CarSelectionDialog dialog = new CarSelectionDialog(this, carNoList); diff --git a/app/src/main/java/com/example/tyre/UpActivity.java b/app/src/main/java/com/example/tyre/UpActivity.java index 8097740..3b4ac4d 100644 --- a/app/src/main/java/com/example/tyre/UpActivity.java +++ b/app/src/main/java/com/example/tyre/UpActivity.java @@ -77,9 +77,10 @@ public class UpActivity extends AllBaseActivity implements AdapterView.OnItemSel private Toast toast; private KeyReceiver keyReceiver; private boolean dataType; - + private List locationList; // 用于存储最后一次扫描到的 EPC private String lastScannedEpc; + private BaseTyre baseTyreResult; // 用于处理防抖逻辑的 Handler private Handler debounceHandler = new Handler(new Handler.Callback() { @Override @@ -146,11 +147,16 @@ public class UpActivity extends AllBaseActivity implements AdapterView.OnItemSel // 从保养跳转过来的 binding.azlw.setText(intent.getStringExtra("location")); binding.car.setText(intent.getStringExtra("carNo")); - ; binding.start.setText(intent.getStringExtra("licheng")); - ; } - + locationList = new ArrayList<>() {{ + add("左前轮"); + add("右前轮"); + add("右内轮"); + add("右外轮"); + add("左内轮"); + add("左外轮"); + }}; } @@ -337,6 +343,7 @@ public class UpActivity extends AllBaseActivity implements AdapterView.OnItemSel @Override public void onNothingSelected(AdapterView parent) { } + // 提交函数 private void up_insert(String rfid, String carNo, String millage, String wheel, String selfNo) { OkGo.post(MyUrl.url + "/tyre/install/PdaInstallTyre") @@ -386,6 +393,20 @@ public class UpActivity extends AllBaseActivity implements AdapterView.OnItemSel new CommonDialog(this).setMessage(result.getMsg()).show(); break; case "0": + // 新增轮换 + try { + int i = locationList.indexOf(binding.azlw.getText().toString()); + int size = locationList.size(); + if (i < size ) { + i++; + binding.azlw.setText(locationList.get(i)); + }else { + binding.azlw.setText(locationList.get(0)); + } + }catch (Exception e){ + + } + new CommonDialog(this).setMessage(result.getMsg()).show(); break; } @@ -414,7 +435,7 @@ public class UpActivity extends AllBaseActivity implements AdapterView.OnItemSel } }); } - private BaseTyre baseTyreResult; + // 基本信息查询 private void find(String epc) { OkGo.post(MyUrl.url + "/tyre/tyre/pdaQueryTyreInfo").tag(this).params("tyreEpc", epc).execute(new StringCallback() { @@ -427,7 +448,7 @@ public class UpActivity extends AllBaseActivity implements AdapterView.OnItemSel BaseTyre baseTyre = gson.fromJson(body, BaseTyre.class); if (baseTyre != null) { - baseTyreResult=baseTyre; + baseTyreResult = baseTyre; // 空值处理：若字段为 null 则显示空字符串 String TyreNo = safeGetString(baseTyre.getTyreNo()); th.setText(TyreNo); 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 6e21cd4..33e7f90 100644 --- a/app/src/main/java/com/example/tyre/maintenance/WorkExecuteActivity.java +++ b/app/src/main/java/com/example/tyre/maintenance/WorkExecuteActivity.java @@ -148,7 +148,7 @@ public class WorkExecuteActivity extends BaseActivity { Intent data = result.getData(); // 返回json转换 BaseTyre reBaseTyre = gson.fromJson(data.getStringExtra("json"), BaseTyre.class); - + tyreMap.put(location, reBaseTyre); } } ); diff --git a/app/src/main/res/layout/activity_create_work_order.xml b/app/src/main/res/layout/activity_create_work_order.xml index aadc59f..b91c774 100644 --- a/app/src/main/res/layout/activity_create_work_order.xml +++ b/app/src/main/res/layout/activity_create_work_order.xml @@ -41,7 +41,7 @@ android:textSize="16sp" android:inputType="number" - android:hint="输入最少四位开始检索" + android:hint="输入车牌开始检索" android:layout_marginTop="8dp" android:background="@drawable/bg_stroke_blue_1" /> diff --git a/app/src/main/res/layout/activity_tyre_layout.xml b/app/src/main/res/layout/activity_tyre_layout.xml index 2043b0c..c034ded 100644 --- a/app/src/main/res/layout/activity_tyre_layout.xml +++ b/app/src/main/res/layout/activity_tyre_layout.xml @@ -55,7 +55,7 @@ android:id="@+id/et_plate_number" android:layout_width="match_parent" android:layout_height="wrap_content" - android:inputType="textCapCharacters" + android:inputType="number" android:maxLines="1" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2d83e3a..6a20ff7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - 汽车轮胎管理 + 公交管理 Hello blank fragment