From 6c8659a0e154e72467489b26f533aa74886d6e66 Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Tue, 2 Jan 2024 16:20:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20-=20=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/aucma_mes/CheckActivity.java | 2 +- .../example/aucma_mes/HomePageActivity.java | 96 +++++++++--------- .../com/example/aucma_mes/MainActivity.java | 5 +- .../example/aucma_mes/base/BaseActivity.java | 2 +- .../res/mipmap-xhdpi/{logo2.png => logo2.jpg} | Bin 5 files changed, 51 insertions(+), 54 deletions(-) rename app/src/main/res/mipmap-xhdpi/{logo2.png => logo2.jpg} (100%) 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 3f704bb..cd1809d 100644 --- a/app/src/main/java/com/example/aucma_mes/CheckActivity.java +++ b/app/src/main/java/com/example/aucma_mes/CheckActivity.java @@ -158,7 +158,7 @@ public class CheckActivity extends BaseActivity implements CheckAdapter.CheckIte Log.e("TAG", "onSuccess:" + body.toString()); if (body.getCode() == 200) { Toast.makeText(CheckActivity.this, "请求成功", Toast.LENGTH_SHORT).show(); - list = gson.fromJson(body.getData().toString(), new TypeToken>() { + list = gson.fromJson(gson.toJson(body.getData()), new TypeToken>() { }.getType()); if (list == null || list.isEmpty()) { Toast.makeText(CheckActivity.this, "缺陷列表没有维护", Toast.LENGTH_SHORT).show(); 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 22c13dd..4a05dec 100644 --- a/app/src/main/java/com/example/aucma_mes/HomePageActivity.java +++ b/app/src/main/java/com/example/aucma_mes/HomePageActivity.java @@ -32,62 +32,60 @@ public class HomePageActivity extends AppCompatActivity { getSupportActionBar().hide(); Intent intent1 = getIntent(); roles = intent1.getStringArrayListExtra("role"); - String json=intent1.getStringExtra("info"); - LoginInfoBeen infoBeen=new Gson().fromJson(json, LoginInfoBeen.class); + String json = intent1.getStringExtra("info"); + LoginInfoBeen infoBeen = new Gson().fromJson(json, LoginInfoBeen.class); Log.e("TAG", "onCreate:" + infoBeen); - InfoDialog infoDialog=new InfoDialog(this); + InfoDialog infoDialog = new InfoDialog(this); String stationCode = null; try { User user = infoBeen.getUser(); - user.setTeamName(SharedPreferencesUtils.getstring("teamName",null)); - user.setTeamCode(SharedPreferencesUtils.getstring("teamCode",null)); + user.setTeamName(SharedPreferencesUtils.getstring("teamName", null)); + user.setTeamCode(SharedPreferencesUtils.getstring("teamCode", null)); stationCode = user.getStationCode(); infoDialog.setInfoData(infoBeen, user); - }catch (Exception e){ - + 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); + startActivity(intent); + }); + binding.homeButton2.setOnClickListener(v -> { + if (!roles.contains("shell_bile_binding")) { + Toast.makeText(this, "暂无权限", Toast.LENGTH_SHORT).show(); + return; + } + intent = new Intent(this, BindingActivity.class); + intent.putExtra("title", "壳胆绑定"); + startActivity(intent); + }); + binding.homeButton3.setOnClickListener(v -> { + if (!roles.contains("quality_repair")) { + Toast.makeText(this, "暂无权限", Toast.LENGTH_SHORT).show(); + return; + } + intent = new Intent(this, RepairActivity.class); + startActivity(intent); + }); + binding.homeButton4.setOnClickListener(v -> { + if (!roles.contains("barcode_binding")) { + Toast.makeText(this, "暂无权限", Toast.LENGTH_SHORT).show(); + return; + } + intent = new Intent(this, BindingActivity.class); + intent.putExtra("title", "条码绑定"); + startActivity(intent); + }); + binding.homeButton5.setOnClickListener(v -> { + infoDialog.show(); + }); + } catch (Exception e) { + Toast.makeText(this, "暂无权限", Toast.LENGTH_SHORT).show(); + e.printStackTrace(); } - - -// String final StationCode = 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", "2001"); - startActivity(intent); - }); - binding.homeButton2.setOnClickListener(v -> { - if (!roles.contains("shell_bile_binding")) { - Toast.makeText(this, "暂无权限", Toast.LENGTH_SHORT).show(); - return; - } - intent = new Intent(this, BindingActivity.class); - intent.putExtra("title", "壳胆绑定"); - startActivity(intent); - }); - binding.homeButton3.setOnClickListener(v -> { - if (!roles.contains("quality_repair")) { - Toast.makeText(this, "暂无权限", Toast.LENGTH_SHORT).show(); - return; - } - intent = new Intent(this, RepairActivity.class); - startActivity(intent); - }); - binding.homeButton4.setOnClickListener(v -> { - if (!roles.contains("barcode_binding")) { - Toast.makeText(this, "暂无权限", Toast.LENGTH_SHORT).show(); - return; - } - intent = new Intent(this, BindingActivity.class); - intent.putExtra("title", "条码绑定"); - startActivity(intent); - }); - binding.homeButton5.setOnClickListener(v -> { - infoDialog.show(); - }); - } 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 c155409..a627539 100644 --- a/app/src/main/java/com/example/aucma_mes/MainActivity.java +++ b/app/src/main/java/com/example/aucma_mes/MainActivity.java @@ -46,8 +46,8 @@ public class MainActivity extends BaseActivity { super.onCreate(savedInstanceState); ActivityMainBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_main); user = new User(); - user.setUsername("pda01"); - user.setPassword("aucma@123"); + // user.setUsername("pda02"); + // user.setPassword("123456"); getSupportActionBar().hide(); // 隐藏原生标题栏 binding.setUser(user); @@ -132,7 +132,6 @@ public class MainActivity extends BaseActivity { Toast.makeText(this, "设备未注册，不允许登录", Toast.LENGTH_SHORT).show(); 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/base/BaseActivity.java b/app/src/main/java/com/example/aucma_mes/base/BaseActivity.java index 5d517a1..1647f91 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,7 +26,7 @@ import okhttp3.MediaType; public abstract class BaseActivity extends AppCompatActivity { private MyBroad receiver; - // public static String url="http://192.168.3.199:6061"; + // public static String url="http://172.20.10.2:8080"; public static String url="http://10.100.72.10:8080"; public ProgressDialog dialog; public Gson gson; diff --git a/app/src/main/res/mipmap-xhdpi/logo2.png b/app/src/main/res/mipmap-xhdpi/logo2.jpg similarity index 100% rename from app/src/main/res/mipmap-xhdpi/logo2.png rename to app/src/main/res/mipmap-xhdpi/logo2.jpg