From 794e0ac8248782223f5a57afd8a8a1c750ddffa1 Mon Sep 17 00:00:00 2001 From: xuhuixiang Date: Sat, 27 May 2023 10:49:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=AB=E5=90=8D=E5=85=B6=E5=A6=99=E7=9A=84?= =?UTF-8?q?=E4=B8=9C=E8=A5=BF=E5=8F=88=E5=A2=9E=E5=8A=A0=E4=BA=8611?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 10 +- .../main/java/com/dskj/daikuan/InitApp.java | 2 + .../daikuan/ui/activity/ShenQingActivity.java | 11 +- app/src/main/res/layout/activity_shenqing.xml | 2 +- .../main/res/layout/activity_shenqing1.xml | 655 +++++++++++++++++ .../main/res/layout/activity_shenqing_bf.xml | 663 ++++++++++++++++++ 6 files changed, 1339 insertions(+), 4 deletions(-) create mode 100644 app/src/main/res/layout/activity_shenqing1.xml create mode 100644 app/src/main/res/layout/activity_shenqing_bf.xml diff --git a/app/build.gradle b/app/build.gradle index e99b623..e1e1359 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.dskj.daikuan" minSdkVersion 23 targetSdkVersion 30 - versionCode 124 - versionName "1.2.4" + versionCode 127 + versionName "1.2.7" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" // configurations.all { @@ -51,12 +51,17 @@ android { storePassword "123456" keyAlias 'videomark' keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true } release { storeFile file('videomark.jks') storePassword "123456" keyAlias 'videomark' keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } } lintOptions { @@ -109,5 +114,6 @@ dependencies { implementation 'com.scwang.smart:refresh-footer-classics:2.0.1' implementation 'com.scwang.smart:refresh-footer-ball:2.0.1' implementation 'com.github.cazaea:sweet-alert-dialog:1.0.0' + implementation 'com.tencent.bugly:crashreport:4.0.4' } \ No newline at end of file diff --git a/app/src/main/java/com/dskj/daikuan/InitApp.java b/app/src/main/java/com/dskj/daikuan/InitApp.java index 3d12c97..7a1cd32 100644 --- a/app/src/main/java/com/dskj/daikuan/InitApp.java +++ b/app/src/main/java/com/dskj/daikuan/InitApp.java @@ -11,6 +11,7 @@ import com.dskj.daikuan.config.Config; import com.dskj.daikuan.utils.DeviceUtil; import com.dskj.daikuan.utils.GsonUtils; import com.dskj.daikuan.utils.LogUtils; +import com.tencent.bugly.crashreport.CrashReport; /** @@ -43,6 +44,7 @@ public class InitApp extends Application { initApp = this; DeviceUtil.init(this); initARouter(); + CrashReport.initCrashReport(getApplicationContext(), "67a2a1ead7", false); } diff --git a/app/src/main/java/com/dskj/daikuan/ui/activity/ShenQingActivity.java b/app/src/main/java/com/dskj/daikuan/ui/activity/ShenQingActivity.java index d515946..0cbe6e1 100644 --- a/app/src/main/java/com/dskj/daikuan/ui/activity/ShenQingActivity.java +++ b/app/src/main/java/com/dskj/daikuan/ui/activity/ShenQingActivity.java @@ -59,6 +59,7 @@ import com.dskj.daikuan.viewModel.home.MainViewModel; import com.github.hariprasanths.bounceview.BounceView; import com.tbruyelle.rxpermissions2.Permission; import com.tbruyelle.rxpermissions2.RxPermissions; +import com.tencent.bugly.crashreport.CrashReport; import com.zhihu.matisse.Matisse; import com.zhihu.matisse.MimeType; import com.zhihu.matisse.engine.impl.GlideEngine; @@ -66,6 +67,7 @@ import com.zhihu.matisse.internal.entity.CaptureStrategy; import java.io.File; import java.io.IOException; +import java.lang.reflect.Type; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -113,6 +115,8 @@ public class ShenQingActivity extends BaseActivity { SweetAlertDialog pDialog = new SweetAlertDialog(this, SweetAlertDialog.WARNING_TYPE); @@ -216,6 +221,9 @@ public class ShenQingActivity extends BaseActivity) GsonUtils.getListFromJSON(defaultJson, BankBean.class); + +// LogUtils.i("银行列表:"+GsonUtils.beanToJSONString(banks)); getBank(); dataBinding.topLyF1.backButton.setOnClickListener(new View.OnClickListener() { @@ -289,12 +297,13 @@ public class ShenQingActivity extends BaseActivity> feedbackResp) { if (feedbackResp.data != null && feedbackResp.data.size() > 0) { banks = (ArrayList) feedbackResp.data; + InitApp.saveString("bank_list",GsonUtils.beanToJSONString(banks)); } } @Override public void onError(int code, String msg) { - + banks = (ArrayList) GsonUtils.getListFromJSON(InitApp.getString("bank_list",""), BankBean.class); } }); } diff --git a/app/src/main/res/layout/activity_shenqing.xml b/app/src/main/res/layout/activity_shenqing.xml index 9861fb7..f324454 100644 --- a/app/src/main/res/layout/activity_shenqing.xml +++ b/app/src/main/res/layout/activity_shenqing.xml @@ -291,7 +291,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp12" android:layout_marginTop="@dimen/dp15" - android:text="收款银行//Bank Penerima:" + android:text="收款银行/Bank Penerima:" android:textColor="#ff959595" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/activity_shenqing1.xml b/app/src/main/res/layout/activity_shenqing1.xml new file mode 100644 index 0000000..f324454 --- /dev/null +++ b/app/src/main/res/layout/activity_shenqing1.xml @@ -0,0 +1,655 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +