From c686fb4e8f20619e6c288e704eb0bee6e65e666c Mon Sep 17 00:00:00 2001 From: lijia Date: Mon, 14 Aug 2023 17:50:37 +0800 Subject: [PATCH] =?UTF-8?q?3.2.2=E7=BB=93=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 +-- .../arpa/hndahesudintocctmsdriver/App.java | 7 ++- .../ui/MainActivity.kt | 1 + .../ui/auth/AuthQualificationActivity.java | 8 +-- .../ui/auth/CertificatesActivity.java | 50 +++++++++++-------- .../ui/auth/PersonalAuthActivity.java | 6 ++- .../ui/auth/PhotoCarActivity.java | 29 ++++++++--- .../ui/auth/VehicleAuthActivity.java | 6 ++- .../ui/home/HomeFragment.java | 5 +- .../ui/home/OrderAllActivity.java | 2 +- .../shangchuan/GetShangChuanActivity.java | 11 +++- .../shangchuan/ShangChuangImgActivity.java | 10 ++-- .../shangchuan/ShangChuangImgActivity2.java | 6 ++- .../ui/login/WelcomeActivity.java | 8 ++- .../ui/my/WoDeFragment.java | 6 ++- .../ui/wallet/WalletFragment.java | 25 +++++----- .../util/view/GrayFrameLayout.java | 43 ++++++++++++++++ app/src/main/res/layout/activity_che_data.xml | 4 ++ .../res/layout/activity_get_shangchuan.xml | 3 +- build.gradle | 1 + compile.gradle | 4 +- 21 files changed, 178 insertions(+), 63 deletions(-) create mode 100644 app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/GrayFrameLayout.java diff --git a/app/build.gradle b/app/build.gradle index 95cf9da..6ea0e3a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,10 +32,10 @@ android { defaultConfig { applicationId "com.arpa.hndahesudintocctmsdriver" - minSdkVersion 22 + minSdkVersion 23 targetSdkVersion 30 - versionCode 52 - versionName "3.2.1" + versionCode 53 + versionName "3.2.2" 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 9b8c089..0ef0b04 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/App.java @@ -29,8 +29,11 @@ import cn.jiguang.verifysdk.api.JVerificationInterface; public class App extends Application { - String key = "f9d35b1133cff1f6e3960c89b249e03f"; - String license = "eQQm7gCZPF58Cy4i9OGkqSdFdDnFF0VSUVpw92WcrNLx7zVbpGJwjQhnKL8b0piApIbOTog5log/S1ZIxoUQogueaG84BQlJfRwKjtvpVWImlmhthQyQd2ogRqGkm3rkVGeG9wK49fzP3g5AtghNF05je2rQWd/Tyy/wutXq0e0rvR/bEckFaZ4BesQaYd0MejFC3lA8BjxNWiuvCKs15e1aRUOU5vwN5wsaTsTHokBIYhioSxOoGgHn6NrX6K9Dsl9uTWZ2dOVK/jEzYsNt6E/1Ww2ck1XmIWdRCQNmCpgikuPT0ACAL/w7UaRoWzM/Pm+akWqyp+bEavHT1Vhug3HAHOSGfOghGw2NerNlyEg8h6cVneMx+TsidnQ0ZG29aqdcLBRsvi26BYJJCA8+0WXjT+73RhS8g97Rfb6h0/W//5Az8UNZ6dp6XvUi2EJXQRhY5hkHiuwWT2W1ik+6wiiURkkrBACKbO1kmZWbVpRIe3Y3pcr3Q/V+oAcyPHRXCxu+JIe/j40/epuRrCyf8yvKsZ2Dnkl4QQmlwNqlW1F/arS+19G6zOG+6VKwtbI01A1R9SU1TYOA5UL/Qpo6Gyi3Ec3/irgQlzkq1rZrOIS4oo6tghul/zcG8rjno3luqHYwIZf8vAVfpwBesIVcANCOIuTRPU3A8vdmUoK/twGIchPapmjlAzLhjZ4KoAbNeMsWu3sN6kF44xofLMghos2X8OtvUA9CMD37v2FpYoM75qavyoivsBAbb6mG0p5TmkZ37BxfaGGP6SYrCa9ygQ=="; +// String key = "f9d35b1133cff1f6e3960c89b249e03f"; + String key = "19ac0aa74338e487e45057faf7212401"; + String license = "HF41uGxM/1i3CtW98DimoA97BlNTAnQ+DiEAihYmZ2jR1jqC4be253joEJbOJgFDIzp5aIoeuXSWWHFaDVfaHL2Pksbq5f8M8EqsVhP9q/i1xGYSYf6MJVlHdMAVLWgR0Kra+n8dVzkSDuZeyJuDsskAmZaGFQN1CqnWYCI1tmV1Tk4A57e9LQMed0U11QWjdshdU2DGqBXKmGE419PdW3NmIxOR2u9iB1OKBmvzCUT8RAYyBzSn/yhU++YJ25g5a8Pb5kOvi+eOh+PEFEcQL6oOp/CF4Iw5nadlsLhc+XEnVJpwL2myZBoSlVcKxrJKbRn1/DIgXBueKKnqhyHKdJlpqI9eghAlRF0p2Q4f23m89mWRZf4nhKzTeXGIjCTFO4TNVucrlGU7tyJcrRCDVdfV24fziH+hB3QGckpuYzzjefr7hZalLRJ/w8dPw/8dCY1wnWq3AJ3zw2g1PzMxl51q7AgdKvwc1ERcGBns0zb8PK6vGKCnJq3uHiJEnslbTI0MEosje+h+OPO7hf2QofErewjI19wHEOv4dTvuFLh3VmGFMObAmov5kI47705fjSxCvAPGATBrfUSwim+5EQ1hanc5IcXe0/nOTiRUNEpZ+x65zVydqAs7490yqQiIUQvPazEwcal7vH2OD54lCcgpxKxqdmGc5/bp5UnqB45+n+iuInV/Q9DMOQVk15uaVZmhS8VaCqH21CmfH/ZGLb9wiEpaRLrPZLKX3bK7MT9Z0/OlDnb2QUKU8LMMIhLuQQntzsf0Wn4kA/0e9QAJJQ=="; + + // String license = "eQQm7gCZPF58Cy4i9OGkqSdFdDnFF0VSUVpw92WcrNLx7zVbpGJwjQhnKL8b0piApIbOTog5log/S1ZIxoUQogueaG84BQlJfRwKjtvpVWImlmhthQyQd2ogRqGkm3rkVGeG9wK49fzP3g5AtghNF05je2rQWd/Tyy/wutXq0e0rvR/bEckFaZ4BesQaYd0MejFC3lA8BjxNWiuvCKs15e1aRUOU5vwN5wsaTsTHokBIYhioSxOoGgHn6NrX6K9Dsl9uTWZ2dOVK/jEzYsNt6E/1Ww2ck1XmIWdRCQNmCpgikuPT0ACAL/w7UaRoWzM/Pm+akWqyp+bEavHT1Vhug3HAHOSGfOghGw2NerNlyEg8h6cVneMx+TsidnQ0ZG29aqdcLBRsvi26BYJJCA8+0WXjT+73RhS8g97Rfb6h0/W//5Az8UNZ6dp6XvUi2EJXQRhY5hkHiuwWT2W1ik+6wiiURkkrBACKbO1kmZWbVpRIe3Y3pcr3Q/V+oAcyPHRXCxu+JIe/j40/epuRrCyf8yvKsZ2Dnkl4QQmlwNqlW1F/arS+19G6zOG+6VKwtbI01A1R9SU1TYOA5UL/Qpo6Gyi3Ec3/irgQlzkq1rZrOIS4oo6tghul/zcG8rjno3luqHYwIZf8vAVfpwBesIVcANCOIuTRPU3A8vdmUoK/twGIchPapmjlAzLhjZ4KoAbNeMsWu3sN6kF44xofLMghos2X8OtvUA9CMD37v2FpYoM75qavyoivsBAbb6mG0p5TmkZ37BxfaGGP6SYrCa9ygQ=="; public final static int APP_STATUS_KILLED = 0; // 表示应用是被杀死后在启动的 public final static int APP_STATUS_NORMAL = 1; // 表示应用时正常的启动流程 diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt index 74e6744..7c959bd 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/MainActivity.kt @@ -155,6 +155,7 @@ class MainActivity : BaseAppCompatActivity() { fun jumpLogin() { var inl = Intent(con, LoginActivity::class.java) startActivity(inl) + } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/AuthQualificationActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/AuthQualificationActivity.java index 20cc40d..cb021fa 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/AuthQualificationActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/AuthQualificationActivity.java @@ -43,6 +43,7 @@ import com.arpa.hndahesudintocctmsdriver.util.file.ImageFileCompressUtil; import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants; import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil; import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity; +import com.lxj.xpopup.util.SmartGlideImageLoader; import java.io.File; import java.util.List; @@ -205,9 +206,10 @@ public class AuthQualificationActivity extends BaseAppCompatActivity { }); img.setOnClickListener(v -> { if (!"".equals(url)) { - new XPopup.Builder(con) - .asImageViewer(img, url, true, -1, -1, 50, false, new CertificatesActivity.ImageLoader()) - .show(); + new XPopup.Builder(con).asImageViewer(img, url,new SmartGlideImageLoader(R.mipmap.ic_launcher_round)).show(); +// new XPopup.Builder(con) +// .asImageViewer(img, url, true, -1, -1, 50, false, new CertificatesActivity.ImageLoader()) +// .show(); } }); value2.setOnClickListener(v -> { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java index 09d88f3..188915c 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java @@ -68,6 +68,7 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil; import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity; import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView; import com.lxj.xpopup.photoview.PhotoView; +import com.lxj.xpopup.util.SmartGlideImageLoader; import org.greenrobot.eventbus.EventBus; @@ -372,8 +373,11 @@ public class CertificatesActivity extends BaseAppCompatActivity { img1.setOnClickListener(v -> { if (!url1.equals("")) { new XPopup.Builder(con) - .asImageViewer(img1, url1, true, -1, -1, 50, false, new ImageLoader()) + .asImageViewer(img1, url1, new SmartGlideImageLoader(R.mipmap.ic_launcher_round)) .show(); +// new XPopup.Builder(con) +// .asImageViewer(img1, url1, true, -1, -1, 50, false, new ImageLoader()) +// .show(); }else{ if (!isAuth) { FalseKeys(); @@ -386,8 +390,11 @@ public class CertificatesActivity extends BaseAppCompatActivity { img2.setOnClickListener(v -> { if (!url2.equals("")) { new XPopup.Builder(con) - .asImageViewer(img2, url2, true, -1, -1, 50, false, new ImageLoader()) + .asImageViewer(img2, url2, new SmartGlideImageLoader(R.mipmap.ic_launcher_round)) .show(); +// new XPopup.Builder(con) +// .asImageViewer(img2, url2, true, -1, -1, 50, false, new ImageLoader()) +// .show(); }else{ if (!isAuth) { FalseKeys(); @@ -430,8 +437,11 @@ public class CertificatesActivity extends BaseAppCompatActivity { gia.showPopueWindow(this); } else if (!url3.equals("")) { new XPopup.Builder(con) - .asImageViewer(img3, url3, true, -1, -1, 50, false, new ImageLoader()) + .asImageViewer(img3, url3, new SmartGlideImageLoader(R.mipmap.ic_launcher_round)) .show(); +// new XPopup.Builder(con) +// .asImageViewer(img3, url3, true, -1, -1, 50, false, new ImageLoader()) +// .show(); } }); value5.setOnClickListener(v -> { @@ -883,22 +893,22 @@ public class CertificatesActivity extends BaseAppCompatActivity { EventBus.getDefault().post(he); } - public static class ImageLoader implements XPopupImageLoader { - @Override - public void loadImage(int position, @NonNull Object url, @NonNull ImageView imageView) { - //必须指定Target.SIZE_ORIGINAL，否则无法拿到原图，就无法享用天衣无缝的动画 - Glide.with(imageView).load(url).apply(new RequestOptions().placeholder(R.mipmap.ic_launcher_round).override(Target.SIZE_ORIGINAL)).into(imageView); - } - - @Override - public File getImageFile(@NonNull Context context, @NonNull Object uri) { - try { - return Glide.with(context).downloadOnly().load(uri).submit().get(); - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - } +// public static class ImageLoader implements XPopupImageLoader { +// @Override +// public void loadImage(int position, @NonNull Object url, @NonNull ImageView imageView) { +// //必须指定Target.SIZE_ORIGINAL，否则无法拿到原图，就无法享用天衣无缝的动画 +// Glide.with(imageView).load(url).apply(new RequestOptions().placeholder(R.mipmap.ic_launcher_round).override(Target.SIZE_ORIGINAL)).into(imageView); +// } +// +// @Override +// public File getImageFile(@NonNull Context context, @NonNull Object uri) { +// try { +// return Glide.with(context).downloadOnly().load(uri).submit().get(); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// return null; +// } +// } } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PersonalAuthActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PersonalAuthActivity.java index f734d6a..6e9ffec 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PersonalAuthActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PersonalAuthActivity.java @@ -40,6 +40,7 @@ import com.arpa.hndahesudintocctmsdriver.util.file.ImageFileCompressUtil; import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants; import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil; import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity; +import com.lxj.xpopup.util.SmartGlideImageLoader; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -175,8 +176,11 @@ public class PersonalAuthActivity extends BaseAppCompatActivity { up_head.setOnClickListener(v -> { if (ub.getData().getHeadportraitUrl() != null && !ub.getData().getHeadportraitUrl().equals("")) { new XPopup.Builder(con) - .asImageViewer(up_head, ub.getData().getHeadportraitUrl(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader()) + .asImageViewer(up_head, ub.getData().getHeadportraitUrl(), new SmartGlideImageLoader(R.mipmap.ic_launcher)) .show(); +// new XPopup.Builder(con) +// .asImageViewer(up_head, ub.getData().getHeadportraitUrl(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader()) +// .show(); } }); hyr = new HuoYuanRequset(con, hd); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java index 89054c5..8f906fa 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java @@ -36,6 +36,7 @@ import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.entity.LocalMedia; import com.lxj.xpopup.XPopup; +import com.lxj.xpopup.util.SmartGlideImageLoader; import java.io.File; import java.util.List; @@ -57,7 +58,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl "", "*注意: 没有粘贴NFC芯片的车辆无需上传,可直接跳过", "*注意: 没有可直接跳过,等候下次上传", - "*注意: 4.5吨一下车辆不需要上传,可直接跳过"}; + "*注意: 4.5吨以下车辆不需要上传,可直接跳过"}; private BaseRecyclerView brv; @@ -287,30 +288,42 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl case 0: if (cdb.getData().getRoadLicensePhoto() != null && !cdb.getData().getCarImage().equals("")) { new XPopup.Builder(con) - .asImageViewer(img, cdb.getData().getCarImage(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader()) + .asImageViewer(img, cdb.getData().getCarImage(), new SmartGlideImageLoader(R.mipmap.ic_launcher)) .show(); +// new XPopup.Builder(con) +// .asImageViewer(img, cdb.getData().getCarImage(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader()) +// .show(); } break; case 1: if (cdb.getData().getRoadLicensePhoto() != null && !cdb.getData().getNfcImage().equals("")) { new XPopup.Builder(con) - .asImageViewer(img, cdb.getData().getNfcImage(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader()) + .asImageViewer(img, cdb.getData().getNfcImage(), new SmartGlideImageLoader(R.mipmap.ic_launcher)) .show(); +// new XPopup.Builder(con) +// .asImageViewer(img, cdb.getData().getNfcImage(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader()) +// .show(); } break; case 2: if (cdb.getData().getRoadLicensePhoto() != null && !cdb.getData().getRegisterImage().equals("")) { new XPopup.Builder(con) - .asImageViewer(img, cdb.getData().getRegisterImage(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader()) + .asImageViewer(img, cdb.getData().getRegisterImage(), new SmartGlideImageLoader(R.mipmap.ic_launcher)) .show(); +// new XPopup.Builder(con) +// .asImageViewer(img, cdb.getData().getRegisterImage(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader()) +// .show(); } break; case 3: if (cdb.getData().getRoadLicensePhoto() != null && !"".equals(cdb.getData().getRoadLicensePhoto())) { //roadLicensePhoto new XPopup.Builder(con) - .asImageViewer(img, cdb.getData().getRoadLicensePhoto(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader()) + .asImageViewer(img, cdb.getData().getRoadLicensePhoto(), new SmartGlideImageLoader(R.mipmap.ic_launcher)) .show(); +// new XPopup.Builder(con) +// .asImageViewer(img, cdb.getData().getRoadLicensePhoto(), true, -1, -1, 50, false, new CertificatesActivity.ImageLoader()) +// .show(); break; } @@ -332,7 +345,8 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl if (!TextUtils.isEmpty(url)||(cdb!=null&&!TextUtils.isEmpty(cdb.getData().getCarImage()))){ finish(); Intent in = new Intent(con, PhotoCarActivity.class); - in.putExtra("type", 1); +// in.putExtra("type", 1); + in.putExtra("type", 3); in.putExtra("carId", carId); con.startActivity(in); } else{ @@ -425,7 +439,8 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl if (0 == type) { finish(); Intent in = new Intent(con, PhotoCarActivity.class); - in.putExtra("type", 1); +// in.putExtra("type", 1); + in.putExtra("type", 3); in.putExtra("carId", carId); con.startActivity(in); } else if (1 == type) { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/VehicleAuthActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/VehicleAuthActivity.java index 37bdc70..bb1c159 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/VehicleAuthActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/VehicleAuthActivity.java @@ -33,6 +33,7 @@ import com.arpa.hndahesudintocctmsdriver.util.file.ImageFileCompressUtil; import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil; import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity; import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView; +import com.lxj.xpopup.util.SmartGlideImageLoader; import com.scwang.smart.refresh.layout.SmartRefreshLayout; import org.greenrobot.eventbus.EventBus; @@ -221,8 +222,11 @@ public class VehicleAuthActivity extends BaseAppCompatActivity { carImage.setOnClickListener(v14 -> { if(cdb!=null && cdb.getData()!=null && cdb.getData().getCarImage()!=null && !cdb.getData().getCarImage().equals("")){ new XPopup.Builder(con) - .asImageViewer(carImage,cdb.getData().getCarImage(), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader()) + .asImageViewer(carImage,cdb.getData().getCarImage(), new SmartGlideImageLoader(R.mipmap.ic_launcher)) .show(); +// new XPopup.Builder(con) +// .asImageViewer(carImage,cdb.getData().getCarImage(), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader()) +// .show(); } }); r1.setOnClickListener(v12 -> { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java index c45797d..304b2a3 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java @@ -784,7 +784,9 @@ public class HomeFragment extends BaseFragment { private class MyLoader extends ImageLoader { @Override public void displayImage(Context context, Object path, ImageView imageView) { - Glide.with(con).load(path).into(imageView); + if (HomeFragment.this != null && getActivity() != null && !getActivity().isDestroyed()) { + Glide.with(con).load(path).into(imageView); + } } } @@ -883,6 +885,7 @@ public class HomeFragment extends BaseFragment { public void initAlct() { PermissionX.init(getActivity()) .permissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.RECORD_AUDIO) .request((allGranted, grantedList, deniedList) -> { if (allGranted) { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/OrderAllActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/OrderAllActivity.java index f36382c..e2d2597 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/OrderAllActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/OrderAllActivity.java @@ -81,7 +81,7 @@ public class OrderAllActivity extends BaseActivity { }else{ Toast.makeText(con,"抢单",Toast.LENGTH_SHORT).show(); } - xp.dismiss(); +// xp.dismiss(); break; default:break; } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/GetShangChuanActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/GetShangChuanActivity.java index 885935f..0dab5e5 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/GetShangChuanActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/GetShangChuanActivity.java @@ -16,6 +16,7 @@ import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity; import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil; import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil; import com.arpa.hndahesudintocctmsdriver.util.view.BaseActivity; +import com.lxj.xpopup.util.SmartGlideImageLoader; /** * @author hlh @@ -74,16 +75,22 @@ public class GetShangChuanActivity extends BaseActivity { Glide.with(con).load(sdw.getSendPutImagesUrl().get(0)).into(img1); img1.setOnClickListener(v -> { new XPopup.Builder(con) - .asImageViewer(img1,sdw.getSendPutImagesUrl().get(0), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader()) + .asImageViewer(img1,sdw.getSendPutImagesUrl().get(0), new SmartGlideImageLoader(R.mipmap.ic_launcher)) .show(); +// new XPopup.Builder(con) +// .asImageViewer(img1,sdw.getSendPutImagesUrl().get(0), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader()) +// .show(); }); } if(sdw.getReceiptUrl()!=null && sdw.getReceiptUrl().size()>=1){ Glide.with(con).load(sdw.getReceiptUrl().get(0)).into(img2); img2.setOnClickListener(v -> { new XPopup.Builder(con) - .asImageViewer(img2,sdw.getReceiptUrl().get(0), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader()) + .asImageViewer(img2,sdw.getReceiptUrl().get(0), new SmartGlideImageLoader(R.mipmap.ic_launcher)) .show(); +// new XPopup.Builder(con) +// .asImageViewer(img2,sdw.getReceiptUrl().get(0), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader()) +// .show(); }); } //new GlideUrl(sdw.getSendPutImagesUrl().toString(), new LazyHeaders.Builder().addHeader("Cookie", AppCurrentUser.getInstance().getUserCookie()).build()); 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 a83b7da..d29eb9f 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 @@ -24,6 +24,7 @@ import com.arpa.hndahesudintocctmsdriver.util.BitmapUtil; import com.arpa.hndahesudintocctmsdriver.util.NfcUtils; import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil; import com.arpa.hndahesudintocctmsdriver.util.img.GetCarImageAlert; +import com.arpa.hndahesudintocctmsdriver.util.location.LocationUtil; import com.bumptech.glide.Glide; import com.google.gson.Gson; import com.luck.picture.lib.PictureSelector; @@ -39,7 +40,6 @@ import com.arpa.hndahesudintocctmsdriver.request.bean.LUInputBean; import com.arpa.hndahesudintocctmsdriver.request.bean.UploadReceiptInputBean; import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity; import com.arpa.hndahesudintocctmsdriver.util.location.LocationGDUtil; -import com.arpa.hndahesudintocctmsdriver.util.location.LocationUtil; import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog; import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup; import com.arpa.hndahesudintocctmsdriver.util.file.FileUtil; @@ -48,6 +48,7 @@ import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants; import com.arpa.hndahesudintocctmsdriver.util.time.Timer; import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil; import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity; +import com.lxj.xpopup.util.SmartGlideImageLoader; import java.io.File; import java.io.UnsupportedEncodingException; @@ -68,7 +69,7 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { private LUInputBean lub=new LUInputBean(); private UploadReceiptInputBean urib=new UploadReceiptInputBean(); private LocationGDUtil lgdu; - private LocationUtil lu; + public LocationUtil lu; private List imgIds=new ArrayList<>(); private UploadBean ub; private HuoYuanRequset hyr; @@ -241,8 +242,11 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { gia.showPopueWindow(this,index==2); }else{ new XPopup.Builder(con) - .asImageViewer(res_img, ub.getData().getUrl(), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader()) + .asImageViewer(res_img, ub.getData().getUrl(), new SmartGlideImageLoader(R.mipmap.ic_launcher)) .show(); +// new XPopup.Builder(con) +// .asImageViewer(res_img, ub.getData().getUrl(), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader()) +// .show(); Toast.makeText(con,"查看了照片", Toast.LENGTH_SHORT).show(); } }); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity2.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity2.java index 1c2f4b1..2938037 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity2.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/ShangChuangImgActivity2.java @@ -49,6 +49,7 @@ import com.luck.picture.lib.PictureSelector; import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.entity.LocalMedia; import com.lxj.xpopup.XPopup; +import com.lxj.xpopup.util.SmartGlideImageLoader; import java.io.File; import java.io.UnsupportedEncodingException; @@ -243,8 +244,11 @@ public class ShangChuangImgActivity2 extends BaseAppCompatActivity { // gia.showPopueWindow(this,index==2); }else{ new XPopup.Builder(con) - .asImageViewer(res_img, ub.getData().getUrl(), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader()) + .asImageViewer(res_img, ub.getData().getUrl(), new SmartGlideImageLoader(R.mipmap.ic_launcher)) .show(); +// new XPopup.Builder(con) +// .asImageViewer(res_img, ub.getData().getUrl(), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader()) +// .show(); Toast.makeText(con,"查看了照片", Toast.LENGTH_SHORT).show(); } }); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java index 4af1fb5..eea459b 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java @@ -307,8 +307,12 @@ public class WelcomeActivity extends BaseAppCompatActivity { }, cd * 1000); } - String keys = "f9d35b1133cff1f6e3960c89b249e03f"; - String license = "eQQm7gCZPF58Cy4i9OGkqSdFdDnFF0VSUVpw92WcrNLx7zVbpGJwjQhnKL8b0piApIbOTog5log/S1ZIxoUQogueaG84BQlJfRwKjtvpVWImlmhthQyQd2ogRqGkm3rkVGeG9wK49fzP3g5AtghNF05je2rQWd/Tyy/wutXq0e0rvR/bEckFaZ4BesQaYd0MejFC3lA8BjxNWiuvCKs15e1aRUOU5vwN5wsaTsTHokBIYhioSxOoGgHn6NrX6K9Dsl9uTWZ2dOVK/jEzYsNt6E/1Ww2ck1XmIWdRCQNmCpgikuPT0ACAL/w7UaRoWzM/Pm+akWqyp+bEavHT1Vhug3HAHOSGfOghGw2NerNlyEg8h6cVneMx+TsidnQ0ZG29aqdcLBRsvi26BYJJCA8+0WXjT+73RhS8g97Rfb6h0/W//5Az8UNZ6dp6XvUi2EJXQRhY5hkHiuwWT2W1ik+6wiiURkkrBACKbO1kmZWbVpRIe3Y3pcr3Q/V+oAcyPHRXCxu+JIe/j40/epuRrCyf8yvKsZ2Dnkl4QQmlwNqlW1F/arS+19G6zOG+6VKwtbI01A1R9SU1TYOA5UL/Qpo6Gyi3Ec3/irgQlzkq1rZrOIS4oo6tghul/zcG8rjno3luqHYwIZf8vAVfpwBesIVcANCOIuTRPU3A8vdmUoK/twGIchPapmjlAzLhjZ4KoAbNeMsWu3sN6kF44xofLMghos2X8OtvUA9CMD37v2FpYoM75qavyoivsBAbb6mG0p5TmkZ37BxfaGGP6SYrCa9ygQ=="; +// String keys = "f9d35b1133cff1f6e3960c89b249e03f"; +// String license = "eQQm7gCZPF58Cy4i9OGkqSdFdDnFF0VSUVpw92WcrNLx7zVbpGJwjQhnKL8b0piApIbOTog5log/S1ZIxoUQogueaG84BQlJfRwKjtvpVWImlmhthQyQd2ogRqGkm3rkVGeG9wK49fzP3g5AtghNF05je2rQWd/Tyy/wutXq0e0rvR/bEckFaZ4BesQaYd0MejFC3lA8BjxNWiuvCKs15e1aRUOU5vwN5wsaTsTHokBIYhioSxOoGgHn6NrX6K9Dsl9uTWZ2dOVK/jEzYsNt6E/1Ww2ck1XmIWdRCQNmCpgikuPT0ACAL/w7UaRoWzM/Pm+akWqyp+bEavHT1Vhug3HAHOSGfOghGw2NerNlyEg8h6cVneMx+TsidnQ0ZG29aqdcLBRsvi26BYJJCA8+0WXjT+73RhS8g97Rfb6h0/W//5Az8UNZ6dp6XvUi2EJXQRhY5hkHiuwWT2W1ik+6wiiURkkrBACKbO1kmZWbVpRIe3Y3pcr3Q/V+oAcyPHRXCxu+JIe/j40/epuRrCyf8yvKsZ2Dnkl4QQmlwNqlW1F/arS+19G6zOG+6VKwtbI01A1R9SU1TYOA5UL/Qpo6Gyi3Ec3/irgQlzkq1rZrOIS4oo6tghul/zcG8rjno3luqHYwIZf8vAVfpwBesIVcANCOIuTRPU3A8vdmUoK/twGIchPapmjlAzLhjZ4KoAbNeMsWu3sN6kF44xofLMghos2X8OtvUA9CMD37v2FpYoM75qavyoivsBAbb6mG0p5TmkZ37BxfaGGP6SYrCa9ygQ=="; + + String keys = "19ac0aa74338e487e45057faf7212401"; + String license = "HF41uGxM/1i3CtW98DimoA97BlNTAnQ+DiEAihYmZ2jR1jqC4be253joEJbOJgFDIzp5aIoeuXSWWHFaDVfaHL2Pksbq5f8M8EqsVhP9q/i1xGYSYf6MJVlHdMAVLWgR0Kra+n8dVzkSDuZeyJuDsskAmZaGFQN1CqnWYCI1tmV1Tk4A57e9LQMed0U11QWjdshdU2DGqBXKmGE419PdW3NmIxOR2u9iB1OKBmvzCUT8RAYyBzSn/yhU++YJ25g5a8Pb5kOvi+eOh+PEFEcQL6oOp/CF4Iw5nadlsLhc+XEnVJpwL2myZBoSlVcKxrJKbRn1/DIgXBueKKnqhyHKdJlpqI9eghAlRF0p2Q4f23m89mWRZf4nhKzTeXGIjCTFO4TNVucrlGU7tyJcrRCDVdfV24fziH+hB3QGckpuYzzjefr7hZalLRJ/w8dPw/8dCY1wnWq3AJ3zw2g1PzMxl51q7AgdKvwc1ERcGBns0zb8PK6vGKCnJq3uHiJEnslbTI0MEosje+h+OPO7hf2QofErewjI19wHEOv4dTvuFLh3VmGFMObAmov5kI47705fjSxCvAPGATBrfUSwim+5EQ1hanc5IcXe0/nOTiRUNEpZ+x65zVydqAs7490yqQiIUQvPazEwcal7vH2OD54lCcgpxKxqdmGc5/bp5UnqB45+n+iuInV/Q9DMOQVk15uaVZmhS8VaCqH21CmfH/ZGLb9wiEpaRLrPZLKX3bK7MT9Z0/OlDnb2QUKU8LMMIhLuQQntzsf0Wn4kA/0e9QAJJQ=="; + public void init() { String state = SPUtil.getSP(con, "state_data", "authorization_state"); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/WoDeFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/WoDeFragment.java index 9bb0926..03d6d91 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/WoDeFragment.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/WoDeFragment.java @@ -35,6 +35,7 @@ import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup; import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants; import com.arpa.hndahesudintocctmsdriver.util.view.BaseFragment; import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView; +import com.lxj.xpopup.util.SmartGlideImageLoader; import com.zhpan.bannerview.BannerViewPager; import com.zhpan.bannerview.constants.PageStyle; @@ -176,8 +177,11 @@ public class WoDeFragment extends BaseFragment { headportraitUrl.setOnClickListener(v1 -> { if(ub.getData().getHeadportraitUrl()!=null && !ub.getData().getHeadportraitUrl().equals("")){ new XPopup.Builder(con) - .asImageViewer(headportraitUrl,ub.getData().getHeadportraitUrl(), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader()) + .asImageViewer(headportraitUrl,ub.getData().getHeadportraitUrl(),new SmartGlideImageLoader(R.mipmap.ic_launcher_round)) .show(); +// new XPopup.Builder(con) +// .asImageViewer(headportraitUrl,ub.getData().getHeadportraitUrl(), true, -1, -1, 50, false,new CertificatesActivity.ImageLoader()) +// .show(); }else{ Intent in=new Intent(con, PersonalAuthActivity.class); startActivity(in); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/WalletFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/WalletFragment.java index f6480b7..1354c0e 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/WalletFragment.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/WalletFragment.java @@ -34,6 +34,7 @@ import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView; import org.jetbrains.annotations.NotNull; + public class WalletFragment extends BaseFragment{ public static UserBean userBean; @@ -220,8 +221,8 @@ public class WalletFragment extends BaseFragment{ } } - //初始化银行卡信息 - public void initBack(){ + //初始化银行卡信息 + public void initBack(){ if(bcb.getData() !=null && bcb.getData().getRecords()!=null && bcb.getData().getRecords().size()>=1){ bank_title_1.setText(bcb.getData().getRecords().get(0).getBankName()); bank_number.setText(bcb.getData().getRecords().get(0).getCardNo()); @@ -233,17 +234,17 @@ public class WalletFragment extends BaseFragment{ bank_add.setVisibility(View.VISIBLE); bank_remove.setVisibility(View.GONE); } - } + } - //初始化电子账户信息 - public void initContracts(){ - if(cb.getData()!=null && !StringUtil.isNull(cb.getData().getChildAcctNo(),"").equals("")) { - bank_title_2.setText("浦发银行电子账户"); - bank2_number.setText(cb.getData().getChildAcctNo()); - bank2_number.setVisibility(View.VISIBLE); - bank_add2.setVisibility(View.GONE); - } - } + //初始化电子账户信息 + public void initContracts(){ + if(cb.getData()!=null && !StringUtil.isNull(cb.getData().getChildAcctNo(),"").equals("")) { + bank_title_2.setText("浦发银行电子账户"); + bank2_number.setText(cb.getData().getChildAcctNo()); + bank2_number.setVisibility(View.VISIBLE); + bank_add2.setVisibility(View.GONE); + } + } public static boolean isInsBank=false; diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/GrayFrameLayout.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/GrayFrameLayout.java new file mode 100644 index 0000000..926d7cf --- /dev/null +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/GrayFrameLayout.java @@ -0,0 +1,43 @@ +package com.arpa.hndahesudintocctmsdriver.util.view; + +import android.content.Context; +import android.graphics.Canvas; +import android.graphics.ColorMatrix; +import android.graphics.ColorMatrixColorFilter; +import android.graphics.Paint; +import android.util.AttributeSet; +import android.widget.FrameLayout; + +/** + * @ClassName GrayFrameLayout + * @Author 用户 + * @Date 2023/1/29 15:28 + * @Description TODO + */ +public class GrayFrameLayout extends FrameLayout { + private Paint mPaint = new Paint(); + + public GrayFrameLayout(Context context, AttributeSet attrs) { + super(context, attrs); + + ColorMatrix cm = new ColorMatrix(); + cm.setSaturation(0); + mPaint.setColorFilter(new ColorMatrixColorFilter(cm)); + } + + @Override + protected void dispatchDraw(Canvas canvas) { + canvas.saveLayer(null, mPaint, Canvas.ALL_SAVE_FLAG); + super.dispatchDraw(canvas); + canvas.restore(); + } + + + @Override + public void draw(Canvas canvas) { + canvas.saveLayer(null, mPaint, Canvas.ALL_SAVE_FLAG); + super.draw(canvas); + canvas.restore(); + } + +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_che_data.xml b/app/src/main/res/layout/activity_che_data.xml index 931c2ac..56b4f17 100644 --- a/app/src/main/res/layout/activity_che_data.xml +++ b/app/src/main/res/layout/activity_che_data.xml @@ -176,10 +176,12 @@ android:layout_centerVertical="true"/> @@ -202,10 +204,12 @@ android:layout_centerVertical="true"/> diff --git a/app/src/main/res/layout/activity_get_shangchuan.xml b/app/src/main/res/layout/activity_get_shangchuan.xml index a6e5116..7a8c866 100644 --- a/app/src/main/res/layout/activity_get_shangchuan.xml +++ b/app/src/main/res/layout/activity_get_shangchuan.xml @@ -55,10 +55,11 @@ android:layout_width="@dimen/dp_90" android:layout_height="@dimen/dp_90" android:background="#EEEEEE"> + + android:layout_height="match_parent" />