From 92705cbd38d78d25e5905fedbb2debbf2a18c9c6 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Thu, 25 Jan 2024 09:31:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=B0=8F=E6=96=99?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/example/duken_mes/HomeActivity.java  |  4 ++--
 .../main/java/com/example/duken_mes/MainActivity.java  | 10 +++++++---
 app/src/main/res/layout/activity_main.xml              |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/example/duken_mes/HomeActivity.java b/app/src/main/java/com/example/duken_mes/HomeActivity.java
index b5b0f54..b4fd792 100644
--- a/app/src/main/java/com/example/duken_mes/HomeActivity.java
+++ b/app/src/main/java/com/example/duken_mes/HomeActivity.java
@@ -17,12 +17,12 @@ public class HomeActivity extends AppCompatActivity {
     }
 
     public void startAc1(View view) {
-        intent.putExtra("type",false);
+        intent.putExtra("type",true);
         startActivity(intent);
     }
 
     public void startAc2(View view) {
-        intent.putExtra("type",true);
+        intent.putExtra("type",false);
         startActivity(intent);
     }
 
diff --git a/app/src/main/java/com/example/duken_mes/MainActivity.java b/app/src/main/java/com/example/duken_mes/MainActivity.java
index d8eb125..89a3e64 100644
--- a/app/src/main/java/com/example/duken_mes/MainActivity.java
+++ b/app/src/main/java/com/example/duken_mes/MainActivity.java
@@ -6,6 +6,7 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
@@ -56,12 +57,14 @@ public class MainActivity extends BaseActivity {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         ingredientInfo.setIsOpen(1);
+                        submitRequest();
                     }
                 })
                 .setNeutralButton("保存数据", new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         ingredientInfo.setIsOpen(2);
+                        submitRequest();
                     }
                 }).create();
     }
@@ -113,7 +116,10 @@ public class MainActivity extends BaseActivity {
             return;
         }
         alertDialog.show();
+    }
+    private void submitRequest(){
         var type = mainVm.isType();
+        Log.e("TAG", "submitRequest:" + type);
         if (type) {
             ingredientInfo.setRemainder(mainVm.isResidueYes());
             var residueNum = mainVm.getResidueNum();
@@ -127,7 +133,7 @@ public class MainActivity extends BaseActivity {
 
         }
 
-        OkGo.<MyResult>post(url + "/api/IngCheck/" + (type ? "BigMaterial" : "SmallMaterial"))
+        OkGo.<MyResult>post(url + "/api/IngCheck/" + (type ?"SmallMaterial": "BigMaterial"  ))
                 .tag(this)
                 .upRequestBody(RequestBody.create(JSON, gson.toJson(ingredientInfo)))
                 .execute(new MyRecultCall(dialog, this) {
@@ -143,8 +149,6 @@ public class MainActivity extends BaseActivity {
 
                     }
                 });
-
-
     }
 
     public void backAc(View view) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8bb4eee..f835c09 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -31,7 +31,7 @@
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:letterSpacing="0.2"
-                android:text='@{vm.type?"大料料罐投料":"小料料罐投料"}'
+                android:text='@{vm.type?"小料料罐投料":"大料料罐投料"}'
                 android:textColor="@color/white"
                 android:textSize="18sp" />