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

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

@@ -72,6 +72,7 @@ public class RechargeAct extends BaseActivity {
     private int payTypePosition = -1;//选择支付方式的位置
     private String mAmount = null;//支付的金额
     private boolean forResult = false;
+    private String fromPackage;
 
     @Override
     protected void onCreate(Bundle b) {
@@ -95,6 +96,9 @@ public class RechargeAct extends BaseActivity {
         if (getIntent().hasExtra("forResult")) {
             forResult = true;
         }
+        if(getIntent().hasExtra("from_package")) {
+            fromPackage = getIntent().getStringExtra("from_package");
+        }
         TitleBarUtils.getInstance()
                 .setShowOrHide(this, true)
                 .setTitle(this, "充值")
@@ -250,12 +254,9 @@ public class RechargeAct extends BaseActivity {
                         } else {
                             temp.append("respCode=").append(resp.respCode).append("\n").append("respMsg=").append(resp.respMsg);
                         }
-//                        Toast.makeText(RechargeAct.this, "onIpaynowTransResult:" + temp.toString(), Toast.LENGTH_LONG).show();
-//                        Log.e("IPayNow", temp.toString());
-                        if (forResult && resp.respCode.equals("00")) {
-                            Intent intent = new Intent();
-                            intent.putExtra("amount", Integer.parseInt(mAmount));
-                            setResult(777, intent);
+                        if (forResult) {
+                            String result = resp.respCode.equals("00") ? "9000" : resp.respCode;
+                            Jump2View.getInstance().goRechargeResult(RechargeAct.this, result, fromPackage, null);
                         } else {
                             String result = resp.respCode.equals("00") ? "9000" : resp.respCode;
                             Jump2View.getInstance().goRechargeResultAct(RechargeAct.this, result);

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

@@ -80,8 +80,9 @@ public class RechargeResultAct extends BaseActivity {
             ComponentName appName = new ComponentName(gowhere, "com.yog.kothoth.view.activity.SSRechargeActivity");
             Intent intent = new Intent();
             intent.setComponent(appName);
+            intent.putExtra("action", TextUtils.isEmpty(orderno) ? 777 : 666);
             intent.putExtra("orderno", orderno);
-            intent.putExtra("status", "9000".equals(resultStatus)?2:-2);
+            intent.putExtra("status", "9000".equals(resultStatus) ? 2 : -2);
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
             startActivity(intent);
         }