内存检测

RvClient/build.gradle

@@ -12,6 +12,9 @@ android {
         versionName "1.4.2"
         multiDexEnabled true
 
+        ndk {
+            abiFilters "armeabi", "armeabi-v7a", "x86", "mips"
+        }
         //新版Gradle 是 implementation 为了兼容compile,写上这句话
         javaCompileOptions {
             annotationProcessorOptions {

RvClient/src/main/java/com/xxfc/rv/GuideActivity.java

@@ -71,12 +71,26 @@ public class GuideActivity extends BaseActivity<CommonPresenter> {
             }
         });
         btnSkip.setOnClickListener(v -> {
+            startActivity(MainActivity.getIntent(getApplicationContext()));
             mPresenter.getView().onShowLoading();
-            startActivity(MainActivity.getIntent(GuideActivity.this));
+            new Thread(() -> {
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
                 finish();
+            }).start();
+
         });
     }
 
+    @Override
+    public void finish() {
+        mPresenter.getView().onHideLoading();
+        super.finish();
+    }
+
     @Override
     protected void loadData(Bundle savedInstanceState, Intent intent) {
 
@@ -95,4 +109,14 @@ public class GuideActivity extends BaseActivity<CommonPresenter> {
         list.add(new GuideFourthFragment());
         return list;
     }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
 }

RvClient/src/main/java/com/xxfc/rv/MainActivity.java

@@ -290,6 +290,11 @@ public class MainActivity extends BaseActivity<CommonPresenter> {
             ARouter.getInstance()
                     .build(Constance.ACTIVITY_URL_COUPONALL)
                     .navigation();
+        } else if (intent != null && "mine_wallet".equals(intent.getStringExtra("to"))) {
+            setCurrent(TYPE_MINE);
+            ARouter.getInstance()
+                    .build(Constance.ACTIVITY_URL_WALLET)
+                    .navigation();
         } else {
             wakeUp(intent);
         }

RvClient/src/main/java/com/xxfc/rv/RvClientApplication.java

@@ -24,6 +24,8 @@ import com.rv.component.utils.LogUtil;
 import com.sh.sdk.shareinstall.ShareInstall;
 import com.squareup.leakcanary.LeakCanary;
 import com.tencent.bugly.crashreport.CrashReport;
+import com.tencent.smtt.sdk.QbSdk;
+import com.tencent.smtt.sdk.TbsListener;
 import com.umeng.commonsdk.UMConfigure;
 import com.umeng.socialize.PlatformConfig;
 import com.yuyife.okgo.OkGoUtil;
