From dabe3d6db52ab8436f2b31c549babe3666d7b2af Mon Sep 17 00:00:00 2001 From: jianbo <263303411@qq.com> Date: Wed, 23 Dec 2020 11:34:36 +0800 Subject: [PATCH 1/5] d --- .idea/compiler.xml | 9 +++++++++ .idea/modules.xml | 8 +++----- app/haotian.jks | Bin 0 -> 2241 bytes app/release/output.json | 1 + app/src/main/res/values/colors.xml | 2 -- 5 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 .idea/compiler.xml create mode 100644 app/haotian.jks create mode 100644 app/release/output.json diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..886f8ac --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 72867f0..745ca28 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,11 +2,9 @@ - - - - - + + + \ No newline at end of file diff --git a/app/haotian.jks b/app/haotian.jks new file mode 100644 index 0000000000000000000000000000000000000000..e904dd086fe16738b83da2d2065de66574afad5a GIT binary patch literal 2241 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 #FE5200 #FE5200 - #FE552C - #000000 #Dddddd #878787 From 64848f733fa15505eb14cfff41abbdd077797fc8 Mon Sep 17 00:00:00 2001 From: jianbo <263303411@qq.com> Date: Thu, 7 Jan 2021 14:57:25 +0800 Subject: [PATCH 2/5] d --- .idea/compiler.xml | 5 +---- .idea/misc.xml | 2 +- app/src/main/AndroidManifest.xml | 1 + app/src/main/java/http/ApiConfig.java | 3 ++- app/src/main/res/xml/network_security_config.xml | 5 +++++ 5 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 app/src/main/res/xml/network_security_config.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 886f8ac..61a9130 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,9 +1,6 @@ - - - - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index af0bbdd..3378229 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 16889fb..1883e16 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -72,6 +72,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher" + android:networkSecurityConfig="@xml/network_security_config" android:theme="@style/AppTheme"> + + + + \ No newline at end of file From 23116673fb62dfbb3e613e95b118a2ea0a93e7c1 Mon Sep 17 00:00:00 2001 From: renjianbo0118 <18133922183> Date: Wed, 27 Jan 2021 21:52:02 +0800 Subject: [PATCH 3/5] d --- .idea/jarRepositories.xml | 15 +++++++++++++++ app/release/output.json | 1 + 2 files changed, 16 insertions(+) create mode 100644 app/release/output.json diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index c37f9c1..3eafbd3 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -56,5 +56,20 @@ \ No newline at end of file diff --git a/app/release/output.json b/app/release/output.json new file mode 100644 index 0000000..218e0c7 --- /dev/null +++ b/app/release/output.json @@ -0,0 +1 @@ +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file From b8cc9c21e7940cac2f58ebfad681b14c97c140d3 Mon Sep 17 00:00:00 2001 From: renjianbo0118 <18133922183> Date: Thu, 28 Jan 2021 02:00:17 +0800 Subject: [PATCH 4/5] d --- 开发文档 | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 开发文档 diff --git a/开发文档 b/开发文档 new file mode 100644 index 0000000..8e1f94c --- /dev/null +++ b/开发文档 @@ -0,0 +1,2 @@ +1.支付宝支付 + MyPayActivity \ No newline at end of file From 721449c36971da6a7b1e22b444c74a415ce4d7fb Mon Sep 17 00:00:00 2001 From: jianbo <263303411@qq.com> Date: Thu, 28 Jan 2021 09:52:22 +0800 Subject: [PATCH 5/5] d --- .../sl/house_property/order/PayActivity.java | 122 +++++++++++++++++- .../house_property/order/SettleActivity.java | 2 +- 2 files changed, 122 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/sl/house_property/order/PayActivity.java b/app/src/main/java/com/sl/house_property/order/PayActivity.java index 3a259f3..b116a82 100644 --- a/app/src/main/java/com/sl/house_property/order/PayActivity.java +++ b/app/src/main/java/com/sl/house_property/order/PayActivity.java @@ -7,8 +7,10 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; import android.support.annotation.Nullable; +import android.util.Log; import android.view.View; +import com.cutil.StringUtils; import com.google.gson.Gson; import com.google.gson.internal.LinkedTreeMap; import com.gyf.immersionbar.ImmersionBar; @@ -19,6 +21,9 @@ import com.tencent.mm.opensdk.modelpay.PayReq; import com.tencent.mm.opensdk.openapi.IWXAPI; import com.tencent.mm.opensdk.openapi.WXAPIFactory; +import org.json.JSONException; +import org.json.JSONObject; + import java.util.HashMap; import java.util.Map; @@ -26,14 +31,18 @@ import entity.RegisterUser; import http.ApiConfig; import my_loader.Loader; import my_loader.Resultcode; +import pay.alipay.AliPayManager; +import rx.Subscription; import rx.functions.Action1; import tools.Config; +import utils.Constants; import utils.Md5; public class PayActivity extends BaseActivity { private Context context; private String payment_amount; private String order_number; + private Loader mGankLoader; private BroadcastReceiver receiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent1) { @@ -122,7 +131,13 @@ public class PayActivity extends BaseActivity { @Override public void onClick(View v) { if (mDataBinding.alpay.isChecked()) { - setToast("支付宝支付" + payment_amount + "元"); + // setToast("支付宝支付" + payment_amount + "元"); + if (StringUtils.isTrimEmpty(payment_amount) || Double.parseDouble(payment_amount) <= 0) { + setToast("支付金额不能小于或等于0元"); + return; + } + startAliPay(); + return; } if (mDataBinding.wxpaly.isChecked()) { @@ -227,4 +242,109 @@ public class PayActivity extends BaseActivity { }); } + + private void startAliPay() { + RegisterUser user = + Config.getInstance(PayActivity.this).getUser(); + Map map = new HashMap<>(); + if (user != null) { + map.put("userid", user.getUserid()); + } else { + map.put("userid", 0 + ""); + } + map.put("app", "System"); + map.put("class", "System_an_ALiPayment"); + map.put("sign", Md5.md5("System" + "System_an_ALiPayment" + Md5.secret)); + + getAliPayConfigDataFun(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting)); + } + private void getAliPayConfigDataFun(String myurl, Map map, String msg) { + progressDialog.setMessage(msg); + progressDialog.setCancelable(false); + progressDialog.show(); + mGankLoader = new Loader(); + Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1() { + @Override + public void call(Resultcode resultcode) { + progressDialog.dismiss(); + if (!(resultcode.status == 0)) { + setToast(1, resultcode.msg); + } + if (resultcode.status == 0) { + Gson gs = new Gson(); + LinkedTreeMap adta = (LinkedTreeMap) resultcode.data; + String s = gs.toJson(adta); + Log.e("支付宝接口返回值==",s); + String ssd = gs.toJson(adta); + try { + JSONObject jsonObject = new JSONObject(s); + String billNumber = jsonObject.getString("bill_number"); + Log.e("支付宝billNumber值==",billNumber); + JSONObject playmentJsonObj = jsonObject.getJSONObject("payment"); + String appID = playmentJsonObj.getString("partner"); + Log.e("支付宝appID值==",appID); + String pid = playmentJsonObj.getString("seller"); + Log.e("支付宝pid值==",pid); + String privateKey = playmentJsonObj.getString("privateKey"); + Log.e("支付宝privateKey值==",privateKey); + + // execAliPay(appID, pid, privateKey, billNumber); + } catch (JSONException e) { + e.printStackTrace(); + } + } + } + + }, new Action1() { + @Override + public void call(Throwable throwable) { + progressDialog.dismiss(); + setToast(2, getString(R.string.getdatafailure)); + throwable.printStackTrace(); + } + }); + + addSubscription(subscription); + } + + private void execAliPay(String appID, String pid, String privateKey, final String billNumber) { + AliPayManager aliPayManager = new AliPayManager(PayActivity.this, appID, pid, privateKey, new AliPayManager.PayResultCallback() { + @Override + public void payResutl(Boolean isSuc) { + if (isSuc) { + // 支付成功，返回相应结果页面 + Intent intent = new Intent(); + //设置返回数据 + setResult(Constants.PayResultCode.OK, intent); + intent.putExtra("payNumber", billNumber); + finish(); + } + } + }); + + RegisterUser user = + Config.getInstance(PayActivity.this).getUser(); + String userId = user.getUserid(); + + String feeCategory = getIntent().getStringExtra("feeCategory"); + String tradeNo = ""; + String notifyUrl = ""; + if (StringUtils.equalsIgnoreCase(feeCategory, Constants.FeeCategory.HOUSEKEEPING)) { + notifyUrl = ApiConfig.CALLBACK_HOUSEKEEPING_PAY; + tradeNo = getIntent().getStringExtra("serve_order_number"); + } else if (StringUtils.equalsIgnoreCase(feeCategory, Constants.FeeCategory.PROPERTY_FEE)) { + String userHomeId = getIntent().getStringExtra("userHomeId"); + String feeType = getIntent().getStringExtra("feeType"); + tradeNo = billNumber + "o" + userId + "o" + userHomeId + "o" + feeType; + notifyUrl = ApiConfig.CALLBACK_PROPERTY_PAY; + } else if (StringUtils.equalsIgnoreCase(feeCategory, Constants.FeeCategory.RECHARGE)) { + tradeNo = billNumber + "o" + userId; + notifyUrl = ApiConfig.CALLBACK_RECHARGE_PAY; + } else if (StringUtils.equalsIgnoreCase(feeCategory, Constants.FeeCategory.PARKING_FEE)) { + notifyUrl = ApiConfig.CALLBACK_TEMP_STOP_PAY; + tradeNo = getIntent().getStringExtra("orderSn"); + } + //String number = mDataBinding.number.getText().toString(); + aliPayManager.startPay("", "", tradeNo, payment_amount, notifyUrl); + } } diff --git a/app/src/main/java/com/sl/house_property/order/SettleActivity.java b/app/src/main/java/com/sl/house_property/order/SettleActivity.java index d4f7ca4..fb36801 100644 --- a/app/src/main/java/com/sl/house_property/order/SettleActivity.java +++ b/app/src/main/java/com/sl/house_property/order/SettleActivity.java @@ -253,7 +253,7 @@ public class SettleActivity extends BaseActivity { private String totalAmount = "0.00"; private String consignee_id; private String goods_user_id; - + //提交订单的方法 private void submit() { progressDialog.setMessage("下单中"); progressDialog.show();