Commit d9b84936bcc65dccfb685783739e631587adfd35
1 parent
bc76e485
添加银联支付功能
Showing
20 changed files
with
56 additions
and
19 deletions
app/build.gradle
| @@ -47,5 +47,5 @@ dependencies { | @@ -47,5 +47,5 @@ dependencies { | ||
| 47 | compile 'com.android.support.constraint:constraint-layout:1.0.2' | 47 | compile 'com.android.support.constraint:constraint-layout:1.0.2' |
| 48 | testCompile 'junit:junit:4.12' | 48 | testCompile 'junit:junit:4.12' |
| 49 | 49 | ||
| 50 | - compile 'com.cnlive:lib_cnpay:1.0.4' | 50 | + compile 'com.cnlive:lib_cnpay:1.0.9' |
| 51 | } | 51 | } |
app/libs/UPPayAssistEx.jar
0 → 100644
No preview for this file type
app/libs/UPPayPluginExPro.jar
0 → 100644
No preview for this file type
app/src/main/java/com/cnlive/demo/pay/MainActivity.java
| 1 | package com.cnlive.demo.pay; | 1 | package com.cnlive.demo.pay; |
| 2 | 2 | ||
| 3 | import android.app.ProgressDialog; | 3 | import android.app.ProgressDialog; |
| 4 | -import android.support.v7.app.AppCompatActivity; | 4 | +import android.content.Intent; |
| 5 | import android.os.Bundle; | 5 | import android.os.Bundle; |
| 6 | +import android.support.v7.app.AppCompatActivity; | ||
| 6 | import android.view.View; | 7 | import android.view.View; |
| 7 | import android.widget.Toast; | 8 | import android.widget.Toast; |
| 8 | 9 | ||
| @@ -17,13 +18,15 @@ public class MainActivity extends AppCompatActivity { | @@ -17,13 +18,15 @@ public class MainActivity extends AppCompatActivity { | ||
| 17 | 18 | ||
| 18 | private ProgressDialog dialog; | 19 | private ProgressDialog dialog; |
| 19 | 20 | ||
| 21 | + private String orderId; | ||
| 22 | + | ||
| 20 | @Override | 23 | @Override |
| 21 | protected void onCreate(Bundle savedInstanceState) { | 24 | protected void onCreate(Bundle savedInstanceState) { |
| 22 | super.onCreate(savedInstanceState); | 25 | super.onCreate(savedInstanceState); |
| 23 | setContentView(R.layout.activity_main); | 26 | setContentView(R.layout.activity_main); |
| 24 | } | 27 | } |
| 25 | 28 | ||
| 26 | - public void clickWX(View v){ | 29 | + public void clickWX(View v) { |
| 27 | showDialog(); | 30 | showDialog(); |
| 28 | PayUtil.startPay(this, IPay.PAY_TYPE_WX, System.currentTimeMillis() + "", "测试", 1, "http://apps.pay.cnlive.com/upappnotify/notify/updateCnCoin", "liveshow", "", getTestExtraParams(), new PayStatusCallback() { | 31 | PayUtil.startPay(this, IPay.PAY_TYPE_WX, System.currentTimeMillis() + "", "测试", 1, "http://apps.pay.cnlive.com/upappnotify/notify/updateCnCoin", "liveshow", "", getTestExtraParams(), new PayStatusCallback() { |
| 29 | @Override | 32 | @Override |
| @@ -33,18 +36,18 @@ public class MainActivity extends AppCompatActivity { | @@ -33,18 +36,18 @@ public class MainActivity extends AppCompatActivity { | ||
| 33 | 36 | ||
| 34 | @Override | 37 | @Override |
| 35 | public void onSuccess(int payType) { | 38 | public void onSuccess(int payType) { |
| 36 | - Toast.makeText(MainActivity.this,"支付成功",Toast.LENGTH_LONG).show(); | 39 | + Toast.makeText(MainActivity.this, "支付成功", Toast.LENGTH_LONG).show(); |
| 37 | } | 40 | } |
| 38 | 41 | ||
| 39 | @Override | 42 | @Override |
| 40 | - public void onFail(int payType, int errorCode,String errorMsg) { | 43 | + public void onFail(int payType, int errorCode, String errorMsg) { |
| 41 | closeDialog(); | 44 | closeDialog(); |
| 42 | - Toast.makeText(MainActivity.this,"支付失败:"+errorMsg,Toast.LENGTH_LONG).show(); | 45 | + Toast.makeText(MainActivity.this, "支付失败:" + errorMsg, Toast.LENGTH_LONG).show(); |
| 43 | } | 46 | } |
| 44 | }); | 47 | }); |
| 45 | } | 48 | } |
| 46 | 49 | ||
| 47 | - public void clickAli(View v){ | 50 | + public void clickAli(View v) { |
| 48 | showDialog(); | 51 | showDialog(); |
| 49 | PayUtil.startPay(this, IPay.PAY_TYPE_ALI, System.currentTimeMillis() + "", "测试", 1, "http://apps.pay.cnlive.com/upappnotify/notify/updateCnCoin", "liveshow", "", getTestExtraParams(), new PayStatusCallback() { | 52 | PayUtil.startPay(this, IPay.PAY_TYPE_ALI, System.currentTimeMillis() + "", "测试", 1, "http://apps.pay.cnlive.com/upappnotify/notify/updateCnCoin", "liveshow", "", getTestExtraParams(), new PayStatusCallback() { |
| 50 | @Override | 53 | @Override |
| @@ -54,37 +57,59 @@ public class MainActivity extends AppCompatActivity { | @@ -54,37 +57,59 @@ public class MainActivity extends AppCompatActivity { | ||
| 54 | 57 | ||
| 55 | @Override | 58 | @Override |
| 56 | public void onSuccess(int payType) { | 59 | public void onSuccess(int payType) { |
| 57 | - Toast.makeText(MainActivity.this,"支付成功",Toast.LENGTH_LONG).show(); | 60 | + Toast.makeText(MainActivity.this, "支付成功", Toast.LENGTH_LONG).show(); |
| 61 | + } | ||
| 62 | + | ||
| 63 | + @Override | ||
| 64 | + public void onFail(int payType, int errorCode, String errorMsg) { | ||
| 65 | + closeDialog(); | ||
| 66 | + Toast.makeText(MainActivity.this, "支付失败:" + errorMsg, Toast.LENGTH_LONG).show(); | ||
| 67 | + } | ||
| 68 | + }); | ||
| 69 | + } | ||
| 70 | + | ||
| 71 | + public void clickUnion(View v) { | ||
| 72 | + showDialog(); | ||
| 73 | + orderId = System.currentTimeMillis() + ""; | ||
| 74 | + PayUtil.startPay(this, IPay.PAY_TYPE_UNION, orderId, "测试", 50, "http://apps.pay.cnlive.com/upappnotify/notify/updateCnCoin", "", "", getTestExtraParams(), new PayStatusCallback() { | ||
| 75 | + @Override | ||
| 76 | + public void onStartCallPayPage(int i) { | ||
| 77 | + closeDialog(); | ||
| 78 | + } | ||
| 79 | + | ||
| 80 | + @Override | ||
| 81 | + public void onSuccess(int payType) { | ||
| 82 | + Toast.makeText(MainActivity.this, "支付成功", Toast.LENGTH_LONG).show(); | ||
| 58 | } | 83 | } |
| 59 | 84 | ||
| 60 | @Override | 85 | @Override |
| 61 | - public void onFail(int payType, int errorCode,String errorMsg) { | 86 | + public void onFail(int payType, int errorCode, String errorMsg) { |
| 62 | closeDialog(); | 87 | closeDialog(); |
| 63 | - Toast.makeText(MainActivity.this,"支付失败:"+errorMsg,Toast.LENGTH_LONG).show(); | 88 | + Toast.makeText(MainActivity.this, "支付失败," + errorMsg, Toast.LENGTH_LONG).show(); |
| 64 | } | 89 | } |
| 65 | }); | 90 | }); |
| 66 | } | 91 | } |
| 67 | 92 | ||
| 68 | //测试业务系统需要的其他参数 | 93 | //测试业务系统需要的其他参数 |
| 69 | - private Map<String,String> getTestExtraParams(){ | ||
| 70 | - Map<String,String> extraParams = new HashMap<>(); | ||
| 71 | - extraParams.put("plat","a"); | ||
| 72 | - extraParams.put("sid","123554"); | 94 | + private Map<String, String> getTestExtraParams() { |
| 95 | + Map<String, String> extraParams = new HashMap<>(); | ||
| 96 | + extraParams.put("plat", "a"); | ||
| 97 | + extraParams.put("sid", "123554"); | ||
| 73 | return extraParams; | 98 | return extraParams; |
| 74 | } | 99 | } |
| 75 | 100 | ||
| 76 | 101 | ||
| 77 | - private void showDialog(){ | ||
| 78 | - if(dialog != null && dialog.isShowing()) return; | ||
| 79 | - if(dialog == null){ | 102 | + private void showDialog() { |
| 103 | + if (dialog != null && dialog.isShowing()) return; | ||
| 104 | + if (dialog == null) { | ||
| 80 | dialog = new ProgressDialog(this); | 105 | dialog = new ProgressDialog(this); |
| 81 | dialog.setMessage("正在加载支付页面..."); | 106 | dialog.setMessage("正在加载支付页面..."); |
| 82 | } | 107 | } |
| 83 | dialog.show(); | 108 | dialog.show(); |
| 84 | } | 109 | } |
| 85 | 110 | ||
| 86 | - private void closeDialog(){ | ||
| 87 | - if(dialog != null && dialog.isShowing()) | 111 | + private void closeDialog() { |
| 112 | + if (dialog != null && dialog.isShowing()) | ||
| 88 | dialog.cancel(); | 113 | dialog.cancel(); |
| 89 | } | 114 | } |
| 90 | 115 | ||
| @@ -93,4 +118,10 @@ public class MainActivity extends AppCompatActivity { | @@ -93,4 +118,10 @@ public class MainActivity extends AppCompatActivity { | ||
| 93 | super.onPause(); | 118 | super.onPause(); |
| 94 | closeDialog(); | 119 | closeDialog(); |
| 95 | } | 120 | } |
| 121 | + | ||
| 122 | + @Override | ||
| 123 | + protected void onActivityResult(int requestCode, int resultCode, Intent data) { | ||
| 124 | + super.onActivityResult(requestCode, resultCode, data); | ||
| 125 | + PayUtil.unionPayOnActivityResult(orderId, data); | ||
| 126 | + } | ||
| 96 | } | 127 | } |
app/src/main/jniLibs/arm64-v8a/libentryexpro.so
0 → 100644
No preview for this file type
app/src/main/jniLibs/arm64-v8a/libuptsmaddon.so
0 → 100644
No preview for this file type
app/src/main/jniLibs/arm64-v8a/libuptsmaddonmi.so
0 → 100644
No preview for this file type
app/src/main/jniLibs/armeabi-v7a/libentryexpro.so
0 → 100644
No preview for this file type
app/src/main/jniLibs/armeabi-v7a/libuptsmaddon.so
0 → 100644
No preview for this file type
app/src/main/jniLibs/armeabi-v7a/libuptsmaddonmi.so
0 → 100644
No preview for this file type
app/src/main/jniLibs/armeabi/libentryexpro.so
0 → 100644
No preview for this file type
app/src/main/jniLibs/armeabi/libuptsmaddon.so
0 → 100644
No preview for this file type
app/src/main/jniLibs/armeabi/libuptsmaddonmi.so
0 → 100644
No preview for this file type
app/src/main/jniLibs/x86/libentryexpro.so
0 → 100644
No preview for this file type
app/src/main/jniLibs/x86/libuptsmaddon.so
0 → 100644
No preview for this file type
app/src/main/jniLibs/x86/libuptsmaddonmi.so
0 → 100644
No preview for this file type
app/src/main/jniLibs/x86_64/libentryexpro.so
0 → 100644
No preview for this file type
app/src/main/jniLibs/x86_64/libuptsmaddon.so
0 → 100644
No preview for this file type
app/src/main/jniLibs/x86_64/libuptsmaddonmi.so
0 → 100644
No preview for this file type
app/src/main/res/layout/activity_main.xml
| @@ -16,4 +16,10 @@ | @@ -16,4 +16,10 @@ | ||
| 16 | android:text="支付宝支付" | 16 | android:text="支付宝支付" |
| 17 | android:onClick="clickAli"/> | 17 | android:onClick="clickAli"/> |
| 18 | 18 | ||
| 19 | + <Button | ||
| 20 | + android:layout_width="wrap_content" | ||
| 21 | + android:layout_height="wrap_content" | ||
| 22 | + android:text="银联支付" | ||
| 23 | + android:onClick="clickUnion"/> | ||
| 24 | + | ||
| 19 | </LinearLayout> | 25 | </LinearLayout> |