bug修复

RvClient/build.gradle

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

RvClient/src/main/AndroidManifest.xml

@@ -273,7 +273,7 @@
             android:theme="@style/MyFrameTheme"
             android:windowSoftInputMode="adjustResize|stateHidden" /> <!-- 查看预览图 -->
         <activity
-            android:name="com.frame.base.browse.ActivityImageBrowseInt"
+            android:name="com.ruiwenliu.wrapper.browse.ActivityImageBrowseInt"
             android:configChanges="orientation|keyboardHidden"
             android:launchMode="singleInstance"
             android:maxAspectRatio="2.4"
@@ -281,7 +281,7 @@
             android:theme="@style/MyFrameTheme"
             android:windowSoftInputMode="adjustResize|stateHidden" /> <!-- 查看预览图 -->
         <activity
-            android:name="com.frame.base.browse.ActivityImageBrowseUrl"
+            android:name="com.ruiwenliu.wrapper.browse.ActivityImageBrowseUrl"
             android:configChanges="orientation|keyboardHidden"
             android:launchMode="singleInstance"
             android:maxAspectRatio="2.4"

RvTravel/src/main/java/com/rv/travel/fragment/TravelFragmentHotType.java

@@ -15,7 +15,6 @@ import android.widget.ImageView;
 
 import com.base.utils.base.BaseFragment;
 import com.base.utils.tools.android.IntentUtil;
-import com.frame.base.browse.ActivityImageBrowseUrl;
 import com.frame.rv.widget.BaseTipsLayout;
 import com.rv.travel.GoOtherUtil;
 import com.rv.travel.R;
@@ -179,10 +178,10 @@ public class TravelFragmentHotType extends BaseFragment {
                 .setOnBannerListener(new OnBannerListener() {
                     @Override
                     public void OnBannerClick(int position) {
-                        Bundle bundle = new Bundle();
-                        bundle.putInt(ActivityImageBrowseUrl.KEY_BACKGROUND, R.color.colorPrimary);
-                        bundle.putStringArrayList(ActivityImageBrowseUrl.KEY_IMAGE, (ArrayList<String>) images);
-                        IntentUtil.startActivity(baseContext, ActivityImageBrowseUrl.class, bundle);
+//                        Bundle bundle = new Bundle();
+//                        bundle.putInt(ActivityImageBrowseUrl.KEY_BACKGROUND, R.color.colorPrimary);
+//                        bundle.putStringArrayList(ActivityImageBrowseUrl.KEY_IMAGE, (ArrayList<String>) images);
+//                        IntentUtil.startActivity(baseContext, ActivityImageBrowseUrl.class, bundle);
                     }
                 })
                 .start();

RvTravel/src/main/java/com/rv/travel/fragment/TravelFragmentMain.java

@@ -18,7 +18,6 @@ import com.base.animset.util.NiftyEffects;
 import com.base.utils.base.BaseFragment;
 import com.base.utils.tools.android.IntentUtil;
 import com.base.utils.ui.datetime.selector.util.TextUtil;
-import com.frame.base.browse.ActivityImageBrowseUrl;
 import com.frame.rv.widget.BaseTipsLayout;
 import com.rv.travel.GoOtherUtil;
 import com.rv.travel.R;
@@ -223,10 +222,10 @@ public class TravelFragmentMain extends BaseFragment {
                             @Override
                             public void OnBannerClick(int position) {
 
-                                Bundle bundle = new Bundle();
-                                bundle.putInt(ActivityImageBrowseUrl.KEY_BACKGROUND, R.color.colorPrimary);
-                                bundle.putStringArrayList(ActivityImageBrowseUrl.KEY_IMAGE, (ArrayList<String>) images);
-                                IntentUtil.startActivity(baseContext, ActivityImageBrowseUrl.class, bundle);
+//                                Bundle bundle = new Bundle();
+//                                bundle.putInt(ActivityImageBrowseUrl.KEY_BACKGROUND, R.color.colorPrimary);
+//                                bundle.putStringArrayList(ActivityImageBrowseUrl.KEY_IMAGE, (ArrayList<String>) images);
+//                                IntentUtil.startActivity(baseContext, ActivityImageBrowseUrl.class, bundle);
 
                             }
                         })

