From befc3d6c94f804b57fb8a9973be6977b894abfe1 Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Thu, 19 Sep 2024 13:31:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20-=20=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E9=A1=B5=E9=9D=A2=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |  2 +-
 .idea/misc.xml                                |  3 +-
 app/build.gradle                              |  4 +-
 .../example/aucma_mes/entity/DefectBeen.java  |  9 ++
 app/src/main/res/layout/item_repair_info.xml  | 83 ++++++++++++-------
 5 files changed, 67 insertions(+), 34 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0c51b85..a058051 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,7 +8,7 @@
         <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="17" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d7916a5..0f86676 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,5 @@
 <project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index bbb73c4..93108c9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.example.aucma_mes"
         minSdk 24
         targetSdk 33
-        versionCode 12
-        versionName "1.12"
+        versionCode 13
+        versionName "1.13"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/example/aucma_mes/entity/DefectBeen.java b/app/src/main/java/com/example/aucma_mes/entity/DefectBeen.java
index 9868a6d..d812c39 100644
--- a/app/src/main/java/com/example/aucma_mes/entity/DefectBeen.java
+++ b/app/src/main/java/com/example/aucma_mes/entity/DefectBeen.java
@@ -25,6 +25,15 @@ public class DefectBeen extends BaseObservable {
     private String productLineName;//pda 工位名称
     private String productLineCode;
 
+    private String inspectorTime;
+
+    public String getInspectorTime() {
+        return inspectorTime;
+    }
+
+    public void setInspectorTime(String inspectorTime) {
+        this.inspectorTime = inspectorTime;
+    }
 
     public String getProductLineCode() {
         return productLineCode;
diff --git a/app/src/main/res/layout/item_repair_info.xml b/app/src/main/res/layout/item_repair_info.xml
index 2b5b47a..6cdb10b 100644
--- a/app/src/main/res/layout/item_repair_info.xml
+++ b/app/src/main/res/layout/item_repair_info.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <data>
+
         <variable
             name="item"
             type="com.example.aucma_mes.entity.DefectBeen" />
@@ -28,34 +29,58 @@
             android:layout_height="match_parent"
             android:background="@color/white" />
 
-<!--        <TextView-->
-<!--            style="@style/item_text_style"-->
-<!--            android:layout_width="65dp"-->
-<!--            android:layout_height="match_parent"-->
-<!--            android:text="@{item.qualityDefectCode}" />  -->
-        <TextView
-            style="@style/item_text_style"
-            android:layout_width="105dp"
+        <!--        <TextView-->
+        <!--            style="@style/item_text_style"-->
+        <!--            android:layout_width="65dp"-->
+        <!--            android:layout_height="match_parent"-->
+        <!--            android:text="@{item.qualityDefectCode}" />  -->
+
+        <LinearLayout
+            android:layout_width="218dp"
             android:layout_height="wrap_content"
-            android:minHeight="44dp"
-            android:layout_gravity="center"
-            android:text="@{item.productLineName}" />
 
-        <View
-            android:layout_width="2dp"
-            android:layout_height="match_parent"
-            android:background="@color/white" />
+            android:orientation="vertical">
 
-        <TextView
-            style="@style/item_text_style"
-            android:layout_width="110dp"
-            android:layout_height="wrap_content"
-            android:minHeight="44dp"
-            android:layout_gravity="center"
-            android:paddingStart="1dp"
-            android:paddingEnd="1dp"
-            android:text="@{item.qualityDefectName}"
-            tools:ignore="InefficientWeight" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    style="@style/item_text_style"
+                    android:layout_width="105dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:minHeight="44dp"
+                    android:text="@{item.productLineName}" />
+
+                <View
+                    android:layout_width="2dp"
+                    android:layout_height="match_parent"
+                    android:background="@color/white" />
+
+                <TextView
+                    style="@style/item_text_style"
+                    android:layout_width="110dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:minHeight="44dp"
+                    android:paddingStart="1dp"
+                    android:paddingEnd="1dp"
+                    android:text="@{item.qualityDefectName}"
+                    tools:ignore="InefficientWeight" />
+            </LinearLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/white" />
+            <TextView
+                style="@style/item_text_style"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@{item.inspectorTime}" />
+        </LinearLayout>
 
         <View
             android:layout_width="2dp"
@@ -68,8 +93,8 @@
             android:layout_width="50dp"
             android:layout_height="match_parent"
             android:text='@{item.processResult}'
-            android:textSize="15sp"
-            android:textColor="#E71717" />
+            android:textColor="#E71717"
+            android:textSize="15sp" />
 
 
     </LinearLayout>