diff --git a/app/src/main/java/com/example/tyre/TyreSearchActivity.java b/app/src/main/java/com/example/tyre/TyreSearchActivity.java index d4eed7d..8844d4d 100644 --- a/app/src/main/java/com/example/tyre/TyreSearchActivity.java +++ b/app/src/main/java/com/example/tyre/TyreSearchActivity.java @@ -62,10 +62,15 @@ public class TyreSearchActivity extends AppCompatActivity { EditText inSantext; Button basemessage; Button button; + Button scanButton; TextView pinpai; TextView xinghao; TextView cengji; TextView huawen; + TextView huawendepth; + TextView shengyuhuawen; + TextView zhuangtai; + TextView qiya; private int power = 0; private int area = 0; private SharedPreferences shared; @@ -84,7 +89,7 @@ public class TyreSearchActivity extends AppCompatActivity { binding = ActivityTyresearchBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); bindViews(); - // setupClickListeners(); + setupClickListeners(); manager = MyApplication.getManager(); initView(); Thread thread = new InventoryThread(); @@ -127,29 +132,29 @@ public class TyreSearchActivity extends AppCompatActivity { inSantext = binding.inSantext; // basemessage = binding.basemessage; button = binding.button; + scanButton = binding.scanButton; pinpai = binding.pinpai; xinghao = binding.xinghao; cengji = binding.cengji; huawen = binding.huawen; - + huawendepth = binding.huawendepth; + shengyuhuawen = binding.shengyuhuawen; + scanButton = binding.scanButton; + zhuangtai = binding.zhuangtai; + qiya = binding.qiya; } -// 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 -> { + find(textVersion.getText().toString().trim()); + finish(); + }); + binding.button.setOnClickListener(v -> { + Intent intent = new Intent(this, HomePageActivity.class); + startActivity(intent); + finish(); + }); + } @@ -200,7 +205,10 @@ public class TyreSearchActivity extends AppCompatActivity { xinghao = binding.xinghao; cengji = binding.cengji; huawen = binding.huawen; - + huawendepth = binding.huawendepth; + shengyuhuawen = binding.shengyuhuawen; + zhuangtai = binding.zhuangtai; + qiya = binding.qiya; listEPC = new ArrayList(); } private long exitTime = 0; @@ -387,6 +395,8 @@ public class TyreSearchActivity extends AppCompatActivity { String model = safeGetString(baseTyre.getTyreModel()); String level = safeGetString(baseTyre.getTyreLevel()); String pattern = safeGetString(baseTyre.getTyrePattern()); + String patternDeepth = safeGetString(baseTyre.getPatternDepth()); + String pressure = safeGetString(baseTyre.getPressure()); team = safeGetString(baseTyre.getTeam()); TYREPYTE = "new".equals(TYREPYTE) ? "全新胎" : TYREPYTE; patternDepth = safeGetString(baseTyre.getPatternDepth()); @@ -394,15 +404,160 @@ public class TyreSearchActivity extends AppCompatActivity { xinghao.setText(model); cengji.setText(level); huawen.setText(pattern); + huawendepth.setText(patternDeepth); + shengyuhuawen.setText(patternDeepth); + qiya.setText(pressure); + String carNo = baseTyre.getCarNo(); + if (carNo == null || "".equals(carNo)) { + zhuangtai.setText("未装车"); + } else { + zhuangtai.setText("已装车|车牌号："+ carNo); + } }else { pinpai.setText(""); xinghao.setText(""); cengji.setText(""); huawen.setText(""); + huawendepth.setText(""); + qiya.setText(""); } } - //出入库数据 List data = new ArrayList<>(); + if (dataObject.has("bizMaintenanceOrder") && !dataObject.get("bizMaintenanceOrder").isJsonNull()){ + JsonObject maintenanceOrderObj = dataObject.get("bizMaintenanceOrder").getAsJsonObject(); + if (maintenanceOrderObj.has("bizOrderTireDetailList") && !maintenanceOrderObj.get("bizOrderTireDetailList").isJsonNull()) { + JsonArray detailListArray = maintenanceOrderObj.get("bizOrderTireDetailList").getAsJsonArray(); + String mileage = maintenanceOrderObj.has("lastMileage") ? maintenanceOrderObj.get("lastMileage").getAsString() : ""; + String inputmileage = maintenanceOrderObj.has("inputMileage") ? maintenanceOrderObj.get("inputMileage").getAsString() : ""; + String type = maintenanceOrderObj.has("typeCode") ? maintenanceOrderObj.get("typeCode").getAsString() : ""; + String teams = maintenanceOrderObj.has("factoryName") ? maintenanceOrderObj.get("factoryName").getAsString() : ""; + String plateNumber = maintenanceOrderObj.has("plateNumber") ? maintenanceOrderObj.get("plateNumber").getAsString() : ""; + for (JsonElement element : detailListArray) { + // 3. 将每个元素转为 JsonObject，方便通过键名取值 + JsonObject itemObject = element.getAsJsonObject(); + // 4. 提取你需要的字段（假设里面有 "warehouseId" 和 "status" 字段） + String tyreNo = itemObject.has("tireCode") ? itemObject.get("tireCode").getAsString() : ""; + String time = itemObject.has("createTime") ? itemObject.get("createTime").getAsString() : ""; + String user = itemObject.has("createBy") ? itemObject.get("createBy").getAsString() : ""; + String wheel = itemObject.has("positionName") ? itemObject.get("positionName").getAsString() : ""; + String tirePress = itemObject.has("tirePress") ? itemObject.get("tirePress").getAsString() : ""; + // 直接获取，如果为 null 或不存在，自动返回 "" + String depth = itemObject.has("treadDepth") && !itemObject.get("treadDepth").isJsonNull() + ? itemObject.get("treadDepth").getAsString() + : ""; + if (type.equals("1")){ + data.add(new TimelineItem(time, "二级保养", Html.fromHtml("操作人:"+user+"
场站: "+teams+ + "
车辆信息: "+plateNumber+ + "
当前车辆里程: "+mileage+" KM"+ + "
上次车辆里程: "+inputmileage+"KM"+ + "
轮位: "+wheel+ + "
剩余花纹深度: "+depth+"mm"+ + "
胎压: "+tirePress))); + shengyuhuawen.setText(depth); + + }else if (type.equals("2")){ + data.add(new TimelineItem(time, "二级保养", Html.fromHtml("操作人:"+user+"
场站: "+teams+ + "
车辆信息: "+plateNumber+ + "
当前车辆里程: "+mileage+" KM"+ + "
上次车辆里程: "+inputmileage+"KM"+ + "
轮位: "+wheel+ + "
剩余花纹深度: "+depth+"mm"+ + "
胎压: "+tirePress))); + shengyuhuawen.setText(depth); + } + else if (type.equals("3")){ + data.add(new TimelineItem(time, "二级保养", Html.fromHtml("操作人:"+user+"
场站: "+teams+ + "
车辆信息: "+plateNumber+ + "
当前车辆里程: "+mileage+" KM"+ + "
上次车辆里程: "+inputmileage+"KM"+ + "
轮位: "+wheel+ + "
剩余花纹深度: "+depth+"mm"+ + "
胎压: "+tirePress))); + shengyuhuawen.setText(depth); + } + else if (type.equals("4")){ + data.add(new TimelineItem(time, "二级保养", Html.fromHtml("操作人:"+user+"
场站: "+teams+ + "
车辆信息: "+plateNumber+ + "
当前车辆里程: "+mileage+" KM"+ + "
上次车辆里程: "+inputmileage+"KM"+ + "
轮位: "+wheel+ + "
剩余花纹深度: "+depth+"mm"+ + "
胎压: "+tirePress))); + shengyuhuawen.setText(depth); + } + else if (type.equals("5")){ + data.add(new TimelineItem(time, "二级保养", Html.fromHtml("操作人:"+user+"
场站: "+teams+ + "
车辆信息: "+plateNumber+ + "
当前车辆里程: "+mileage+" KM"+ + "
上次车辆里程: "+inputmileage+"KM"+ + "
轮位: "+wheel+ + "
剩余花纹深度: "+depth+"mm"+ + "
胎压: "+tirePress))); + shengyuhuawen.setText(depth); + } + else if (type.equals("6")){ + data.add(new TimelineItem(time, "二级保养", Html.fromHtml("操作人:"+user+"
场站: "+teams+ + "
车辆信息: "+plateNumber+ + "
当前车辆里程: "+mileage+" KM"+ + "
上次车辆里程: "+inputmileage+"KM"+ + "
轮位: "+wheel+ + "
剩余花纹深度: "+depth+"mm"+ + "
胎压: "+tirePress))); + shengyuhuawen.setText(depth); + } + else if (type.equals("7")){ + data.add(new TimelineItem(time, "二级保养", Html.fromHtml("操作人:"+user+"
场站: "+teams+ + "
车辆信息: "+plateNumber+ + "
当前车辆里程: "+mileage+" KM"+ + "
上次车辆里程: "+inputmileage+"KM"+ + "
轮位: "+wheel+ + "
剩余花纹深度: "+depth+"mm"+ + "
胎压: "+tirePress))); + shengyuhuawen.setText(depth); + } + } + } + // 2. 遍历数组中的每一个元素 + + } + if (dataObject.has("recordTyreInstallList") && !dataObject.get("recordTyreInstallList").isJsonNull()){ + JsonElement resultBaseElement = dataObject.get("recordTyreInstallList"); + 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() : ""; + String wheel = itemObject.has("wheelPostion") ? itemObject.get("wheelPostion").getAsString() : ""; + String mileage = itemObject.has("mileage") ? itemObject.get("mileage").getAsString() : ""; + String carNo = itemObject.has("carNo") ? itemObject.get("carNo").getAsString() : ""; + // 直接获取，如果为 null 或不存在，自动返回 "" + String depth = itemObject.has("patternDepth") && !itemObject.get("patternDepth").isJsonNull() + ? itemObject.get("patternDepth").getAsString() + : ""; + if (type.equals("0")){ + data.add(new TimelineItem(time, "轮胎装车", Html.fromHtml("操作人:"+user+"
场站: "+team+ + "
车牌号: "+carNo+ + "
安装轮位: "+wheel+ + "
装车里程: "+mileage+" KM"+ + "
花纹深度: "+depth+"mm"))); + shengyuhuawen.setText(depth); + }else if (type.equals("1")){ + data.add(new TimelineItem(time, "轮胎卸车", Html.fromHtml("操作人:"+user+"
场站: "+team+ + "
车牌号: "+carNo+ + "
卸下轮位: "+wheel+ + "
剩余花纹深度: "+depth+"mm"+ + "
卸车里程: "+mileage+"KM"))); + shengyuhuawen.setText(depth); + } + } + } + //出入库数据 + if(dataObject.has("recordWarehousingList") && !dataObject.get("recordWarehousingList").isJsonNull()){ JsonElement resultBaseElement = dataObject.get("recordWarehousingList"); JsonArray jsonArray = resultBaseElement.getAsJsonArray(); @@ -419,21 +574,19 @@ public class TyreSearchActivity extends AppCompatActivity { if (type.equals("0")){ data.add(new TimelineItem(time, "轮胎入库", Html.fromHtml("操作人:"+user+"
场站: "+team+ "
轮胎类型: "+TYREPYTE+ - "
剩余花纹深度: "+patternDepth+"mm"+ - "
里程: "+"0"))); + "
剩余花纹深度: "+patternDepth+"mm"))); + }else if (type.equals("1")){ + data.add(new TimelineItem(time, "轮胎出库", Html.fromHtml("操作人:"+user+"
场站: "+team+ + "
轮胎类型: "+TYREPYTE+ + "
剩余花纹深度: "+patternDepth+"mm"))); } } - - // 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(); } + + + + renderTimeline(data); + data.clear(); } } catch (JsonSyntaxException e) { pinpai.setText(""); 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 9ca3e0f..7d5ed0f 100644 --- a/app/src/main/java/com/example/tyre/entity/BaseTyre.java +++ b/app/src/main/java/com/example/tyre/entity/BaseTyre.java @@ -52,6 +52,16 @@ public class BaseTyre private String patternDepth; + private String pressure; + + public String getPressure() { + return pressure; + } + + public void setPressure(String pressure) { + this.pressure = pressure; + } + public String getPatternDepth() { return patternDepth; } 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 51ccb52..cc1524f 100644 --- a/app/src/main/java/com/example/tyre/util/MyUrl.java +++ b/app/src/main/java/com/example/tyre/util/MyUrl.java @@ -6,7 +6,7 @@ package com.example.tyre.util; * @date: 2019-10-24 13:59 */ public class MyUrl { - // public static String url="http://192.168.137.1:8020"; + public static String url="http://192.168.0.18: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://10.11.187.77:8020"; } diff --git a/app/src/main/res/layout/activity_tyresearch.xml b/app/src/main/res/layout/activity_tyresearch.xml index 18605fa..83b853c 100644 --- a/app/src/main/res/layout/activity_tyresearch.xml +++ b/app/src/main/res/layout/activity_tyresearch.xml @@ -135,7 +135,7 @@ android:layout_columnWeight="1" android:orientation="vertical" android:layout_marginBottom="12dp"> - + @@ -147,7 +147,7 @@ android:orientation="vertical" android:layout_marginBottom="12dp"> - + @@ -158,7 +158,7 @@ android:orientation="vertical" android:layout_marginBottom="12dp"> - + @@ -239,7 +239,7 @@ app:cornerRadius="6dp"/>