From 0d72d4cdc241a4b641d3b901b4d06b8a3232120e Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Thu, 29 Feb 2024 11:32:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E5=8D=8A=E6=88=90?=
 =?UTF-8?q?=E5=93=81=E5=87=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   1 +
 app/src/main/AndroidManifest.xml              |  24 ++--
 .../jingyuan_mes/base/BaseActivity.java       |   2 +-
 .../jingyuan_mes/check/CheckActivity.java     |  16 +++
 app/src/main/res/layout/activity_check.xml    | 128 ++++++++++++++++++
 5 files changed, 162 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/java/com/example/jingyuan_mes/check/CheckActivity.java
 create mode 100644 app/src/main/res/layout/activity_check.xml

diff --git a/.gitignore b/.gitignore
index aa724b7..bb035db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 .externalNativeBuild
 .cxx
 local.properties
+/release
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b15cf42..f8ad046 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,6 +17,9 @@
         android:theme="@style/Theme.Jingyuanmes"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
+        <activity
+            android:name=".check.CheckActivity"
+            android:exported="false" />
         <activity
             android:name=".store.SemiActivity"
             android:exported="false" />
@@ -38,9 +41,6 @@
         <activity
             android:name=".store.ProductOutApplyActivity"
             android:exported="true" />
-        <activity
-            android:name=".store.SemiFinishedActivity"
-            android:exported="false" />
         <activity
             android:name=".store.ProductInActivity"
             android:exported="true" />
@@ -59,11 +59,13 @@
         <activity
             android:name=".HomePageActivity"
             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.MAIN" /> -->
+
+
+            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
+            <!-- </intent-filter> -->
         </activity>
         <activity
             android:name=".store.MaterialOutListActivity"
@@ -73,7 +75,13 @@
             android:exported="true" />
         <activity
             android:name=".MainActivity"
-            android:exported="true" />
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/jingyuan_mes/base/BaseActivity.java b/app/src/main/java/com/example/jingyuan_mes/base/BaseActivity.java
index 97824a6..9c5ecba 100644
--- a/app/src/main/java/com/example/jingyuan_mes/base/BaseActivity.java
+++ b/app/src/main/java/com/example/jingyuan_mes/base/BaseActivity.java
@@ -37,7 +37,7 @@ public class BaseActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         Log.e("TAG", this.getLocalClassName() );
         gson = new Gson();
-        SharedPreferencesUtils.putstring("access_token",handle);
+        // SharedPreferencesUtils.putstring("access_token",handle);
         this.context=this;
         initDialog();
         // initSan();
diff --git a/app/src/main/java/com/example/jingyuan_mes/check/CheckActivity.java b/app/src/main/java/com/example/jingyuan_mes/check/CheckActivity.java
new file mode 100644
index 0000000..59f1e3d
--- /dev/null
+++ b/app/src/main/java/com/example/jingyuan_mes/check/CheckActivity.java
@@ -0,0 +1,16 @@
+package com.example.jingyuan_mes.check;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+import com.example.jingyuan_mes.R;
+
+public class CheckActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_check);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_check.xml b/app/src/main/res/layout/activity_check.xml
new file mode 100644
index 0000000..bd0b6fe
--- /dev/null
+++ b/app/src/main/res/layout/activity_check.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        tools:context=".check.CheckActivity">
+
+        <include
+            layout="@layout/toolbar"
+            app:title='@{title??"物料检验"}' />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="45dp"
+            android:layout_margin="8dp"
+            android:background="@drawable/san_text_bg"
+            android:padding="4dp">
+
+            <EditText
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@color/white"
+                android:hint="请输入领用人名称"
+                android:text="@={vm.searchText}" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:onClick="outPassSearch"
+                android:src="@mipmap/ic_search" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="45dp"
+            android:layout_marginEnd="4dp">
+
+            <TextView
+                style="@style/text_title"
+                android:layout_width="90dp"
+                android:layout_height="match_parent"
+                android:text="扫描物料:" />
+
+            <TextView
+                style="@style/text_info"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@={vm.instockBatch}" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="45dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="4dp">
+
+            <TextView
+                style="@style/text_title"
+                android:layout_width="90dp"
+                android:layout_height="match_parent"
+                android:text="物料编号:" />
+
+            <TextView
+                style="@style/text_info"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="@={vm.instockBatch}" />
+
+            <TextView
+                style="@style/text_title"
+                android:layout_width="90dp"
+                android:layout_height="match_parent"
+                android:text="物料名称:" />
+
+            <TextView
+                style="@style/text_info"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="@={vm.instockBatch}" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="45dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="4dp">
+
+            <TextView
+                style="@style/text_title"
+                android:layout_width="90dp"
+                android:layout_height="match_parent"
+                android:text="检验类型:" />
+
+            <TextView
+                style="@style/text_info"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="@={vm.instockBatch}" />
+
+            <TextView
+                style="@style/text_title"
+                android:layout_width="90dp"
+                android:layout_height="match_parent"
+                android:text="检验状态:" />
+
+            <TextView
+                style="@style/text_info"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:text="@={vm.instockBatch}" />
+        </LinearLayout>
+
+
+    </LinearLayout>
+</layout>
\ No newline at end of file