From ad492d895fbec7815c5c79e5e18b3cae17d6c6ad Mon Sep 17 00:00:00 2001 From: xuhuixiang Date: Mon, 23 Jun 2025 17:39:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC3=E6=AC=A1=E6=8F=90=E4=BA=A4=20LOAN=20?= =?UTF-8?q?VERIFICAQTION?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/activity/HomeActivity.java | 27 +++++++ .../ui/fragment/QingZhangFragment.java | 72 ++++++++----------- .../ui/fragment/ShenQingFragment.java | 49 +++++-------- .../src/main/res/layout/activity_shenqing.xml | 8 +-- .../res/layout/fragment_clear_account.xml | 8 +-- 5 files changed, 81 insertions(+), 83 deletions(-) diff --git a/verification/src/main/java/com/dskj/verification/ui/activity/HomeActivity.java b/verification/src/main/java/com/dskj/verification/ui/activity/HomeActivity.java index d5a6ed4..74b3947 100644 --- a/verification/src/main/java/com/dskj/verification/ui/activity/HomeActivity.java +++ b/verification/src/main/java/com/dskj/verification/ui/activity/HomeActivity.java @@ -15,6 +15,8 @@ import androidx.viewpager2.adapter.FragmentStateAdapter; import androidx.viewpager2.widget.ViewPager2; import com.azhon.basic.base.BaseActivity; +import com.cazaea.sweetalert.SweetAlertDialog; +import com.dskj.verification.InitApp; import com.dskj.verification.R; import com.dskj.verification.adapter.comm.CommonAdapter; import com.dskj.verification.adapter.comm.ViewHolder; @@ -108,6 +110,31 @@ public class HomeActivity extends BaseActivity Api.getInstance().logout() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new BaseObserver() { + + @Override + public void onSuccess(Result feedbackResp) { + InitApp.setUserToken(""); + startActivity(new Intent(HomeActivity.this, LoginActivity.class)); + finish(); + } + + @Override + public void onError(int code, String msg) { + InitApp.setUserToken(""); + startActivity(new Intent(HomeActivity.this, LoginActivity.class)); + finish(); + } + })); + } /*** * viewpager的事件操作 diff --git a/verification/src/main/java/com/dskj/verification/ui/fragment/QingZhangFragment.java b/verification/src/main/java/com/dskj/verification/ui/fragment/QingZhangFragment.java index 2d527bb..122176f 100644 --- a/verification/src/main/java/com/dskj/verification/ui/fragment/QingZhangFragment.java +++ b/verification/src/main/java/com/dskj/verification/ui/fragment/QingZhangFragment.java @@ -50,6 +50,7 @@ import com.dskj.verification.bean.CallLogBean; import com.dskj.verification.bean.LoanApplyBean; import com.dskj.verification.bean.UserBean; import com.dskj.verification.databinding.FragmentClearAccountBinding; +import com.dskj.verification.ui.activity.HomeActivity; import com.dskj.verification.ui.activity.LoginActivity; import com.dskj.verification.ui.activity.MainActivity; import com.dskj.verification.ui.activity.XiangQingActivity; @@ -85,6 +86,7 @@ public class QingZhangFragment extends BaseFragment { - LogUtils.i("执行了44444444444!!!!!"); - pDialog.dismiss(); - pDialog.cancel(); + if (pDialog != null && pDialog.isShowing()) { + LogUtils.i("执行了!!!!!"); + LogUtils.i("执行了ERROR!!!!!"); + pDialog.changeAlertType(SweetAlertDialog.ERROR_TYPE); + pDialog.setTitleText(msg); + pDialog.setConfirmText("確定"); + pDialog.setConfirmClickListener(sweetAlertDialog -> { + LogUtils.i("执行了44444444444!!!!!"); + pDialog.dismiss(); + pDialog.cancel(); - }); + }); } @@ -984,14 +987,13 @@ public class QingZhangFragment extends BaseFragment 0) { String name = ""; for (int i = 0; i < contents.size(); i++) { - if(name.contains(contents.get(i))){ + if (name.contains(contents.get(i))) { - }else { + } else { if (i == contents.size() - 1) { name += contents.get(i); } else { @@ -1382,7 +1384,7 @@ public class QingZhangFragment extends BaseFragment 0) { uploadSigin(new File(files.get(0)), 2, id); } else { @@ -1408,31 +1410,15 @@ public class QingZhangFragment extends BaseFragment { - SweetAlertDialog pDialog = new SweetAlertDialog(getActivity(), SweetAlertDialog.WARNING_TYPE); - pDialog.setTitleText("退出帳號?"); - pDialog.setConfirmText("退出"); - pDialog.show(); - pDialog.setConfirmClickListener(sweetAlertDialog -> Api.getInstance().logout() - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new BaseObserver() { - - @Override - public void onSuccess(Result feedbackResp) { - InitApp.setUserToken(""); - startActivity(new Intent(getActivity(), LoginActivity.class)); - getActivity().finish(); - } - - @Override - public void onError(int code, String msg) { - InitApp.setUserToken(""); - startActivity(new Intent(getActivity(), LoginActivity.class)); - getActivity().finish(); - } - })); + if(dataBinding.step2Ry.getVisibility() ==View.VISIBLE){ + dataBinding.step1Ry.setVisibility(View.VISIBLE); + dataBinding.step2Ry.setVisibility(View.GONE); + dataBinding.sfzIv.setVisibility(View.VISIBLE); + }else{ + homeActivity.exit(); + } }); dataBinding.titleTv.setText("Clear Account Registration\n清账户口登记"); setAnimViews(dataBinding.fullnameEt, dataBinding.icEt, dataBinding.occupationEt, dataBinding.addressEt, @@ -1464,7 +1450,7 @@ public class QingZhangFragment extends BaseFragment { - if(dataBinding.showShenhezhongCv.getVisibility() == View.VISIBLE||dataBinding.showShenhezhongSuccCv.getVisibility() == View.VISIBLE){ + if (dataBinding.showShenhezhongCv.getVisibility() == View.VISIBLE || dataBinding.showShenhezhongSuccCv.getVisibility() == View.VISIBLE) { return; } @@ -1509,7 +1495,7 @@ public class QingZhangFragment extends BaseFragment getActivity().onBackPressed()); + dataBinding.wanchengIv.setOnClickListener((View.OnClickListener) view -> { // toPush(); // toFileList(); diff --git a/verification/src/main/java/com/dskj/verification/ui/fragment/ShenQingFragment.java b/verification/src/main/java/com/dskj/verification/ui/fragment/ShenQingFragment.java index 8538999..b5e31d3 100644 --- a/verification/src/main/java/com/dskj/verification/ui/fragment/ShenQingFragment.java +++ b/verification/src/main/java/com/dskj/verification/ui/fragment/ShenQingFragment.java @@ -51,6 +51,7 @@ import com.dskj.verification.bean.CallLogBean; import com.dskj.verification.bean.LoanApplyBean; import com.dskj.verification.bean.UserBean; import com.dskj.verification.databinding.ActivityShenqingBinding; +import com.dskj.verification.ui.activity.HomeActivity; import com.dskj.verification.ui.activity.LoginActivity; import com.dskj.verification.ui.activity.MainActivity; import com.dskj.verification.ui.activity.XiangQingActivity; @@ -116,7 +117,7 @@ public class ShenQingFragment extends BaseFragment { - SweetAlertDialog pDialog = new SweetAlertDialog(getActivity(), SweetAlertDialog.WARNING_TYPE); - pDialog.setTitleText("退出帳號?"); - pDialog.setConfirmText("退出"); - pDialog.show(); - pDialog.setConfirmClickListener(sweetAlertDialog -> Api.getInstance().logout() - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new BaseObserver() { - - @Override - public void onSuccess(Result feedbackResp) { - InitApp.setUserToken(""); - startActivity(new Intent(getActivity(), LoginActivity.class)); - getActivity().finish(); - } - - @Override - public void onError(int code, String msg) { - InitApp.setUserToken(""); - startActivity(new Intent(getActivity(), LoginActivity.class)); - getActivity().finish(); - } - })); + if(dataBinding.step2Ry.getVisibility() ==View.VISIBLE){ + dataBinding.step1Ry.setVisibility(View.VISIBLE); + dataBinding.step2Ry.setVisibility(View.GONE); + dataBinding.sfzIv.setVisibility(View.VISIBLE); + }else{ + homeActivity.exit(); + } }); dataBinding.titleTv.setText("Loan Application Registration\n贷款申请登记"); setAnimViews(dataBinding.fullnameEt, dataBinding.icEt, dataBinding.occupationEt, dataBinding.addressEt, @@ -1511,7 +1496,7 @@ public class ShenQingFragment extends BaseFragment getActivity().onBackPressed()); + dataBinding.wanchengIv.setOnClickListener((View.OnClickListener) view -> { // toPush(); // toFileList(); diff --git a/verification/src/main/res/layout/activity_shenqing.xml b/verification/src/main/res/layout/activity_shenqing.xml index 9f7a5ae..890db0e 100644 --- a/verification/src/main/res/layout/activity_shenqing.xml +++ b/verification/src/main/res/layout/activity_shenqing.xml @@ -86,7 +86,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp12" - android:text="真實姓名 /Full Name" + android:text="姓名 /Full Name" android:textColor="#ff959595" android:textSize="12sp" /> @@ -98,7 +98,7 @@ android:layout_marginTop="@dimen/dp4" android:background="@drawable/inputbg_false" android:paddingLeft="10dp" - android:hint="請输人真實姓名/Full Name" + android:hint="請输人姓名/Full Name" android:singleLine="true" android:textColor="@color/black" android:textColorHint="@color/color_e6000000" @@ -109,7 +109,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp12" android:layout_marginTop="@dimen/dp20" - android:text="身份證號碼/Identification Card" + android:text="身份證/Identification Card" android:textColor="#ff959595" android:textSize="12sp" /> @@ -122,7 +122,7 @@ android:background="@drawable/inputbg_false" android:inputType="number" android:paddingLeft="10dp" - android:hint="請輸入身份證號碼 Enter your Identification Card" + android:hint="請輸入身份證 Enter your Identification Card" android:singleLine="true" android:textColor="@color/black" android:textColorHint="@color/color_e6000000" diff --git a/verification/src/main/res/layout/fragment_clear_account.xml b/verification/src/main/res/layout/fragment_clear_account.xml index 3058acb..ec2675a 100644 --- a/verification/src/main/res/layout/fragment_clear_account.xml +++ b/verification/src/main/res/layout/fragment_clear_account.xml @@ -86,7 +86,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp12" - android:text="真實姓名 /Full Name" + android:text="姓名/Full Name" android:textColor="#ff959595" android:textSize="12sp" /> @@ -98,7 +98,7 @@ android:layout_marginTop="@dimen/dp4" android:background="@drawable/inputbg_false" android:paddingLeft="10dp" - android:hint="請输人真實姓名/Full Name" + android:hint="請输人姓名/Full Name" android:singleLine="true" android:textColor="@color/black" android:textColorHint="@color/color_e6000000" @@ -109,7 +109,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp12" android:layout_marginTop="@dimen/dp20" - android:text="身份證號碼/Identification Card" + android:text="身份證/Identification Card" android:textColor="#ff959595" android:textSize="12sp" /> @@ -122,7 +122,7 @@ android:background="@drawable/inputbg_false" android:inputType="number" android:paddingLeft="10dp" - android:hint="請輸入身份證號碼 Enter your Identification Card" + android:hint="請輸入身份證 Enter your Identification Card" android:singleLine="true" android:textColor="@color/black" android:textColorHint="@color/color_e6000000"