hanjing 6 anni fa
parent
commit
211e9a2b09

+ 2 - 0
app/src/main/java/com/sheep/gamegroup/greendao/download/DownLoadInfo.java

@@ -20,6 +20,8 @@ import java.io.Serializable;
 @Entity
 public class DownLoadInfo implements Serializable{
 
+    public final static long serialVersionUID = 0l;
+
     /**
      * id
      */

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

@@ -486,7 +486,7 @@ public class FgtWebX5 extends BaseFgtWebX5 {
 
     @Override
     public boolean onBackPressed() {
-        if (responseBack) {
+        if (responseBack && !mWebView.getUrl().contains(Config.PATH_DIRECTIONAL_PAY)) {
             if (mWebView != null && mWebView.canGoBack()) {
                 mWebView.goBack();
                 return true;

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

@@ -151,7 +151,7 @@ public class KFZSJs {
     }
 
     @JavascriptInterface
-    public void gotoSearch(){
+    public void gotoSearch() {
         Jump2View.getInstance().goActSearch(activity);
     }
 
@@ -213,6 +213,7 @@ public class KFZSJs {
     public void paymentCompleted(String from, boolean ret, String msg, String orderNo) {
         //1. app
         //2. sdk
+        Log.e("PaymentCompleted", from + " " + ret + " " + msg + " " + orderNo);
         if (from.equals("2")) {
             Intent intent = new Intent();
             intent.putExtra("ret", ret);
@@ -753,8 +754,8 @@ public class KFZSJs {
     @Subscribe
     public void whenWXAuth(WXLoginAuthEvent ev) {
         EventBus.getDefault().unregister(this);
-        if(!TextUtils.isEmpty(ev.code)) {
-            WXAPIUtil.loadWXUserToken(ev.code, (ret, openid, token)->{
+        if (!TextUtils.isEmpty(ev.code)) {
+            WXAPIUtil.loadWXUserToken(ev.code, (ret, openid, token) -> {
                 Map<String, String> params = new HashMap<>();
                 params.put("access_token", token);
                 params.put("openid", openid);
@@ -762,7 +763,7 @@ public class KFZSJs {
                 params.put("app_id", Config.WX_AUTH_APP_ID);
                 loadThirdPartUserInfo("wx", params);
             });
-        }else{
+        } else {
             G.shortToast("微信授权失败");
             iWeb.loadJs("handleLogin(2)");
         }