billyyoyo лет назад: 6
Родитель
Сommit
eecfd3587a

+ 2 - 0
app/src/main/java/com/sheep/gamegroup/model/api/IWeb.java

@@ -34,6 +34,8 @@ public interface IWeb {
 
     String getWebUrl();
 
+    String getFirstUrl();
+
     String getWebTitle();
 
     void setCookies(String url, Map<String, String> params);

+ 8 - 0
app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWeb.java

@@ -86,6 +86,12 @@ public class FgtWeb extends BaseFgtWeb {
     ImageView act_web_loading_iv;
     protected WebParams webParams;
 
+    private String finallyUrl;
+
+    public String getFirstUrl(){
+        return finallyUrl;
+    }
+
     @Override
     public int getLayoutId() {
         return R.layout.fgt_web;
@@ -467,8 +473,10 @@ public class FgtWeb extends BaseFgtWeb {
             }
             loadUrl = StringUtils.addUrlQuery(loadUrl, webParams.getInvitationCodeKey(), DataUtil.getInstance().getInvitationCode());
             LogUtil.println("ActWeb loadUrl = " + loadUrl);
+            finallyUrl = loadUrl;
             webViewLoadUrl(mWebView, loadUrl);
         } else {
+            finallyUrl = url;
             webViewLoadUrl(mWebView, url);
         }
     }

+ 4 - 2
app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWebX5.java

@@ -93,6 +93,10 @@ public class FgtWebX5 extends BaseFgtWebX5 {
 
     private String finallyUrl;
 
+    public String getFirstUrl(){
+        return finallyUrl;
+    }
+
     @Override
     public int getLayoutId() {
         return R.layout.fgt_web_x5;
@@ -425,7 +429,6 @@ public class FgtWebX5 extends BaseFgtWebX5 {
                 } else if (url.startsWith("https://wx.tenpay.com")) {
                     Map<String, String> extraHeaders = new HashMap<>();
                     extraHeaders.put("Referer", "http://17xmy.com");
-                    finallyUrl = url;
                     webViewLoadUrl(view, extraHeaders, url);
                     return true;
                 } else if (url.contains("kfzs.com")
@@ -433,7 +436,6 @@ public class FgtWebX5 extends BaseFgtWebX5 {
                         || (url.startsWith("http://10.8.") && TestUtil.isDev())) {
                     Map<String, String> extraHeaders = new HashMap<>();
                     extraHeaders.put("Referer", "http://kfzs.com");
-                    finallyUrl = url;
                     webViewLoadUrl(view, extraHeaders, url);
                     return true;
                 } else {

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

@@ -788,6 +788,11 @@ public class KFZSJs {
         });
     }
 
+    @JavascriptInterface
+    public String getFirstUrl() {
+        return iWeb.getFirstUrl();
+    }
+
     @Subscribe
     public void whenWXAuth(WXLoginAuthEvent ev) {
         EventBus.getDefault().unregister(this);