From df7a29e54bbc2370dfb6a3c3d926a555f926426b Mon Sep 17 00:00:00 2001 From: lijia Date: Thu, 21 Nov 2024 11:07:34 +0800 Subject: [PATCH] =?UTF-8?q?h5title=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/arpa/hndahesudintocctmsdriver/H5Activity.java | 6 ++++++ .../ui/auth/CertificatesActivity.java | 2 ++ .../ui/home/HuoYunDelActivity.java | 1 + .../ui/home/shangchuan/ShangChuangImgActivity.java | 10 ++++++++-- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity.java index ec5c576..4664c87 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity.java @@ -95,8 +95,14 @@ public class H5Activity extends AppCompatActivity { mWebView = findViewById(R.id.webview); ImageView back = findViewById(R.id.back); TextView close = findViewById(R.id.close); + TextView tvTitle = findViewById(R.id.tv_title); WebSettings webSetting = mWebView.getSettings(); + String title = getIntent().getStringExtra("title"); + if (!TextUtils.isEmpty(title)){ + tvTitle.setText(title); + } + back.setOnClickListener(v -> { if (isOk){ ActivityUtils.finishToActivity(MainActivity.class,false); 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 2ec92a5..6619f67 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 @@ -224,6 +224,7 @@ public class CertificatesActivity extends BaseAppCompatActivity { Intent intent = new Intent(this, H5Activity.class); intent.putExtra("url", (String) bb.getData()); intent.putExtra("view_file", false); + intent.putExtra("title", "人脸识别"); intent.putExtra("isGoCar", true); startActivity(intent); // EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), "")); @@ -461,6 +462,7 @@ public class CertificatesActivity extends BaseAppCompatActivity { Intent intent = new Intent(this, H5Activity.class); intent.putExtra("url", (String) bb.getData()); intent.putExtra("view_file", false); + intent.putExtra("title", "人脸识别"); intent.putExtra("isGoCar", true); startActivity(intent); // EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), "")); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java index fd58095..9010ba9 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java @@ -128,6 +128,7 @@ public class HuoYunDelActivity extends BaseAppCompatActivity { Intent intent = new Intent(this, H5Activity.class); intent.putExtra("url", (String) bb.getData()); intent.putExtra("view_file", false); + intent.putExtra("title", "合同签署"); startActivity(intent); } //finish(); 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 7a68328..7f00738 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 @@ -473,7 +473,10 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onFailure(String s, String s1) { - + if (!isFinishing() && customDialog != null && customDialog.isShowing()) { + customDialog.dismiss(); + } + ToastUtils.showToast(con, s1); } }); @@ -523,7 +526,10 @@ public class ShangChuangImgActivity extends BaseAppCompatActivity { @Override public void onFailure(String s, String s1) { - + if (!isFinishing() && customDialog != null && customDialog.isShowing()) { + customDialog.dismiss(); + } + ToastUtils.showToast(con, s1); } });