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

app/src/main/java/com/sheep/gamegroup/util/js/KFZSJs.java

@@ -204,7 +204,7 @@ public class KFZSJs {
         activity.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                activity.finish();
+                activity.onBackPressed();
             }
         });
     }

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

@@ -390,9 +390,7 @@ public class ActWebX5 extends BaseActWeb {
                     webParams.tokenFirstUpperCase();
                 }
                 loadUrl = addUrlQuery(url, webParams.getTokenKey(), SpUtils.getToken(SheepApp.getInstance()));
-                if (url.startsWith(Config.YF_SHOP_HOME)) {
-                    loadUrl = addUrlQuery(loadUrl, "pf", Config.YF_SHOP_PLATFORM);
-                }
+                loadUrl = addUrlQuery(loadUrl, "pf", Config.YF_SHOP_PLATFORM);
             }
             LogUtil.println("ActWeb loadUrl = " + loadUrl);
             webViewLoadUrl(mWebView, loadUrl);
@@ -425,9 +423,14 @@ public class ActWebX5 extends BaseActWeb {
 
     @Override
     public void onBackPressed() {
-        if (responseBack)
-            super.onBackPressed();
-        else {
+        if (responseBack) {
+            if (mWebView != null && mWebView.canGoBack()) {
+                mWebView.goBack();
+
+            } else {
+                super.onBackPressed();
+            }
+        } else {
             loadJs("onBackPressed()");
         }
     }
@@ -438,15 +441,6 @@ public class ActWebX5 extends BaseActWeb {
     }
 
     @Override
-    public void finish() {
-        if (mWebView != null && mWebView.canGoBack()) {
-            mWebView.goBack();
-            return;
-        }
-        super.finish();
-    }
-
-    @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == FILECHOOSER_RESULTCODE) {
             if (null == mUploadMessage) return;
@@ -481,7 +475,7 @@ public class ActWebX5 extends BaseActWeb {
 
             mFilePathCallback.onReceiveValue(results);
             mFilePathCallback = null;
-        } else if(Constant.INTENT_RECHARGE == requestCode) {
+        } else if (Constant.INTENT_RECHARGE == requestCode) {
             mWebView.reload();
         } else {
             super.onActivityResult(requestCode, resultCode, data);