zeki пре 4 година
родитељ
комит
aa0781cc79

+ 0 - 1
app/src/main/AndroidManifest.xml

@@ -487,7 +487,6 @@
                 android:configChanges="orientation|screenSize"
                 android:exported="true"
                 android:process=":newWeb"
-                android:hardwareAccelerated="false"
                 android:screenOrientation="portrait"
                 android:theme="@style/AppActionTheme"/>
 

+ 10 - 1
app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWebX5.java

@@ -465,7 +465,8 @@ public class FgtWebX5 extends BaseFgtWebX5 {
             @Override
             public WebResourceResponse shouldInterceptRequest(WebView webView, String s) {
                 if (url.contains("h5.qzone.qq.com")) {
-                    if (s.equals("https://qzonestyle.gtimg.cn/qz-proj/qz-common/img/m-error/pic-error.png")) {
+                    Log.d("!!!!!!",s);
+                    if (s.contains("pic-error.png")||s.contains("page-error.css")) {
                         //鱼死网破
                         needWxLogin = true;
                         kfzsJs.loginThirdPartApp("wx");
@@ -541,6 +542,14 @@ public class FgtWebX5 extends BaseFgtWebX5 {
             public void onPageFinished(WebView view, String url) {
                 LogUtil.println("ActWebX5", "onPageFinished " + url);
                 super.onPageFinished(view, url);
+                if (url.contains("h5.qzone.qq.com")) {
+                    Log.d("!!!!!!",url);
+                    if (url.contains("pic-error.png")||url.contains("page-error.css")) {
+                        //鱼死网破
+                        needWxLogin = true;
+                        kfzsJs.loginThirdPartApp("wx");
+                    }
+                }
                 CookieManager cookieManager = CookieManager.getInstance();
                 cookieManager.flush();
                 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {

+ 17 - 0
app/src/main/java/com/sheep/gamegroup/util/js/KFZSJs.java

@@ -15,6 +15,7 @@ import android.view.View;
 import android.webkit.JavascriptInterface;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.kfzs.cfyl.media.BaseActivity;
 import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.event.WXLoginAuthEvent;
 import com.sheep.gamegroup.event.WebViewEvent;
@@ -61,6 +62,10 @@ import com.umeng.socialize.UMAuthListener;
 import com.umeng.socialize.UMShareAPI;
 import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;
+import io.reactivex.Completable;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Action;
+import io.reactivex.functions.Consumer;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
@@ -68,6 +73,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import cn.finalteam.rxgalleryfinal.utils.CameraUtil;
@@ -179,6 +185,17 @@ public class KFZSJs {
 
     @JavascriptInterface
     public void gotoH5Game(String url) {
+        Log.d(":::::",activity.toString());
+        if(activity instanceof BaseActivity){
+            Completable.timer(3, TimeUnit.SECONDS).subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .doOnSubscribe(disposable -> {
+                        ((BaseActivity) activity).showProgress();
+                    })
+                    .doOnComplete(() -> {
+                        ((BaseActivity) activity).hideProgress();
+                    }).subscribe();
+        }
         Jump2View.getInstance().goH5Game(activity, url);
     }