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

app/proguard-rules.pro

@@ -511,4 +511,65 @@
 -keep public class pl.droidsonroids.gif.GifIOException{<init>(int, java.lang.String);}
 #==================鸿途信达广告sdk==========================
 -keep class com.hc.**{*;}
--keep class com.hoc.**{*;}
+-keep class com.hoc.**{*;}
+
+#==================现在支付保护区====================================
+-optimizationpasses 5
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontskipnonpubliclibraryclassmembers
+-dontpreverify
+-verbose
+-printmapping proguardMapping.txt
+-optimizations !code/simplification/cast,!field/*,!class/merging/*
+-keepattributes *Annotation*,InnerClasses
+-keepattributes Signature
+-keepattributes SourceFile,LineNumberTable
+-ignorewarnings
+-keep class com.alipay.android.app.IAlixPay{*;}
+-keep class com.alipay.android.app.IAlixPay$Stub{*;}
+-keep class com.alipay.android.app.IRemoteServiceCallback{*;}
+-keep class com.alipay.android.app.IRemoteServiceCallback$Stub{*;}
+-keep class com.alipay.sdk.app.PayTask{ public *;}
+-keep class com.alipay.sdk.auth.AlipaySDK{ public *;}
+-keep class com.alipay.sdk.auth.APAuthInfo{ public *;}
+-keep class com.alipay.mobilesecuritysdk.*
+-keep class com.ut.*
+-keep class cn.gov.pbc.tsm.*{*;}
+-keep class com.UCMobile.PayPlugin.*{*;}
+-keep class com.unionpay.*{*;}
+-dontwarn com.unionpay.**
+
+-keep class com.ipaynow.plugin.api.IpaynowPlugin{
+    <fields>;
+    <methods>;
+}
+-keep class com.ipaynow.plugin.manager.route.dto.RequestParams{
+    <fields>;
+    <methods>;
+}
+-keep class com.ipaynow.plugin.manager.route.dto.ResponseParams{
+    <fields>;
+    <methods>;
+}
+-keep class com.ipaynow.plugin.manager.route.impl.ReceivePayResult{
+    <fields>;
+    <methods>;
+}
+-keep class com.alipay.android.app.IAlixPay {
+    <fields>;
+    <methods>;
+}
+-keep class com.ipaynow.plugin.utils.StringUtils{
+    <fields>;
+    <methods>;
+}
+-keep class com.alipay.android.app.IRemoteServiceCallback {
+    <fields>;
+    <methods>;
+}
+
+-keep class com.ipaynow.plugin.utils.NativeUtils{
+   <fields>;
+   <methods>;
+}

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

@@ -1,5 +1,6 @@
 package com.sheep.gamegroup.view.activity;
 
+import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -62,6 +63,7 @@ public class ActPay extends BaseActivity {
     @Override
     protected void onCreate(Bundle b) {
         super.onCreate(b);
+        Log.e("ActPay", "Oncreate -------------");
         IpaynowPlugin.getInstance().init(this);
     }
 
@@ -165,11 +167,8 @@ public class ActPay extends BaseActivity {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        Intent intent = new Intent();
-                        intent.putExtra(EXTRA_NAME_ORDERNO, order_no);
-                        intent.putExtra(EXTRA_NAME_STATUS, STATUS_PAY_ORDER_ERROR);
-                        setResult(RESULT_CODE, intent);
-                        finish();
+                        status = STATUS_PAY_ORDER_ERROR;
+                        sdkCallback();
                     }
 
                     @Override
@@ -179,8 +178,8 @@ public class ActPay extends BaseActivity {
                 });
     }
 
-    private void launchMini(String payInfo){
-        Log.i("ActPay","启动小程序支付");
+    private void launchMini(String payInfo) {
+        Log.i("ActPay", "启动小程序支付");
         IpaynowPlugin.getInstance()
                 .setMiniProgramEnv(0)
                 .setCustomLoading(IpaynowPlugin.getInstance().getDefaultLoading())
@@ -200,22 +199,35 @@ public class ActPay extends BaseActivity {
                             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("PayRet", temp.toString());
+                        Log.e("PayRet----", temp.toString());
                         if (resp.respCode.equals("00")) {
                             status = STATUS_PAY_ORDER_SUCCESS;
                         } else {
                             status = STATUS_PAY_ORDER_ERROR;
                         }
-                        Intent intent = new Intent();
-                        intent.putExtra(EXTRA_NAME_ORDERNO, order_no);
-                        intent.putExtra(EXTRA_NAME_STATUS, status);
-                        setResult(RESULT_CODE, intent);
-                        finish();
+                        sdkCallback();
                     }
                 })
                 .pay(payInfo);
     }
 
+    private void sdkCallback() {
+//        ComponentName appName = new ComponentName(from_package, "com.yog.kothoth.view.activity.SSRechargeActivity");
+//        Intent intent = new Intent();
+//        intent.setComponent(appName);
+//        intent.putExtra("orderno", order_no);
+//        intent.putExtra("status", status);
+//        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+//        startActivity(intent);
+        //-----------------
+//        Intent intent = new Intent();
+//        intent.putExtra(EXTRA_NAME_ORDERNO, order_no);
+//        intent.putExtra(EXTRA_NAME_STATUS, status);
+//        setResult(RESULT_CODE, intent);
+        Jump2View.getInstance().goRechargeResult(this, status == STATUS_PAY_ORDER_SUCCESS ? "9000" : "-1000", from_package, order_no);
+        finish();
+    }
+
     public void onActivityResult(int requestCode, int resultCode, Intent in) {
         if (resultCode == RESULT_OK) {
             if (requestCode == Constant.INTENT_PAY) {

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

@@ -229,6 +229,7 @@ public class RechargeAct extends BaseActivity {
     }
 
     private void tryIpaynow(String payInfo) {
+        Log.i("IPayNow", payInfo);
         IpaynowPlugin.getInstance().getDefaultLoading().setLoadingMsg("正在生成订单");
         IpaynowPlugin.getInstance().getDefaultLoading().show();
         IpaynowPlugin.getInstance()
@@ -250,7 +251,7 @@ public class RechargeAct extends BaseActivity {
                             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("PayRet", temp.toString());
+//                        Log.e("IPayNow", temp.toString());
                         if (forResult && resp.respCode.equals("00")) {
                             Intent intent = new Intent();
                             intent.putExtra("amount", Integer.parseInt(mAmount));