MyFrame/src/main/java/com/frame/base/browse/ActivityImageBrowseInt.java → RvWrapper/src/main/java/com/ruiwenliu/wrapper/browse/ActivityImageBrowseInt.java

-package com.frame.base.browse;
+package com.ruiwenliu.wrapper.browse;
 
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -15,9 +15,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
-
-import com.base.utils.R;
 import com.base.utils.base.BaseActivity;
+import com.ruiwenliu.wrapper.R;
 
 import java.util.ArrayList;
 import java.util.List;

MyFrame/src/main/java/com/frame/base/browse/ActivityImageBrowseUrl.java → RvWrapper/src/main/java/com/ruiwenliu/wrapper/browse/ActivityImageBrowseUrl.java

-package com.frame.base.browse;
+package com.ruiwenliu.wrapper.browse;
 
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -16,8 +16,8 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import com.base.utils.R;
 import com.base.utils.base.BaseActivity;
+import com.ruiwenliu.wrapper.R;
 
 import java.util.ArrayList;
 import java.util.List;

MyFrame/src/main/java/com/frame/base/browse/FragmentImageBrowse.java → RvWrapper/src/main/java/com/ruiwenliu/wrapper/browse/FragmentImageBrowse.java

-package com.frame.base.browse;
+package com.ruiwenliu.wrapper.browse;
 
 import android.os.Bundle;
 import android.support.annotation.IntegerRes;
@@ -8,9 +8,11 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.base.utils.R;
 import com.base.utils.base.BaseFragment;
 import com.base.utils.ui.image.pinch.PinchImageView;
+import com.ruiwenliu.wrapper.R;
+import com.ruiwenliu.wrapper.util.glide.GlideManager;
+
 import java.util.Objects;
 
 /**
@@ -74,7 +76,7 @@ public class FragmentImageBrowse extends BaseFragment {
         if (getImageInt() != 0) {
             pinchImageView.setImageResource(getImageInt());
         } else {
-//            GlideManager.getInstance(baseContext).loadImage(getImageString(), pinchImageView);
+            GlideManager.getInstance(baseContext).loadImage(getImageString(), pinchImageView);
         }
         pinchImageView.setOnClickListener(new View.OnClickListener() {
             @Override

RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/UtilsManager.java

@@ -14,6 +14,8 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.frame.base.bus.RxBus;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -35,18 +37,24 @@ public class UtilsManager {
     private Context mContext = null;
 
     public static UtilsManager getInstance(Context context) {
-        if (instance == null) {
-            instance = new UtilsManager(context);
+        if (instance ==null){
+            synchronized (UtilsManager.class){
+                if (instance ==null){
+                    instance = new UtilsManager(context);
+                }
+            }
         }
-
         return instance;
     }
 
     public static UtilsManager getInstance() {
-        if (instance == null) {
-            instance = new UtilsManager();
+        if (instance ==null){
+            synchronized (UtilsManager.class){
+                if (instance ==null){
+                    instance = new UtilsManager();
+                }
+            }
         }
-
         return instance;
     }
 

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

@@ -24,7 +24,6 @@ import java.lang.reflect.Method;
  * Desc:
  */
 public class SafeWebView extends WebView {
-    private ProgressBar mProgressBar;
     public SafeWebView(Context context) {
         super(context);
         initWeb(context);
@@ -63,41 +62,6 @@ public class SafeWebView extends WebView {
         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) {

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

@@ -13,6 +13,7 @@ import android.webkit.WebResourceRequest;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.ProgressBar;
 
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
@@ -44,8 +45,10 @@ import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
  */
 @Route(path = Constance.ACTIVITY_URL_CAMPDETAIL)
 public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
+    @BindView(R2.id.pb_progress)
+    ProgressBar pbProgress;
     @BindView(R2.id.webView)
-    ProgressWebView mWebView;
+    WebView mWebView;
 
     private String webUrl;
 
@@ -134,19 +137,25 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
         // 如果此设置是允许，则 setAllowFileAccessFromFileURLs 不起做用
         webSettings.setAllowUniversalAccessFromFileURLs(true);
         mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
-        mWebView.setWebViewClient(new WebViewClient(){
+        mWebView.setWebViewClient(new WebViewClient() {
             @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                return false;
+            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+                return super.shouldOverrideUrlLoading(view, request);
             }
         });
         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) {
+                if(newProgress==100){
+                    pbProgress.setVisibility(View.GONE);//加载完网页进度条消失
+                }
+                else{
+                    pbProgress.setVisibility(View.VISIBLE);//开始加载网页时显示进度条
+                    pbProgress.setProgress(newProgress);//设置进度值
+                }
+            }
+        });
     }
 
     @Override

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

