From 15fe33c22b0271df6f9df3348ea41591b3e7d212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=87=8C?= <1726150332@qq.com>
Date: Mon, 27 Apr 2026 13:29:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E5=91=BD=E5=91=A8=E6=9C=9F=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/encodings.xml                           |    2 +-
 .idea/gradle.xml                              |    4 +-
 .idea/misc.xml                                |    2 +-
 .../com/example/tyre/TyreSearchActivity.java  |  184 ++-
 .../java/com/example/tyre/UpActivity.java     | 1226 +++++++++--------
 .../com/example/tyre/entity/BaseTyre.java     |   10 +
 .../java/com/example/tyre/util/MyUrl.java     |    4 +-
 app/src/main/res/drawable/bg_timeline_dot.xml |    6 +
 .../main/res/drawable/shape_circle_blue.xml   |    5 +
 .../main/res/layout/activity_tyresearch.xml   |  520 +++----
 app/src/main/res/layout/activity_up.xml       |  554 ++++----
 app/src/main/res/layout/item_timeline.xml     |   69 +
 app/src/main/res/values/colors.xml            |    1 +
 app/src/main/res/values/styles.xml            |   20 +
 build.gradle                                  |    5 +-
 15 files changed, 1472 insertions(+), 1140 deletions(-)
 create mode 100644 app/src/main/res/drawable/bg_timeline_dot.xml
 create mode 100644 app/src/main/res/drawable/shape_circle_blue.xml
 create mode 100644 app/src/main/res/layout/item_timeline.xml

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index c2bae49..4987eca 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
+  <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a058051..678ca7f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,8 +7,8 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$PROJECT_DIR$/../../../android gradle version/gradle-8.0.2" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleHome" value="D:/gradle-8.0.2" />
+        <option name="gradleJvm" value="#JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0f86676..f85ddd4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,5 @@
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/example/tyre/TyreSearchActivity.java b/app/src/main/java/com/example/tyre/TyreSearchActivity.java
index 5b14067..d4eed7d 100644
--- a/app/src/main/java/com/example/tyre/TyreSearchActivity.java
+++ b/app/src/main/java/com/example/tyre/TyreSearchActivity.java
@@ -14,15 +14,20 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.SystemClock;
+import android.text.Html;
 import android.util.Log;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.android.hdhe.uhf.reader.UhfReader;
 import com.android.hdhe.uhf.readerInterface.TagModel;
+import com.example.tyre.entity.AjaxResult;
 import com.example.tyre.entity.BaseTyre;
 import com.example.tyre.entity.EPC;
 import com.example.tyre.entity.Tyre;
@@ -31,6 +36,10 @@ import com.example.tyre.util.MyUrl;
 import com.example.tyre.util.PlayMusic;
 import com.example.tyre.util.Util;
 import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.callback.StringCallback;
@@ -44,11 +53,13 @@ import androidx.appcompat.app.AppCompatActivity;
 import cn.pda.serialport.Tools;
 import com.example.tyre.databinding.ActivityTyresearchBinding;
 
