Merge branch 'master' into newlj

app/build.gradle

@@ -37,8 +37,8 @@ android {
         applicationId "com.arpa.hndahesudintocctmsdriver"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 73
-        versionName "3.4.3"
+        versionCode 74
+        versionName "3.4.4"
         flavorDimensions "CHANNEL_VALUE"
         flavorDimensions "app_icon"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity.java

@@ -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);

app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/shangchuan/WebPDFActivity.java

@@ -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();
             }