h5 return payment flag 1,2

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

@@ -3,6 +3,7 @@ package com.sheep.gamegroup.util.js;
 import android.app.Activity;
 import android.content.Intent;
 import android.text.TextUtils;
+import android.util.Log;
 import android.webkit.JavascriptInterface;
 
 import com.alibaba.fastjson.JSONObject;
@@ -120,24 +121,25 @@ public class KFZSJs {
 
     @JavascriptInterface
     public void paymentCompleted(String from, boolean ret, String msg, String orderNo) {
-        if (from.equals("sdk")) {
+        //1. app
+        //2. sdk
+        if (from.equals("2")) {
             Intent intent = new Intent();
             intent.putExtra("ret", ret);
             intent.putExtra("msg", msg);
             intent.putExtra("order_no", orderNo);
-            activity.setResult(Activity.RESULT_OK);
-            activity.setIntent(intent);
+            activity.setResult(Activity.RESULT_OK, intent);
         }
         activity.finish();
     }
 
     @JavascriptInterface
-    public void jumpGame(){
+    public void jumpGame() {
         Jump2View.getInstance().goMainGame(activity);
     }
 
     @JavascriptInterface
-    public void jumpShop(){
+    public void jumpShop() {
         Jump2View.getInstance().gotoYfShop(activity);
     }