diff --git a/app/build.gradle b/app/build.gradle index 2749a8d..4aec6c4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { applicationId "com.example.aucma_mes" minSdk 24 targetSdk 33 - versionCode 2 + versionCode 5 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/release/02-修改质检查询报错.apk b/app/release/02-修改质检查询报错.apk deleted file mode 100644 index 4376b18..0000000 Binary files a/app/release/02-修改质检查询报错.apk and /dev/null differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index ea9279a..9205a3a 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,7 +11,7 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 2, + "versionCode": 5, "versionName": "1.0", "outputFile": "app-release.apk" } 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 a4265e4..01cc8a0 100644 --- a/app/src/main/java/com/example/aucma_mes/CheckActivity.java +++ b/app/src/main/java/com/example/aucma_mes/CheckActivity.java @@ -3,6 +3,7 @@ package com.example.aucma_mes; import androidx.appcompat.app.AppCompatActivity; import androidx.databinding.DataBindingUtil; +import android.content.Intent; import android.graphics.Color; import android.os.Bundle; import android.util.Log; @@ -57,13 +58,16 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte super.onCreate(savedInstanceState); binding = DataBindingUtil.setContentView(this, R.layout.activity_check); checkViewModel = new CheckViewModel(); + getSupportActionBar().hide(); binding.setVm(checkViewModel); checkAdapter = new CheckAdapter(this, this); submitList = new ArrayList<>(); checkAdapter.setList(submitList); binding.recyclerView.setAdapter(checkAdapter); - String stationCode = getIntent().getStringExtra("stationCode"); + Intent intent = getIntent(); + String stationCode = intent.getStringExtra("stationCode"); checkViewModel.setStationCode(stationCode); + binding.setTitle("质量检测 - "+ intent.getStringExtra("stationName")); // 三联 initOptionpb(stationCode); tipDialog = new RepairSubmintInfoDialog(this, this); @@ -113,7 +117,7 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte // 测试 public void checkSubmint1(View view) { - sanInfo("B24010181060283110001"); + sanInfo("B24010181060282920007"); } // 提交 public void checkSubmint(View view) { diff --git a/app/src/main/java/com/example/aucma_mes/HomePageActivity.java b/app/src/main/java/com/example/aucma_mes/HomePageActivity.java index 7294ffe..33f777a 100644 --- a/app/src/main/java/com/example/aucma_mes/HomePageActivity.java +++ b/app/src/main/java/com/example/aucma_mes/HomePageActivity.java @@ -49,6 +49,7 @@ public class HomePageActivity extends AppCompatActivity { } intent = new Intent(this, CheckActivity.class); intent.putExtra("stationCode", user.getStationCode()); + intent.putExtra("stationName",user.getStationName()); startActivity(intent); }); binding.homeButton2.setOnClickListener(v -> { 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 0e2ca27..0a1483c 100644 --- a/app/src/main/java/com/example/aucma_mes/MainActivity.java +++ b/app/src/main/java/com/example/aucma_mes/MainActivity.java @@ -53,7 +53,6 @@ public class MainActivity extends BaseActivity { binding.setUser(user); OkGo.get(url + "/base/teamMembers/getTeamMemberList").tag(this) - // .headers("Authorization", SharedPreferencesUtils.getstring("token", "")) .execute(new MyRecultCall(dialog, this) { @Override public void onSuccess(Response response) { @@ -131,10 +130,10 @@ public class MainActivity extends BaseActivity { // 登录 public void login(View view) { - // if (!loginState) { - // Toast.makeText(this, "设备未注册,不允许登录", Toast.LENGTH_SHORT).show(); - // return; - // } + if (!loginState) { + Toast.makeText(this, "设备未注册,不允许登录", Toast.LENGTH_SHORT).show(); + return; + } String teamCode = user.getTeamCode(); if (teamCode==null||teamCode.isEmpty()) return; dialog.show(); 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 0291a4c..6bd96d2 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 @@ -1,5 +1,7 @@ package com.example.aucma_mes.adapter; + + import android.content.Context; import android.view.LayoutInflater; import android.view.ViewGroup; @@ -49,6 +51,14 @@ 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 4e48368..057ac36 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.0.102:8080"; + public static String url="http://10.100.72.10:8080"; public ProgressDialog dialog; public Gson gson; public MediaType JSON = MediaType.parse("application/json; charset=utf-8"); 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 47b720a..0340159 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 @@ -21,6 +21,7 @@ public class DefectBeen extends BaseObservable { private String stationCode; private String qualityDefectCode; private String qualityDefectName; + private String processResult;//返修结果 private String productLineName;//pda 工位名称 public String getProductLineName() { @@ -43,6 +44,14 @@ public class DefectBeen extends BaseObservable { this.stationCode = stationCode; } + public String getProcessResult() { + return processResult; + } + + public void setProcessResult(String processResult) { + this.processResult = processResult; + } + @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/app/src/main/res/layout/activity_check.xml b/app/src/main/res/layout/activity_check.xml index 5e9953e..11bd7c6 100644 --- a/app/src/main/res/layout/activity_check.xml +++ b/app/src/main/res/layout/activity_check.xml @@ -4,10 +4,14 @@ xmlns:tools="http://schemas.android.com/tools"> + + - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_info.xml b/app/src/main/res/layout/dialog_info.xml index 2ba8804..9c2683d 100644 --- a/app/src/main/res/layout/dialog_info.xml +++ b/app/src/main/res/layout/dialog_info.xml @@ -144,24 +144,24 @@ android:layout_height="match_parent" android:text="@{user.teamName}" /> - - - - - - + + + + + + + + + + + + + + + + + + #F2F3F5 #377CF9 + #DEE3E6 + #6AFF5722 + #FFEB3B \ No newline at end of file