diff --git a/app/build.gradle b/app/build.gradle index 85914e1..a4e614f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,8 +37,8 @@ android { applicationId "com.arpa.hndahesudintocctmsdriver" minSdkVersion 23 targetSdkVersion 30 - versionCode 57 - versionName "3.2.7" + versionCode 58 + versionName "3.2.8" flavorDimensions "CHANNEL_VALUE" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" javaCompileOptions { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java index 280cf82..74a91e9 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java @@ -47,7 +47,7 @@ public class App extends Application { mApplication = this; con = getBaseContext(); CommonBaseLibrary.getInstance().init(this, Api.BASE_URL); - CrashReport.initCrashReport(getApplicationContext(), "0fa55ffad8", true); + CrashReport.initCrashReport(getApplicationContext(), "0fa55ffad8", false); String state = SPUtil.getSP(con, "state_data", "authorization_state"); if ("1".equals(state)) { try { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java index d0cc893..db96bb0 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity.java @@ -115,17 +115,17 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { if (CacheGroup.cacheList.get(TYPE_NAME[i]) != null) { BaseBean bb = gson.fromJson(CacheGroup.cacheList.get(TYPE_NAME[i]), BaseBean.class); if (bb.getCode() == 200) { - if (!keys) { - Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show(); - finish(); - } else { - Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show(); - finish(); + if (index == 2) { + if (!keys){//装货回单 + Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show(); + finish(); + } } } else { Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show(); } CacheGroup.cacheList.remove(TYPE_NAME[i]); + break; } } if (CacheGroup.cacheList.get("carName") != null) { @@ -596,6 +596,8 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onSuccess() { Log.e("上报安联", "装货照片上传成功"); + Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show(); + finish(); } @Override @@ -626,6 +628,8 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onSuccess() { Log.e("上报安联", "卸货照片上传成功"); + Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show(); + finish(); } @Override @@ -657,6 +661,8 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onSuccess() { Log.e("上报安联", "回单照片上传成功"); + Toast.makeText(con, "上传成功", Toast.LENGTH_SHORT).show(); + finish(); } @Override @@ -719,10 +725,10 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { if (sob.getData().getReport() == 1) { JTTProcess.start(con, sob, ""); } - //装货照片 - up_image_z(); //装货状态 hyr.loading(lub); + //装货照片 + up_image_z(); } @Override @@ -756,10 +762,10 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { if (sob.getData().getReport() == 1) { JTTProcess.stop(con, sob, ""); } - //卸货照片-安联 - up_image(); //卸货状态-平台 hyr.dischargeCargo(lub); + //卸货照片-安联 + up_image(); } @Override diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/adapter/AdapterAlls.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/adapter/AdapterAlls.java index 57f77e2..e650995 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/adapter/AdapterAlls.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/adapter/AdapterAlls.java @@ -51,6 +51,9 @@ public class AdapterAlls extends RecyclerView.Adapter { } public void add(List addMessageList) { + if (object==null){ + return; + } //增加数据 int position = object.size(); object.addAll(position, addMessageList); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/img/GetCarImageAlert.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/img/GetCarImageAlert.java index 4643d13..5ef9f9e 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/img/GetCarImageAlert.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/img/GetCarImageAlert.java @@ -70,13 +70,27 @@ public class GetCarImageAlert { .permissions(Manifest.permission.CAMERA) .request((allGranted, grantedList, deniedList) -> { if (allGranted) { - file=ImageGetUtil.createImageFile(act); - ImageGetUtil.cameraAlbumGetImage(act,file); + openCam(act); +// file=ImageGetUtil.createImageFile(act); +// ImageGetUtil.cameraAlbumGetImage(act,file); } else { Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show(); } }); }); + img.setOnClickListener(v -> { + if (!key){ + PermissionX.init(act) + .permissions(Manifest.permission.CAMERA) + .request((allGranted, grantedList, deniedList) -> { + if (allGranted) { + openCam(act); + } else { + Toast.makeText(act.getBaseContext(), "开启权限失败,请手动开启权限", Toast.LENGTH_LONG).show(); + } + }); + } + }); btn_quxiao.setOnClickListener(v -> popupWindow.dismiss()); //popupWindow消失屏幕变为不透明 popupWindow.setOnDismissListener(() -> { @@ -99,4 +113,13 @@ public class GetCarImageAlert { popupWindow.dismiss(); } + private void openCam(AppCompatActivity act){ + file=ImageGetUtil.createImageFile(act); + if (file!=null){ + ImageGetUtil.cameraAlbumGetImage(act,file); + }else{ + Toast.makeText(act.getBaseContext(), "路径创建失败，请清除缓存后重试", Toast.LENGTH_LONG).show(); + } + } + }