+import org.json.JSONObject;
+
 
 public class TyreSearchActivity extends AppCompatActivity {
     private ActivityTyresearchBinding binding;
 
-    TextView inSantext;
+    EditText inSantext;
     Button basemessage;
     Button button;
     TextView pinpai;
@@ -58,7 +69,7 @@ public class TyreSearchActivity extends AppCompatActivity {
     private int power = 0;
     private int area = 0;
     private SharedPreferences shared;
-    private TextView textVersion;
+    private EditText textVersion;
 
     private boolean runFlag = true;
     private boolean startFlag = false;
@@ -66,21 +77,52 @@ public class TyreSearchActivity extends AppCompatActivity {
     private ArrayList<EPC> listEPC;
     private ArrayList<String> listepc = new ArrayList<String>();
     private ProgressDialog progressDialog;
+    private LinearLayout llTimelineContainer;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         binding = ActivityTyresearchBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         bindViews();
-        setupClickListeners();
+       // setupClickListeners();
         manager = MyApplication.getManager();
         initView();
         Thread thread = new InventoryThread();
         thread.start();
         com.example.tyre.util.Util.initSoundPool(this);
         Log.e("onCreate", "onCreate:+ " );
-    }
+        llTimelineContainer = findViewById(R.id.ll_timeline_container);
 
+
+    }
+    private void renderTimeline(List<TimelineItem> data) {
+        LayoutInflater inflater = LayoutInflater.from(this);
+        llTimelineContainer.removeAllViews();
+        for (int i = 0; i < data.size(); i++) {
+            // 加载单项布局
+            View itemView = inflater.inflate(R.layout.item_timeline, llTimelineContainer, false);
+
+            TimelineItem item = data.get(i);
+
+            // 绑定数据
+            TextView tvTime = itemView.findViewById(R.id.tv_time);
+            TextView tvTitle = itemView.findViewById(R.id.tv_title);
+            TextView tvContent = itemView.findViewById(R.id.tv_content);
+            View viewLine = itemView.findViewById(R.id.view_line); // 竖线
+
+            tvTime.setText(item.time);
+            tvTitle.setText(item.title);
+            tvContent.setText(item.content);
+
+            // 逻辑控制：如果是最后一条数据，隐藏竖线
+            if (i == data.size() - 1) {
+                viewLine.setVisibility(View.GONE);
+            }
+
+            // 添加到容器
+            llTimelineContainer.addView(itemView);
+        }
+    }
     private void bindViews() {
         inSantext = binding.inSantext;
         // basemessage = binding.basemessage;
@@ -89,24 +131,25 @@ public class TyreSearchActivity extends AppCompatActivity {
         xinghao = binding.xinghao;
         cengji = binding.cengji;
         huawen = binding.huawen;
+
     }
 
-    private void setupClickListeners() {
-        binding.scanButton.setOnClickListener(v -> {
-            if (!startFlag) {
-                startFlag = true;
-                binding.scanButton.setText("停     止");
-            } else {
-                startFlag = false;
-                binding.scanButton.setText("扫     描");
-            }
-        });
-        binding.button.setOnClickListener(v -> {
-            // Intent intent = new Intent(this, HomePageActivity.class);
-            // startActivity(intent);
-            finish();
-        });
-    }
+//    private void setupClickListeners() {
+//        binding.scanButton.setOnClickListener(v -> {
+//            if (!startFlag) {
+//                startFlag = true;
+//                binding.scanButton.setText("停     止");
+//            } else {
+//                startFlag = false;
+//                binding.scanButton.setText("扫     描");
+//            }
+//        });
+//        binding.button.setOnClickListener(v -> {
+//            // Intent intent = new Intent(this, HomePageActivity.class);
+//            // startActivity(intent);
+//            finish();
+//        });
+//    }
 
 
 
@@ -120,12 +163,23 @@ public class TyreSearchActivity extends AppCompatActivity {
         }
         registerReceiver();
     }
+    // TyreSearchActivity.java (内部类或单独文件)
+    public class TimelineItem {
+        public String time;
+        public String title;
+        public CharSequence  content;
 
+        public TimelineItem(String time, String title, CharSequence  content) {
+            this.time = time;
+            this.title = title;
+            this.content = content;
+        }
+    }
 
     @Override
     public void onPause() {
         startFlag = false;
-        binding.scanButton.setText("扫描");
+        binding.scanButton.setText("搜索");
        // manager.close();
         unregisterReceiver();
         Log.e("onPause", "onPause:+ " );
@@ -232,7 +286,7 @@ public class TyreSearchActivity extends AppCompatActivity {
         Log.e("EPC", "listepc:+ " + listepc);
         if (listepc != null && !listepc.isEmpty()){
             startFlag = false;
-            binding.scanButton.setText("扫     描");
+            //binding.scanButton.setText("扫     描");
             textVersion.setText(listepc.get(0).toString());
             find(listepc.get(0).toString());
         }
@@ -297,28 +351,45 @@ public class TyreSearchActivity extends AppCompatActivity {
                     case KeyEvent.KEYCODE_F4:
                     case KeyEvent.KEYCODE_F5:
                     case 136:
-                       binding.scanButton.callOnClick();
+                        startFlag = true;
+                       //binding.scanButton.callOnClick();
                         break;
                 }
             }
         }
     }
     private void find(String epc) {
-        OkGo.<String>post(MyUrl.url + "/tyre/tyre/pdaQueryTyreInfo").tag(this)
-                .params("tyreEpc", epc)
+        OkGo.<String>post(MyUrl.url + "/tyre/tyre/pdaQueryTyreTimeLine").tag(this)
+                .params("keyParam", epc)
                 .execute(new StringCallback() {
             @Override
             public void onSuccess(Response<String> response) {
+                hideLoadingDialog();
                 String body = response.body();
                 try {
                     Gson gson = new Gson();
-                    BaseTyre baseTyre = gson.fromJson(body, BaseTyre.class);
-                    if (baseTyre != null) {
+                    JsonElement rootElement = JsonParser.parseString(body);
+                    JsonObject rootObject = rootElement.getAsJsonObject();
+                    BaseTyre baseTyre =new BaseTyre();
+                    // 3. 获取 "data" 节点 (注意判空，防止空指针异常)
+                    if (rootObject.has("data") && !rootObject.get("data").isJsonNull()) {
+                        JsonObject dataObject = rootObject.getAsJsonObject("data");
+                        // 4. 获取 "resultBase" 节点
+                        String team = "";
+                        String TYREPYTE = "";
+                        String patternDepth = "";
+                        if (dataObject.has("resultBase") && !dataObject.get("resultBase").isJsonNull()) {
+                            JsonElement resultBaseElement = dataObject.get("resultBase");
+                            // 5. 【关键步骤】将 resultBase 节点直接转换为 BaseTyre 对象
+                             baseTyre = gson.fromJson(resultBaseElement, BaseTyre.class);
+                     if (baseTyre != null) {
                         String brand = safeGetString(baseTyre.getTyreBrand());
                         String model = safeGetString(baseTyre.getTyreModel());
                         String level = safeGetString(baseTyre.getTyreLevel());
                         String pattern = safeGetString(baseTyre.getTyrePattern());
-
+                         team = safeGetString(baseTyre.getTeam());
+                         TYREPYTE = "new".equals(TYREPYTE) ? "全新胎" : TYREPYTE;
+                         patternDepth = safeGetString(baseTyre.getPatternDepth());
                         pinpai.setText(brand);
                         xinghao.setText(model);
                         cengji.setText(level);
@@ -328,6 +399,41 @@ public class TyreSearchActivity extends AppCompatActivity {
                         xinghao.setText("");
                         cengji.setText("");
                         huawen.setText("");
+                     }
+                        }
+                        //出入库数据
+                        List<TimelineItem> data = new ArrayList<>();
+                        if(dataObject.has("recordWarehousingList") && !dataObject.get("recordWarehousingList").isJsonNull()){
+                            JsonElement resultBaseElement = dataObject.get("recordWarehousingList");
+                            JsonArray jsonArray = resultBaseElement.getAsJsonArray();
+                            // 2. 遍历数组中的每一个元素
+                            for (JsonElement element : jsonArray) {
+                                // 3. 将每个元素转为 JsonObject，方便通过键名取值
+                                JsonObject itemObject = element.getAsJsonObject();
+                                // 4. 提取你需要的字段（假设里面有 "warehouseId" 和 "status" 字段）
+                                String tyreNo = itemObject.has("tyreNo") ? itemObject.get("tyreNo").getAsString() : "";
+                                String type = itemObject.has("type") ? itemObject.get("type").getAsString() : "";
+                                String time = itemObject.has("createTime") ? itemObject.get("createTime").getAsString() : "";
+                                String user = itemObject.has("createBy") ? itemObject.get("createBy").getAsString() : "";
+                                // 打印或处理你的数据
+                                if (type.equals("0")){
+                                    data.add(new TimelineItem(time, "轮胎入库", Html.fromHtml("操作人:"+user+"<br>场站: "+team+
+                                            "<br>轮胎类型: "+TYREPYTE+
+                                            "<br>剩余花纹深度: "+patternDepth+"mm"+
+                                            "<br>里程: "+"0")));
+                                }
+                            }
+
+                            // 1. 生成模拟数据 (按时间倒序)
+//
+//                            data.add(new TimelineItem("2026-04-20 12:23:28", "轮胎安装: 赵宁波", "车辆: 粤B08499D | 轮位: 右外轮"));
+//                            data.add(new TimelineItem("2026-04-20 12:17:46", "轮胎出库: 赵宁波", "仓库: 轮胎仓库"));
+//                            data.add(new TimelineItem("2026-04-20 12:15:37", "轮胎入库: 赵宁波", "仓库: 轮胎仓库"));
+//                            data.add(new TimelineItem("2026-04-19 09:00:00", "轮胎采购", "供应商: 某某橡胶厂"));
+//                            // 2. 动态添加视图
+                            renderTimeline(data);
+                            data.clear();
+                        }
                     }
                 } catch (JsonSyntaxException e) {
                     pinpai.setText("");
@@ -337,9 +443,31 @@ public class TyreSearchActivity extends AppCompatActivity {
                     return;
                 }
             }
+                    @Override
+                    public void onError(Response<String> response) {
+                        super.onError(response);
+                        // ✅ 修改点 3：网络请求失败也要关闭弹窗
+                        Toast.makeText(TyreSearchActivity.this, "网络请求失败", Toast.LENGTH_SHORT).show();
+                    }
+
         });
     }
     private String safeGetString(String value) {
         return value == null || "null".equals(value) ? "" : value;
     }
+    private void showLoadingDialog() {
+        if (progressDialog == null) {
+            progressDialog = new ProgressDialog(this);
+            progressDialog.setMessage("数据加载中...");
+            progressDialog.setCancelable(false);
+        }
+        if (!progressDialog.isShowing()) {
+            progressDialog.show();
+        }
+    }
+    private void hideLoadingDialog() {
+        if (progressDialog != null && progressDialog.isShowing()) {
+            progressDialog.dismiss();
+        }
+    }
 }
diff --git a/app/src/main/java/com/example/tyre/UpActivity.java b/app/src/main/java/com/example/tyre/UpActivity.java
index 2c8c88c..018f958 100644
--- a/app/src/main/java/com/example/tyre/UpActivity.java
+++ b/app/src/main/java/com/example/tyre/UpActivity.java
@@ -1,6 +1,5 @@
 package com.example.tyre;
 
-
 import android.app.ProgressDialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -13,23 +12,15 @@ import android.os.SystemClock;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Spinner;
-import android.widget.TextView;
-import android.widget.Toast;
-
+import android.widget.*;
+import androidx.appcompat.app.AppCompatActivity;
 import com.android.hdhe.uhf.reader.UhfReader;
 import com.android.hdhe.uhf.readerInterface.TagModel;
-import com.example.tyre.databinding.ActivityUpBinding;
 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.entity.InStoreSpinnerVo;
 import com.example.tyre.util.CarSelectionDialog;
 import com.example.tyre.util.CommonDialog;
 import com.example.tyre.util.MyUrl;
@@ -41,304 +32,696 @@ import com.google.gson.reflect.TypeToken;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.callback.StringCallback;
 import com.lzy.okgo.model.Response;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.lzy.okgo.request.base.Request;
+import java.lang.ref.WeakReference;
+import java.util.*;
 import cn.pda.serialport.Tools;
-import okhttp3.MediaType;
-import okhttp3.RequestBody;
 
-public class UpActivity extends AllBaseActivity implements AdapterView.OnItemSelectedListener {
+public class UpActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener {
 
-    // 防抖延迟时间 (毫秒)
-    private static final long DEBOUNCE_DELAY = 500;
-    public MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-    TextView EPC;
-    TextView azlw;
-    Spinner condition;
-    EditText start;
-    Button searchButton;
-    Button ok;
-    Button back;
-    TextView th;
-    TextView zbh;
-    EditText car;
-    long lastTime;
-    long nextTime;
-    String min = "EC0001012026010100000001"; // 左边界（包含）
-    String max = "EC0001012026010100100000"; // 右边界（包含）
-    private ActivityUpBinding binding;
-    private boolean isStart = true;
-    private ProgressDialog progressDialog;
+    // UI Components - 对应新 XML 的 ID
+    private TextView epcText, thText; // EPC 和 胎号
+    private EditText zbhEdit, carEdit, startEdit,patternDepthEdit; // 自编号、车牌、里程
+    private Spinner conditionSpinner; // 轮位选择
+    private Button searchBtn, confirmBtn, cancelBtn; // 搜索、确认、取消
+
+    // RFID Manager
+    private UhfReader manager;
     private boolean runFlag = true;
     private boolean startFlag = false;
-    private UhfReader manager; // UHF manager,UHF Operating handle
-    private ArrayList<EPC> listEPC;
-    private ArrayList<String> listepc = new ArrayList<String>();
-    private Toast mToast;
-    private Toast toast;
-    private KeyReceiver keyReceiver;
-    private boolean dataType;
-    private List<String> locationList;
-    private String location;
-    // 用于存储最后一次扫描到的 EPC
-    private String lastScannedEpc;
-    private BaseTyre baseTyreResult;
-    // 用于处理防抖逻辑的 Handler
-    private Handler debounceHandler = new Handler(new Handler.Callback() {
-        @Override
-        public boolean handleMessage(Message msg) {
-            if (msg.what == 1 && lastScannedEpc != null) {
-                // 延迟时间到，执行查询
-                showLoadingDialog();
-                if (isInRange(lastScannedEpc, min, max)) {
-                    // 查询车辆数据方法
-                    findCar(lastScannedEpc);
-                } else {
-                    find(lastScannedEpc);
-                }
-                lastScannedEpc = null; // 清空，等待下一次扫描
-            }
-            return true;
-        }
-    });
 
-    /**
-     * 判断字符串是否在指定的区间内（包含边界）
-     *
-     * @param target 要判断的目标字符串
-     * @param min    区间左边界
-     * @param max    区间右边界
-     * @return true=在区间内，false=不在
-     */
-    public static boolean isInRange(String target, String min, String max) {
-        // 空值校验，避免空指针异常
-        if (target == null || min == null || max == null) {
-            return false;
-        }
-        // compareTo规则：
-        // 1. 字符串相等返回0；
-        // 2. 目标字符串 > 对比字符串 返回正数；
-        // 3. 目标字符串 < 对比字符串 返回负数。
-        // 因此：target >= min 等价于 target.compareTo(min) >= 0；
-        //      target <= max 等价于 target.compareTo(max) <= 0。
-        return target.compareTo(min) >= 0 && target.compareTo(max) <= 0;
-    }
+    // Data Lists
+    private ArrayList<EPC> listEPC;
+    private ArrayList<String> listepcStr;
+
+    // Loading Dialog
+    private ProgressDialog progressDialog;
+    private boolean isProcessing = false; // 标记是否正在处理请求
+    // Debounce Handler for RFID Scan
+    private static final long DEBOUNCE_DELAY = 500;
+    private String lastScannedEpc;
+//    private Handler debounceHandler = new Handler(new Handler.Callback() {
+//        @Override
+//        public boolean handleMessage(Message msg) {
+//            if (msg.what == 1 && lastScannedEpc != null) {
+//                // 延迟结束，执行查询逻辑
+//                showLoadingDialog();
+//                if (isInRange(lastScannedEpc, min, max)) {
+//                    findCar(lastScannedEpc); // 车辆芯片
+//                } else {
+//                    find(lastScannedEpc); // 轮胎芯片
+//                }
+//                lastScannedEpc = null;
+//            }
+//            return true;
+//        }
+//    });
+
+    // EPC Range Check (示例范围，请根据实际业务修改)
+    String min = "EC0001012026010100000001"; // 左边界（包含）
+    String max = "EC0001012026010100100000"; // 右边界（包含）
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        binding = ActivityUpBinding.inflate(getLayoutInflater());
-        setContentView(binding.getRoot());
-        bindViews();
-        setupClickListeners();
-        manager = MyApplication.getManager();
-        listEPC = new ArrayList<EPC>();
+        setContentView(R.layout.activity_up); // 确保使用新布局
 
+        // 初始化视图
+        initViews();
 
-        showLoadingDialog();
+        // 初始化硬件
+        manager = UhfReader.getInstance(); // 假设单例模式，根据实际情况调整
+        if (manager == null) {
+            Toast.makeText(this, "UHF Reader Init Failed", Toast.LENGTH_SHORT).show();
+            finish();
+            return;
+        }
 
+        listEPC = new ArrayList<>();
+        listepcStr = new ArrayList<>();
+
+        // 设置 Spinner 监听
+        conditionSpinner.setOnItemSelectedListener(this);
+
+        // 启动扫描线程
         Thread thread = new InventoryThread();
         thread.start();
+
+        // 初始化工具类
         Util.initSoundPool(this);
 
-        Intent intent = getIntent();
-
-        if (intent.getBooleanExtra("dataType", false)) dataType = true;
-        else dataType = false;
-        if (dataType) {
-            // 从保养跳转过来的
-
-            location = intent.getStringExtra("location");
-            binding.azlw.setText(location);
-            binding.car.setText(intent.getStringExtra("carNo"));
-            binding.start.setText(intent.getStringExtra("licheng"));
-            progressDialog.dismiss();
-        } else {
-            condition.setOnItemSelectedListener(this);
-            check_spinner();
-        }
-        locationList = new ArrayList<>() {{
-            add("左前轮");
-            add("右前轮");
-            add("右内轮");
-            add("右外轮");
-            add("左内轮");
-            add("左外轮");
-        }};
+        // 加载轮位数据
+        check_spinner();
 
+        // 默认显示加载框（如果需要预加载数据）
+        // showLoadingDialog();
     }
 
-    private void bindViews() {
-        EPC = binding.epc;
-        azlw = binding.azlw;
-        condition = binding.condition;
-        start = binding.start;
-        searchButton = binding.searchButton;
-        ok = binding.ok;
-        back = binding.back;
-        th = binding.th;
-        zbh = binding.zbh;
-        car = binding.car;
-    }
-
-    private void setupClickListeners() {
-        binding.ok.setOnClickListener(v -> {
-            String rfid = EPC.getText().toString();
-            String carNo = car.getText().toString();
-            String millage = start.getText().toString();
-            String wheel = azlw.getText().toString();
-            String selfNo = zbh.getText().toString();
-
-            if (rfid == null || rfid.isEmpty()) {
-                new CommonDialog(UpActivity.this).setMessage("请扫描轮胎！").show();
-                return;
-            }
-            if (carNo == null || carNo.isEmpty()) {
-                new CommonDialog(UpActivity.this).setMessage("请选择安装车辆！").show();
-                return;
-            }
-            if (millage == null || millage.isEmpty()) {
-                new CommonDialog(UpActivity.this).setMessage("请输入起始里程！").show();
-                return;
-            }
-            if (wheel == null || wheel.isEmpty()) {
-                new CommonDialog(UpActivity.this).setMessage("请选择安装轮位！").show();
-                return;
-            }
-            if (selfNo == null || selfNo.isEmpty()) {
-                new CommonDialog(UpActivity.this).setMessage("请输入自编号！").show();
-                return;
-            }
-            up_insert(rfid, carNo, millage, wheel, selfNo);
-            showLoadingDialog();
-        });
-
-        binding.back.setOnClickListener(v -> {
-            // Intent intent = new Intent(this, HomePageActivity.class);
-            // startActivity(intent);
-            finish();
-        });
-
-        binding.searchButton.setOnClickListener(v -> {
-            String carNo = car.getText().toString();
-            if (carNo == null || carNo.isEmpty()) {
-                new CommonDialog(UpActivity.this).setMessage("请输入车牌号！").show();
+    private void initViews() {
+        // 绑定新布局中的控件
+        epcText = findViewById(R.id.epc);
+        thText = findViewById(R.id.th);
+        zbhEdit = findViewById(R.id.zbh);
+        carEdit = findViewById(R.id.car);
+        startEdit = findViewById(R.id.start);
+        patternDepthEdit = findViewById(R.id.patternDepth);
+        conditionSpinner = findViewById(R.id.condition);
+        searchBtn = findViewById(R.id.searchButton);
+        confirmBtn = findViewById(R.id.confirmButton);
+        cancelBtn = findViewById(R.id.back);
+        // 设置按钮点击事件
+        searchBtn.setOnClickListener(v -> {
+            String carNo = carEdit.getText().toString().trim();
+            if (carNo.isEmpty()) {
+                new CommonDialog(UpActivity.this).setMessage("请输入车牌号或扫描车辆芯片！").show();
                 return;
             }
             showLoadingDialog();
             car_spinner(carNo);
         });
+
+        confirmBtn.setOnClickListener(v -> {
+            String rfid = epcText.getText().toString();
+            String carNo = carEdit.getText().toString();
+            String mileage = startEdit.getText().toString();
+            String wheel = conditionSpinner.getSelectedItem().toString();
+            String selfNo = zbhEdit.getText().toString();
+            String patternDepth = patternDepthEdit.getText().toString();
+            // 校验逻辑
+            if (rfid.isEmpty() || "请扫描或输入EPC".equals(rfid)) {
+                new CommonDialog(UpActivity.this).setMessage("请扫描轮胎！").show();
+                return;
+            }
+            if (carNo.isEmpty()) {
+                new CommonDialog(UpActivity.this).setMessage("请选择安装车辆！").show();
+                return;
+            }
+            if (mileage.isEmpty()) {
+                new CommonDialog(UpActivity.this).setMessage("请输入起始里程！").show();
+                return;
+            }
+            if (wheel.isEmpty()) {
+                new CommonDialog(UpActivity.this).setMessage("请选择安装轮位！").show();
+                return;
+            }
+
+            // 提交数据
+            up_insert(rfid, carNo, mileage, wheel, selfNo,patternDepth);
+            showLoadingDialog();
+        });
+
+        cancelBtn.setOnClickListener(v -> finish());
     }
 
+    // ---------------- RFID 扫描线程 ----------------
+    class InventoryThread extends Thread {
+        @Override
+        public void run() {
+            while (runFlag) {
+                if (startFlag && !isProcessing) { // 只有非处理状态才允许扫描
+                    List<TagModel> tagList = manager.inventoryRealTime();
+                    if (tagList != null && !tagList.isEmpty()) {
+                        // 1. 立即停止扫描标志，防止循环继续
+                        startFlag = false;
+
+                        Util.play(1, 0);
+                        TagModel tag = tagList.get(0); // 只取第一个标签
+                        if (tag != null) {
+                            String epcStr = Tools.Bytes2HexString(tag.getmEpcBytes(), tag.getmEpcBytes().length);
+                            // 2. 发送到主线程处理
+                            addToList(epcStr);
+                        }
+                        tagList.clear();
+                    }
+                    try {
+                        Thread.sleep(20);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
+    private void handleScannedTag(String epc) {
+        runOnUiThread(() -> {
+            if (isProcessing) return; // 二次检查
+
+            isProcessing = true; // 锁定状态
+            showLoadingDialog(); // 显示加载框，自然阻塞用户操作
+
+            // 执行业务逻辑
+            if (isInRange(epc, min, max)) {
+                findCar(epc); // 内部网络请求完成后需重置 isProcessing
+            } else {
+                find(epc); // 内部网络请求完成后需重置 isProcessing
+            }
+        });
+    }
+    private void addToList(final String epc) {
+        runOnUiThread(() -> {
+            // 1. 状态锁检查：如果正在请求网络，直接无视本次扫描结果
+            if (isProcessing) return;
+
+            // 2. 更新内部列表（如果你还需要保留 listEPC 用于显示或其他逻辑）
+            boolean found = false;
+            for (EPC mEPC : listEPC) {
+                if (epc.equals(mEPC.getEpc())) {
+                    mEPC.setCount(mEPC.getCount() + 1);
+                    found = true;
+                    break;
+                }
+            }
+            if (!found) {
+                EPC newEPC = new EPC();
+                newEPC.setEpc(epc);
+                newEPC.setCount(1);
+                listEPC.add(newEPC);
+            }
+
+            // 3. 进入业务逻辑处理（替代原有的 debounceHandler）
+            // 这里直接调用 handleScannedTag 或者直接写逻辑
+            handleScannedTag(epc);
+        });
+    }
+
+    private void clearData() {
+        // listEPC.clear(); // 根据实际逻辑决定是否清空，注释掉以便保留显示
+        listepcStr.clear();
+    }
+    private void finishQuery() {
+        hideLoadingDialog();
+        isProcessing = false; // 解锁状态，允许下次扫描
+    }
+    // ---------------- 网络请求与业务逻辑 ----------------
+    private void up_insert(String rfid, String carNo, String mileage, String wheel, String selfNo,String patternDepth) {
+        OkGo.<String>post(MyUrl.url + "/tyre/install/PdaInstallTyre")
+                .tag(this)
+                .params("tyreRfid", rfid)
+                .params("mileage", mileage)
+                .params("carNo", carNo)
+                .params("wheelPostion", wheel)
+                .params("selfNo", selfNo)
+                .params("patternDepth", patternDepth)
+                .params("CreateBy", SharedPreferencesUtils.getstring("user", "admin"))
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(Response<String> response) {
+
+                        Gson gson = new Gson();
+                        try {
+                            AjaxResult result = gson.fromJson(response.body(), AjaxResult.class);
+                            handleResponse(result);
+                        } catch (JsonSyntaxException e) {
+                            Toast.makeText(UpActivity.this, "数据解析错误", Toast.LENGTH_SHORT).show();
+                        }
+                        finishQuery(); // 关键：处理完成
+                    }
+
+                    @Override
+                    public void onError(Response<String> response) {
+                        super.onError(response);
+                        finishQuery();
+                        Toast.makeText(UpActivity.this, "网络请求失败", Toast.LENGTH_SHORT).show();
+                    }
+                });
+    }
+
+    /**
+     * 根据车牌号查询车辆信息
+     * 对应之前的 car_spinner 逻辑
+     * @param carNo 车牌号
+     */
+    private void car_spinner(String carNo) {
+        // 1. 参数校验
+        if (carNo == null || carNo.trim().isEmpty()) {
+            hideLoadingDialog();
+            new CommonDialog(UpActivity.this).setMessage("车牌号不能为空！").show();
+            return;
+        }
+
+        // 2. 发起网络请求
+        // 接口说明：通常调用车辆查询接口，传入车牌号
+        OkGo.<String>post(MyUrl.url + "/tyre/car/PdaQueryCarList") // 注意：这是根据车牌查询的接口，区别于之前的 RFID 查询
+                .tag(this)
+                .params("carNo", carNo) // 传递车牌号参数
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(Response<String> response) {
+                        hideLoadingDialog();
+                        String body = response.body();
+                        Log.d("CarQuery", "Response: " + body);
+                        Gson gson = new Gson();
+
+                        try {
+                            // 1. 将响应体解析为 JsonObject (通用 JSON 对象)
+                            // 这样可以绕过 AjaxResult 类对 data 字段的 String 类型限制
+                            com.google.gson.JsonObject jsonObject = gson.fromJson(body, com.google.gson.JsonObject.class);
+
+                            // 2. 获取 code 字段 (注意：你的日志显示 code 是数字 0，但 AjaxResult 定义是 String，这里做兼容处理)
+                            String code = "";
+                            if (jsonObject.has("code")) {
+                                // 尝试获取 code，无论是 "0" 还是 0 都能处理
+                                code = jsonObject.get("code").getAsString();
+                            }
+
+                            // 3. 判断成功状态 (根据你的日志，0 代表成功)
+                            if ("0".equals(code) || "200".equals(code)) {
+
+                                // 4. 获取 data 元素
+                                if (jsonObject.has("data")) {
+                                    com.google.gson.JsonElement dataElement = jsonObject.get("data");
+
+                                    // 5. 将 data 元素转换为 List<BaseCar>
+                                    // 使用 TypeToken 指定泛型类型
+                                    java.lang.reflect.Type type = new com.google.gson.reflect.TypeToken<List<BaseCar>>() {}.getType();
+                                    List<BaseCar> carList = gson.fromJson(dataElement, type);
+
+                                    if (carList != null && !carList.isEmpty()) {
+                                        // 6. 展示弹窗列表
+                                        showCarSelectionDialog(carList);
+                                    } else {
+                                        // 7. 无数据处理
+                                        new CommonDialog(UpActivity.this).setMessage("未查询到相关车辆信息").show();
+                                    }
+                                }
+                            } else {
+                                // 业务错误处理
+                                String msg = jsonObject.has("msg") ? jsonObject.get("msg").getAsString() : "未知错误";
+                                new CommonDialog(UpActivity.this).setMessage(msg).show();
+                            }
+
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            new CommonDialog(UpActivity.this).setMessage("数据解析异常").show();
+                        }
+                    }
+
+                    @Override
+                    public void onError(Response<String> response) {
+                        super.onError(response);
+                        hideLoadingDialog();
+                        handleCarQueryError("response.getMessage()");
+                    }
+                });
+    }
+
+    /**
+     * 展示车辆选择弹窗
+     * @param carList 车辆列表
+     */
+    private void showCarSelectionDialog(List<BaseCar> carList) {
+        if (carList.size() == 1) {
+            // 如果只有一辆车，直接填充，无需弹窗
+            BaseCar car = carList.get(0);
+            fillCarInfoToUI(car);
+            //Util.play(1, 0); // 提示音
+            Toast.makeText(this, "自动匹配车辆：" + car.getCarNo(), Toast.LENGTH_SHORT).show();
+        } else {
+            // 如果有多辆车，展示弹窗供用户选择
+            // 提取车牌号列表用于显示
+            List<String> licensePlates = new ArrayList<>();
+            for (BaseCar car : carList) {
+                licensePlates.add(car.getCarNo() != null ? car.getCarNo() : "未知车牌");
+            }
+
+            // 创建并显示弹窗
+            CarSelectionDialog dialog = new CarSelectionDialog(this, licensePlates);
+            dialog.setOnCarSelectedListener((selectedItem) -> {
+                // selectedItem 是 Object，转成 String
+                String selectedPlate = selectedItem.toString().trim();
+
+                // 遍历列表找到对应的对象
+                for (BaseCar car : carList) {
+                    if (selectedPlate.equals(car.getCarNo())) {
+                        fillCarInfoToUI(car);
+                        break;
+                    }
+                }
+            });
+            dialog.show();
+        }
+    }
+
+    /**
+     * 将车辆信息填充到界面控件
+     * @param car 车辆对象
+     */
+    private void fillCarInfoToUI(BaseCar car) {
+        // 填充车牌号
+        carEdit.setText(safeGetString(car.getCarNo()));
+        // 如果有其他字段，例如：
+        // startEdit.setText(safeGetString(car.getDefaultMileage())); // 默认里程
+
+        // 视觉反馈
+        carEdit.setTextColor(getColor(R.color.green500));
+        //  Util.play(1, 0);
+    }
+    /**
+     * 统一处理车辆查询错误（复用之前的逻辑）
+     */
+    private void handleCarQueryError(String errorMsg) {
+        new CommonDialog(UpActivity.this).setMessage(errorMsg).show();
+    }
+    /**
+     * 扫描到轮胎芯片后的处理逻辑
+     * @param tyreRfid 扫描到的轮胎 EPC 码
+     */
+    private void find(String tyreRfid) {
+        // 1. 前置条件校验：必须先选择轮位才能扫描轮胎
+        // 这里的逻辑是：防止用户先扫轮胎后扫车，或者忘记选轮位
+        // 2. UI 更新：显示扫描到的轮胎 EPC
+        // 将 EPC 码显示在界面上，给用户视觉反馈
+        epcText.setText(tyreRfid);
+        // 3. 网络请求：查询轮胎详情
+        // 调用后台接口，根据 EPC 查询轮胎档案
+        OkGo.<String>post(MyUrl.url + "/tyre/tyre/pdaQueryTyreInfo")
+                .tag(this)
+                .params("tyreEpc", tyreRfid)
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(Response<String> response) {
+                        finishQuery();
+                        Gson gson = new Gson();
+                        String body = response.body();
+                        try {
+                            // 4. 解析数据
+                            // 假设后端返回标准 AjaxResult，data 字段包含 BaseTyre 对象
+
+                            // 解析轮胎对象
+                            BaseTyre tyre = gson.fromJson(body, BaseTyre.class);
+
+                            // 5. 数据回填 (UI 更新)
+                            // 将查询到的轮胎信息填充到界面控件
+                            thText.setText(safeGetString(tyre.getTyreNo())); // 胎号
+                            zbhEdit.setText(safeGetString(tyre.getSelfNo())); // 自编号/工厂码
+                            patternDepthEdit.setText(safeGetString(tyre.getPatternDepth()));
+                            // 视觉反馈：高亮显示，提示成功
+                            epcText.setTextColor(getColor(R.color.green500));
+
+                            Util.play(1, 0); // 播放成功提示音
+                            Toast.makeText(UpActivity.this, "轮胎识别成功", Toast.LENGTH_SHORT).show();
+
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            handleTyreError("数据解析异常");
+                        }
+                    }
+
+                    @Override
+                    public void onError(Response<String> response) {
+                        super.onError(response);
+                        hideLoadingDialog();
+                        handleTyreError("网络请求失败: ");
+                        // handleTyreError("网络请求失败: " + response.getMessage());
+                    }
+                });
+    }
+
+    /**
+     * 统一处理轮胎查询错误
+     * 作用：清空无效数据，防止误操作
+     */
+    private void handleTyreError(String errorMsg) {
+        // 1. 清空轮胎相关显示
+        // thText.setText("未知轮胎");
+        // zbhEdit.setText("");
+        epcText.setTextColor(getColor(R.color.colorAccent));
+        new CommonDialog(UpActivity.this).setMessage("轮胎识别错误！").show();
+
+    }
+    /**
+     * 根据车辆RFID查询车辆基本信息
+     * @param carRfid 扫描到的车辆EPC码
+     */
+    private void findCar(String carRfid) {
+        // 1. 构建请求
+        OkGo.<String>post(MyUrl.url + "/tyre/car/queryCarByRfid")
+                .tag(this)
+                .params("rfid", carRfid) // 发送RFID查询
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(Response<String> response) {
+                        hideLoadingDialog(); // 隐藏加载框
+                        String body = response.body();
+                        Gson gson = new Gson();
+                        try {
+                            // 2. 解析响应
+                            // 假设后端返回的是标准的 AjaxResult 包装类，或者直接是 BaseCar JSON
+                            // 这里为了健壮性，先尝试解析 BaseCar
+                            BaseCar baseCar = gson.fromJson(body, BaseCar.class);
+                            if (baseCar != null && baseCar.getCarNo() != null) {
+                                // 3. UI 更新 - 数据回填
+                                // 填充车牌号
+                                carEdit.setText(safeGetString(baseCar.getCarNo()));
+                                // 如果有其他字段，继续填充
+                                // start.setText(safeGetString(baseCar.getDefaultMileage())); // 默认里程
+
+                                // 视觉反馈：高亮车牌号，提示用户车辆已识别
+                                carEdit.setTextColor(getColor(R.color.green500)); // 假设 colors.xml 中有定义
+                                Toast.makeText(UpActivity.this, "车辆识别成功: " + baseCar.getCarNo(), Toast.LENGTH_SHORT).show();
+
+                                // 清空轮胎显示区，准备扫描轮胎
+//                                epcText.setText("车辆已识别，请扫描轮胎");
+//                                thText.setText("");
+//                                zbhEdit.setText("");
+
+                            } else {
+                                // 4. 数据不存在处理
+                                handleCarQueryError("系统无此车辆绑定信息，请检查芯片是否损坏或未绑定！");
+                            }
+                            finishQuery();
+                        } catch (JsonSyntaxException e) {
+                            e.printStackTrace();
+                            handleCarQueryError("数据解析异常，请重试");
+                        }
+                    }
+
+                    @Override
+                    public void onError(Response<String> response) {
+                        super.onError(response);
+                        handleCarQueryError("请求失败");
+                        finishQuery();
+                    }
+                });
+    }
+
+    /**
+     * 统一处理车辆查询错误
+     * 作用：锁定流程，必须正确识别车辆才能继续
+     */
+
+    private String safeGetString(String value) {
+        return value == null || "null".equals(value) ? "" : value;
+    }
+
+    private void handleResponse(AjaxResult result) {
+        runOnUiThread(() -> {
+            CommonDialog dialog = new CommonDialog(this);
+            if ("200".equals(result.getCode()) || "0".equals(result.getCode())) {
+                dialog.setMessage(result.getMsg()).show();
+            } else {
+                dialog.setMessage(result.getMsg()).show();
+            }
+        });
+    }
+
+    // 重置表单
+    private void resetForm() {
+        epcText.setText("");
+        thText.setText("请扫描或输入EPC");
+        zbhEdit.setText("");
+        startEdit.setText("");
+        // 车牌号不清空，方便连续装车
+        // carEdit.setText("");
+    }
+
+    // ---------------- Spinner 数据加载 ----------------
+    /**
+     * 加载轮位下拉框数据
+     * 对应接口：/system/dict/data/wheelPositionList
+     * 对应实体：InStoreSpinnerVo (根据你上传的代码推断)
+     */
+    private void check_spinner() {
+        // 1. 显示加载状态（如果需要，可选）
+        showLoadingDialog();
+        OkGo.<String>post(MyUrl.url + "/system/dict/data/wheelPositionList")
+                .tag(this)
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(Response<String> response) {
+                        hideLoadingDialog();
+                        String body = response.body();
+                        Log.d("WheelPosition", "Raw Response: " + body);
+
+                        Gson gson = new Gson();
+                        try {
+                            // 2. 解析数据
+                            // 根据你上传的代码，使用了 InStoreSpinnerVo
+                            // 假设接口返回的是 List<InStoreSpinnerVo> 或者 包含 data 字段的 AjaxResult
+                            // 这里提供两种常见场景的解析逻辑：
+
+                            // --- 场景 A：接口直接返回 List<String> 或 List<InStoreSpinnerVo> ---
+                            // 如果是直接列表，使用 TypeToken 解析
+//                            List<String> tempList = gson.fromJson(body,
+//                                    new TypeToken<List<String>>(){}.getType());
+//
+                            List<String> wheelList = gson.fromJson(body,
+                                    new TypeToken<List<String>>(){}.getType());
+//                            if (tempList != null && !tempList.isEmpty()) {
+//                                for (InStoreSpinnerVo vo : tempList) {
+//                                    // 假设 InStoreSpinnerVo 有 getDictLabel() 或类似方法
+//                                    // 如果是直接 String 列表，直接 add vo 即可
+//                                    wheelList.add(vo.getDictLabel());
+//                                }
+//                            }
+
+                            // --- 场景 B：接口返回 AjaxResult 包装类 (如果场景 A 报错，请尝试此逻辑) ---
+//                             AjaxResult result = gson.fromJson(body, AjaxResult.class);
+//                             if (result.getCode().equals("200")) {
+//                                 tempList = gson.fromJson(gson.toJson(result.getData()),
+//                                         new TypeToken<List<InStoreSpinnerVo>>(){}.getType());
+//                                 // ... 后续填充逻辑同上
+//                             }
+
+                            // 3. 绑定适配器
+                            if (wheelList.isEmpty()) {
+                                wheelList.add("未获取到轮位数据");
+                            }
+
+                            // 创建适配器 (Simple Spinner Item 样式)
+                            ArrayAdapter<String> adapter = new ArrayAdapter<>(UpActivity.this,
+                                    android.R.layout.simple_spinner_item, wheelList);
+                            adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+
+                            // 绑定到 Spinner
+                            conditionSpinner.setAdapter(adapter);
+
+                        } catch (JsonSyntaxException e) {
+                            e.printStackTrace();
+                            showErrorDialog("轮位数据解析失败");
+                        }
+                    }
+
+                    @Override
+                    public void onError(Response<String> response) {
+                        super.onError(response);
+                        hideLoadingDialog();
+                        showErrorDialog("轮位数据加载失败");
+                        //showErrorDialog("轮位数据加载失败: " + response.getMessage());
+                    }
+                });
+    }
+
+    // 通用错误处理
+    private void showErrorDialog(String msg) {
+        new CommonDialog(UpActivity.this).setMessage(msg).show();
+    }
+
+    // ---------------- 生命周期与广播 ----------------
     @Override
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
-        if (dataType) {
-            // 从保养跳转过来的
-            binding.azlw.setText(location);
-        }
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
         registerReceiver();
+        startFlag = false; // 开启扫描
     }
 
     @Override
-    public void onPause() {
-        startFlag = false;
+    protected void onPause() {
         super.onPause();
+        startFlag = false; // 关闭扫描
         unregisterReceiver();
     }
 
     @Override
     protected void onDestroy() {
-        startFlag = false;
         runFlag = false;
         super.onDestroy();
     }
 
-    // EPC add to LISTVIEW
-    private void addToList(final List<EPC> list, final String epc, final byte rssi) {
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                // The epc for the first time
-                if (list.isEmpty()) {
-                    EPC epcTag = new EPC();
-                    epcTag.setEpc(epc);
-                    epcTag.setCount(1);
-                    epcTag.setRssi(rssi);
-                    list.add(epcTag);
-                    listepc.add(epc);
+    private void registerReceiver() {
+        IntentFilter filter = new IntentFilter();
+        filter.addAction("android.rfid.FUN_KEY");
+        filter.addAction("android.intent.action.FUN_KEY");
+        registerReceiver(keyReceiver, filter);
+    }
 
-                } else {
-                    for (int i = 0; i < list.size(); i++) {
-                        EPC mEPC = list.get(i);
-                        // list contain this epc
-                        if (epc.equals(mEPC.getEpc())) {
-                            mEPC.setCount(mEPC.getCount() + 1);
-                            mEPC.setRssi(rssi);
-                            list.set(i, mEPC);
-                            break;
-                        } else if (i == (list.size() - 1)) {
-                            // list doesn't contain this epc
-                            EPC newEPC = new EPC();
-                            newEPC.setEpc(epc);
-                            newEPC.setCount(1);
-                            newEPC.setRssi(rssi);
-                            list.add(newEPC);
-                            listepc.add(epc);
-                        }
+    private void unregisterReceiver() {
+        try {
+            unregisterReceiver(keyReceiver);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private BroadcastReceiver keyReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if ("android.rfid.FUN_KEY".equals(intent.getAction()) || "android.intent.action.FUN_KEY".equals(intent.getAction())) {
+                int keyCode = intent.getIntExtra("keyCode", 0);
+                boolean keyDown = intent.getBooleanExtra("keydown", false);
+                if (keyDown && keyCode == KeyEvent.KEYCODE_F5) {
+                    // 只有不在处理中，才允许开启扫描
+                    if (!isProcessing) {
+                        startFlag = true;
+                        // 清除上次扫描的显示（可选）
+                        //epcText.setText("扫描中...");
                     }
                 }
-
-                // play sound
-                lastTime = SystemClock.elapsedRealtime();
-                long time = lastTime - nextTime;
-                if (time >= 60) {
-                    Util.play(1, 0);
-                    nextTime = lastTime;
-                    Log.e("TAG", "run: " + time);
-                }
-                if (listepc != null && !listepc.isEmpty()) {
-                    startFlag = false;
-                    String currentEpc = listepc.get(0);
-                    if (isInRange(currentEpc, min, max)) {
-                        // 请求后台 查询车辆信息
-                        // car.setText(currentEpc);
-                        // 请求后台
-                    } else {
-                        EPC.setText(currentEpc);
-                        // 请求后台
-                        debounceHandler.removeMessages(1);
-                    }
-                    debounceHandler.removeMessages(1);
-                    lastScannedEpc = currentEpc;
-                    debounceHandler.sendEmptyMessageDelayed(1, DEBOUNCE_DELAY);
-                }
-
-                clearData();
             }
-        });
-        Log.e("EPC", "listepc:+ " + listepc);
-    }
+        }
+    };
+
 
-    private void clearData() {
-        listEPC.removeAll(listEPC);
-        listepc.removeAll(listepc);
-    }
 
     private void showLoadingDialog() {
-        progressDialog = new ProgressDialog(this);
-        progressDialog.setMessage("数据加载中...");
-        progressDialog.setCancelable(false);
-        progressDialog.show();
+        if (progressDialog == null) {
+            progressDialog = new ProgressDialog(this);
+            progressDialog.setMessage("数据加载中...");
+            progressDialog.setCancelable(false);
+        }
+        if (!progressDialog.isShowing()) {
+            progressDialog.show();
+        }
     }
 
     private void hideLoadingDialog() {
@@ -347,310 +730,43 @@ public class UpActivity extends AllBaseActivity implements AdapterView.OnItemSel
         }
     }
 
+    // Spinner 选中事件 (用于显示选中的轮位)
     @Override
     public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
         if (parent.getId() == R.id.condition) {
-            azlw.setText(parent.getItemAtPosition(position).toString());
+            // 在实际应用中，这里可能需要更新一个隐藏的变量存储轮位ID
+            // ((TextView) findViewById(R.id.azlw)).setText(parent.getItemAtPosition(position).toString());
         }
-
     }
 
