zeki лет назад: 4
Родитель
Сommit
06da037f71

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

@@ -63,6 +63,7 @@ import java.util.Map;
 
 import butterknife.BindView;
 import cn.finalteam.rxgalleryfinal.utils.CameraUtil;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import okhttp3.Call;
 import org.greenrobot.eventbus.EventBus;
 
@@ -464,14 +465,28 @@ public class FgtWebX5 extends BaseFgtWebX5 {
 
             @Override
             public WebResourceResponse shouldInterceptRequest(WebView webView, String s) {
-                if (url.contains("h5.qzone.qq.com")) {
+                if (s.contains("page-error.css")) {
+                    CookieManager.getInstance().removeAllCookie();
+                    Log.d("!!!!!!s","清理了cookie~~~");
+                    AndroidSchedulers.mainThread().scheduleDirect(new Runnable() {
+                        @Override
+                        public void run() {
+                            loadJs("window.location.reload()");
+                        /*//鱼死网破
+                        needWxLogin = true;
+                        kfzsJs.loginThirdPartApp("wx");*/
+                        }
+                    });
+                }
+
+                /*if (url.contains("h5.qzone.qq.com")) {
                     Log.d("!!!!!!",s);
                     if (s.contains("pic-error.png")||s.contains("page-error.css")) {
                         //鱼死网破
                         needWxLogin = true;
                         kfzsJs.loginThirdPartApp("wx");
                     }
-                }
+                }*/
                 return super.shouldInterceptRequest(webView, s);
             }
 
@@ -542,14 +557,6 @@ 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) {

+ 8 - 0
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -1052,6 +1052,14 @@ public class Jump2View {
     }
 
     public void goH5Game(Context context, String url) {
+        if (context instanceof ActMain) {
+            Completable.timer(2, TimeUnit.SECONDS).subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .doOnSubscribe(disposable -> {
+                        ((ActMain) context).showProgress();
+                    })
+                    .doOnComplete(((ActMain) context)::hideProgress).subscribe();
+        }
         Uri uri = Uri.parse(url);
         String host = uri.getHost();
         //FgtWebX5.saveWXToken(context, host, "", "dwfewdf");

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

@@ -185,17 +185,6 @@ 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);
     }