Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

app/src/main/java/com/kfzs/duanduan/ActWeb.java

@@ -6,11 +6,12 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+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 android.webkit.JavascriptInterface;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
 import android.widget.ImageButton;
 import android.widget.TextView;
 

app/src/main/java/com/kfzs/duanduan/fragment/FgtAskgetmoney.java

@@ -8,7 +8,7 @@ import android.support.v4.widget.NestedScrollView;
 import android.text.TextUtils;
 import android.view.MotionEvent;
 import android.view.View;
-import android.webkit.WebView;
+import com.tencent.smtt.sdk.WebView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -26,6 +26,7 @@ import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyFriend;
 import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyRank;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -161,9 +162,9 @@ public class FgtAskgetmoney extends BaseCompatFragment {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
-
                         ViewUtil.newInstance().hideProgress(activity);
-                        G.showToast(baseMessage.getMsg()+"");
+                        if(BuildConfig.DEBUG)
+                            G.showToast(baseMessage);
                     }
 
                     @Override

app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -29,7 +29,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
-import android.webkit.WebView;
+import com.tencent.smtt.sdk.WebView;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;

app/src/main/java/com/sheep/gamegroup/view/activity/ActCreditCardWeb.java

@@ -3,10 +3,10 @@ package com.sheep.gamegroup.view.activity;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+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 android.widget.TextView;
 
 import com.kfzs.duanduan.BaseCompatActivity;
