增加 - 检测弹出页面时间

master
wanghao 2 months ago
parent 488407ed9d
commit befc3d6c94

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

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

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

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

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

Loading…
Cancel
Save