Merge branch 'master' into newlj

This commit is contained in:
2024-12-16 17:10:59 +08:00
5 changed files with 577 additions and 5 deletions
@@ -242,7 +242,7 @@ public class H5Activity extends AppCompatActivity {
} catch (Exception e) {
}
// }else if (url.startsWith("https://agreement.dahehuoyun.com/#/1ba5c216/912f4c9587/5eb5184653/6ef9")) {
} else if (url.startsWith("https://agreement.dahehuoyun.com/goApp")) {
} else if (url.startsWith("https://agreement.dahehuoyun.com")) {
Intent in = new Intent(ctx, FaceSuccActivity.class);
startActivity(in);
if (isGoCar) {
@@ -271,7 +271,7 @@ public class H5Activity extends AppCompatActivity {
Log.e("test", "要加载的地址:" + uri.getScheme() + " " + url + " ");
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/goApp")) {
if (url.startsWith("https://agreement.dahehuoyun.com")) {
Intent in = new Intent(ctx, FaceSuccActivity.class);
in.putExtra("isGoCar", isGoCar);
startActivity(in);
@@ -58,7 +58,7 @@ public class WebPDFActivity extends BaseActivity {
protected void onPostExecute(Void aVoid) {
super.onPostExecute(aVoid);
pdf_view.fromStream(input[0])
.pages(0,1) // all pages are displayed by default
// .pages(0,1,2,3,4,5,6,7) // all pages are displayed by default
.enableAnnotationRendering(true)
.load();
}