@@ -57,7 +57,7 @@ public class ActCreditCardWeb extends BaseCompatActivity {
         webViewSettings = mWebView.getSettings();
         webViewSettings.setJavaScriptCanOpenWindowsAutomatically(true);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+//            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         }
         if (getIntent().hasExtra(EXTRA_WEBVIEW_NO_TITLE)) {//不显示标题
             findViewById(R.id.appbar_act_webview).setVisibility(View.GONE);

app/src/main/java/com/sheep/gamegroup/view/activity/ActFindGame.java

@@ -10,7 +10,7 @@ import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.View;
-import android.webkit.WebView;
+import com.tencent.smtt.sdk.WebView;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.RatingBar;

app/src/main/java/com/sheep/gamegroup/view/activity/ActFindInformation.java

@@ -15,10 +15,12 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+
+import com.tencent.smtt.export.external.interfaces.IX5WebChromeClient;
+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 android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -91,7 +93,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
     protected final FrameLayout.LayoutParams COVER_SCREEN_PARAMS = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
     private View customView;
     private FrameLayout fullscreenContainer;
-    private WebChromeClient.CustomViewCallback customViewCallback;
+    private IX5WebChromeClient.CustomViewCallback customViewCallback;
 
 
     @BindView(R.id.refresh)
@@ -200,7 +202,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
             }
 
             @Override
-            public void onShowCustomView(View view, CustomViewCallback callback) {
+            public void onShowCustomView(View view, IX5WebChromeClient.CustomViewCallback callback) {
                 showCustomView(view, callback);
                 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);//设置横屏
             }
@@ -218,7 +220,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
      * 视频播放全屏
      */
 
-    private void showCustomView(View view, WebChromeClient.CustomViewCallback callback) {
+    private void showCustomView(View view, IX5WebChromeClient.CustomViewCallback callback) {
         // if a view already exists then immediately terminate the new one
         if (customView != null) {
             callback.onCustomViewHidden();

app/src/main/java/com/sheep/gamegroup/view/activity/ActGuideDeblocked.java

@@ -2,10 +2,10 @@ package com.sheep.gamegroup.view.activity;
 
 import android.os.Bundle;
 import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+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 android.widget.TextView;
 
 import com.kfzs.duanduan.BaseCompatActivity;

app/src/main/java/com/sheep/gamegroup/view/activity/ActGuideOnHook.java

@@ -2,10 +2,10 @@ package com.sheep.gamegroup.view.activity;
 
 import android.os.Bundle;
 import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+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.kfzs.duanduan.BaseCompatActivity;
 import com.kfzs.duanduan.bean.KFIntentKeys;

app/src/main/java/com/sheep/gamegroup/view/activity/ActLoadH5.java

@@ -2,7 +2,7 @@ package com.sheep.gamegroup.view.activity;
 
 import android.text.method.ScrollingMovementMethod;
 import android.view.View;
-import android.webkit.WebView;
+import com.tencent.smtt.sdk.WebView;
 import android.widget.TextView;
 
 import com.sheep.gamegroup.absBase.BaseActivity;

app/src/main/java/com/sheep/gamegroup/view/activity/ActNewAboutUs.java

@@ -5,7 +5,7 @@ import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
-import android.webkit.WebView;
+import com.tencent.smtt.sdk.WebView;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;

app/src/main/java/com/sheep/gamegroup/view/activity/ActNotice.java

@@ -1,7 +1,7 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.view.View;
-import android.webkit.WebView;
+import com.tencent.smtt.sdk.WebView;
 import android.widget.TextView;
 
 import com.sheep.gamegroup.absBase.BaseActivity;

app/src/main/java/com/sheep/gamegroup/view/activity/ActWeb.java

@@ -11,13 +11,13 @@ import android.provider.MediaStore;
 import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.view.View;
-import android.webkit.DownloadListener;
+import com.tencent.smtt.sdk.DownloadListener;
 import android.webkit.JavascriptInterface;
-import android.webkit.ValueCallback;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+import com.tencent.smtt.sdk.ValueCallback;
+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.kfzs.duanduan.BaseCompatActivity;
 import com.sheep.gamegroup.util.CommonUtil;
@@ -27,21 +27,18 @@ import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
-import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import com.yalantis.ucrop.util.FileUtils;
-import com.zhy.http.okhttp.OkHttpUtils;
-import com.zhy.http.okhttp.callback.FileCallBack;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import okhttp3.Call;
 
 import static com.kfzs.duanduan.bean.KFIntentKeys.EXTRA_WEBVIEW_NO_TITLE;
 
@@ -86,7 +83,7 @@ public class ActWeb extends BaseCompatActivity {
             e.printStackTrace();
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+//            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         }
         if (getIntent().hasExtra(EXTRA_WEBVIEW_NO_TITLE)) {//不显示标题
             findViewById(R.id.appbar_act_webview).setVisibility(View.GONE);
@@ -234,10 +231,22 @@ public class ActWeb extends BaseCompatActivity {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 try {
-                    view.loadUrl(url);
+                    //微信H5支付核心代码
+                    if (url.startsWith("weixin://wap/pay?")) {
+                        Intent intent = new Intent();
+                        intent.setAction(Intent.ACTION_VIEW);
+                        intent.setData(Uri.parse(url));
+                        startActivity(intent);
+                        return true;
+                    } else {
+                        Map<String, String> extraHeaders = new HashMap<>();
+                        extraHeaders.put("Referer", "http://17xmy.com");
+                        view.loadUrl(url, extraHeaders);
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
+
                 return true;
             }
 

app/src/main/java/com/sheep/gamegroup/view/activity/ActXinwanWeb.java

@@ -5,10 +5,10 @@ import android.os.Build;
 import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+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 android.widget.TextView;
 
 import com.kfzs.duanduan.BaseCompatActivity;
@@ -83,7 +83,7 @@ public class ActXinwanWeb extends BaseCompatActivity {
         webViewSettings = mWebView.getSettings();
         webViewSettings.setJavaScriptCanOpenWindowsAutomatically(true);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+//            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         }
         if (getIntent().hasExtra(EXTRA_WEBVIEW_NO_TITLE)) {//不显示标题
             findViewById(R.id.appbar_act_webview).setVisibility(View.GONE);

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -8,10 +8,11 @@ import android.support.annotation.RequiresApi;
 import android.text.Html;
 import android.text.TextUtils;
 import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+
+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 android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAddQQAct.java

@@ -6,26 +6,23 @@ import android.os.Bundle;
 import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
 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.RelativeLayout;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+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;
 import butterknife.ButterKnife;

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailCreditCardAct.java

@@ -6,40 +6,35 @@ import android.os.Bundle;
 import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
+import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+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 java.util.Locale;
 

app/src/main/java/com/sheep/gamegroup/view/activity/WebviewAct.java

@@ -2,10 +2,10 @@ package com.sheep.gamegroup.view.activity;
 
 import android.text.TextUtils;
 import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+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 android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;

app/src/main/java/com/sheep/gamegroup/view/customview/WebViewForScrollView.java

@@ -3,7 +3,7 @@ package com.sheep.gamegroup.view.customview;
         import android.content.Context;
         import android.util.AttributeSet;
         import android.view.View;
-        import android.webkit.WebView;
+        import com.tencent.smtt.sdk.WebView;
 
 /**
  * WebViewForScrollView

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -32,6 +32,7 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.tencent.bugly.Bugly;
 import com.tencent.bugly.beta.Beta;
+import com.tencent.smtt.sdk.QbSdk;
 
 import rx.functions.Action1;
 
@@ -114,6 +115,18 @@ public class SheepApp extends BaseApplication {
             connectAddress = ConnectAddress.sheep.getDefultConnectAddress();
             registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
             initNet();
+            QbSdk.initX5Environment(this, new QbSdk.PreInitCallback() {
+                @Override
+                public void onCoreInitFinished() {
+                    LogUtil.println("SheepApp", "QbSdk", "initX5Environment", "onCoreInitFinished");
+                }
+
+                @Override
+                public void onViewInitFinished(boolean b) {
+                    LogUtil.println("SheepApp", "QbSdk", "initX5Environment", "onViewInitFinished", b);
+
+                }
+            });
             ChannelContent.getInstance().initChannelContent(this);
         }
     }

app/src/main/res/layout-um/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"

app/src/main/res/layout/act_find_game.xml

@@ -323,7 +323,7 @@
                             android:textSize="15sp" />
 
                     </LinearLayout>
-                    <WebView
+                    <com.tencent.smtt.sdk.WebView
                         android:id="@+id/find_game_info_wv"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"

app/src/main/res/layout/act_load_h5.xml

@@ -17,7 +17,7 @@
         android:textColor="#939393"
         android:textSize="13sp" />
 
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/act_notice_content_wb"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

app/src/main/res/layout/act_new_about_us.xml

@@ -209,7 +209,7 @@
                         android:layout_width="match_parent"
                         android:text="公司简介" />
 
-                    <WebView
+                    <com.tencent.smtt.sdk.WebView
                         android:id="@+id/about_us_other_wv"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />

app/src/main/res/layout/act_notice.xml

@@ -44,7 +44,7 @@
             android:text="@string/app_name"
             android:textColor="#939393"
             android:textSize="13sp" />
-        <WebView
+        <com.tencent.smtt.sdk.WebView
             android:id="@+id/act_notice_content_wb"
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>

app/src/main/res/layout/act_web.xml

@@ -7,7 +7,7 @@
 
     <include
         layout="@layout/title"/>
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/webview"
         android:layout_width="match_parent"
         android:layout_height="0dp"

app/src/main/res/layout/activity_guide_on_hook.xml

@@ -7,7 +7,7 @@
 
     <include
         layout="@layout/title"/>
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/webview"
         android:layout_width="match_parent"
         android:layout_height="0dp"

app/src/main/res/layout/jpush_popwin_layout.xml

@@ -7,7 +7,7 @@
     android:layout_width="280dp"
     android:layout_height="250dp" >
 
-        <WebView
+        <com.tencent.smtt.sdk.WebView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:id="@+id/wvPopwin"/>

app/src/main/res/layout/jpush_webview_layout.xml

@@ -50,7 +50,7 @@
         android:progress="0"
         android:progressDrawable="@drawable/jpush_richpush_progressbar"
         style="?android:attr/progressBarStyleHorizontal" />
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/fullWebView"

app/src/main/res/layout/task_detail_layout.xml

@@ -318,12 +318,10 @@
                         style="@style/nomal_txt_style"
                         android:layout_marginBottom="@dimen/content_padding_small"/>
 
-                    <WebView
+                    <com.tencent.smtt.sdk.WebView
                         android:id="@+id/web_text"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                    </WebView>
+                        android:layout_height="wrap_content"/>
                 </LinearLayout>
 
                 <LinearLayout

app/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"

app/src/main/res/layout/x_ask_getmoney_act_layout.xml

@@ -23,7 +23,7 @@
             android:layout_height="match_parent"
             android:background="#FFD269">
 
-            <WebView
+            <com.tencent.smtt.sdk.WebView
                 android:id="@+id/ask_bg"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />

app/src/main/res/layout/x_msg_wv_dialog.xml

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/dialog_msg_wv"
         android:layout_width="match_parent"
         android:layout_marginLeft="10dp"

view/build.gradle

@@ -30,6 +30,7 @@ android {
 dependencies {
     compile "com.android.support:appcompat-v7:$supportLibVersion"
     compile "com.android.support:support-v4:$supportLibVersion"
+    compile files('libs/tbs_sdk_thirdapp_v3.6.0.1325.jar')
 //    compile 'com.github.bumptech.glide:glide:3.7.0'
 //    compile ('jp.wasabeef:glide-transformations:2.0.2'){
 //        exclude group: 'com.github.bumptech.glide', module: 'glide'

view/src/main/java/com/kfzs/android/view/widget/SafeWebView.java

@@ -9,13 +9,13 @@ import android.os.Build;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
-import android.webkit.JsPromptResult;
-import android.webkit.JsResult;
-import android.webkit.ValueCallback;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+import com.tencent.smtt.export.external.interfaces.JsPromptResult;
+import com.tencent.smtt.export.external.interfaces.JsResult;
+import com.tencent.smtt.sdk.ValueCallback;
+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 org.json.JSONArray;
 import org.json.JSONObject;