@@ -4,13 +4,23 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.rv.component.control.ProgressWebView
+    <ProgressBar
+        android:id="@+id/pb_progress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/size_3"
+        android:indeterminateOnly="false"
+        android:max="100"
+        android:visibility="gone"
+        android:progressDrawable="@drawable/shape_rv_bg_yellow_progress" >
+    </ProgressBar>
+
+    <WebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:id="@+id/webView">
-    </com.rv.component.control.ProgressWebView>
-
+        android:id="@+id/webView"
+        />
 
     <TextView
         android:id="@+id/tv_scheduled_camp"

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

@@ -5,9 +5,13 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.View;
+import android.webkit.WebChromeClient;
+import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
@@ -23,7 +27,8 @@ import butterknife.BindView;
 
 @Route(path = Constance.ACTIVITY_URL_WEBVIEW)
 public class WebActivity extends BaseStatusActivity<PickerPresenter> {
-
+    @BindView(R2.id.pb_progress)
+    ProgressBar pbProgress;
     @BindView(R2.id.webView)
     SafeWebView mWebView;
     @BindView(R2.id.lay_web)
@@ -57,10 +62,10 @@ 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(){
+        mWebView.setWebViewClient(new WebViewClient() {
             @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                return false;
+            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+                return super.shouldOverrideUrlLoading(view, request);
             }
         });
         if (0 == type) {
@@ -70,6 +75,19 @@ public class WebActivity extends BaseStatusActivity<PickerPresenter> {
             Log.i("webactivityactivyt", "initView: ----" +baseUrl);
             mWebView.loadUrl(baseUrl);
         }
+
+        mWebView.setWebChromeClient(new WebChromeClient() {
+            @Override
+            public void onProgressChanged(WebView view, int newProgress) {
+                if(newProgress==100){
+                    pbProgress.setVisibility(View.GONE);//加载完网页进度条消失
+                }
+                else{
+                    pbProgress.setVisibility(View.VISIBLE);//开始加载网页时显示进度条
+                    pbProgress.setProgress(newProgress);//设置进度值
+                }
+            }
+        });
     }
 
     @Override

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java

@@ -8,13 +8,16 @@ import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.view.KeyEvent;
 import android.view.View;
 import android.webkit.JavascriptInterface;
 import android.webkit.WebChromeClient;
+import android.webkit.WebResourceRequest;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -29,7 +32,6 @@ import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.ruiwenliu.wrapper.util.um.CustomShareListener;
 import com.ruiwenliu.wrapper.util.um.ShareManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
-import com.rv.component.control.ProgressWebView;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
@@ -56,8 +58,10 @@ import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
  * Desc:租车详情
  */
 public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
+    @BindView(R2.id.pb_progress)
+    ProgressBar pbProgress;
     @BindView(R2.id.webView)
-    ProgressWebView mWebView;
+    WebView mWebView;
     @BindView(R2.id.tv_center)
     TextView tvTitleCenter;
     @BindView(R2.id.iv_collect)
@@ -259,22 +263,25 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
         // 如果此设置是允许，则 setAllowFileAccessFromFileURLs 不起做用
         webSettings.setAllowUniversalAccessFromFileURLs(true);
         mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
-        mWebView.setWebViewClient(new WebViewClient(){
+        mWebView.setWebViewClient(new WebViewClient() {
             @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                return false;
+            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+                return super.shouldOverrideUrlLoading(view, request);
             }
         });
         mWebView.loadUrl(webUrl);
-//        mWebView.setWebChromeClient(new WebChromeClient() {
-//            @Override
-//            public void onProgressChanged(WebView view, int newProgress) {
-//                super.onProgressChanged(view, newProgress);
-//                if (newProgress == 100) {
-//                    onHideLoading();
-//                }
-//            }
-//        });
+        mWebView.setWebChromeClient(new WebChromeClient() {
+            @Override
+            public void onProgressChanged(WebView view, int newProgress) {
+                if(newProgress==100){
+                    pbProgress.setVisibility(View.GONE);//加载完网页进度条消失
+                }
+                else{
+                    pbProgress.setVisibility(View.VISIBLE);//开始加载网页时显示进度条
+                    pbProgress.setProgress(newProgress);//设置进度值
+                }
+            }
+        });
     }
 
 

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Rect;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -737,7 +738,10 @@ public class HomeFragment extends BaseFragment<CommonPresenter> implements Obser
         } else if (id == R.id.ll_item_top) {
             scrollview.fullScroll(View.FOCUS_UP);
         } else if (id == R.id.travel_server_image) {
-            showToast("亲，该功能还在开发中。。。");
+            Intent intent = new Intent(Intent.ACTION_DIAL);
+            Uri uri = Uri.parse("tel:" + "4000369369");
+            intent.setData(uri);
+            startActivity(intent);
         } else if (id == R.id.tv_car_rental_guide) {
             //租车指南
             ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)

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