@@ -49,7 +51,8 @@ public class RvClientApplication extends FrameApp {
     @Override
     public void onCreate() {
         super.onCreate();
-        Log.e("xxxxxxxxxxxxxxxxxxxxx", "RvClientApplication_onCreate11");
+        initX5();
+        Log.e("xxxxxxxxxxxxxxxxxxxxx", "RvClientApplication_onCreate");
         StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
         StrictMode.setVmPolicy(builder.build());
         builder.detectFileUriExposure();
@@ -70,6 +73,7 @@ public class RvClientApplication extends FrameApp {
         CrashReport.initCrashReport(getApplicationContext(), "82ebaf448b", false);
         //初始化AutoSize
         initAuto();
+
         //OkGoUtil.setToken(token);
         OkGoUtil.initOkGo(this, true);
         MyFrameManager.getInstance().setKeepWake(false);
@@ -112,6 +116,42 @@ public class RvClientApplication extends FrameApp {
         /**********************************************/
     }
 
+    private void initX5() {
+        QbSdk.PreInitCallback cb = new QbSdk.PreInitCallback() {
+
+            @Override
+            public void onViewInitFinished(boolean arg0) {
+                // TODO Auto-generated method stub
+                //x5內核初始化完成的回调，为true表示x5内核加载成功，否则表示x5内核加载失败，会自动切换到系统内核。
+                Log.d("app", " onViewInitFinished is " + arg0);
+            }
+
+            @Override
+            public void onCoreInitFinished() {
+                // TODO Auto-generated method stub
+            }
+        };
+
+        QbSdk.setTbsListener(new TbsListener() {
+            @Override
+            public void onDownloadFinish(int i) {
+                Log.d("apptbs", "onDownloadFinish");
+            }
+
+            @Override
+            public void onInstallFinish(int i) {
+                Log.d("apptbs", "onInstallFinish");
+            }
+
+            @Override
+            public void onDownloadProgress(int i) {
+                Log.d("apptbs", "onDownloadProgress:" + i);
+            }
+        });
+        //x5内核初始化接口
+        QbSdk.initX5Environment(getApplicationContext(), cb);
+    }
+
 
     /**
      * 判断当前进程是否是应用的主进程

RvClient/src/main/java/com/xxfc/rv/fragment/GuideFourthFragment.java

@@ -12,6 +12,7 @@ import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.share.utils.TransformationUtils;
+import com.xxfc.rv.GuideActivity;
 import com.xxfc.rv.MainActivity;
 import com.xxfc.rv.R;
 
@@ -43,9 +44,17 @@ public class GuideFourthFragment extends BaseFragment<CommonPresenter> {
         btnConfirm = getView().findViewById(R.id.btn_confirm);
         btnConfirm.setVisibility(View.VISIBLE);
         btnConfirm.setOnClickListener(v -> {
-            mPresenter.getView().onShowLoading();
+
             startActivity(MainActivity.getIntent(getContext()));
-            getActivity().finish();
+            mPresenter.getView().onShowLoading();
+            new Thread(() -> {
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                getActivity().finish();;
+            }).start();
         });
         textView1.setText("开启房车自驾新旅程");
         String html = "出发即是家，开门即是景";

RvClient/src/sit/res/values/strings.xml

 <resources>
     <string name="app_name">滴房车(测试)</string>
-	<string name="share_install_key">FFBK2KEE6RK6EF</string>
-	<string name="share_install_scheme">dkkg9859</string>
+	<string name="share_install_key">7BBK22KKFH26KE</string>
+	<string name="share_install_scheme">epad4069</string>
 </resources>

RvWrapper/build.gradle

@@ -70,5 +70,5 @@ dependencies {
     api 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0'
     implementation 'com.alibaba:fastjson:1.2.21'
     implementation project(':component_utils')
-
+    implementation files('libs/tbs_sdk_thirdapp_v3.6.0.1310_43612_sharewithdownload_withoutGame_obfs_20180706_163319.jar')
 }

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

@@ -25,7 +25,7 @@ public class MapUtil {
     private WeakReference<Context> weakReference;
 
     public MapUtil(Context context) {
-        weakReference=new WeakReference<>(context);
+        weakReference = new WeakReference<>(context);
     }
 
     public static MapUtil getInstance(Context context) {
@@ -37,9 +37,10 @@ public class MapUtil {
     }
 
 
-    private Context getContext(){
+    private Context getContext() {
         return weakReference.get();
     }
+
     /**
      * BD-09 坐标转换成 GCJ-02 坐标
      * 百度转高德
@@ -69,13 +70,14 @@ public class MapUtil {
 
     /**
      * 跳转百度地图
+     *
      * @param latLng
      * @param address
      * @param isTrue  是否需要转换经纬度
      */
-    public void goToBaiduMap(LatLng latLng, String address,boolean isTrue) {
-        if(isTrue==true){
-            latLng=GCJ2BD(latLng);
+    public void goToBaiduMap(LatLng latLng, String address, boolean isTrue) {
+        if (isTrue == true) {
+            latLng = GCJ2BD(latLng);
         }
         if (!isInstalled(getContext(), "com.baidu.BaiduMap")) {
             Toast.makeText(getContext(), "请先安装百度地图客户端", Toast.LENGTH_SHORT).show();
@@ -97,22 +99,31 @@ public class MapUtil {
      * @param address
      * @param isTrue
      */
-    public void goToGaodeMap(LatLng latLng, String address,boolean isTrue) {
+    public void goToGaodeMap(LatLng ststartP, LatLng latLng, String address, boolean isTrue) {
 
         if (!isInstalled(getContext(), "com.autonavi.minimap")) {
             Toast.makeText(getContext(), "请先安装高德地图客户端", Toast.LENGTH_SHORT).show();
             return;
         }
-        LatLng endPoint = isTrue==true?BD2GCJ(latLng):latLng;//坐标转换
-        StringBuffer stringBuffer = new StringBuffer("androidamap://navi?sourceApplication=").append("amap");
-        stringBuffer.append("&lat=").append(endPoint.latitude)
-                .append("&lon=").append(endPoint.longitude).append("&keywords=" + address)
+        LatLng endPoint = isTrue == true ? BD2GCJ(latLng) : latLng;//坐标转换
+        LatLng startPoint = isTrue == true ? BD2GCJ(ststartP) : ststartP;
+        StringBuffer stringBuffer = new StringBuffer("androidamap://route?sourceApplication=").append("滴房车");
+        stringBuffer.append("&dlat=").append(endPoint.latitude)
+                .append("&dlon=").append(endPoint.longitude)
+                .append("&slat=").append(startPoint.latitude)
+                .append("&slon=").append(startPoint.longitude)
+                .append("&keywords=" + address)
+                .append("&sname=").append("当前位置")
+                .append("&dname=").append(address)
                 .append("&dev=").append(0)
-                .append("&style=").append(2);
+                .append("&m=").append(0)
+                .append("&t=").append(0)
+                .append("&showType=").append(1);
         Intent intent = new Intent("android.intent.action.VIEW", Uri.parse(stringBuffer.toString()));
         intent.setPackage("com.autonavi.minimap");
         getContext().startActivity(intent);
     }
+
     /**
      * 是否安装指定应用
      *

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

 package com.ruiwenliu.wrapper.weight.webview;
 
 import android.graphics.Bitmap;
-import android.os.Build;
-import android.webkit.ConsoleMessage;
-import android.webkit.JsPromptResult;
-import android.webkit.JsResult;
-import android.webkit.WebChromeClient;
-import android.webkit.WebView;
+
+import com.tencent.smtt.export.external.interfaces.ConsoleMessage;
+import com.tencent.smtt.export.external.interfaces.JsPromptResult;
+import com.tencent.smtt.export.external.interfaces.JsResult;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebView;
+
 
 /**
  * Created by Amuse

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

@@ -2,18 +2,14 @@ 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;
 
 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 com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
 
 import java.lang.reflect.Method;
 

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

 package com.ruiwenliu.wrapper.weight.webview;
 
 import android.graphics.Bitmap;
-import android.net.http.SslError;
-import android.webkit.SslErrorHandler;
-import android.webkit.WebResourceError;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebResourceResponse;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+
+import com.tencent.smtt.export.external.interfaces.SslError;
+import com.tencent.smtt.export.external.interfaces.SslErrorHandler;
+import com.tencent.smtt.export.external.interfaces.WebResourceError;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.export.external.interfaces.WebResourceResponse;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 
 /**
  * Created by Amuse

component_control/src/main/java/com/rv/component/control/ProgressWebView.java

-package com.rv.component.control;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.webkit.WebView;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-
-public class ProgressWebView extends WebView {
-    private ProgressBar mProgressBar;
-
-    public ProgressWebView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        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_hint);
-        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);
-    }
-}

component_utils/src/main/java/com/rv/component/utils/StringUtils.java

@@ -13,9 +13,7 @@ public class StringUtils {
         if (TextUtils.isEmpty(str)) {
             return false;
         }
-        String regExp = "^1(3[0-9]|4[57]|5[0-35-9]|8[0-9]|70)\\d{8}$";
-        Pattern p = Pattern.compile(regExp);
-        Matcher m = p.matcher(str);
-        return m.matches();
+
+        return str.length() == 11 && str.startsWith("1");
     }
 }

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

@@ -4,21 +4,13 @@ import android.annotation.TargetApi;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Intent;
-import android.graphics.Bitmap;
 import android.net.Uri;
-import android.net.http.SslError;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.webkit.JavascriptInterface;
-import android.webkit.SslErrorHandler;
-import android.webkit.WebChromeClient;
-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;
@@ -40,9 +32,13 @@ 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.rv.component.utils.Cookie;
 import com.rv.component.utils.IsAppInstall;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.shareboard.SnsPlatform;
 import com.umeng.socialize.utils.ShareBoardlistener;
@@ -153,7 +149,7 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
 //        webSettings.setAppCacheMaxSize(8 * 1024 * 1024);
         // Android 私有缓存存储，如果你不调用setAppCachePath方法，WebView将不会产生这个目录
         webSettings.setAppCachePath(getCacheDir().getAbsolutePath());
-        // 数据库路径
+//         数据库路径
 //        if (!hasKitkat()) {
 //            webSettings.setDatabasePath(getDatabasePath("html").getPath());
 //        }
@@ -179,11 +175,6 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
             }
         });
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            mWebView.getSettings().setMixedContentMode(
-                    WebSettings.MIXED_CONTENT_COMPATIBILITY_MODE);
-        }
-
         mWebView.loadUrl(webUrl);
         mWebView.setWebChromeClient(new WebChromeClient() {
             @Override
@@ -249,7 +240,7 @@ public class CampDetailActivity extends BaseStatusActivity<CampPresenter> {
     @Override
     protected void onPause() {
         super.onPause();
-        mWebView.loadUrl("about:blank");
+//        mWebView.loadUrl("about:blank");
         mWebView.onPause();//生命周期onPause
 
     }

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

@@ -7,6 +7,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.baidu.location.BDAbstractLocationListener;
@@ -37,6 +38,7 @@ import com.rv.camp.api.CampApi;
 import com.rv.camp.bean.CampListBean;
 import com.rv.camp.presenter.CampPresenter;
 import com.rv.component.dialog.BottomPromptDialog;
+import com.rv.component.utils.LocationRecord;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -72,6 +74,9 @@ public class CampShopShowActivity extends BaseStatusActivity<CampPresenter> {
     private boolean isClick;//是否第一次点击
     private CampListBean.DataBeanX.DataBean selectBean;
 
+    private LatLng locationLatLng;
+
+
     public static Intent getIntent(Context context) {
         return new Intent(context, CampShopShowActivity.class);
     }
@@ -85,6 +90,7 @@ public class CampShopShowActivity extends BaseStatusActivity<CampPresenter> {
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
 //             titleView.setTitle(mActivity.getString(R.string.rv_shop_map));
         showTitle(false);
+//        initGps();
         initMap();
     }
 
@@ -95,6 +101,40 @@ public class CampShopShowActivity extends BaseStatusActivity<CampPresenter> {
 
     }
 
+    /**
+     * 初始化定位
+     */
+    public void initGps() {
+        if (!isGpsOpen()) {
+            Toast.makeText(getApplicationContext(), "请先打开gps", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        locationManager = new LocationManager(getApplicationContext());
+        locationManager.getLocationDetail(new BDAbstractLocationListener() {
+            @Override
+            public void onReceiveLocation(BDLocation location) {
+                int errorCode = location.getLocType();
+                if (errorCode == 61 || errorCode == 161) {
+                    double latLatitude = LocationRecord.getOrSavelatLatitude(getApplicationContext(), errorCode, location.getLatitude());
+                    double lonLongitude = LocationRecord.getOrSaveLonLongitude(getApplicationContext(), errorCode, location.getLongitude());
+                    locationLatLng = new LatLng(latLatitude, lonLongitude);
+                } else {
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            Toast.makeText(mActivity, "定位失败!", Toast.LENGTH_SHORT).show();
+                        }
+                    });
+                }
+            }
+        });
+    }
+
+    private boolean isGpsOpen() {
+        android.location.LocationManager lm = (android.location.LocationManager) this.getSystemService(LOCATION_SERVICE);
+        return lm.isProviderEnabled(android.location.LocationManager.GPS_PROVIDER);
+    }
+
     @Override
     public void onShowResult(int requestType, BaseBean result) {
         processData((CampListBean) result);
@@ -210,7 +250,7 @@ public class CampShopShowActivity extends BaseStatusActivity<CampPresenter> {
                 isClick = true;
                 isVisible(View.VISIBLE);
                 Bundle bundle = marker.getExtraInfo();
-                selectBean= (CampListBean.DataBeanX.DataBean) bundle.getSerializable("info");
+                selectBean = (CampListBean.DataBeanX.DataBean) bundle.getSerializable("info");
                 tvAddress.setText(String.format("%1$s%2$s", "地址：", selectBean.getAddress()));
                 tvPhone.setText(String.format("%1$s%2$s", "联系电话：", selectBean.getPhone()));
                 tvName.setText(selectBean.getName());
@@ -350,7 +390,7 @@ public class CampShopShowActivity extends BaseStatusActivity<CampPresenter> {
                             dismiss();
 
                         } else if (i == R.id.btn2) {
-                            MapUtil.getInstance(mActivity).goToGaodeMap(latLng, address, true);
+                            MapUtil.getInstance(mActivity).goToGaodeMap(locationLatLng == null ? new LatLng(LocationRecord.getLat(getApplicationContext()), LocationRecord.getLon(getApplicationContext())) : locationLatLng, latLng, address, true);
                             dismiss();
 
                         } else if (i == R.id.btn3) {

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

@@ -15,7 +15,7 @@
         android:progressDrawable="@drawable/shape_rv_bg_yellow_progress" >
     </ProgressBar>
 
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"

module_discovery/src/main/java/com/xxfc/discovery/other/DetailPatActivity.java

@@ -13,18 +13,12 @@ import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 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.LinearLayout;
 import android.widget.ProgressBar;
 
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.alibaba.fastjson.JSON;
 import com.base.utils.tools.android.IntentUtil;
 import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.frame.base.bus.LoginSuccessfulEvent;
@@ -46,6 +40,11 @@ import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.component.utils.Cookie;
 import com.rv.component.utils.DateUtils;
 import com.rv.component.utils.IsAppInstall;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.shareboard.SnsPlatform;
 import com.umeng.socialize.utils.ShareBoardlistener;

module_discovery/src/main/java/com/xxfc/discovery/other/DetailQuestionAndAnswerActivity.java

@@ -10,11 +10,6 @@ import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 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.LinearLayout;
 import android.widget.ProgressBar;
 import com.alibaba.android.arouter.facade.annotation.Autowired;
@@ -25,6 +20,11 @@ import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.component.utils.DateUtils;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import com.xxfc.discovery.R;
 import com.xxfc.discovery.R2;
 import com.xxfc.discovery.api.DiscoveryApi;

module_discovery/src/main/res/layout/activity_detail_pat.xml

@@ -17,7 +17,7 @@
         android:visibility="gone">
     </ProgressBar>
 
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/webView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

module_discovery/src/main/res/layout/activity_detail_question_and_answer.xml

@@ -17,7 +17,7 @@
         android:visibility="gone">
     </ProgressBar>
 
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/webView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

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

@@ -6,10 +6,6 @@ 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;
 
@@ -23,6 +19,10 @@ import com.ruiwenliu.wrapper.weight.webview.SafeWebView;
 import com.rv.home.R;
 import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
 import com.rv.home.R2;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 
 import butterknife.BindView;
 

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

@@ -11,12 +11,6 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 import android.webkit.JavascriptInterface;
-import android.webkit.WebChromeClient;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebResourceResponse;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -49,6 +43,12 @@ import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.login.LoginRvActivity;
 import com.rv.home.rv.module.ui.main.home.bean.CarTypeListBean;
 import com.rv.home.rv.module.ui.main.home.bean.OrderDataBean;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.export.external.interfaces.WebResourceResponse;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import com.umeng.socialize.UMShareAPI;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.shareboard.SnsPlatform;

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

@@ -2,11 +2,13 @@ package com.rv.home.rv.module.ui.main.home;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
@@ -29,6 +31,7 @@ import com.ruiwenliu.wrapper.util.LocationManager;
 import com.ruiwenliu.wrapper.util.MapUtil;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.rv.component.utils.LocationRecord;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.component.dialog.PickerDialog;
@@ -77,6 +80,8 @@ public class CarDetailMapActivity extends SwipeBackActivity<CommonPresenter> {
     @Autowired()
     double longitude;
 
+    private LatLng locationLatLng = null;
+
 
     @Override
     protected int setLayout() {
@@ -89,11 +94,46 @@ public class CarDetailMapActivity extends SwipeBackActivity<CommonPresenter> {
         showTitle(false);
         initMap();
 
+//        initGps();
         tvAddress.setText(String.format("%1$s%2$s", "地址：", addrDetail));
         tvPhone.setText(String.format("%1$s%2$s", "联系电话：", phone));
         tvName.setText(name);
     }
 
+    /**
+     * 初始化定位
+     */
+    public void initGps() {
+        if (!isGpsOpen()) {
+            Toast.makeText(getApplicationContext(), "请先打开gps", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        locationManager = new LocationManager(getApplicationContext());
+        locationManager.getLocationDetail(new BDAbstractLocationListener() {
+            @Override
+            public void onReceiveLocation(BDLocation location) {
+                int errorCode = location.getLocType();
+                if (errorCode == 61 || errorCode == 161) {
+                    double latLatitude = LocationRecord.getOrSavelatLatitude(getApplicationContext(), errorCode, location.getLatitude());
+                    double lonLongitude = LocationRecord.getOrSaveLonLongitude(getApplicationContext(), errorCode, location.getLongitude());
+                    locationLatLng = new LatLng(latLatitude, lonLongitude);
+                } else {
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            Toast.makeText(mActivity, "定位失败!", Toast.LENGTH_SHORT).show();
+                        }
+                    });
+                }
+            }
+        });
+    }
+
+    private boolean isGpsOpen() {
+        android.location.LocationManager lm = (android.location.LocationManager) this.getSystemService(LOCATION_SERVICE);
+        return lm.isProviderEnabled(android.location.LocationManager.GPS_PROVIDER);
+    }
+
     @Override
     protected void loadData(Bundle savedInstanceState, Intent intent) {
 
@@ -203,7 +243,7 @@ public class CarDetailMapActivity extends SwipeBackActivity<CommonPresenter> {
                 .longitude(location.getLongitude()).build();
 
         mBaiduMap.setMyLocationData(locData);
-        if (isFirstLoc ) {
+        if (isFirstLoc) {
             isFirstLoc = false;
             mBaiduMap.addOverlay(getMark());
             updateMap(new LatLng(latitude, longitude));
@@ -247,7 +287,7 @@ public class CarDetailMapActivity extends SwipeBackActivity<CommonPresenter> {
                             MapUtil.getInstance(mActivity).goToBaiduMap(latLng, address, false);
                             dismiss();
                         } else if (v.getId() == R.id.btn_album) {
-                            MapUtil.getInstance(mActivity).goToGaodeMap(latLng, address, true);
+                            MapUtil.getInstance(mActivity).goToGaodeMap(locationLatLng == null ? new LatLng(LocationRecord.getLat(getApplicationContext()), LocationRecord.getLon(getApplicationContext())) : locationLatLng, latLng, address, true);
                             dismiss();
                         } else if (v.getId() == R.id.btn_cancel) {
                             dismiss();

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

@@ -7,6 +7,7 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.baidu.location.BDAbstractLocationListener;
@@ -29,6 +30,7 @@ import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.LocationManager;
 import com.ruiwenliu.wrapper.util.MapUtil;
+import com.rv.component.utils.LocationRecord;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.ruiwenliu.wrapper.util.ViewHolder;
@@ -75,6 +77,7 @@ public class ShopShowActivity extends BaseStatusActivity<CommonPresenter> {
     private double mLon;
     private boolean isClick;//是否第一次点击
     private ShopListBean.DataBeanX.DataBean selectBean;
+    private LatLng locationLatLng;
 
     public static Intent getIntent(Context context, double lat, double lon) {
         return new Intent(context, ShopShowActivity.class)
@@ -93,9 +96,45 @@ public class ShopShowActivity extends BaseStatusActivity<CommonPresenter> {
         showTitle(false);
         mLat = intent.getDoubleExtra("lat", 0);
         mLon = intent.getDoubleExtra("lon", 0);
+//        initGps();
         initMap();
     }
 
+    /**
+     * 初始化定位
+     */
+    public void initGps() {
+        if (!isGpsOpen()) {
+            Toast.makeText(getApplicationContext(), "请先打开gps", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        locationManager = new LocationManager(getApplicationContext());
+        locationManager.getLocationDetail(new BDAbstractLocationListener() {
+            @Override
+            public void onReceiveLocation(BDLocation location) {
+                int errorCode = location.getLocType();
+                if (errorCode == 61 || errorCode == 161) {
+                    double latLatitude = LocationRecord.getOrSavelatLatitude(getApplicationContext(), errorCode, location.getLatitude());
+                    double lonLongitude = LocationRecord.getOrSaveLonLongitude(getApplicationContext(), errorCode, location.getLongitude());
+                    locationLatLng = new LatLng(latLatitude, lonLongitude);
+                } else {
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            Toast.makeText(mActivity, "定位失败!", Toast.LENGTH_SHORT).show();
+                        }
+                    });
+                }
+            }
+        });
+    }
+
+    private boolean isGpsOpen() {
+        android.location.LocationManager lm = (android.location.LocationManager) this.getSystemService(LOCATION_SERVICE);
+        return lm.isProviderEnabled(android.location.LocationManager.GPS_PROVIDER);
+    }
+
+
     @Override
     protected void loadData(Bundle savedInstanceState, Intent intent) {
         super.loadData(savedInstanceState, intent);
@@ -224,7 +263,7 @@ public class ShopShowActivity extends BaseStatusActivity<CommonPresenter> {
                 isClick = true;
                 isVisible(View.VISIBLE);
                 Bundle bundle = marker.getExtraInfo();
-                selectBean= (ShopListBean.DataBeanX.DataBean) bundle.getSerializable("info");
+                selectBean = (ShopListBean.DataBeanX.DataBean) bundle.getSerializable("info");
                 tvAddress.setText(String.format("%1$s%2$s", "地址：", selectBean.getAddrDetail()));
                 tvPhone.setText(String.format("%1$s%2$s", "联系电话：", selectBean.getLeaderContactInfo()));
                 tvName.setText(selectBean.getName());
@@ -363,7 +402,7 @@ public class ShopShowActivity extends BaseStatusActivity<CommonPresenter> {
                             dismiss();
 
                         } else if (i == R.id.btn_album) {
-                            MapUtil.getInstance(mActivity).goToGaodeMap(latLng, address, true);
+                            MapUtil.getInstance(mActivity).goToGaodeMap(locationLatLng == null ? new LatLng(LocationRecord.getLat(getApplicationContext()), LocationRecord.getLon(getApplicationContext())) : locationLatLng, latLng, address, true);
                             dismiss();
 
                         } else if (i == R.id.btn_cancel) {

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

@@ -7,11 +7,6 @@ import android.os.Build;
 import android.os.Bundle;
 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.ProgressBar;
 
 import com.base.utils.tools.android.IntentUtil;
@@ -26,6 +21,11 @@ import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
 import com.ruiwenliu.wrapper.base.presenter.PickerPresenter;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import com.yuyife.okgo.OkGoUtil;
 
 import java.util.ArrayList;

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

@@ -9,11 +9,6 @@ import android.os.Build;
 import android.os.Bundle;
 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.LinearLayout;
 import android.widget.TextView;
 
@@ -36,6 +31,11 @@ import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
 import com.tencent.mm.opensdk.modelpay.PayReq;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import com.yuyife.okgo.OkGoUtil;
 
 import java.util.LinkedHashMap;

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

@@ -14,11 +14,6 @@ import android.text.TextUtils;
 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.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -48,6 +43,11 @@ import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
 import com.tencent.mm.opensdk.modelpay.PayReq;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import com.yuyife.okgo.OkGoUtil;
 
 import java.util.LinkedHashMap;

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

@@ -13,11 +13,6 @@ import android.text.TextUtils;
 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.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -46,6 +41,11 @@ import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
 import com.tencent.mm.opensdk.modelpay.PayReq;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import com.yuyife.okgo.OkGoUtil;
 
 import java.util.LinkedHashMap;

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

@@ -16,7 +16,7 @@
         android:progressDrawable="@drawable/shape_rv_bg_yellow_progress"
         android:visibility="gone"></ProgressBar>
 
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/webView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

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

@@ -46,7 +46,7 @@
 
     <include layout="@layout/common_line"/>
 
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"

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

@@ -64,7 +64,7 @@
         android:progressDrawable="@drawable/shape_rv_bg_yellow_progress"
         android:visibility="gone"></ProgressBar>
 
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/webView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

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

@@ -53,8 +53,6 @@
         </RelativeLayout>
     </com.ruiwenliu.wrapper.statusbar.StatusBarHeightView>
 
-    <include layout="@layout/common_line" />
-
     <ProgressBar
         android:id="@+id/pb_progress"
         style="?android:attr/progressBarStyleHorizontal"
@@ -65,7 +63,7 @@
         android:progressDrawable="@drawable/shape_rv_bg_yellow_progress"
         android:visibility="gone"></ProgressBar>
 
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/webView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

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

@@ -82,7 +82,7 @@
         android:progressDrawable="@drawable/shape_rv_bg_yellow_progress" >
     </ProgressBar>
 
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"

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

@@ -89,7 +89,7 @@
         <!--android:orientation="horizontal"-->
         <!--android:visibility="visible" />-->
 
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/webView"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"

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

@@ -12,11 +12,6 @@ import android.text.TextUtils;
 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;
@@ -38,7 +33,6 @@ import com.google.gson.reflect.TypeToken;
 import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
-import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.ruiwenliu.wrapper.util.um.CustomShareListener;
 import com.ruiwenliu.wrapper.util.um.ShareManager;
@@ -49,11 +43,14 @@ import com.rv.tourism.R;
 import com.rv.tourism.R2;
 import com.rv.tourism.api.TourismApi;
 import com.rv.tourism.bean.BeanOrderParam;
-import com.rv.tourism.bean.BeanTourAround;
 import com.rv.tourism.bean.BeanTourDetail;
-import com.rv.tourism.bean.BeanTourismBanner;
 import com.rv.tourism.bean.BeanTourismCollection;
 import com.rv.tourism.presenter.TourismPresenter;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import com.umeng.socialize.UMShareAPI;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.shareboard.SnsPlatform;
@@ -65,7 +62,6 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 import io.reactivex.schedulers.Schedulers;
 
@@ -393,12 +389,12 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
 
                 } else if (snsPlatform.mShowWord.equals("复制链接")) {
                     copyText();
-                }else if (snsPlatform.mShowWord.contains("微信")) {
+                } else if (snsPlatform.mShowWord.contains("微信")) {
                     if (!IsAppInstall.isWeixinAvilible(mActivity)) {
                         showToast("亲，您微信还没有安装呢");
                         return;
                     }
-                }else if (snsPlatform.mShowWord.contains("QQ")){
+                } else if (snsPlatform.mShowWord.contains("QQ")) {
                     if (!IsAppInstall.isQQClientAvailable(mActivity)) {
                         showToast("亲，您QQ还没有安装呢");
                         return;

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

@@ -77,7 +77,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <WebView
+        <com.tencent.smtt.sdk.WebView
             android:id="@+id/webView"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />

plugin_carpurchase/src/main/java/com/xxrv/carpurchase/activity/DetailCarPurchaseActivity.java

@@ -7,14 +7,7 @@ import android.os.Build;
 import android.os.Bundle;
 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.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
@@ -24,6 +17,11 @@ import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.util.um.CustomShareListener;
 import com.ruiwenliu.wrapper.util.um.ShareManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import com.umeng.socialize.UMShareAPI;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.shareboard.SnsPlatform;

plugin_carpurchase/src/main/res/layout/activity_detail_car_purchase.xml

@@ -15,7 +15,7 @@
         android:progressDrawable="@drawable/shape_rv_bg_yellow_progress" >
     </ProgressBar>
 
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"

plugin_share/build.gradle

@@ -18,7 +18,6 @@ android {
 //
 //            }
 //        }
-
     }
 
     buildTypes {
@@ -40,12 +39,6 @@ android {
     }
 }
 
-repositories {
-    flatDir {
-        dirs 'libs'
-    }
-}
-
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:28.0.0'
@@ -54,9 +47,9 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-//    annotationProcessor 'com.alibaba:arouter-compiler:1.1.4'
+    //    annotationProcessor 'com.alibaba:arouter-compiler:1.1.4'
     api project(':module_home')
     api project(':component_resource')
     api project(':component_utils')
-
+//    implementation files('libs/tbs_sdk_thirdapp_v3.6.0.1310_43612_sharewithdownload_withoutGame_obfs_20180706_163319.jar')
 }

plugin_share/src/main/java/com/rv/share/BillActivity.java

@@ -11,10 +11,7 @@ import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.CardView;
 import android.view.View;
-import android.webkit.WebView;
 import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.ruiwenliu.wrapper.base.BaseBean;

plugin_share/src/main/java/com/rv/share/presenter/BillPresenter.java

@@ -7,13 +7,13 @@ import android.graphics.Color;
 import android.support.v7.widget.CardView;
 import android.util.Log;
 import android.view.View;
-import android.webkit.WebView;
 import android.widget.Toast;
 
 import com.ruiwenliu.wrapper.base.presenter.CommonPresenter;
 import com.rv.component.utils.ShareUtils;
 import com.rv.component.utils.StorageUtils;
 import com.rv.share.view.ShareChoiceDialog;
+import com.tencent.smtt.sdk.WebView;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;

plugin_share/src/main/java/com/rv/share/view/RvWebView.java

@@ -6,20 +6,20 @@ import android.content.Intent;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
-import android.webkit.ConsoleMessage;
 import android.webkit.JavascriptInterface;
-import android.webkit.WebChromeClient;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebResourceResponse;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
 
 import com.ruiwenliu.wrapper.SPConstance;
 import com.rv.component.utils.Cookie;
 import com.rv.component.utils.LogUtil;
 import com.rv.home.rv.module.ui.login.LoginRvActivity;
+import com.tencent.smtt.export.external.interfaces.ConsoleMessage;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.export.external.interfaces.WebResourceResponse;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import com.yuyife.okgo.OkGoUtil;
 
 import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
@@ -193,7 +193,12 @@ public class RvWebView extends WebView {
 
         @JavascriptInterface
         public void toMyWallet() {
-
+            ComponentName name = new ComponentName(getContext(), "com.xxfc.rv.MainActivity");
+            Intent intent = new Intent();
+            intent.setComponent(name);
+            intent.putExtra("to", "mine_wallet");
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) ;
+            getContext().startActivity(intent);
         }
 
         @JavascriptInterface

plugin_wallet/src/main/java/com/xxrv/wallet/activity/CashWithdrawalDetailsActivity.java

@@ -4,23 +4,20 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 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.ProgressBar;
 
-import com.frame.base.bus.RxBus;
-import com.frame.base.bus.WithdrawSuccessEvent;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import com.xxrv.wallet.R;
 import com.xxrv.wallet.R2;
 import com.xxrv.wallet.api.WalletApi;

plugin_wallet/src/main/res/layout/activity_cash_withdrawal_details.xml

@@ -18,7 +18,7 @@
         android:visibility="gone">
     </ProgressBar>
 
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/webView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"