生命周期页面添加

.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>

.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$" />

.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">

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);
+                    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);
@@ -329,6 +400,41 @@ public class TyreSearchActivity extends AppCompatActivity {
                         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("");
                     xinghao.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();
+        }
+    }
 }

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;
     }

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";
 }

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>

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>

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">
-
-        <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"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </LinearLayout>
-
-
-    <!--    <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">-->
+        android:layout_height="0dp"
+        android:layout_weight="1">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal">
+            android:orientation="vertical"
+            android:padding="16dp">
 
-        <Button
-            android:id="@+id/scan_button"
-            style="@style/buttonStyle"
+            <!-- 轮胎信息卡片 (保持原有结构，仅微调) -->
+            <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="55dp"
-            android:layout_margin="18dp"
-            android:layout_weight="1"
-            android:letterSpacing="1"
-            android:text="扫描" />
+                            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下方，底部按钮上方 -->
+
+
+    <!-- 4. 底部操作栏 -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        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="返回" />
-
-    </LinearLayout>
-    <!--    </LinearLayout>-->
-
+            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>

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" />
+    android:background="#F5F7FA"
+    android:padding="8dp">
 
     <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:" />
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
+        <!-- 页面标题 -->
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:background="#FFFFFF"
+            android:elevation="4dp"
+            android:gravity="center"
+            android:layout_marginBottom="16dp"
+            android:padding="8dp"
+            android:text="轮胎装车管理"
+            android:textColor="#333333"
+            android:textSize="20sp"
+            android:textStyle="bold" />
+
+        <!-- 主表单卡片 -->
+        <androidx.cardview.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:cardCornerRadius="12dp"
+            app:cardElevation="8dp"
+            android:layout_marginBottom="16dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="16dp">
+
+                <!-- 第一行：EPC芯片 (独立一行) -->
+                <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="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="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" />
+                        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="40dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginEnd="8dp"
+                    android:layout_height="wrap_content"
                     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_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="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" />
+                            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="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">
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
                         <TextView
-            style="@style/alltext"
-            android:layout_width="80dp"
-            android:layout_height="match_parent"
-            android:background="@color/blue2"
-            android:text="自编号:" />
+                            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="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"
-            android:inputType="textVisiblePassword"/>
+                            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: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:layout_height="wrap_content"
                     android:orientation="horizontal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout3">
+                    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
-            style="@style/alltext"
-            android:layout_width="80dp"
-            android:layout_height="match_parent"
-            android:background="@color/blue2"
-            android:text="车牌号:" />
+                            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="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="搜索" />
-
-        <!--        <Spinner-->
-<!--            android:id="@+id/carAdapter"-->
-<!--            android:layout_width="50dp"-->
-<!--            android:layout_height="match_parent"></Spinner>-->
+                            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: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">
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.4"
+                        android:orientation="vertical">
+
                         <TextView
-            style="@style/alltext"
-            android:layout_width="80dp"
-            android:layout_height="match_parent"
-            android:background="@color/blue2"
-            android:text="起始里程:" />
+                            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="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: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: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="安装轮位:" />
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
 
                         <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" />
+                            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="30dp"
-            android:layout_height="match_parent"></Spinner>
+                            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-->
-        <!--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>
+                <!-- 花纹深度（独立一行） -->
                 <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">
+                    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="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="24dp">
+
             <Button
-            android:id="@+id/ok"
-            android:layout_width="150dp"
-            android:layout_height="match_parent"
+                android:id="@+id/confirmButton"
+                android:layout_width="0dp"
+                android:layout_height="60dp"
                 android:layout_weight="1"
-            android:text="完成"
-            style="@style/buttonStyle"/>
-        <View
-            android:layout_width="50dp"
-            android:layout_height="match_parent"
-            />
+                android:layout_marginEnd="8dp"
+                android:backgroundTint="#333333"
+                android:text="确 认 装 车"
+                android:textColor="#FFFFFF"
+                android:textSize="18sp"
+                android:elevation="4dp" />
+
             <Button
                 android:id="@+id/back"
-            android:layout_width="150dp"
-            android:layout_height="match_parent"
+                android:layout_width="0dp"
+                android:layout_height="60dp"
                 android:layout_weight="1"
-            android:text="返回"
-            style="@style/buttonStyle"/>
-
+                android:layout_marginStart="8dp"
+                android:backgroundTint="#333333"
+                android:text="取 消"
+                android:textColor="#FFFFFF"
+                android:textSize="18sp"
+                android:elevation="4dp" />
         </LinearLayout>
 
     </LinearLayout>
+</ScrollView>

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>

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>

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>

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"
     }
 }