From 543e2e9d5ed7dba12a12955e6d2ca7eb2409e509 Mon Sep 17 00:00:00 2001 From: "weiwei.xia" Date: Tue, 26 Oct 2021 16:38:33 +0800 Subject: [PATCH] update --- app/proguard-rules.pro | 4 +++- app/release/output-metadata.json | 20 ------------------- .../com/atome/merchant/demo/RequestBean.kt | 5 ++++- .../com/atome/merchant/demo/ResponseBean.kt | 6 ++++-- 4 files changed, 11 insertions(+), 24 deletions(-) delete mode 100644 app/release/output-metadata.json diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 7c2e1cf..4d934a2 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -51,4 +51,6 @@ @com.google.gson.annotations.SerializedName ; } --keep public class com.atome.merchant.demo.**{*;} \ No newline at end of file +-keep public class com.atome.merchant.demo.**{*;} + +-keep class * implements java.io.Serializable { *; } \ No newline at end of file diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json deleted file mode 100644 index 4ce0d62..0000000 --- a/app/release/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "artifactType": { - "type": "APK", - "kind": "Directory" - }, - "applicationId": "com.atome.merchant.demo", - "variantName": "release", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "properties": [], - "versionCode": 1, - "versionName": "1.0", - "enabled": true, - "outputFile": "app-release.apk" - } - ] -} \ No newline at end of file diff --git a/app/src/main/java/com/atome/merchant/demo/RequestBean.kt b/app/src/main/java/com/atome/merchant/demo/RequestBean.kt index 1f0da2d..86c0e07 100644 --- a/app/src/main/java/com/atome/merchant/demo/RequestBean.kt +++ b/app/src/main/java/com/atome/merchant/demo/RequestBean.kt @@ -1,3 +1,6 @@ package com.atome.merchant.demo -data class RequestBean(val currency: String, val amount: Number, val paymentResultUrl: String) \ No newline at end of file +import java.io.Serializable + +data class RequestBean(val currency: String, val amount: Number, val paymentResultUrl: String) : + Serializable \ No newline at end of file diff --git a/app/src/main/java/com/atome/merchant/demo/ResponseBean.kt b/app/src/main/java/com/atome/merchant/demo/ResponseBean.kt index 2a50498..12f8037 100644 --- a/app/src/main/java/com/atome/merchant/demo/ResponseBean.kt +++ b/app/src/main/java/com/atome/merchant/demo/ResponseBean.kt @@ -1,6 +1,8 @@ package com.atome.merchant.demo -data class ResponseBean(val code: String, val message: String, val data: DataBean) +import java.io.Serializable + +data class ResponseBean(val code: String, val message: String, val data: DataBean) : Serializable data class DataBean( val referenceId: String, val currency: String, @@ -13,4 +15,4 @@ data class DataBean( val merchantReferenceId: String, val appPaymentUrl: String, val extra: String -) \ No newline at end of file +) : Serializable \ No newline at end of file