diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 90f907f..dfe62e3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -167,6 +167,9 @@ + diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity.java index cc72aea..a349d49 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity.java @@ -45,6 +45,7 @@ import com.arpa.hndahesudintocctmsdriver.request.UserRequset; import com.arpa.hndahesudintocctmsdriver.ui.MainActivity; import com.arpa.hndahesudintocctmsdriver.ui.UiAuxiliary; import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity; +import com.arpa.hndahesudintocctmsdriver.ui.auth.FaceSuccActivity; import com.arpa.hndahesudintocctmsdriver.ui.home.StartYunDanActivity; import com.arpa.hndahesudintocctmsdriver.util.MessageUtils; import com.dahe.mylibrary.utils.ActivityUtils; @@ -100,13 +101,13 @@ public class H5Activity extends AppCompatActivity { WebSettings webSetting = mWebView.getSettings(); String title = getIntent().getStringExtra("title"); - if (!TextUtils.isEmpty(title)){ + if (!TextUtils.isEmpty(title)) { tvTitle.setText(title); } back.setOnClickListener(v -> { - if (isOk){ - ActivityUtils.finishToActivity(MainActivity.class,false); + if (isOk) { + ActivityUtils.finishToActivity(MainActivity.class, false); return; } if (mWebView.canGoBack()) { @@ -117,8 +118,8 @@ public class H5Activity extends AppCompatActivity { }); close.setOnClickListener(v -> { - if (isOk){ - ActivityUtils.finishToActivity(MainActivity.class,false); + if (isOk) { + ActivityUtils.finishToActivity(MainActivity.class, false); return; } if (mWebView.canGoBack()) { @@ -224,13 +225,22 @@ public class H5Activity extends AppCompatActivity { String url = intent.getStringExtra("url"); viewFile = intent.getBooleanExtra("view_file", false); if (url.startsWith("alipay")) { - try { Intent intent2 = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); + intent2.putExtra("isGoCar",isGoCar); startActivity(intent2); return; } catch (Exception e) { } + }else if (url.startsWith("https://agreement.dahehuoyun.com/#/1ba5c216/912f4c9587/5eb5184653/6ef9")) { + Intent in = new Intent(ctx, FaceSuccActivity.class); + startActivity(in); + if (isGoCar) { + ActivityUtils.finishToActivity(MainActivity.class, false); + }else{ + finish(); + } + return; } if (curUrl == null) { curUrl = url; @@ -250,17 +260,29 @@ public class H5Activity extends AppCompatActivity { Uri uri = Uri.parse(url); Log.e("test", "要加载的地址:" + uri.getScheme() + " " + url + " "); if (uri.getScheme().equals("http") || uri.getScheme().equals("https")) { - if (isGoCar&&url.startsWith("https://agreement.dahehuoyun.com/#/1ba5c216/912f4c9587/5eb5184653/6ef9")){ - isOk = true; - view.loadUrl(url); - new MessageUtils().showSimCenPop(ctx, "个人信息上传成功，请添加车辆信息!", "去添加",() -> { - Intent in = new Intent(ctx, CertificatesActivity.class); - in.putExtra("index", 2); - startActivity(in); - ActivityUtils.finishToActivity(MainActivity.class,false); - }); + if (url.startsWith("https://agreement.dahehuoyun.com/#/1ba5c216/912f4c9587/5eb5184653/6ef9")) { + Intent in = new Intent(ctx, FaceSuccActivity.class); + in.putExtra("isGoCar",isGoCar); + startActivity(in); + if (isGoCar) { + ActivityUtils.finishToActivity(MainActivity.class, false); + }else{ + finish(); + } return true; } + +// if (isGoCar&&url.startsWith("https://agreement.dahehuoyun.com/#/1ba5c216/912f4c9587/5eb5184653/6ef9")){ +// isOk = true; +// view.loadUrl(url); +// new MessageUtils().showSimCenPop(ctx, "个人信息上传成功，请添加车辆信息!", "去添加",() -> { +// Intent in = new Intent(ctx, CertificatesActivity.class); +// in.putExtra("index", 2); +// startActivity(in); +// ActivityUtils.finishToActivity(MainActivity.class,false); +// }); +// return true; +// } view.loadUrl(url); return true; } else if (uri.getScheme().equals("js") || uri.getScheme().equals("jsbridge")) { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/FaceSuccActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/FaceSuccActivity.java index 8e018be..5c9f7f0 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/FaceSuccActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/FaceSuccActivity.java @@ -1,12 +1,17 @@ package com.arpa.hndahesudintocctmsdriver.ui.auth; +import android.content.Intent; import android.os.Bundle; +import android.view.View; +import android.widget.Button; import androidx.annotation.Nullable; import com.arpa.hndahesudintocctmsdriver.R; +import com.arpa.hndahesudintocctmsdriver.ui.MainActivity; import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil; import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity; +import com.dahe.mylibrary.utils.ActivityUtils; /** * @ClassName FaceSuccActivity @@ -20,6 +25,26 @@ public class FaceSuccActivity extends BaseAppCompatActivity { protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); StateStyleUtil.stateTextColor(this); - setContentView(R.layout.activity_auth_qualification); + setContentView(R.layout.activity_face_succ_result); + con = this; + initView(null); + Button btnHome = findViewById(R.id.btnHome); + Button btnAddCar = findViewById(R.id.btnAddCar); + boolean isGoCar = getIntent().getBooleanExtra("isGoCar", false); + if (isGoCar){ + btnHome.setText("返回"); + btnAddCar.setVisibility(View.GONE); + }else{ + btnHome.setText("返回首页"); + btnAddCar.setVisibility(View.VISIBLE); + } + + btnHome.setOnClickListener(v -> finish()); + btnAddCar.setOnClickListener(v -> { + Intent in = new Intent(con, CertificatesActivity.class); + in.putExtra("index", 2); + startActivity(in); + }); + } } diff --git a/app/src/main/res/drawable-xxhdpi/face_success.png b/app/src/main/res/drawable-xxhdpi/face_success.png new file mode 100644 index 0000000..465e970 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/face_success.png differ diff --git a/app/src/main/res/drawable/bg_btn_deepgreen16.xml b/app/src/main/res/drawable/bg_btn_deepgreen16.xml new file mode 100644 index 0000000..666df07 --- /dev/null +++ b/app/src/main/res/drawable/bg_btn_deepgreen16.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_btn_green16.xml b/app/src/main/res/drawable/bg_btn_green16.xml new file mode 100644 index 0000000..103bbd9 --- /dev/null +++ b/app/src/main/res/drawable/bg_btn_green16.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_face_succ_result.xml b/app/src/main/res/layout/activity_face_succ_result.xml new file mode 100644 index 0000000..7e6a3d2 --- /dev/null +++ b/app/src/main/res/layout/activity_face_succ_result.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + +