Merge pull request #75 from yangchong211/feature_1.3.0

Feature 1.3.0

Author: yangchong211

.idea/caches/build_file_checksums.ser

@@ -27,9 +27,16 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation ("com.aliyun.ams:alicloud-android-httpdns:1.1.7@aar") {
+    //okhttp库
+    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
+    //阿里https+dns开源库
+    implementation('com.aliyun.ams:alicloud-android-httpdns:1.1.7@aar') {
         transitive true
     }
+    //x5库
+    //仅仅在编译时使用，但最终不会被编译到apk或aar里
+    //provided files('libs/tbs_sdk_thirdapp_v4.3.0.3_43903_sharewithdownloadwithfile_withoutGame_obfs_20200402_121309.jar')
+    //implementation 'com.tencent.tbs.tbssdk:sdk:latest.release'
     implementation files('libs/tbs_sdk_thirdapp_v4.3.0.3_43903_sharewithdownloadwithfile_withoutGame_obfs_20200402_121309.jar')
 }
 
@@ -49,7 +56,7 @@ group = "cn.yc"
 //发布到JCenter上的项目名字，必须填写
 def libName = "WebViewLib"
 // 版本号，下次更新是只需要更改版本号即可
-version = "1.2.7"
+version = "1.3.0"
 
 //生成源文件
 task sourcesJar(type: Jar) {

README.md

@@ -25,7 +25,7 @@
 
 
         <activity
-            android:name=".X5WebViewActivity"
+            android:name=".view.X5WebViewActivity"
             android:configChanges="orientation|screenSize"
             android:hardwareAccelerated="true"
             android:launchMode="singleTask"

WebViewLib/build.gradle

@@ -13,34 +13,32 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package com.ycbjie.webviewlib;
+package com.ycbjie.webviewlib.base;
 
 import android.Manifest;
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Message;
 import android.support.v4.app.ActivityCompat;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.FrameLayout;
 
 import com.tencent.smtt.export.external.interfaces.ConsoleMessage;
 import com.tencent.smtt.export.external.interfaces.GeolocationPermissionsCallback;
-import com.tencent.smtt.export.external.interfaces.IX5WebChromeClient;
 import com.tencent.smtt.export.external.interfaces.JsPromptResult;
 import com.tencent.smtt.export.external.interfaces.JsResult;
 import com.tencent.smtt.export.external.interfaces.PermissionRequest;
 import com.tencent.smtt.sdk.ValueCallback;
-import com.tencent.smtt.sdk.WebChromeClient;
 import com.tencent.smtt.sdk.WebStorage;
 import com.tencent.smtt.sdk.WebView;
+import com.ycbjie.webviewlib.inter.InterWebListener;
+import com.ycbjie.webviewlib.inter.VideoWebListener;
+import com.ycbjie.webviewlib.utils.X5LogUtils;
+import com.ycbjie.webviewlib.utils.X5WebUtils;
+import com.ycbjie.webviewlib.video.VideoChromeClient;
 import static android.app.Activity.RESULT_OK;
 
 /**
@@ -55,7 +53,7 @@
  *             作用：WebViewClient主要辅助WebView执行处理各种响应请求事件的
  * </pre>
  */
-public class X5WebChromeClient extends WebChromeClient {
+public class X5WebChromeClient extends VideoChromeClient {
 
     private ValueCallback<Uri> mUploadMessage;
     private ValueCallback<Uri[]> mUploadMessageForAndroid5;
@@ -65,15 +63,9 @@ public class X5WebChromeClient extends WebChromeClient {
     public static int FILE_CHOOSER_RESULT_CODE = 1;
     public static int FILE_CHOOSER_RESULT_CODE_5 = 2;
     private InterWebListener webListener;
-    private VideoWebListener videoWebListener;
     private boolean isShowContent = false;
     private Context context;
-    private View progressVideo;
-    private View customView;
-    private IX5WebChromeClient.CustomViewCallback customViewCallback;
-    private FullscreenHolder videoFullView;
     private WebView webView;
-    private boolean isShowCustomVideo = true;
     public static final int REQUEST_LOCATION = 100;
 
     /**
@@ -89,22 +81,23 @@ public void setWebListener(InterWebListener listener){
      * @param videoWebListener                  listener
      */
     public void setVideoWebListener(VideoWebListener videoWebListener){
-        this.videoWebListener = videoWebListener;
+        setVideoListener(videoWebListener);
     }
 
     /**
-     * 设置是否使用
+     * 设置是否使用自定义视频视图，建议使用
      * @param showCustomVideo                   是否使用自定义视频视图
      */
     public void setShowCustomVideo(boolean showCustomVideo) {
-        isShowCustomVideo = showCustomVideo;
+        setCustomVideo(showCustomVideo);
     }
 
     /**
      * 构造方法
      * @param context                          上下文
      */
     public X5WebChromeClient(WebView webView , Context context) {
+        super(context, webView);
         this.context = context;
         this.webView = webView;
     }
@@ -259,133 +252,6 @@ public void onGeolocationPermissionsShowPrompt(String origin, GeolocationPermiss
         }
     }
 
-    /**
-     * 当全屏的视频正在缓冲时，此方法返回一个占位视图(比如旋转的菊花)。
-     * 视频加载时进程loading
-     */
-    @Override
-    public View getVideoLoadingProgressView() {
-        if (progressVideo == null && context!=null) {
-            LayoutInflater inflater = LayoutInflater.from(context);
-            progressVideo = inflater.inflate(R.layout.view_web_video_progress, null);
-        }
-        return progressVideo;
-    }
-
-    /**
-     *  通知应用当前页进入了全屏模式，此时应用必须显示一个包含网页内容的自定义View
-     * 播放网络视频时全屏会被调用的方法，播放视频切换为横屏
-     * @param view                              view
-     * @param callback                          callback
-     */
-    @SuppressLint("SourceLockedOrientationActivity")
-    @Override
-    public void onShowCustomView(View view, IX5WebChromeClient.CustomViewCallback callback) {
-        X5LogUtils.i("-------onShowCustomView-------");
-        if (isShowCustomVideo){
-            if (context instanceof Activity){
-                Activity activity = (Activity) context;
-                activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-                videoWebListener.hindWebView();
-                // 如果一个视图已经存在，那么立刻终止并新建一个
-                if (customView != null) {
-                    callback.onCustomViewHidden();
-                    return;
-                }
-                fullViewAddView(view);
-                customView = view;
-                customViewCallback = callback;
-                videoWebListener.showVideoFullView();
-            }
-        }
-    }
-
-    /**
-     * 添加view到decorView容齐中
-     * @param view                              view
-     */
-    private void fullViewAddView(View view) {
-        //增强逻辑判断，尤其是getWindow()
-        if (context!=null && context instanceof Activity){
-            Activity activity = (Activity) context;
-            if (activity.getWindow()!=null){
-                FrameLayout decor = (FrameLayout) activity.getWindow().getDecorView();
-                videoFullView = new FullscreenHolder(activity);
-                videoFullView.addView(view);
-                decor.addView(videoFullView);
-            }
-        }
-    }
-
-    /**
-     * 获取视频控件view
-     * @return                                  view
-     */
-    private FrameLayout getVideoFullView() {
-        return videoFullView;
-    }
-
-    /**
-     * 销毁的时候需要移除一下视频view
-     */
-    public void removeVideoView(){
-        if (videoFullView!=null){
-            videoFullView.removeAllViews();
-        }
-    }
-
-    /**
-     * 通知应用当前页退出了全屏模式，此时应用必须隐藏之前显示的自定义View
-     * 视频播放退出全屏会被调用的
-     */
-    @SuppressLint("SourceLockedOrientationActivity")
-    @Override
-    public void onHideCustomView() {
-        X5LogUtils.i("-------onHideCustomView-------");
-        if (isShowCustomVideo){
-            if (customView == null) {
-                // 不是全屏播放状态
-                return;
-            }
-            if (context!=null && context instanceof Activity){
-                Activity activity = (Activity) context;
-                activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-            }
-            customView.setVisibility(View.GONE);
-            if (getVideoFullView() != null) {
-                getVideoFullView().removeView(customView);
-            }
-            customView = null;
-            if (videoWebListener!=null){
-                videoWebListener.hindVideoFullView();
-            }
-            customViewCallback.onCustomViewHidden();
-            if (videoWebListener!=null){
-                videoWebListener.showWebView();
-            }
-        }
-    }
-
-    /**
-     * 判断是否是全屏
-     */
-    public boolean inCustomView() {
-        return (customView != null);
-    }
-
-    /**
-     * 逻辑是：先判断是否全频播放，如果是，则退出全频播放
-     * 全屏时按返加键执行退出全屏方法
-     */
-    @SuppressLint("SourceLockedOrientationActivity")
-    public void hideCustomView() {
-        this.onHideCustomView();
-        if (context!=null && context instanceof Activity){
-            Activity activity = (Activity) context;
-            activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-        }
-    }
-
     /**
      * 打开文件夹，扩展浏览器上传文件，3.0++版本
      * @param uploadMsg                         msg

WebViewLib/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package com.ycbjie.webviewlib;
+package com.ycbjie.webviewlib.base;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -35,6 +35,10 @@
 import com.tencent.smtt.export.external.interfaces.WebResourceResponse;
 import com.tencent.smtt.sdk.WebView;
 import com.tencent.smtt.sdk.WebViewClient;
+import com.ycbjie.webviewlib.utils.X5LogUtils;
+import com.ycbjie.webviewlib.utils.X5WebUtils;
+import com.ycbjie.webviewlib.helper.WebSchemeIntent;
+import com.ycbjie.webviewlib.inter.InterWebListener;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;

WebViewLib/src/main/java/com/ycbjie/webviewlib/ImageJavascriptInterface.java

@@ -13,7 +13,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package com.ycbjie.webviewlib;
+package com.ycbjie.webviewlib.bridge;
 
 import android.content.Context;
 
@@ -35,19 +35,19 @@
  */
 public final class BridgeUtil {
 
-	final static String YY_OVERRIDE_SCHEMA = "yy://";
+	public final static String YY_OVERRIDE_SCHEMA = "yy://";
 	/**
 	 * 格式为   yy://return/{function}/returncontent
 	 */
-	final static String YY_RETURN_DATA = YY_OVERRIDE_SCHEMA + "return/";
+	public final static String YY_RETURN_DATA = YY_OVERRIDE_SCHEMA + "return/";
 	private final static String YY_FETCH_QUEUE = YY_RETURN_DATA + "_fetchQueue/";
 	private final static String EMPTY_STR = "";
-	final static String UNDERLINE_STR = "_";
-	private final static String SPLIT_MARK = "/";
-	final static String CALLBACK_ID_FORMAT = "JAVA_CB_%s";
-	final static String JS_HANDLE_MESSAGE_FROM_JAVA =
+	public final static String UNDERLINE_STR = "_";
+	public  final static String SPLIT_MARK = "/";
+	public final static String CALLBACK_ID_FORMAT = "JAVA_CB_%s";
+	public final static String JS_HANDLE_MESSAGE_FROM_JAVA =
 			"javascript:WebViewJavascriptBridge._handleMessageFromNative('%s');";
-	final static String JS_FETCH_QUEUE_FROM_JAVA =
+	public final static String JS_FETCH_QUEUE_FROM_JAVA =
 			"javascript:WebViewJavascriptBridge._fetchQueue();";
 	public final static String JAVASCRIPT_STR = "javascript:";