diff --git a/app/src/main/java/com/example/tyre/TyreSearchActivity.java b/app/src/main/java/com/example/tyre/TyreSearchActivity.java
index 9d823bd..124ddae 100644
--- a/app/src/main/java/com/example/tyre/TyreSearchActivity.java
+++ b/app/src/main/java/com/example/tyre/TyreSearchActivity.java
@@ -325,10 +325,15 @@ public class TyreSearchActivity extends AppCompatActivity {
                                         shengyuhuawen.setText(patternDeepth);
                                         qiya.setText(pressure);
                                         String carNo = baseTyre.getCarNo();
-                                        if (carNo == null || "".equals(carNo)) {
+                                        if ("scrap".equals(baseTyre.getTyreType())) {
+                                            zhuangtai.setText("已报废");
+                                            zhuangtai.setTextColor(Color.RED);
+                                        } else if (carNo == null || "".equals(carNo)) {
                                             zhuangtai.setText("未装车");
+                                            zhuangtai.setTextColor(Color.BLACK);
                                         } else {
                                             zhuangtai.setText("已装车|车牌号：" + carNo);
+                                            zhuangtai.setTextColor(Color.BLACK);
                                         }
                                     } else {
                                         pinpai.setText("");
@@ -352,10 +357,16 @@ public class TyreSearchActivity extends AppCompatActivity {
                                         try {
 
                                             mileage =
-                                                    maintenanceOrderObj.has("lastMileage") ? maintenanceOrderObj.get("lastMileage").getAsString() : "";
+                                                    maintenanceOrderObj.has("lastMileage") ? maintenanceOrderObj.get("lastMileage").getAsString() : "0";
+                                            if ("null".equals(mileage) || "".equals(mileage)) {
+                                                mileage = "0";
+                                            }
 
                                             inputmileage =
-                                                    maintenanceOrderObj.has("inputMileage") ? maintenanceOrderObj.get("inputMileage").getAsString() : "";
+                                                    maintenanceOrderObj.has("inputMileage") && !maintenanceOrderObj.get("inputMileage").isJsonNull() ? maintenanceOrderObj.get("inputMileage").getAsString() : "0";
+                                            if ("null".equals(inputmileage) || "".equals(inputmileage)) {
+                                                inputmileage = "0";
+                                            }
                                         } catch (Exception e) {
                                         }
 
@@ -455,8 +466,8 @@ public class TyreSearchActivity extends AppCompatActivity {
                                                         "<br>胎压: " + tirePress)));
                                                 shengyuhuawen.setText(depth);
                                             } else if (type.equals("7")) {
-                                                data.add(new TimelineItem(time, "二级保养", Html.fromHtml("操作人:" + user + "<br>场站: " + teams +
-                                                        "<br>车辆信息: " + plateNumber +
+                                                data.add(new TimelineItem(time, "轮胎报废", Html.fromHtml("操作人:" + user + "<br>场站: " + teams +
+                                                        "<br>轮胎信息: " + plateNumber +
                                                         "<br>当前车辆里程: " + mileage + " KM" +
                                                         "<br>上次车辆里程: " + inputmileage + "KM" +
                                                         "<br>轮位: " + wheel +