@@ -5,6 +5,7 @@ import android.app.Activity;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
@@ -15,6 +16,7 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -70,8 +72,10 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
 
     @BindView(R2.id.tv_center)
     TextView tvCenter;
+    @BindView(R2.id.pb_progress)
+    ProgressBar pbProgress;
     @BindView(R2.id.webView)
-    ProgressWebView mWebView;
+    WebView mWebView;
     @BindView(R2.id.tv_cancel_order)
     TextView tvCancelOrder;
     @BindView(R2.id.tv_pick_up_the_car)
@@ -235,6 +239,10 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
             finish();
 
         } else if (i == R.id.iv_customer_service) {
+            Intent intent = new Intent(Intent.ACTION_DIAL);
+            Uri uri = Uri.parse("tel:" + "4000369369");
+            intent.setData(uri);
+            startActivity(intent);
         } else if (i == R.id.tv_cancel_order) {
             cancelOnclick();
 
@@ -425,26 +433,23 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
         mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
         mWebView.setWebViewClient(new WebViewClient() {
             @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                return false;
+            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+                return super.shouldOverrideUrlLoading(view, request);
             }
         });
         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();
-//                }
-//            }
-//        });
+        mWebView.setWebChromeClient(new WebChromeClient() {
+            @Override
+            public void onProgressChanged(WebView view, int newProgress) {
+                if(newProgress==100){
+                    pbProgress.setVisibility(View.GONE);//加载完网页进度条消失
+                }
+                else{
+                    pbProgress.setVisibility(View.VISIBLE);//开始加载网页时显示进度条
+                    pbProgress.setProgress(newProgress);//设置进度值
+                }
+            }
+        });
     }
 
     public class AndroidJs {

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

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
@@ -14,6 +15,7 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.frame.base.bus.CancelOrderEvent;
@@ -55,8 +57,10 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
 
 
     private static final int TYPE_REQUEST_EVALUATION = 102;
+    @BindView(R2.id.pb_progress)
+    ProgressBar pbProgress;
     @BindView(R2.id.webView)
-    ProgressWebView mWebView;
+    WebView mWebView;
     @BindView(R2.id.tv_cancel_order)
     TextView tvCancelOrder;
     @BindView(R2.id.tv_pick_up_the_car)
@@ -211,6 +215,10 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
             finish();
 
         } else if (i == R.id.iv_customer_service) {
+            Intent intent = new Intent(Intent.ACTION_DIAL);
+            Uri uri = Uri.parse("tel:" + "4000369369");
+            intent.setData(uri);
+            startActivity(intent);
         } else if (i == R.id.tv_cancel_order) {
             cancelOnclick();
 
@@ -389,28 +397,25 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
         // 如果此设置是允许，则 setAllowFileAccessFromFileURLs 不起做用
         webSettings.setAllowUniversalAccessFromFileURLs(true);
         mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
-        mWebView.setWebViewClient(new WebViewClient(){
+        mWebView.setWebViewClient(new WebViewClient() {
             @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                return false;
+            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+                return super.shouldOverrideUrlLoading(view, request);
             }
         });
         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();
-//                }
-//            }
-//        });
+        mWebView.setWebChromeClient(new WebChromeClient() {
+            @Override
+            public void onProgressChanged(WebView view, int newProgress) {
+                if(newProgress==100){
+                    pbProgress.setVisibility(View.GONE);//加载完网页进度条消失
+                }
+                else{
+                    pbProgress.setVisibility(View.VISIBLE);//开始加载网页时显示进度条
+                    pbProgress.setProgress(newProgress);//设置进度值
+                }
+            }
+        });
     }
 
     @Override

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

@@ -45,18 +45,23 @@
     </RelativeLayout>
 
 
-    <com.rv.component.control.ProgressWebView
+    <ProgressBar
+        android:id="@+id/pb_progress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/size_3"
+        android:indeterminateOnly="false"
+        android:max="100"
+        android:visibility="gone"
+        android:progressDrawable="@drawable/shape_rv_bg_yellow_progress" >
+    </ProgressBar>
+
+    <WebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        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" />-->
+        android:id="@+id/webView"
+        />
 
     <include layout="@layout/common_line"/>
 

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

@@ -46,18 +46,23 @@
 
     <include layout="@layout/common_line"/>
 
-    <com.rv.component.control.ProgressWebView
+    <ProgressBar
+        android:id="@+id/pb_progress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/size_3"
+        android:indeterminateOnly="false"
+        android:max="100"
+        android:visibility="gone"
+        android:progressDrawable="@drawable/shape_rv_bg_yellow_progress" >
+    </ProgressBar>
+
+    <WebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        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" />-->
+        android:id="@+id/webView"
+        />
 
     <include layout="@layout/common_line"/>
 

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

@@ -71,19 +71,23 @@
     </RelativeLayout>
     <include layout="@layout/common_line"/>
 
-    <com.rv.component.control.ProgressWebView
+    <ProgressBar
+        android:id="@+id/pb_progress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/size_3"
+        android:indeterminateOnly="false"
+        android:max="100"
+        android:visibility="gone"
+        android:progressDrawable="@drawable/shape_rv_bg_yellow_progress" >
+    </ProgressBar>
+
+    <WebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        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"-->
-        <!--/>-->
+        android:id="@+id/webView"
+        />
 
     <TextView
         android:layout_width="match_parent"

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

@@ -174,7 +174,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/rv_get_car_address_"
+                        android:text="还车地址："
                         android:textColor="@color/textGray"
                         android:textSize="@dimen/text_14" />
 

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

@@ -6,9 +6,20 @@
     android:orientation="vertical"
     android:layout_height="match_parent"
     tools:context=".rv.module.basic.WebActivity">
+    <ProgressBar
+        android:id="@+id/pb_progress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/size_3"
+        android:indeterminateOnly="false"
+        android:max="100"
+        android:visibility="gone"
+        android:progressDrawable="@drawable/shape_rv_bg_yellow_progress" >
+    </ProgressBar>
     <com.ruiwenliu.wrapper.weight.webview.SafeWebView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
         android:id="@+id/webView"
         />
 

module_mine/src/main/java/com/rv/rvmine/MineFragment.java

@@ -17,7 +17,7 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.base.utils.tools.android.IntentUtil;
 import com.base.utils.ui.image.round.RoundImageView;
-import com.frame.base.browse.ActivityImageBrowseInt;
+import com.ruiwenliu.wrapper.browse.ActivityImageBrowseInt;
 import com.frame.base.bus.LoginSuccessfulEvent;
 import com.frame.base.bus.Observer;
 import com.frame.base.bus.RxBus;
@@ -59,7 +59,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.Unbinder;
-import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 
 /**
@@ -190,12 +189,14 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
     }
 
 
-    @OnClick({R2.id.iv_avatar, R2.id.tv_login, R2.id.tv_verified, R2.id.rl_item_to_be_paid, R2.id.rl_item_staying,
+    @OnClick({R2.id.iv_notification, R2.id.iv_avatar, R2.id.tv_login, R2.id.tv_verified, R2.id.rl_item_to_be_paid, R2.id.rl_item_staying,
             R2.id.rl_item_traveling, R2.id.rl_item_completed, R2.id.rl_item_all, R2.id.rl_item_collection, R2.id.rl_item_personal_information,
             R2.id.rl_item_setting, R2.id.rl_item_driver, R2.id.rl_item_traveler, R2.id.rl_item_my_pat, R2.id.tv_view_privileges})
     public void onViewClicked(View view) {
         int id = view.getId();
-        if (id == R.id.iv_avatar) {
+        if (id == R.id.iv_notification){
+            showToast("亲，该功能还在开发中。。。");
+        }else if (id == R.id.iv_avatar) {
             //头像
             if (isLogin()) return;
 
@@ -237,7 +238,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
         } else if (id == R.id.rl_item_my_release) {
             //我的发布
             if (isLogin()) return;
-
+            showToast("亲，该功能还在开发中。。。");
         } else if (id == R.id.rl_item_collection) {
             //收藏
             if (isLogin()) return;

module_tourism/src/main/java/com/rv/tourism/TourismFragment.java

@@ -16,7 +16,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.baidu.location.BDAbstractLocationListener;
 import com.baidu.location.BDLocation;
@@ -29,7 +28,7 @@ import com.baidu.mapapi.search.geocode.OnGetGeoCoderResultListener;
 import com.baidu.mapapi.search.geocode.ReverseGeoCodeResult;
 import com.base.utils.tools.android.IntentUtil;
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.frame.base.browse.ActivityImageBrowseUrl;
+import com.ruiwenliu.wrapper.browse.ActivityImageBrowseUrl;
 import com.frame.base.url.Constance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;

module_tourism/src/main/java/com/rv/tourism/bean/BeanOrderParam.java

@@ -11,19 +11,19 @@ public class BeanOrderParam implements Serializable {
         this.goodId = goodId;
     }
 
-    public String getPrice() {
+    public double getPrice() {
         return price;
     }
 
-    public void setPrice(String price) {
+    public void setPrice(double price) {
         this.price = price;
     }
 
-    public String getChildPrice() {
+    public double getChildPrice() {
         return childPrice;
     }
 
-    public void setChildPrice(String childPrice) {
+    public void setChildPrice(double childPrice) {
         this.childPrice = childPrice;
     }
 
@@ -45,8 +45,8 @@ public class BeanOrderParam implements Serializable {
 
     private String endTime;//1,
     private String goodId;//1,
-    private String price;//成人价格
-    private String childPrice;//儿童价格
+    private double price;//成人价格
+    private double childPrice;//儿童价格
     private String spePriceId;//具体商品id
     private String adultNum;//1,
     private String childNum;//0,

module_tourism/src/main/java/com/rv/tourism/other/PopularTourListActivity.java

@@ -16,7 +16,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.base.utils.tools.android.IntentUtil;
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.frame.base.browse.ActivityImageBrowseUrl;
+import com.ruiwenliu.wrapper.browse.ActivityImageBrowseUrl;
 import com.frame.base.url.Constance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
@@ -27,7 +27,6 @@ import com.rv.tourism.R2;
 import com.rv.tourism.adapter.AllPopularAdapter;
 import com.rv.tourism.adapter.RecommendedRouteAdapter;
 import com.rv.tourism.api.TourismApi;
-import com.rv.tourism.bean.BeanPopularBrigade;
 import com.rv.tourism.bean.BeanPopularBrigadeAll;
 import com.rv.tourism.bean.BeanTourAround;
 import com.rv.tourism.bean.BeanTourismBanner;

module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java

@@ -13,11 +13,13 @@ import android.util.Log;
 import android.view.View;
 import android.webkit.JavascriptInterface;
 import android.webkit.WebChromeClient;
+import android.webkit.WebResourceRequest;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.alibaba.android.arouter.facade.annotation.Autowired;
@@ -68,9 +70,10 @@ import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
  */
 @Route(path = Constance.ACTIVITY_URL_TRAVELDETAILS)
 public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter> {
-
+    @BindView(R2.id.pb_progress)
+    ProgressBar pbProgress;
     @BindView(R2.id.webView)
-    ProgressWebView mWebView;
+    WebView mWebView;
     @BindView(R2.id.tv_center)
     TextView tvTitleCenter;
     @BindView(R2.id.iv_collect)
@@ -295,23 +298,25 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
         // 如果此设置是允许，则 setAllowFileAccessFromFileURLs 不起做用
         webSettings.setAllowUniversalAccessFromFileURLs(true);
         mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
-        mWebView.setWebViewClient(new WebViewClient(){
+        mWebView.setWebViewClient(new WebViewClient() {
             @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                return false;
+            public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
+                return super.shouldOverrideUrlLoading(view, request);
             }
         });
         mWebView.loadUrl(webUrl);
-
-//        mWebView.setWebChromeClient(new WebChromeClient() {
-//            @Override
-//            public void onProgressChanged(WebView view, int newProgress) {
-//                super.onProgressChanged(view, newProgress);
-//                if (newProgress == 100) {
-//                    onHideLoading();
-//                }
-//            }
-//        });
+        mWebView.setWebChromeClient(new WebChromeClient() {
+            @Override
+            public void onProgressChanged(WebView view, int newProgress) {
+                if(newProgress==100){
+                    pbProgress.setVisibility(View.GONE);//加载完网页进度条消失
+                }
+                else{
+                    pbProgress.setVisibility(View.VISIBLE);//开始加载网页时显示进度条
+                    pbProgress.setProgress(newProgress);//设置进度值
+                }
+            }
+        });
     }
 
     /**

module_tourism/src/main/java/com/rv/tourism/other/TravelerConfirmOrderActivity.java

@@ -146,8 +146,8 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
 
             adultNum = Integer.valueOf(dataBean.getAdultNum());
             childNum = Integer.valueOf(dataBean.getChildNum());
-            String childPrice = dataBean.getChildPrice();
-            String adultPrice = dataBean.getPrice();
+            double childPrice = dataBean.getChildPrice();
+            double adultPrice = dataBean.getPrice();
             price = Arith.mul(Double.valueOf(childNum), Double.valueOf(childPrice)) + Arith.mul(Double.valueOf(adultNum), Double.valueOf(adultPrice));
             tvPaymentAmount.setText(String.format("¥%1$s", price));
 
@@ -274,13 +274,13 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
         OrderPriceDetailBean.ChildrenBean childrenBean1 = new OrderPriceDetailBean.ChildrenBean();
         childrenBean1.setKey("成人出游人费用");
         childrenBean1.setDetail("¥" + dataBean.getPrice() + "/人 *" + dataBean.getAdultNum() + "人");
-        childrenBean1.setVal("¥" + Integer.valueOf(dataBean.getPrice()) * Integer.valueOf(dataBean.getAdultNum()));
+        childrenBean1.setVal("¥" + dataBean.getPrice() * Integer.valueOf(dataBean.getAdultNum()));
         childrenBeanList.add(childrenBean1);
         if (childNum > 0) {
             OrderPriceDetailBean.ChildrenBean childrenBean2 = new OrderPriceDetailBean.ChildrenBean();
             childrenBean2.setKey("儿童出游人费用");
             childrenBean2.setDetail("¥" + dataBean.getChildPrice() + "/人 *" + dataBean.getChildNum() + "人");
-            childrenBean2.setVal("¥" + Integer.valueOf(dataBean.getChildPrice()) * Integer.valueOf(dataBean.getChildNum()));
+            childrenBean2.setVal("¥" + dataBean.getChildPrice() * Integer.valueOf(dataBean.getChildNum()));
             childrenBeanList.add(childrenBean2);
         }
         if (isInsuranceType == 1) {

module_tourism/src/main/res/layout/activity_travel_details.xml

@@ -62,12 +62,23 @@
 
     <include layout="@layout/common_line" />
 
+    <ProgressBar
+        android:id="@+id/pb_progress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/size_3"
+        android:indeterminateOnly="false"
+        android:max="100"
+        android:visibility="gone"
+        android:progressDrawable="@drawable/shape_rv_bg_yellow_progress" >
+    </ProgressBar>
 
-    <com.rv.component.control.ProgressWebView
-        android:id="@+id/webView"
+    <WebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="1"></com.rv.component.control.ProgressWebView>
+        android:layout_weight="1"
+        android:id="@+id/webView"
+        />
 
 
     <include layout="@layout/common_line" />

plugin_search/src/main/java/com/rv/search/TravelSearchActivity.java

@@ -151,5 +151,4 @@ public class TravelSearchActivity extends BaseStatusActivity<SearchPresenter> {
         map.put("longitude", lonLongitude);
         mPresenter.getData(0, SearchApi.QUERY_RIM_LIST, BeanTravelSearch.class, map, true);
     }
-
 }