diff --git a/.gitignore b/.gitignore index aa724b7..8a854c5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ /.idea/assetWizardSettings.xml .DS_Store /build +/release /captures .externalNativeBuild .cxx diff --git a/app/build.gradle b/app/build.gradle index c9c8490..2749a8d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { applicationId "com.example.aucma_mes" minSdk 24 targetSdk 33 - versionCode 1 + versionCode 2 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/release/02-修改质检查询报错.apk b/app/release/02-修改质检查询报错.apk new file mode 100644 index 0000000..4376b18 Binary files /dev/null and b/app/release/02-修改质检查询报错.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 0000000..ea9279a --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.example.aucma_mes", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 2, + "versionName": "1.0", + "outputFile": "app-release.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/app/src/main/java/com/example/aucma_mes/BindingActivity.java b/app/src/main/java/com/example/aucma_mes/BindingActivity.java index cccb5bd..ade6c90 100644 --- a/app/src/main/java/com/example/aucma_mes/BindingActivity.java +++ b/app/src/main/java/com/example/aucma_mes/BindingActivity.java @@ -60,32 +60,36 @@ public class BindingActivity extends BaseActivity { public void click1(View view) { - if (boxCode.get() == null || innerCode.get() == null ||materialName.get()==null ) return; + if (boxCode.get() == null || innerCode.get() == null || materialName.get() == null) return; dialog.show(); String s = title.equals("壳胆绑定") ? "/api/boxBanding" : "/api/barCodeBanding"; - OkGo.post(url + s).tag(this).headers("Authorization", SharedPreferencesUtils.getstring("token", "")).params("boxCode", boxCode.get()).params("innerCode", innerCode.get()).params("loginName", SharedPreferencesUtils.getstring("loginName", "")).execute(new StringCallback() { - @Override - public void onSuccess(Response response) { - dialog.dismiss(); + OkGo.post(url + s).tag(this).headers("Authorization", SharedPreferencesUtils.getstring("token", "")) + .params("boxCode", boxCode.get()) + .params("innerCode", innerCode.get()) + .params("loginName", SharedPreferencesUtils.getstring("loginName", "")) + .execute(new StringCallback() { + @Override + public void onSuccess(Response response) { + dialog.dismiss(); - Result result = gson.fromJson(response.body(), Result.class); - if (result.getCode() == 200) { - Toast.makeText(BindingActivity.this, "绑定成功", Toast.LENGTH_SHORT).show(); - boxCode.set(""); - innerCode.set(""); - materialName.set(""); - } else { - Toast.makeText(BindingActivity.this, result.getMsg(), Toast.LENGTH_SHORT).show(); - } - } + Result result = gson.fromJson(response.body(), Result.class); + if (result.getCode() == 200) { + Toast.makeText(BindingActivity.this, "绑定成功", Toast.LENGTH_SHORT).show(); + boxCode.set(""); + innerCode.set(""); + materialName.set(""); + } else { + Toast.makeText(BindingActivity.this, result.getMsg(), Toast.LENGTH_SHORT).show(); + } + } - @Override - public void onError(Response response) { - super.onError(response); - Toast.makeText(BindingActivity.this, "网路连接错误", Toast.LENGTH_SHORT).show(); - } - }); + @Override + public void onError(Response response) { + super.onError(response); + Toast.makeText(BindingActivity.this, "网路连接错误", Toast.LENGTH_SHORT).show(); + } + }); } public void click2(View view) { 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 cd1809d..a4265e4 100644 --- a/app/src/main/java/com/example/aucma_mes/CheckActivity.java +++ b/app/src/main/java/com/example/aucma_mes/CheckActivity.java @@ -73,7 +73,8 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte @Override protected void sanInfo(String code) { checkViewModel.setCode(code); - OkGo.post(url + "/api/check/select").tag(this).headers("Authorization", SharedPreferencesUtils.getstring("token", "")) + OkGo.post(url + "/api/check/select").tag(this) + .headers("Authorization", SharedPreferencesUtils.getstring("token", "")) .params("code", code).execute(new MyRecultCall(dialog, this) { @Override public void onSuccess(Response response) { @@ -110,6 +111,10 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte tipDialog.show(); } + // 测试 + public void checkSubmint1(View view) { + sanInfo("B24010181060283110001"); + } // 提交 public void checkSubmint(View view) { if (checkViewModel.getName() == null || checkViewModel.getName().isEmpty()) return; 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 4a05dec..7294ffe 100644 --- a/app/src/main/java/com/example/aucma_mes/HomePageActivity.java +++ b/app/src/main/java/com/example/aucma_mes/HomePageActivity.java @@ -34,23 +34,21 @@ public class HomePageActivity extends AppCompatActivity { roles = intent1.getStringArrayListExtra("role"); String json = intent1.getStringExtra("info"); LoginInfoBeen infoBeen = new Gson().fromJson(json, LoginInfoBeen.class); - Log.e("TAG", "onCreate:" + infoBeen); + // Log.e("TAG", "onCreate:" + infoBeen.getUserPermission()); InfoDialog infoDialog = new InfoDialog(this); - String stationCode = null; try { User user = infoBeen.getUser(); + user.setUsername(SharedPreferencesUtils.getstring("loginName", "")); user.setTeamName(SharedPreferencesUtils.getstring("teamName", null)); user.setTeamCode(SharedPreferencesUtils.getstring("teamCode", null)); - stationCode = user.getStationCode(); infoDialog.setInfoData(infoBeen, user); - String finalStationCode = stationCode; binding.homeButton1.setOnClickListener(v -> { if (!roles.contains("quality_inspection")) { Toast.makeText(this, "暂无权限", Toast.LENGTH_SHORT).show(); return; } intent = new Intent(this, CheckActivity.class); - intent.putExtra("stationCode", finalStationCode); + intent.putExtra("stationCode", user.getStationCode()); startActivity(intent); }); binding.homeButton2.setOnClickListener(v -> { @@ -67,7 +65,10 @@ public class HomePageActivity extends AppCompatActivity { Toast.makeText(this, "暂无权限", Toast.LENGTH_SHORT).show(); return; } + // 返修 intent = new Intent(this, RepairActivity.class); + intent.putExtra("userPermission",infoBeen.getUserPermission()); + intent.putExtra("stationName",user.getStationName()); startActivity(intent); }); binding.homeButton4.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 a627539..0e2ca27 100644 --- a/app/src/main/java/com/example/aucma_mes/MainActivity.java +++ b/app/src/main/java/com/example/aucma_mes/MainActivity.java @@ -45,9 +45,10 @@ public class MainActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); ActivityMainBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_main); + String loginName = SharedPreferencesUtils.getstring("loginName", ""); user = new User(); - // user.setUsername("pda02"); - // user.setPassword("123456"); + user.setUsername(loginName); + user.setPassword("123456"); getSupportActionBar().hide(); // 隐藏原生标题栏 binding.setUser(user); @@ -71,7 +72,7 @@ public class MainActivity extends BaseActivity { @Override protected void sanInfo(String code) { - + Log.e("TAG", "扫描测试结果:" + code); } // 查询PDA Mac 地址列表 @@ -85,7 +86,9 @@ public class MainActivity extends BaseActivity { List pdaList = gson.fromJson(gson.toJson(result.getData()), new TypeToken>() { }.getType()); RegisterPda registerPda = new RegisterPda(); - registerPda.setSerialCode(getMacAddress()); + String macAddress = getMacAddress(); + Log.e("TAG", "本机MAC:" + macAddress); + registerPda.setSerialCode(macAddress); int index = pdaList.indexOf(registerPda); loginState = index > -1; if (loginState) { @@ -128,10 +131,12 @@ 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(); MediaType JSON = MediaType.parse("application/json; charset=utf-8"); RequestBody body = RequestBody.create(JSON, gson.toJson(user)); diff --git a/app/src/main/java/com/example/aucma_mes/RepairActivity.java b/app/src/main/java/com/example/aucma_mes/RepairActivity.java index 6754bbc..dd1c542 100644 --- a/app/src/main/java/com/example/aucma_mes/RepairActivity.java +++ b/app/src/main/java/com/example/aucma_mes/RepairActivity.java @@ -39,15 +39,18 @@ public class RepairActivity extends BaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + getSupportActionBar().hide(); binding = DataBindingUtil.setContentView(this, R.layout.activity_repair); adapter = new RepairAdapter(this); repairVm = new RepairVm(); + binding.setTitle("质量返修 — "+getIntent().getStringExtra("stationName")); binding.setVm(repairVm); submitList = new ArrayList<>(); binding.recyclerView.setAdapter(adapter); //查询返修措施 OkGo.get(url + "/report/repairMeasures/getRepairMeasures").tag(this) .headers("Authorization", SharedPreferencesUtils.getstring("token", "")) + .params("userPermission",getIntent().getIntExtra("userPermission",-1)) .execute(new MyRecultCall(dialog, this) { @Override public void onSuccess(Response response) { 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 1647f91..4e48368 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://172.20.10.2: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 825af11..47b720a 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,8 +21,15 @@ public class DefectBeen extends BaseObservable { private String stationCode; private String qualityDefectCode; private String qualityDefectName; + private String productLineName;//pda 工位名称 + public String getProductLineName() { + return productLineName; + } + public void setProductLineName(String productLineName) { + this.productLineName = productLineName; + } public void setIndex(int index) { this.index = index; diff --git a/app/src/main/java/com/example/aucma_mes/entity/LoginInfoBeen.java b/app/src/main/java/com/example/aucma_mes/entity/LoginInfoBeen.java index 29985a0..977d9c8 100644 --- a/app/src/main/java/com/example/aucma_mes/entity/LoginInfoBeen.java +++ b/app/src/main/java/com/example/aucma_mes/entity/LoginInfoBeen.java @@ -12,6 +12,7 @@ public class LoginInfoBeen { public String factoryCode; public String companyName; public String factoryName; + public int userPermission; public User user; public String getCompanyCode() { @@ -54,6 +55,14 @@ public class LoginInfoBeen { this.user = user; } + public int getUserPermission() { + return userPermission; + } + + public void setUserPermission(int userPermission) { + this.userPermission = userPermission; + } + @Override public String toString() { return "LoginInfoBeen{" + diff --git a/app/src/main/java/com/example/aucma_mes/vm/User.java b/app/src/main/java/com/example/aucma_mes/vm/User.java index be23a19..4e1a95b 100644 --- a/app/src/main/java/com/example/aucma_mes/vm/User.java +++ b/app/src/main/java/com/example/aucma_mes/vm/User.java @@ -117,4 +117,19 @@ public class User extends BaseObservable { this.teamName = teamName; notifyChange(); } + + @Override + public String toString() { + return "User{" + + "username='" + username + '\'' + + ", password='" + password + '\'' + + ", list=" + list + + ", teamBeens=" + teamBeens + + ", nickName='" + nickName + '\'' + + ", stationCode='" + stationCode + '\'' + + ", stationName='" + stationName + '\'' + + ", teamCode='" + teamCode + '\'' + + ", teamName='" + teamName + '\'' + + '}'; + } } diff --git a/app/src/main/res/layout/activity_check.xml b/app/src/main/res/layout/activity_check.xml index 0fee981..5e9953e 100644 --- a/app/src/main/res/layout/activity_check.xml +++ b/app/src/main/res/layout/activity_check.xml @@ -122,5 +122,15 @@ android:layout_margin="10dp" android:onClick="checkSubmint" android:text="提交" /> + +