-    // 添加缺失的方法
     @Override
     public void onNothingSelected(AdapterView<?> parent) {
+        // Do nothing
     }
-
-    // 提交函数
-    private void up_insert(String rfid, String carNo, String millage, String wheel, String selfNo) {
-        OkGo.<String>post(MyUrl.url + "/tyre/install/PdaInstallTyre")
-                .tag(this)
-                .params("tyreRfid", rfid)
-                .params("mileage", millage)
-                .params("carNo", carNo)
-                .params("wheelPostion", wheel)
-                .params("selfNo", selfNo)
-                .params("CreateBy", SharedPreferencesUtils.getstring("user", "admin"))
-                .execute(new StringCallback() {
-                    @Override
-                    public void onSuccess(Response<String> response) {
-                        hideLoadingDialog();
-                        String body = response.body();
-                        Gson gson = new Gson();
-                        AjaxResult ajaxResult = gson.fromJson(body, AjaxResult.class);
-                        if (ajaxResult.getCode().equals("0") && dataType) {
-                            Intent intent = new Intent();
-                            baseTyreResult.setWheelPostion(wheel);
-                            intent.putExtra("json", gson.toJson(baseTyreResult));
-                            setResult(RESULT_OK, intent);
-                            finish();
-                            return;
-                        }
-
-
-                        handleResponse(ajaxResult);
-//                try {
-//                    Gson gson = new Gson();
-//                    BaseTyre baseTyre = gson.fromJson(body, BaseTyre.class);
-//                    if (baseTyre != null) {
-//                        // 空值处理：若字段为 null 则显示空字符串
-//                        String TyreNo = safeGetString(baseTyre.getTyreNo());
-//                        th.setText(TyreNo);
-//                    }
-//                } catch (JsonSyntaxException e) {
-//                    return;
-//                }
-                    }
-                });
-    }
-
-    private void handleResponse(AjaxResult result) {
-        switch (result.getCode()) {
-            case "500":
-                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;
-        }
-    }
-
-    //    基本信息查询
-    private void findCar(String carNumber) {
-        OkGo.<String>post(MyUrl.url + "/tyre/car/queryCarByRfid").tag(this).params("rfid", carNumber).execute(new StringCallback() {
-            @Override
-            public void onSuccess(Response<String> response) {
-                String body = response.body();
-                hideLoadingDialog();
-                try {
-                    Gson gson = new Gson();
-                    BaseCar baseCar = gson.fromJson(body, BaseCar.class);
-                    if (baseCar != null) {
-                        // 空值处理：若字段为 null 则显示空字符串
-                        String carNo = safeGetString(baseCar.getCarNo());
-                        car.setText(carNo);
-                    } else {
-                        new CommonDialog(UpActivity.this).setMessage("请检查车辆芯片绑定数据！").show();
-                    }
-                } catch (JsonSyntaxException e) {
-                    return;
-                }
-            }
-        });
-    }
-
-    //    基本信息查询
-    private void find(String epc) {
-        OkGo.<String>post(MyUrl.url + "/tyre/tyre/pdaQueryTyreInfo").tag(this).params("tyreEpc", epc).execute(new StringCallback() {
-            @Override
-            public void onSuccess(Response<String> response) {
-                String body = response.body();
-                hideLoadingDialog();
-                try {
-                    Gson gson = new Gson();
-                    BaseTyre baseTyre = gson.fromJson(body, BaseTyre.class);
-
-                    if (baseTyre != null) {
-                        baseTyreResult = baseTyre;
-                        // 空值处理：若字段为 null 则显示空字符串
-                        String TyreNo = safeGetString(baseTyre.getTyreNo());
-                        th.setText(TyreNo);
-                        zbh.setText(baseTyre.getSelfNo());
-                    } else {
-                        new CommonDialog(UpActivity.this).setMessage("系统无此轮胎！").show();
-                        th.setText("");
-                        zbh.setText("");
-                    }
-                } catch (JsonSyntaxException e) {
-                    return;
-                }
-            }
-        });
-    }
-
-    private String safeGetString(String value) {
-        return value == null || "null".equals(value) ? "" : value;
-    }
-
-    private void registerReceiver() {
-        keyReceiver = new KeyReceiver();
-        IntentFilter filter = new IntentFilter();
-        filter.addAction("android.rfid.FUN_KEY");
-        filter.addAction("android.intent.action.FUN_KEY");
-        registerReceiver(keyReceiver, filter);
-    }
-
-    private void unregisterReceiver() {
-        unregisterReceiver(keyReceiver);
-    }
-
-    private void check_spinner() {
-        Gson gson = new Gson();
-        OkGo.<String>post(MyUrl.url + "/system/dict/data/wheelPositionList").execute(new StringCallback() {
-            @Override
-            public void onSuccess(Response<String> response) {
-                hideLoadingDialog();
-                String body = response.body();
-                List<String> stringList = new ArrayList<>();
-                stringList = gson.fromJson(body, new TypeToken<List<String>>() {
-                }.getType());
-                ArrayAdapter<String> arrayAdapter =
-                        new ArrayAdapter<>(UpActivity.this, android.R.layout.simple_list_item_1, stringList);
-                condition.setAdapter(arrayAdapter);
-            }
-        });
-
-        condition.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                azlw.setText(parent.getItemAtPosition(position).toString());
-            }
-
-            @Override
-            public void onNothingSelected(AdapterView<?> parent) {
-            }
-        });
-
-    }
-
-    private void car_spinner(String carNo) {
-
-        Map<String, String> map = new HashMap<>();
-        map.put("carNo", carNo);
-        OkGo.<MyResult>post(MyUrl.url + "/tyre/car/PdaQueryCarList").tag(this)
-                .upRequestBody(RequestBody.create(JSON, new Gson().toJson(map)))
-                .execute(new MyRecultCall(progressDialog, this) {
-                    @Override
-                    public void onSuccess(Response<MyResult> response) {
-                        super.onSuccess(response);
-                        var myResult = response.body();
-                        if (myResult.getCode() == 0) {
-                            Gson gson = new Gson();
-                            List<BaseCar> baseCarList =
-                                    gson.fromJson(myResult.getJson(), new TypeToken<List<BaseCar>>() {
-                                    }.getType());
-                            Log.e("EPC", "listepc:+ " + baseCarList.size());
-                            if (baseCarList != null && baseCarList.size() > 0) {
-                                List<String> carNoList = new ArrayList<>();
-                                for (BaseCar car : baseCarList) {
-                                    carNoList.add(car.getCarNo());
-                                }
-                                // 显示自定义弹窗
-                                showCarSelectionDialog(carNoList);
-
-                            }
-                        }
-                    }
-                });
-    }
-
-    private void showCarSelectionDialog(List<String> carNoList) {
-        CarSelectionDialog dialog = new CarSelectionDialog(this, carNoList);
-        dialog.setOnCarSelectedListener(new CarSelectionDialog.OnCarSelectedListener() {
-            @Override
-            public void onCarSelected(String carNo) {
-                car.setText(carNo);
-                // 处理选中的车辆
-                // 例如设置到EditText或其他控件
-                // editTextCarNo.setText(carNo);
-            }
-        });
-        dialog.show();
-    }
-//        carAdapter.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-//            @Override
-//            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-//                car.setText(parent.getItemAtPosition(position).toString());
-//            }
-//
-//            @Override
-//            public void onNothingSelected(AdapterView<?> parent) {
-//            }
-//        });
-
-
-    class InventoryThread extends Thread {
-        byte[] accessPassword = Tools.HexString2Bytes("00000000");
-        private List<TagModel> tagList;
-
-        @Override
-        public void run() {
-            super.run();
-            while (runFlag) {
-                if (startFlag) {
-                    tagList = manager.inventoryRealTime(); // 实时盘存
-                    if (tagList != null && !tagList.isEmpty()) {
-                        // 播放提示音
-                        Util.play(1, 0);
-                        for (TagModel tag : tagList) {
-                            if (tag == null) {
-                                String epcStr = "";
-//								String epcStr = new String(epc);
-                                addToList(listEPC, epcStr, (byte) -1);
-                            } else {
-                                String epcStr =
-                                        Tools.Bytes2HexString(tag.getmEpcBytes(), tag.getmEpcBytes().length);
-//								String epcStr = new String(epc);
-                                byte rssi = tag.getmRssi();
-                                addToList(listEPC, epcStr, rssi);
-                            }
-
-                        }
-                    }
-                    tagList = null;
-                    try {
-                        Thread.sleep(20);
-                    } catch (InterruptedException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                }
-            }
-        }
-    }
-
-    private class KeyReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            int keyCode = intent.getIntExtra("keyCode", 0);
-            if (keyCode == 0) {
-                keyCode = intent.getIntExtra("keycode", 0);
-            }
-            boolean keyDown = intent.getBooleanExtra("keydown", false);
-            if (keyDown) {
-                if (toast == null) {
-                    // toast = Toast.makeText(OutStoreHouseActivity.this, "KeyReceiver:keyCode = down" + keyCode, Toast.LENGTH_SHORT);
-                } else {
-                    // toast.setText("KeyReceiver:keyCode = down" + keyCode);
-                }
-                // toast.show();
-                switch (keyCode) {
-                    case KeyEvent.KEYCODE_F1:
-                    case KeyEvent.KEYCODE_F2:
-                    case KeyEvent.KEYCODE_F3:
-                    case KeyEvent.KEYCODE_F4:
-                    case KeyEvent.KEYCODE_F5:
-                    case 136:
-                        // 扫描
-                        startFlag = true;
-                        break;
-                }
-            }
+    /**
+     * 判断 EPC 是否在指定的车辆范围内 (十六进制字符串比较)
+     * 注意：此方法针对的是完整的 EPC 码字符串比较，而非简单的前缀匹配
+     *
+     * @param epc  扫描到的 EPC 码
+     * @param min  车辆范围最小值 (包含)
+     * @param max  车辆范围最大值 (包含)
+     * @return true: 是车辆, false: 是轮胎
+     */
+    private boolean isInRange(String epc, String min, String max) {
+        if (epc == null || min == null || max == null) {
+            return false;
         }
 
-        ;
+        // 去除可能的空格并转大写，保证比较一致性
+        epc = epc.trim().toUpperCase();
+        min = min.trim().toUpperCase();
+        max = max.trim().toUpperCase();
+
+        // 逻辑：如果 epc 字符串在 min 和 max 之间（包含），则认为是车辆
+        // compareTo 返回值：0相等，1大于，-1小于
+        boolean isGreaterOrEqual = epc.compareTo(min) >= 0;
+        boolean isLessOrEqual = epc.compareTo(max) <= 0;
+
+        return isGreaterOrEqual && isLessOrEqual;
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/tyre/entity/BaseTyre.java b/app/src/main/java/com/example/tyre/entity/BaseTyre.java
index fa00b22..9ca3e0f 100644
--- a/app/src/main/java/com/example/tyre/entity/BaseTyre.java
+++ b/app/src/main/java/com/example/tyre/entity/BaseTyre.java
@@ -50,6 +50,16 @@ public class BaseTyre
 
     private String createTime;
 
+    private String patternDepth;
+
+    public String getPatternDepth() {
+        return patternDepth;
+    }
+
+    public void setPatternDepth(String patternDepth) {
+        this.patternDepth = patternDepth;
+    }
+
     public String getCreateTime() {
         return createTime;
     }
diff --git a/app/src/main/java/com/example/tyre/util/MyUrl.java b/app/src/main/java/com/example/tyre/util/MyUrl.java
index a8aa333..51ccb52 100644
--- a/app/src/main/java/com/example/tyre/util/MyUrl.java
+++ b/app/src/main/java/com/example/tyre/util/MyUrl.java
@@ -7,6 +7,6 @@ package com.example.tyre.util;
  */
 public class MyUrl {
    // public static String url="http://192.168.137.1:8020";
-   public static String url="http://www.qdhys.xyz:8020";
-//  public static String url="http://10.11.187.77:8020";
+//   public static String url="http://www.qdhys.xyz:8020";
+  public static String url="http://10.11.187.77:8020";
 }
diff --git a/app/src/main/res/drawable/bg_timeline_dot.xml b/app/src/main/res/drawable/bg_timeline_dot.xml
new file mode 100644
index 0000000..3e69624
--- /dev/null
+++ b/app/src/main/res/drawable/bg_timeline_dot.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#007AFF" /> <!-- 蓝色圆点 -->
+    <size android:width="12dp" android:height="12dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_circle_blue.xml b/app/src/main/res/drawable/shape_circle_blue.xml
new file mode 100644
index 0000000..01ea192
--- /dev/null
+++ b/app/src/main/res/drawable/shape_circle_blue.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#1890FF" /> <!-- 蓝色圆点 -->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_tyresearch.xml b/app/src/main/res/layout/activity_tyresearch.xml
index 3af981d..18605fa 100644
--- a/app/src/main/res/layout/activity_tyresearch.xml
+++ b/app/src/main/res/layout/activity_tyresearch.xml
@@ -4,323 +4,251 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/allbg"
+    android:background="#F5F7FA"
     android:orientation="vertical"
     tools:context=".TestActivity">
 
+    <!-- 1. 顶部标题栏 -->
     <TextView
         android:id="@+id/textView2"
-        style="@style/tablebarStyleTwo"
         android:layout_width="match_parent"
-        android:layout_height="55dp"
-        android:text="轮胎信息"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_height="56dp"
+        android:background="#FFFFFF"
+        android:elevation="4dp"
+        android:gravity="center"
+        android:text="轮胎详细信息"
+        android:textColor="#333333"
+        android:textSize="20sp"
+        android:textStyle="bold" />
 
-
-    <LinearLayout
-        android:id="@+id/linearLayout2"
-        style="@style/layout_t12_s8_style"
+    <!-- 2. 滚动内容区 (轮胎基本信息) -->
+    <!-- 注意：如果时间线内容很多，建议将时间线移出ScrollView，或者将整个页面放入NestedScrollView -->
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="45dp">
+        android:layout_height="0dp"
+        android:layout_weight="1">
 
-        <TextView
-            style="@style/alltext"
-            android:layout_width="90dp"
-            android:layout_height="match_parent"
-            android:text="扫描EPC:" />
-
-        <TextView
-            android:id="@+id/in_santext"
-            style="@style/scanTextStyle"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </LinearLayout>
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="16dp">
+
+            <!-- 轮胎信息卡片 (保持原有结构，仅微调) -->
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:cardCornerRadius="12dp"
+                app:cardElevation="6dp"
+                app:cardBackgroundColor="#FFFFFF">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="20dp">
+
+                    <!-- EPC 扫描结果显示 -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:layout_marginBottom="24dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="扫描EPC编码/输入胎号"
+                            android:textColor="#666666"
+                            android:textSize="12sp" />
+
+                        <EditText
+                            android:id="@+id/in_santext"
+                            android:layout_width="match_parent"
+                            android:layout_height="44dp"
+                            android:layout_marginTop="4dp"
+                            android:background="@drawable/rounded_input_bg"
+                            android:gravity="center_vertical"
+                            android:paddingStart="12dp"
+                            android:text=""
+                            android:textColor="#333333"
+                            android:textSize="16sp"
+                            android:textStyle="bold" />
+                    </LinearLayout>
+
+                    <!-- 信息栅格布局 (两列) -->
+                    <GridLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:columnCount="2"
+                        android:alignmentMode="alignBounds"
+                        android:useDefaultMargins="true">
+
+                        <!-- 品牌 -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_columnWeight="1"
+                            android:orientation="vertical"
+                            android:layout_marginBottom="12dp">
+                            <TextView android:text="品 牌" style="@style/label_style_compact"/>
+                            <TextView android:id="@+id/pinpai" style="@style/value_style_compact"/>
+                        </LinearLayout>
+
+                        <!-- 型号 -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_columnWeight="1"
+                            android:orientation="vertical"
+                            android:layout_marginBottom="12dp">
+                            <TextView android:text="型 号" style="@style/label_style_compact"/>
+                            <TextView android:id="@+id/xinghao" style="@style/value_style_compact"/>
+                        </LinearLayout>
+
+                        <!-- 层级 -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_columnWeight="1"
+                            android:orientation="vertical"
+                            android:layout_marginBottom="12dp">
+                            <TextView android:text="层 级" style="@style/label_style_compact"/>
+                            <TextView android:id="@+id/cengji" style="@style/value_style_compact"/>
+                        </LinearLayout>
+
+                        <!-- 花纹 -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_columnWeight="1"
+                            android:orientation="vertical"
+                            android:layout_marginBottom="12dp">
+                            <TextView android:text="花 纹" style="@style/label_style_compact"/>
+                            <TextView android:id="@+id/huawen" style="@style/value_style_compact"/>
+                        </LinearLayout>
+
+                        <!-- 气压 -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_columnWeight="1"
+                            android:orientation="vertical"
+                            android:layout_marginBottom="12dp">
+                            <TextView android:text="气 压" style="@style/label_style_compact"/>
+                            <TextView android:id="@+id/qiya" style="@style/value_style_compact"/>
+                        </LinearLayout>
+
+                        <!-- 初始花纹深度 -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_columnWeight="1"
+                            android:orientation="vertical"
+                            android:layout_marginBottom="12dp">
+                            <TextView android:text="初始花纹深度" style="@style/label_style_compact"/>
+                            <TextView android:id="@+id/huawen_depth" style="@style/value_style_compact"/>
+                        </LinearLayout>
+
+                        <!-- 剩余花纹 -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_columnWeight="1"
+                            android:orientation="vertical"
+                            android:layout_marginBottom="12dp">
+                            <TextView android:text="剩余花纹" style="@style/label_style_compact"/>
+                            <TextView android:id="@+id/shengyu_huawen" style="@style/value_style_compact"/>
+                        </LinearLayout>
+
+                        <!-- 状态 -->
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_columnWeight="1"
+                            android:orientation="vertical"
+                            android:layout_marginBottom="12dp">
+                            <TextView android:text="状 态" style="@style/label_style_compact"/>
+                            <TextView android:id="@+id/zhuangtai" style="@style/value_style_compact"/>
+                        </LinearLayout>
+
+                    </GridLayout>
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
+            <!-- 占位符：如果时间线想放在ScrollView内部，就放在这里 -->
+            <!-- 但通常建议独立出来，如下面的结构所示 -->
+            <androidx.cardview.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                app:cardCornerRadius="12dp"
+                app:cardElevation="4dp"
+                app:cardBackgroundColor="#FFFFFF">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="16dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="生命周期时间线"
+                        android:textSize="16sp"
+                        android:textStyle="bold"
+                        android:textColor="#333333"
+                        android:layout_marginBottom="12dp"/>
+
+                    <!-- 使用 LinearLayout 作为容器，在代码中动态添加 View -->
+                    <LinearLayout
+                        android:id="@+id/ll_timeline_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical" />
+
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
+        </LinearLayout>
+
+    </ScrollView>
+
+    <!-- 3. 新增：生命周期时间线区域 -->
+    <!-- 这是一个独立的卡片，位于ScrollView下方，底部按钮上方 -->
 
 
-    <!--    <LinearLayout-->
-    <!--        android:layout_width="match_parent"-->
-    <!--        android:layout_height="520dp"-->
-    <!--        android:layout_marginStart="20dp"-->
-    <!--        android:layout_marginTop="10dp"-->
-    <!--        android:layout_marginEnd="20dp"-->
-    <!--        android:background="@drawable/bg_santex_coppy"-->
-    <!--        android:orientation="vertical"-->
-    <!--        app:layout_constraintEnd_toEndOf="parent"-->
-    <!--        app:layout_constraintHorizontal_bias="1.0"-->
-    <!--        app:layout_constraintStart_toStartOf="parent"-->
-    <!--        app:layout_constraintTop_toBottomOf="@+id/linearLayout2">-->
-
-
-    <!--        <LinearLayout-->
-    <!--            android:layout_width="match_parent"-->
-    <!--            android:layout_height="300dp"-->
-    <!--            android:layout_marginTop="50dp"-->
-    <!--            android:orientation="vertical">-->
-
-    <!--<LinearLayout-->
-    <!--android:id="@+id/linearLayout1"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="40dp"-->
-    <!--android:layout_marginEnd="8dp"-->
-    <!--android:layout_marginStart="8dp"-->
-    <!--android:orientation="horizontal"-->
-    <!--app:layout_constraintEnd_toEndOf="parent"-->
-    <!--app:layout_constraintStart_toStartOf="parent"-->
-    <!--app:layout_constraintTop_toBottomOf="@+id/linearLayout3">-->
-
-    <!--<TextView-->
-    <!--style="@style/alltext"-->
-    <!--android:layout_width="105dp"-->
-    <!--android:layout_height="match_parent"-->
-
-    <!--android:text="外胎码:" />-->
-
-    <!--<TextView-->
-    <!--android:id="@+id/wtbm"-->
-    <!--style="@style/infotext"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="match_parent" />-->
-    <!--</LinearLayout>-->
-
-    <LinearLayout
-        android:id="@+id/linearLayout4"
-        style="@style/layout_t12_s8_style"
-        android:layout_width="match_parent"
-        android:layout_height="45dp">
-
-        <TextView
-            style="@style/alltext"
-            android:layout_width="90dp"
-            android:layout_height="match_parent"
-            android:text="品    牌:"
-             />
-
-        <TextView
-            android:id="@+id/pinpai"
-            style="@style/textView_info_style"
-
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/linearLayout9"
-        style="@style/layout_t12_s8_style"
-        android:layout_width="match_parent"
-        android:layout_height="45dp">
-
-        <TextView
-            style="@style/alltext"
-            android:layout_width="90dp"
-            android:layout_height="match_parent"
-            android:text="型    号:"
-             />
-
-        <TextView
-            android:id="@+id/xinghao"
-            style="@style/textView_info_style"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/linearLayout5"
-        style="@style/layout_t12_s8_style"
-        android:layout_width="match_parent"
-        android:layout_height="45dp">
-
-        <TextView
-            style="@style/alltext"
-            android:layout_width="90dp"
-            android:layout_height="match_parent"
-            android:text="层    级:"
-             />
-
-        <TextView
-            android:id="@+id/cengji"
-            style="@style/textView_info_style"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/linearLayout6"
-        style="@style/layout_t12_s8_style"
-        android:layout_width="match_parent"
-        android:layout_height="45dp">
-
-        <TextView
-            style="@style/alltext"
-            android:layout_width="90dp"
-            android:layout_height="match_parent"
-            android:text="花    纹:"
-             />
-
-        <TextView
-            android:id="@+id/huawen"
-            style="@style/textView_info_style"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </LinearLayout>
-
-   <LinearLayout
-        style="@style/layout_t12_s8_style"
-        android:layout_width="match_parent"
-        android:layout_height="45dp">
-
-        <TextView
-            style="@style/alltext"
-            android:layout_width="90dp"
-            android:layout_height="match_parent"
-            android:text="气    压:"
-             />
-
-        <TextView
-            style="@style/textView_info_style"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </LinearLayout>
-
-   <LinearLayout
-        style="@style/layout_t12_s8_style"
-        android:layout_width="match_parent"
-        android:layout_height="45dp">
-
-        <TextView
-            style="@style/alltext"
-            android:layout_width="90dp"
-            android:layout_height="match_parent"
-            android:text="花纹深度:" />
-
-        <TextView
-            style="@style/textView_info_style"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </LinearLayout>
-
-
-   <LinearLayout
-        style="@style/layout_t12_s8_style"
-        android:layout_width="match_parent"
-        android:layout_height="45dp">
-
-        <TextView
-            style="@style/alltext"
-            android:layout_width="90dp"
-            android:layout_height="match_parent"
-            android:text="剩余花纹:" />
-
-        <TextView
-            style="@style/textView_info_style"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </LinearLayout>
-
-
-
-
-
-    <!--<LinearLayout-->
-    <!--android:id="@+id/linearLayout7"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="40dp"-->
-    <!--android:layout_marginStart="8dp"-->
-    <!--android:layout_marginEnd="8dp"-->
-    <!--android:orientation="horizontal"-->
-    <!--app:layout_constraintEnd_toEndOf="parent"-->
-    <!--app:layout_constraintStart_toStartOf="parent"-->
-    <!--app:layout_constraintTop_toBottomOf="@+id/linearLayout3">-->
-    <!--<TextView-->
-    <!--style="@style/alltext"-->
-    <!--android:layout_width="105dp"-->
-    <!--android:layout_height="match_parent"-->
-
-    <!--android:text="状    态:" />-->
-
-    <!--<TextView-->
-    <!--android:id="@+id/zhuangtai"-->
-    <!--style="@style/infotext"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="match_parent"-->
-    <!--/>-->
-    <!--</LinearLayout>-->
-    <!--<LinearLayout-->
-    <!--android:id="@+id/linearLayout8"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="40dp"-->
-    <!--android:layout_marginStart="8dp"-->
-    <!--android:layout_marginEnd="8dp"-->
-    <!--android:orientation="horizontal"-->
-    <!--app:layout_constraintEnd_toEndOf="parent"-->
-    <!--app:layout_constraintStart_toStartOf="parent"-->
-    <!--app:layout_constraintTop_toBottomOf="@+id/linearLayout3">-->
-    <!--<TextView-->
-    <!--style="@style/alltext"-->
-    <!--android:layout_width="105dp"-->
-    <!--android:layout_height="match_parent"-->
-
-    <!--android:text="总里程:" />-->
-
-    <!--<TextView-->
-    <!--android:id="@+id/zonglicheng"-->
-    <!--style="@style/infotext"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="match_parent"-->
-    <!--/>-->
-    <!--</LinearLayout>-->
-
-    <!--<FrameLayout-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="match_parent"-->
-    <!--android:id="@+id/framelayout_base"-->
-    <!--android:background="@color/xuebai"-->
-    <!--&gt;-->
-
-    <!--</FrameLayout>-->
-    <!--        </LinearLayout>-->
-    <!--    </LinearLayout>-->
-
-    <!--    <LinearLayout-->
-    <!--        android:layout_width="match_parent"-->
-    <!--        android:layout_height="55dp"-->
-    <!--        android:layout_marginStart="20dp"-->
-    <!--        android:layout_marginTop="600dp"-->
-    <!--        android:layout_marginEnd="20dp"-->
-    <!--        android:background="@drawable/bg_santex_coppy"-->
-    <!--        android:orientation="vertical"-->
-    <!--        app:layout_constraintEnd_toEndOf="parent"-->
-    <!--        app:layout_constraintHorizontal_bias="1.0"-->
-    <!--        app:layout_constraintStart_toStartOf="parent"-->
-    <!--        app:layout_constraintTop_toBottomOf="@+id/linearLayout2">-->
-
+    <!-- 4. 底部操作栏 -->
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <Button
-            android:id="@+id/scan_button"
-            style="@style/buttonStyle"
-            android:layout_width="0dp"
-            android:layout_height="55dp"
-            android:layout_margin="18dp"
-            android:layout_weight="1"
-            android:letterSpacing="1"
-            android:text="扫描" />
+        android:background="#FFFFFF"
+        android:elevation="8dp"
+        android:orientation="horizontal"
+        android:padding="16dp">
 
         <Button
             android:id="@+id/button"
-            style="@style/buttonStyle"
             android:layout_width="0dp"
-            android:layout_height="55dp"
-            android:layout_margin="18dp"
+            android:layout_height="48dp"
             android:layout_weight="1"
-            android:letterSpacing="1"
-            android:text="返回" />
+            android:layout_marginEnd="8dp"
+            android:backgroundTint="#333333"
+            android:text="返 回"
+            android:textColor="#FFFFFF"
+            android:textSize="16sp"
+            app:cornerRadius="6dp"/>
 
+        <Button
+            android:id="@+id/scan_button"
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            android:layout_weight="1"
+            android:layout_marginStart="8dp"
+            android:backgroundTint="#333333"
+            android:text="搜 索"
+            android:textColor="#FFFFFF"
+            android:textSize="16sp"
+            app:cornerRadius="6dp"/>
     </LinearLayout>
-    <!--    </LinearLayout>-->
-
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_up.xml b/app/src/main/res/layout/activity_up.xml
index 8a794e1..9e80f29 100644
--- a/app/src/main/res/layout/activity_up.xml
+++ b/app/src/main/res/layout/activity_up.xml
@@ -1,276 +1,322 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context="com.example.tyre.UpActivity">
-    <TextView
-        android:id="@+id/textView2"
-        style="@style/tablebarStyleTwo"
-        android:layout_width="match_parent"
-        android:layout_height="30dp"
-        android:text="轮胎装车"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <LinearLayout
-        android:id="@+id/linearLayout2"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginEnd="8dp"
-        android:orientation="horizontal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout3">
-        <TextView
-            style="@style/alltext"
-            android:layout_width="80dp"
-            android:layout_height="match_parent"
-            android:background="@color/blue2"
-            android:text="EPC:" />
-
-        <TextView
-            android:id="@+id/epc"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginStart="8dp"
-            android:layout_weight="1"
-            android:textSize="15sp"
-            android:textColor="@color/black"
-            android:background="@drawable/bg_santex_coppy"
-            android:gravity="center" />
-    </LinearLayout>
+    android:background="#F5F7FA"
+    android:padding="8dp">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginEnd="8dp"
-        android:orientation="horizontal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout3">
-        <TextView
-            style="@style/alltext"
-            android:layout_width="80dp"
-            android:layout_height="match_parent"
-            android:background="@color/blue2"
-            android:text="胎号:" />
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
+        <!-- 页面标题 -->
         <TextView
-            android:id="@+id/th"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginStart="8dp"
-            android:layout_weight="1"
-            android:textSize="15sp"
-            android:textColor="@color/black"
-            android:background="@drawable/bg_santex_coppy"
-            android:gravity="center" />
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginEnd="8dp"
-        android:orientation="horizontal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout3">
-        <TextView
-            style="@style/alltext"
-            android:layout_width="80dp"
-            android:layout_height="match_parent"
-            android:background="@color/blue2"
-            android:text="自编号:" />
-
-        <EditText
-            android:id="@+id/zbh"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginStart="8dp"
-            android:layout_weight="1"
-            android:textSize="15sp"
-            android:textColor="@color/black"
-            android:background="@drawable/bg_santex_coppy"
+            android:layout_height="56dp"
+            android:background="#FFFFFF"
+            android:elevation="4dp"
             android:gravity="center"
-            android:inputType="textVisiblePassword"/>
-    </LinearLayout>
+            android:layout_marginBottom="16dp"
+            android:padding="8dp"
+            android:text="轮胎装车管理"
+            android:textColor="#333333"
+            android:textSize="20sp"
+            android:textStyle="bold" />
 
-    <LinearLayout
-        android:id="@+id/linearLayout4"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginEnd="8dp"
-        android:orientation="horizontal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout3">
-        <TextView
-            style="@style/alltext"
-            android:layout_width="80dp"
-            android:layout_height="match_parent"
-            android:background="@color/blue2"
-            android:text="车牌号:" />
-
-        <EditText
-            android:id="@+id/car"
+        <!-- 主表单卡片 -->
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginStart="8dp"
-            android:layout_weight="1"
-            android:background="@drawable/bg_santex_coppy"
-            android:gravity="center"
-            android:inputType="number"
-            android:textColor="@color/black"
-            android:textSize="22sp"
-            />
-        <Button
-            android:id="@+id/searchButton"
-            android:layout_width="50dp"
-            android:layout_height="match_parent"
-            android:background="@mipmap/search_icon"
-            android:contentDescription="搜索" />
+            android:layout_height="wrap_content"
+            app:cardCornerRadius="12dp"
+            app:cardElevation="8dp"
+            android:layout_marginBottom="16dp">
 
-        <!--        <Spinner-->
-<!--            android:id="@+id/carAdapter"-->
-<!--            android:layout_width="50dp"-->
-<!--            android:layout_height="match_parent"></Spinner>-->
-    </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="16dp">
 
-    <LinearLayout
-        android:id="@+id/linearLayout1"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginEnd="8dp"
-        android:orientation="horizontal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout3">
-        <TextView
-            style="@style/alltext"
-            android:layout_width="80dp"
-            android:layout_height="match_parent"
-            android:background="@color/blue2"
-            android:text="起始里程:" />
+                <!-- 第一行：EPC芯片 (独立一行) -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:layout_marginBottom="12dp">
 
-        <EditText
-            android:id="@+id/start"
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="EPC芯片"
+                        android:textColor="#666666"
+                        android:textSize="12sp"
+                        android:layout_marginStart="4dp"/>
+
+                    <!-- 使用TextView显示EPC，背景使用圆角 -->
+                    <TextView
+                        android:id="@+id/epc"
+                        android:layout_width="match_parent"
+                        android:layout_height="48dp"
+                        android:layout_marginTop="4dp"
+                        android:background="@drawable/rounded_input_bg"
+                        android:gravity="center_vertical"
+                        android:paddingStart="12dp"
+                        android:text="请扫描EPC"
+                        android:textColor="#555"
+                        android:textSize="16sp" />
+                </LinearLayout>
+
+                <!-- 第二行：胎号 + 自编号 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="12dp">
+
+                    <!-- 胎号 -->
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:layout_marginEnd="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="胎号"
+                            android:textColor="#666666"
+                            android:textSize="12sp"
+                            android:layout_marginStart="4dp"/>
+
+                        <EditText
+                            android:id="@+id/th"
+                            android:layout_width="match_parent"
+                            android:layout_height="48dp"
+                            android:layout_marginTop="4dp"
+                            android:background="@drawable/rounded_input_bg"
+                            android:gravity="center_vertical"
+                            android:paddingStart="12dp"
+                            android:text="未读取"
+                            android:textColor="#555"
+                            android:textSize="16sp" />
+                    </LinearLayout>
+
+                    <!-- 自编号 -->
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="自编号"
+                            android:textColor="#666666"
+                            android:textSize="12sp"
+                            android:layout_marginStart="4dp"/>
+
+                        <EditText
+                            android:id="@+id/zbh"
+                            android:layout_width="match_parent"
+                            android:layout_height="48dp"
+                            android:layout_marginTop="4dp"
+                            android:background="@drawable/rounded_input_bg"
+                            android:gravity="center_vertical"
+                            android:paddingStart="12dp"
+                            android:textColor="#555"
+                            android:textSize="16sp"
+                            android:hint="请输入自编号" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <!-- 第三行：车牌号 (带搜索图标) -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="12dp">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:layout_marginEnd="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="车牌号"
+                            android:textColor="#666666"
+                            android:textSize="12sp"
+                            android:layout_marginStart="4dp"/>
+
+                        <EditText
+                            android:id="@+id/car"
+                            android:layout_width="match_parent"
+                            android:layout_height="48dp"
+                            android:layout_marginTop="4dp"
+                            android:background="@drawable/rounded_input_bg"
+                            android:gravity="center_vertical"
+                            android:paddingStart="12dp"
+                            android:textColor="#555"
+                            android:textSize="16sp"
+                            android:hint="请输入或扫描" />
+                    </LinearLayout>
+
+                    <!-- 搜索按钮 -->
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.4"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="操作"
+                            android:textColor="#666666"
+                            android:textSize="12sp"
+                            android:layout_marginStart="4dp"/>
+
+                        <Button
+                            android:id="@+id/searchButton"
+                            android:layout_width="match_parent"
+                            android:layout_height="48dp"
+                            android:layout_marginTop="4dp"
+                            android:backgroundTint="#007AFF"
+                            android:text="🔍 搜索"
+                            android:textColor="#FFFFFF" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <!-- 第四行：起始里程 + 安装轮位 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="12dp">
+
+                    <!-- 起始里程 -->
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:layout_marginEnd="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="起始里程"
+                            android:textColor="#666666"
+                            android:textSize="12sp"
+                            android:layout_marginStart="4dp"/>
+
+                        <EditText
+                            android:id="@+id/start"
+                            android:layout_width="match_parent"
+                            android:layout_height="48dp"
+                            android:layout_marginTop="4dp"
+                            android:background="@drawable/rounded_input_bg"
+                            android:gravity="center_vertical"
+                            android:paddingStart="12dp"
+                            android:textColor="#555"
+                            android:textSize="16sp"
+                            android:hint="0"
+                            android:inputType="number" />
+                    </LinearLayout>
+
+                    <!-- 安装轮位 -->
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="安装轮位"
+                            android:textColor="#666666"
+                            android:textSize="12sp"
+                            android:layout_marginStart="4dp"/>
+
+                        <Spinner
+                            android:id="@+id/condition"
+                            android:layout_width="match_parent"
+                            android:layout_height="48dp"
+                            android:layout_marginTop="4dp"
+                            android:background="@drawable/rounded_input_bg"
+                            android:paddingStart="12dp"
+                            android:spinnerMode="dropdown" />
+                    </LinearLayout>
+                </LinearLayout>
+                <!-- 花纹深度（独立一行） -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:layout_marginBottom="12dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="花纹深度"
+                        android:textColor="#666666"
+                        android:textSize="12sp"
+                        android:layout_marginStart="4dp" />
+
+                    <EditText
+                        android:id="@+id/patternDepth"
+                        style="@style/infotext"
+                        android:layout_width="match_parent"
+                        android:layout_height="48dp"
+                        android:background="@drawable/rounded_input_bg"
+                        android:paddingStart="12dp"
+                        android:textSize="16sp"
+                        android:inputType="numberDecimal"
+                        android:hint="请输入花纹深度" />
+                </LinearLayout>
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <!-- 底部操作按钮 -->
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginStart="8dp"
-            android:layout_weight="1"
-            android:textSize="22sp"
-            android:textColor="@color/black"
-            android:background="@drawable/bg_santex_coppy"
-            android:gravity="center"
-            android:inputType="number"/>
-    </LinearLayout>
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="24dp">
 
-    <LinearLayout
-        android:id="@+id/linearLayout5"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginEnd="8dp"
-        android:orientation="horizontal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout3">
-        <TextView
-            style="@style/alltext"
-            android:layout_width="80dp"
-            android:layout_height="match_parent"
-            android:background="@color/blue2"
-            android:text="安装轮位:" />
+            <Button
+                android:id="@+id/confirmButton"
+                android:layout_width="0dp"
+                android:layout_height="60dp"
+                android:layout_weight="1"
+                android:layout_marginEnd="8dp"
+                android:backgroundTint="#333333"
+                android:text="确 认 装 车"
+                android:textColor="#FFFFFF"
+                android:textSize="18sp"
+                android:elevation="4dp" />
 
-        <TextView
-            android:id="@+id/azlw"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginStart="8dp"
-            android:layout_weight="1"
-            android:textSize="22sp"
-            android:textColor="@color/black"
-            android:background="@drawable/bg_santex_coppy"
-            android:gravity="center" />
-        <Spinner
-            android:id="@+id/condition"
-            android:layout_width="30dp"
-            android:layout_height="match_parent"></Spinner>
-    </LinearLayout>
-    <!--<LinearLayout-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="40dp"-->
-        <!--android:layout_marginStart="8dp"-->
-        <!--android:layout_marginTop="20dp"-->
-        <!--android:layout_marginEnd="8dp"-->
-        <!--android:orientation="horizontal"-->
-        <!--app:layout_constraintEnd_toEndOf="parent"-->
-        <!--app:layout_constraintStart_toStartOf="parent"-->
-        <!--app:layout_constraintTop_toBottomOf="@+id/linearLayout3">-->
-        <!--<TextView-->
-            <!--style="@style/alltext"-->
-            <!--android:layout_width="80dp"-->
-            <!--android:layout_height="match_parent"-->
-            <!--android:background="@color/blue2"-->
-            <!--android:text="操作人:" />-->
-
-        <!--<TextView-->
-            <!--android:id="@+id/czr"-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="match_parent"-->
-            <!--android:layout_marginStart="8dp"-->
-            <!--android:layout_weight="1"-->
-            <!--android:textSize="22sp"-->
-            <!--android:textColor="@color/black"-->
-            <!--android:background="@drawable/bg_santex_coppy"-->
-            <!--android:gravity="center" />-->
-        <!--<Spinner-->
-            <!--android:id="@+id/spinner2"-->
-            <!--android:entries="@array/user"-->
-            <!--android:layout_width="30dp"-->
-            <!--android:layout_height="match_parent"></Spinner>-->
-    <!--</LinearLayout>-->
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginTop="50dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginStart="50dp"
-        android:layout_marginEnd="50dp"
-        android:orientation="horizontal">
-        <Button
-            android:id="@+id/ok"
-            android:layout_width="150dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="完成"
-            style="@style/buttonStyle"/>
-        <View
-            android:layout_width="50dp"
-            android:layout_height="match_parent"
-            />
-        <Button
-            android:id="@+id/back"
-            android:layout_width="150dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:text="返回"
-            style="@style/buttonStyle"/>
+            <Button
+                android:id="@+id/back"
+                android:layout_width="0dp"
+                android:layout_height="60dp"
+                android:layout_weight="1"
+                android:layout_marginStart="8dp"
+                android:backgroundTint="#333333"
+                android:text="取 消"
+                android:textColor="#FFFFFF"
+                android:textSize="18sp"
+                android:elevation="4dp" />
+        </LinearLayout>
 
     </LinearLayout>
-
-</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_timeline.xml b/app/src/main/res/layout/item_timeline.xml
new file mode 100644
index 0000000..89d1bc5
--- /dev/null
+++ b/app/src/main/res/layout/item_timeline.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingBottom="16dp">
+
+    <!-- 左侧：时间轴线和圆点 -->
+    <LinearLayout
+        android:layout_width="24dp"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <!-- 圆点 -->
+        <View
+            android:layout_width="10dp"
+            android:layout_height="10dp"
+            android:background="@drawable/shape_circle_blue" />
+
+        <!-- 竖线 (默认显示，代码中会控制最后一条隐藏) -->
+        <View
+            android:id="@+id/view_line"
+            android:layout_width="2dp"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_marginTop="4dp"
+            android:background="#E0E0E0" />
+    </LinearLayout>
+
+    <!-- 右侧：内容区域 -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingStart="8dp">
+
+        <!-- 时间 -->
+        <TextView
+            android:id="@+id/tv_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="2026-04-20 12:23:28"
+            android:textColor="#999999"
+            android:textSize="13sp" />
+
+        <!-- 标题 (加粗) -->
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:text="轮胎安装: 赵宁波"
+            android:textColor="#333333"
+            android:textSize="15sp"
+            android:textStyle="bold" />
+
+        <!-- 详情 -->
+        <TextView
+            android:id="@+id/tv_content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:text="车辆: 粤B08499D | 轮位: 右外轮"
+            android:textColor="#666666"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c0abb5c..468a752 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,6 +9,7 @@
     <color name="black">#232323</color>
     <color name="blue2">#F0F5FD</color>
     <color name="green">#E6E8F6FC</color>
+    <color name="green500">#E60FED3B</color>
     <color name="title">#3b4753</color>
     <color name="textColor1">#2C3E50</color>
     <color name="textColor2">#94A4A5</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d84467e..448d7e9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -83,4 +83,24 @@
         <!--是否模糊-->
         <item name="android:backgroundDimEnabled">true</item>
     </style>
+
+    <!-- 紧凑型标签样式 -->
+    <style name="label_style_compact">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">#666666</item>
+        <item name="android:textSize">12sp</item>
+    </style>
+
+    <!-- 紧凑型内容样式 -->
+    <style name="value_style_compact">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textColor">#333333</item>
+        <item name="android:textSize">15sp</item>
+        <!-- 关键修改：减小内边距，移除固定高度 -->
+        <item name="android:paddingTop">4dp</item>
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:paddingStart">2dp</item>
+    </style>
 </resources>
diff --git a/build.gradle b/build.gradle
index a062a77..98e442b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,6 +2,9 @@
 
 buildscript {
     
+    ext {
+        agp_version = '8.1.2'
+    }
     repositories {
         google()
         maven{url"https://jitpack.io"}
@@ -13,7 +16,7 @@ buildscript {
         maven{url'https://maven.aliyun.com/repository/public'}
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath "com.android.tools.build:gradle:$agp_version"
     }
 }