denghuan/river-lucky-driver
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into newlj

Browse Source
This commit is contained in:
lijia 2024-12-05 10:11:03 +08:00
commit cf94fa8573
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/AndroidManifest.xml
View File

@ -187,7 +187,9 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.FaceSuccActivity" android:name="com.arpa.hndahesudintocctmsdriver.ui.auth.FaceSuccActivity"
android:exported="true"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name="com.arpa.hndahesudintocctmsdriver.ui.login.LoginActivity" android:name="com.arpa.hndahesudintocctmsdriver.ui.login.LoginActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
@ -412,6 +414,12 @@
android:host="demo" android:host="demo"
android:path="/realBack" android:path="/realBack"
android:scheme="esign" /> android:scheme="esign" />
<data
android:host="driver"
android:path="/realBack"
android:port="8088"
android:scheme="dahe" />
</intent-filter> </intent-filter>
</activity> </activity>

23
app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity.java
View File

@ -211,6 +211,15 @@ public class H5Activity extends AppCompatActivity {
if (uri != null) { if (uri != null) {
// 芝麻认证刷脸结束返回获取后续操作页面地址 // 芝麻认证刷脸结束返回获取后续操作页面地址
// String callbackUrl = uri.getQueryParameter("callback"); // String callbackUrl = uri.getQueryParameter("callback");
String urlString = uri.toString();
if ("dahe://driver:8088/realBack".equals(urlString)) {
Intent in = new Intent(ctx, FaceSuccActivity.class);
in.putExtra("isGoCar", true);
startActivity(in);
ActivityUtils.finishToActivity(MainActivity.class, false);
return;
}
String callbackUrl = uri.getQueryParameter("realnameUrl"); String callbackUrl = uri.getQueryParameter("realnameUrl");
if (!TextUtils.isEmpty(callbackUrl)) { if (!TextUtils.isEmpty(callbackUrl)) {
@ -227,17 +236,18 @@ public class H5Activity extends AppCompatActivity {
if (url.startsWith("alipay")) { if (url.startsWith("alipay")) {
try { try {
Intent intent2 = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); Intent intent2 = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
intent2.putExtra("isGoCar",isGoCar); intent2.putExtra("isGoCar", isGoCar);
startActivity(intent2); startActivity(intent2);
return; return;
} catch (Exception e) { } catch (Exception e) {
} }
}else if (url.startsWith("https://agreement.dahehuoyun.com/#/1ba5c216/912f4c9587/5eb5184653/6ef9")) { // }else if (url.startsWith("https://agreement.dahehuoyun.com/#/1ba5c216/912f4c9587/5eb5184653/6ef9")) {
} else if (url.startsWith("https://agreement.dahehuoyun.com/goApp")) {
Intent in = new Intent(ctx, FaceSuccActivity.class); Intent in = new Intent(ctx, FaceSuccActivity.class);
startActivity(in); startActivity(in);
if (isGoCar) { if (isGoCar) {
ActivityUtils.finishToActivity(MainActivity.class, false); ActivityUtils.finishToActivity(MainActivity.class, false);
}else{ } else {
finish(); finish();
} }
return; return;
@ -260,13 +270,14 @@ public class H5Activity extends AppCompatActivity {
Uri uri = Uri.parse(url); Uri uri = Uri.parse(url);
Log.e("test", "要加载的地址:" + uri.getScheme() + " " + url + " "); Log.e("test", "要加载的地址:" + uri.getScheme() + " " + url + " ");
if (uri.getScheme().equals("http") || uri.getScheme().equals("https")) { if (uri.getScheme().equals("http") || uri.getScheme().equals("https")) {
if (url.startsWith("https://agreement.dahehuoyun.com/#/1ba5c216/912f4c9587/5eb5184653/6ef9")) { // if (url.startsWith("https://agreement.dahehuoyun.com/#/1ba5c216/912f4c9587/5eb5184653/6ef9")) {
if (url.startsWith("https://agreement.dahehuoyun.com/goApp")) {
Intent in = new Intent(ctx, FaceSuccActivity.class); Intent in = new Intent(ctx, FaceSuccActivity.class);
in.putExtra("isGoCar",isGoCar); in.putExtra("isGoCar", isGoCar);
startActivity(in); startActivity(in);
if (isGoCar) { if (isGoCar) {
ActivityUtils.finishToActivity(MainActivity.class, false); ActivityUtils.finishToActivity(MainActivity.class, false);
}else{ } else {
finish(); finish();
} }
return true; return true;