bug修复

RvClient/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.xxfc.rv"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 109
-        versionName "1.0.9"
+        versionCode 110
+        versionName "1.1.0"
         multiDexEnabled true
 
         //新版Gradle 是 implementation 为了兼容compile,写上这句话

RvWrapper/src/main/java/com/ruiwenliu/wrapper/weight/webview/SafeWebView.java

@@ -2,6 +2,7 @@ package com.ruiwenliu.wrapper.weight.webview;
 
 
 import android.content.Context;;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -9,6 +10,10 @@ import android.util.Log;
 import android.view.accessibility.AccessibilityManager;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+
+import com.ruiwenliu.wrapper.R;
 
 import java.lang.reflect.Method;
 
@@ -19,7 +24,7 @@ import java.lang.reflect.Method;
  * Desc:
  */
 public class SafeWebView extends WebView {
-
+    private ProgressBar mProgressBar;
     public SafeWebView(Context context) {
         super(context);
         initWeb(context);
@@ -57,6 +62,42 @@ public class SafeWebView extends WebView {
         initListener();
         initinject(context);
 //        initinject(context);
+
+        mProgressBar = new ProgressBar(context, null,
+                android.R.attr.progressBarStyleHorizontal);
+        LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT, 8);
+        mProgressBar.setLayoutParams(layoutParams);
+
+        Drawable drawable = context.getResources().getDrawable(
+                R.drawable.shape_rv_bg_yellow_progress);
+        mProgressBar.setProgressDrawable(drawable);
+        addView(mProgressBar);
+        setWebChromeClient(new WebChromeClient());
+    }
+
+
+    public class WebChromeClient extends android.webkit.WebChromeClient {
+        @Override
+        public void onProgressChanged(WebView view, int newProgress) {
+            if (newProgress == 100) {
+                mProgressBar.setVisibility(GONE);
+            } else {
+                if (mProgressBar.getVisibility() == GONE)
+                    mProgressBar.setVisibility(VISIBLE);
+                mProgressBar.setProgress(newProgress);
+            }
+            super.onProgressChanged(view, newProgress);
+        }
+    }
+
+    @Override
+    protected void onScrollChanged(int l, int t, int oldl, int oldt) {
+        LayoutParams lp = (LayoutParams) mProgressBar.getLayoutParams();
+        lp.x = l;
+        lp.y = t;
+        mProgressBar.setLayoutParams(lp);
+        super.onScrollChanged(l, t, oldl, oldt);
     }
 
     private void initWebSettings(Context context) {

RvWrapper/src/main/res/drawable/shape_rv_bg_yellow_progress.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <color android:color="#ffffff"/>
+    </item>
+
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <gradient
+                    android:centerColor="#aa47e29a"
+                    android:endColor="#47e29a"
+                    android:startColor="#9947e29a"/>
+            </shape>
+        </clip>
+    </item>
+</layer-list>
\ No newline at end of file

component_control/src/main/res/drawable/shape_rv_bg_yellow_progress_hint.xml

@@ -8,9 +8,9 @@
         <clip>
             <shape>
                 <gradient
-                    android:centerColor="#aaf3dd23"
-                    android:endColor="#f3dd23"
-                    android:startColor="#99f3dd23"/>
+                    android:centerColor="#aa47e29a"
+                    android:endColor="#47e29a"
+                    android:startColor="#9947e29a"/>
             </shape>
         </clip>
     </item>

module_camp/build.gradle

@@ -38,5 +38,6 @@ dependencies {
     annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc1'
     annotationProcessor'com.alibaba:arouter-compiler:1.1.4'
     api project(':RvWrapper')
+    api project(':component_control')
 
 }

module_camp/src/main/java/com/rv/camp/camp/CampDetailActivity.java

@@ -27,6 +27,7 @@ import com.rv.camp.R2;
 import com.rv.camp.api.CampApi;
 import com.rv.camp.bean.CampDetailsBean;
 import com.rv.camp.presenter.CampPresenter;
+import com.rv.component.control.ProgressWebView;
 import com.yuyife.okgo.OkGoUtil;
 
 import java.util.LinkedHashMap;
@@ -44,7 +45,7 @@ import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
 @Route(path = Constance.ACTIVITY_URL_CAMPDETAIL)
 public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
     @BindView(R2.id.webView)
-    WebView mWebView;
+    ProgressWebView mWebView;
 
     private String webUrl;
 
@@ -133,22 +134,28 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
         // 如果此设置是允许，则 setAllowFileAccessFromFileURLs 不起做用
         webSettings.setAllowUniversalAccessFromFileURLs(true);
         mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
-        mWebView.loadUrl(webUrl);
-        mWebView.setWebViewClient(new WebViewClient() {
+        mWebView.setWebViewClient(new WebViewClient(){
             @Override
-            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
-                return super.shouldOverrideUrlLoading(view, request);
-            }
-        });
-        mWebView.setWebChromeClient(new WebChromeClient() {
-            @Override
-            public void onProgressChanged(WebView view, int newProgress) {
-                super.onProgressChanged(view, newProgress);
-                if (newProgress == 85) {
-                    onHideLoading();
-                }
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                return false;
             }
         });
+        mWebView.loadUrl(webUrl);
+//        mWebView.setWebViewClient(new WebViewClient() {
+//            @Override
+//            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+//                return super.shouldOverrideUrlLoading(view, request);
+//            }
+//        });
+//        mWebView.setWebChromeClient(new WebChromeClient() {
+//            @Override
+//            public void onProgressChanged(WebView view, int newProgress) {
+//                super.onProgressChanged(view, newProgress);
+//                if (newProgress == 85) {
+//                    onHideLoading();
+//                }
+//            }
+//        });
     }
 
     @Override

module_camp/src/main/res/layout/activity_camp_detail.xml

@@ -4,11 +4,13 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <WebView
+    <com.rv.component.control.ProgressWebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:id="@+id/webView" />
+        android:id="@+id/webView">
+    </com.rv.component.control.ProgressWebView>
+
 
     <TextView
         android:id="@+id/tv_scheduled_camp"

module_home/src/main/java/com/rv/home/rv/module/basic/WebActivity.java

@@ -5,6 +5,8 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
 import android.widget.LinearLayout;
 
 import com.alibaba.android.arouter.facade.annotation.Autowired;
@@ -55,6 +57,12 @@ public class WebActivity extends BaseStatusActivity<PickerPresenter> {
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setTitle(intent.getStringExtra("title"));
         String url = intent.getStringExtra("url");
+        mWebView.setWebViewClient(new WebViewClient(){
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                return false;
+            }
+        });
         if (0 == type) {
             mWebView.loadUrl(url);
         } else {

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderDetailActivity.java

@@ -24,6 +24,7 @@ import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.component.control.ProgressWebView;
 import com.rv.component.dialog.PaymentTypeSelection;
 import com.rv.component.utils.ClipboardUtil;
 import com.rv.home.R;
@@ -66,7 +67,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
     @BindView(R2.id.tv_center)
     TextView tvCenter;
     @BindView(R2.id.webView)
-    WebView mWebView;
+    ProgressWebView mWebView;
     @BindView(R2.id.tv_cancel_order)
     TextView tvCancelOrder;
     @BindView(R2.id.tv_pick_up_the_car)
@@ -401,22 +402,28 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
         // 如果此设置是允许，则 setAllowFileAccessFromFileURLs 不起做用
         webSettings.setAllowUniversalAccessFromFileURLs(true);
         mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
-        mWebView.loadUrl(webUrl);
-        mWebView.setWebViewClient(new WebViewClient() {
+        mWebView.setWebViewClient(new WebViewClient(){
             @Override
-            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
-                return super.shouldOverrideUrlLoading(view, request);
-            }
-        });
-        mWebView.setWebChromeClient(new WebChromeClient() {
-            @Override
-            public void onProgressChanged(WebView view, int newProgress) {
-                super.onProgressChanged(view, newProgress);
-                if (newProgress == 85) {
-                    onHideLoading();
-                }
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                return false;
             }
         });
+        mWebView.loadUrl(webUrl);
+//        mWebView.setWebViewClient(new WebViewClient() {
+//            @Override
+//            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+//                return super.shouldOverrideUrlLoading(view, request);
+//            }
+//        });
+//        mWebView.setWebChromeClient(new WebChromeClient() {
+//            @Override
+//            public void onProgressChanged(WebView view, int newProgress) {
+//                super.onProgressChanged(view, newProgress);
+//                if (newProgress == 85) {
+//                    onHideLoading();
+//                }
+//            }
+//        });
     }
 
     public class AndroidJs {

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/TravelOrderDetailsActivity.java

@@ -24,6 +24,7 @@ import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.component.control.ProgressWebView;
 import com.rv.component.dialog.PaymentTypeSelection;
 import com.rv.home.R;
 import com.rv.home.R2;
@@ -55,7 +56,7 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
 
     private static final int TYPE_REQUEST_EVALUATION = 102;
     @BindView(R2.id.webView)
-    WebView mWebView;
+    ProgressWebView mWebView;
     @BindView(R2.id.tv_cancel_order)
     TextView tvCancelOrder;
     @BindView(R2.id.tv_pick_up_the_car)
@@ -388,22 +389,28 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
         // 如果此设置是允许，则 setAllowFileAccessFromFileURLs 不起做用
         webSettings.setAllowUniversalAccessFromFileURLs(true);
         mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
-        mWebView.loadUrl(webUrl);
-        mWebView.setWebViewClient(new WebViewClient() {
+        mWebView.setWebViewClient(new WebViewClient(){
             @Override
-            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
-                return super.shouldOverrideUrlLoading(view, request);
-            }
-        });
-        mWebView.setWebChromeClient(new WebChromeClient() {
-            @Override
-            public void onProgressChanged(WebView view, int newProgress) {
-                super.onProgressChanged(view, newProgress);
-                if (newProgress == 85) {
-                    onHideLoading();
-                }
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                return false;
             }
         });
+        mWebView.loadUrl(webUrl);
+//        mWebView.setWebViewClient(new WebViewClient() {
+//            @Override
+//            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+//                return super.shouldOverrideUrlLoading(view, request);
+//            }
+//        });
+//        mWebView.setWebChromeClient(new WebChromeClient() {
+//            @Override
+//            public void onProgressChanged(WebView view, int newProgress) {
+//                super.onProgressChanged(view, newProgress);
+//                if (newProgress == 85) {
+//                    onHideLoading();
+//                }
+//            }
+//        });
     }
 
     @Override

module_home/src/main/res/layout/activity_order_to_travel.xml

@@ -44,13 +44,19 @@
 
     </RelativeLayout>
 
-    <include layout="@layout/common_line"/>
 
-    <WebView
+    <com.rv.component.control.ProgressWebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:id="@+id/webView" />
+        android:id="@+id/webView">
+    </com.rv.component.control.ProgressWebView>
+
+    <!--<WebView-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="match_parent"-->
+        <!--android:layout_weight="1"-->
+        <!--android:id="@+id/webView" />-->
 
     <include layout="@layout/common_line"/>
 

module_home/src/main/res/layout/activity_travel_order_details.xml

@@ -46,11 +46,18 @@
 
     <include layout="@layout/common_line"/>
 
-    <WebView
+    <com.rv.component.control.ProgressWebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:id="@+id/webView" />
+        android:id="@+id/webView">
+    </com.rv.component.control.ProgressWebView>
+
+    <!--<WebView-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="match_parent"-->
+        <!--android:layout_weight="1"-->
+        <!--android:id="@+id/webView" />-->
 
     <include layout="@layout/common_line"/>