From 46cb15132184afe532ffb991b30eabbf54caecef Mon Sep 17 00:00:00 2001 From: wanghao Date: Tue, 9 Sep 2025 17:06:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20-=20=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E3=80=81=E5=BC=B9=E7=AA=97=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- .../java/com/example/aucma_mes/CheckActivity.java | 15 +++++++++++---- .../java/com/example/aucma_mes/MainActivity.java | 3 ++- .../adapter/RepaitSubmintInfoAdapter.java | 4 ++-- .../com/example/aucma_mes/base/BaseActivity.java | 4 ++-- app/src/main/res/layout/activity_check.xml | 8 +++++++- .../res/layout/dialog_repair_submint_info.xml | 2 +- app/src/main/res/values/colors.xml | 1 + 8 files changed, 28 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 93108c9..40ae74b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.example.aucma_mes" minSdk 24 targetSdk 33 - versionCode 13 - versionName "1.13" + versionCode 15 + versionName "1.15" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/example/aucma_mes/CheckActivity.java b/app/src/main/java/com/example/aucma_mes/CheckActivity.java index 37c8b0e..007435e 100644 --- a/app/src/main/java/com/example/aucma_mes/CheckActivity.java +++ b/app/src/main/java/com/example/aucma_mes/CheckActivity.java @@ -37,6 +37,7 @@ import com.lzy.okgo.request.base.Request; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import okhttp3.RequestBody; @@ -121,13 +122,18 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte checkViewModel.setName(result.getMsg()); topDefects = gson.fromJson(gson.toJson(result.getData()), new TypeToken>() { }.getType()); - if (topDefects == null || topDefects.isEmpty()) { + if (topDefects == null || topDefects.isEmpty() ) { Toast.makeText(CheckActivity.this, "本工位无需检查返修情况", Toast.LENGTH_SHORT).show(); return; } checkViewModel.setButtonVisbleState(true); tipDialog.setList(topDefects); - tipDialog.show(); + Optional checkState = topDefects.stream().findFirst().map(item -> !item.getQualityDefectName().equals("完成")); + + if (checkState.get()){ + tipDialog.show(); + } + /*// 直接添加提交数据中submitList.addAll(defectBeens); checkAdapter.notifyDataSetChanged();*/ @@ -151,8 +157,9 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte public void checkSubmint1(View view) { - sanInfo("B24031483025025351528"); - } // 提交 + sanInfo(binding.checkTeskCode.getText().toString()); + } + // 提交 public void checkSubmint(View view) { if (checkViewModel.getName() == null || checkViewModel.getName().isEmpty()) return; checkViewModel.setList(submitList); diff --git a/app/src/main/java/com/example/aucma_mes/MainActivity.java b/app/src/main/java/com/example/aucma_mes/MainActivity.java index a1a9075..469b09e 100644 --- a/app/src/main/java/com/example/aucma_mes/MainActivity.java +++ b/app/src/main/java/com/example/aucma_mes/MainActivity.java @@ -48,7 +48,7 @@ public class MainActivity extends BaseActivity { String loginName = SharedPreferencesUtils.getstring("loginName", ""); user = new User(); user.setUsername(loginName); - user.setPassword("123456"); + user.setPassword(SharedPreferencesUtils.getstring("password", "123456")); getSupportActionBar().hide(); // 隐藏原生标题栏 binding.setUser(user); OkGo.get(url + "/base/teamMembers/getTeamMemberList").tag(this) @@ -181,6 +181,7 @@ public class MainActivity extends BaseActivity { intent.putExtra("role", loginBack.getRoles()); intent.putExtra("info", body); SharedPreferencesUtils.putstring("loginName", user.username); + SharedPreferencesUtils.putstring("password", user.password); SharedPreferencesUtils.putstring("teamCode", user.getTeamCode()); SharedPreferencesUtils.putstring("teamName", user.getTeamName()); SharedPreferencesUtils.putstring("token", token); diff --git a/app/src/main/java/com/example/aucma_mes/adapter/RepaitSubmintInfoAdapter.java b/app/src/main/java/com/example/aucma_mes/adapter/RepaitSubmintInfoAdapter.java index c514ee5..0dd660c 100644 --- a/app/src/main/java/com/example/aucma_mes/adapter/RepaitSubmintInfoAdapter.java +++ b/app/src/main/java/com/example/aucma_mes/adapter/RepaitSubmintInfoAdapter.java @@ -56,13 +56,13 @@ public class RepaitSubmintInfoAdapter extends RecyclerView.Adapter { checkItemClickCall.submintRepair(position); }); diff --git a/app/src/main/java/com/example/aucma_mes/base/BaseActivity.java b/app/src/main/java/com/example/aucma_mes/base/BaseActivity.java index 08f0f4e..0956277 100644 --- a/app/src/main/java/com/example/aucma_mes/base/BaseActivity.java +++ b/app/src/main/java/com/example/aucma_mes/base/BaseActivity.java @@ -26,8 +26,8 @@ import okhttp3.MediaType; public abstract class BaseActivity extends AppCompatActivity { private MyBroad receiver; - // public static String url="http://192.168.0.102:8080"; - public static String url = "http://10.100.72.10:8080"; + // public static String url="http://192.168.100.100:6061"; + public static String url = "http://10.100.72.10:8080";//现场IP public ProgressDialog dialog; public Gson gson; public MediaType JSON = MediaType.parse("application/json; charset=utf-8"); diff --git a/app/src/main/res/layout/activity_check.xml b/app/src/main/res/layout/activity_check.xml index e1282d0..dd97a63 100644 --- a/app/src/main/res/layout/activity_check.xml +++ b/app/src/main/res/layout/activity_check.xml @@ -188,6 +188,11 @@ android:onClick="checkSubmint" android:text="提交" /> +