diff --git a/trustlend/src/main/res/layout/activity_reg.xml b/trustlend/src/main/res/layout/activity_reg.xml index 5779541..d48617b 100644 --- a/trustlend/src/main/res/layout/activity_reg.xml +++ b/trustlend/src/main/res/layout/activity_reg.xml @@ -284,7 +284,8 @@ 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 74b3947..403eb64 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 @@ -94,21 +94,21 @@ public class HomeActivity extends BaseActivity 0) { uploadSigin(new File(files.get(0)), 2, id); } else { - changePushNext(true, "Video uploaded successfully"); +// changePush(true, "Video uploaded successfully"); + changePush(true, "申請已成功提交"); + } } else { if (files.size() > 0) { uploadSigin(new File(files.get(0)), 2, id); } else { - changePushNext(true, "Video uploaded successfully"); +// changePush(true, "Video uploaded successfully"); + changePush(true, "申請已成功提交"); + } } } @@ -1495,7 +1499,15 @@ public class QingZhangFragment extends BaseFragment { + if (dataBinding.step2Ry.getVisibility() == View.VISIBLE) { + dataBinding.step1Ry.setVisibility(View.VISIBLE); + dataBinding.step2Ry.setVisibility(View.GONE); + dataBinding.sfzIv.setVisibility(View.VISIBLE); + } else { + getActivity().onBackPressed(); + } + }); dataBinding.wanchengIv.setOnClickListener((View.OnClickListener) view -> { // toPush(); // toFileList(); @@ -1507,7 +1519,10 @@ public class QingZhangFragment extends BaseFragment { dataBinding.showShenhezhongSuccCv.setVisibility(View.GONE); dataBinding.bantouLy.setVisibility(View.GONE); - + completeRecording(false, -1000); + dataBinding.step1Ry.setVisibility(View.VISIBLE); + dataBinding.step2Ry.setVisibility(View.GONE); + dataBinding.sfzIv.setVisibility(View.VISIBLE); qingkong(); new Handler().postDelayed(() -> { Intent intent = new Intent(getActivity(), MainActivity.class); 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 b5e31d3..3a55b5d 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,7 +51,6 @@ 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; @@ -117,7 +116,7 @@ public class ShenQingFragment extends BaseFragment 0) { uploadSigin(new File(files.get(0)), 2, id); } else { - changePushNext(true, "Video uploaded successfully"); + changePush(true, "申請已成功提交"); } }else{ if (files.size() > 0) { uploadSigin(new File(files.get(0)), 2, id); } else { - changePushNext(true, "Video uploaded successfully"); + changePush(true, "申請已成功提交"); } } } @@ -1411,15 +1410,31 @@ public class ShenQingFragment extends BaseFragment { - if(dataBinding.step2Ry.getVisibility() ==View.VISIBLE){ - dataBinding.step1Ry.setVisibility(View.VISIBLE); - dataBinding.step2Ry.setVisibility(View.GONE); - dataBinding.sfzIv.setVisibility(View.VISIBLE); - }else{ - homeActivity.exit(); - } + 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(); + } + })); }); dataBinding.titleTv.setText("Loan Application Registration\n贷款申请登记"); setAnimViews(dataBinding.fullnameEt, dataBinding.icEt, dataBinding.occupationEt, dataBinding.addressEt, @@ -1496,7 +1511,15 @@ public class ShenQingFragment extends BaseFragment{ + if(dataBinding.step2Ry.getVisibility() ==View.VISIBLE){ + dataBinding.step1Ry.setVisibility(View.VISIBLE); + dataBinding.step2Ry.setVisibility(View.GONE); + dataBinding.sfzIv.setVisibility(View.VISIBLE); + }else{ + getActivity().onBackPressed(); + } + }); dataBinding.wanchengIv.setOnClickListener((View.OnClickListener) view -> { // toPush(); // toFileList(); @@ -1508,7 +1531,10 @@ public class ShenQingFragment extends BaseFragment { dataBinding.showShenhezhongSuccCv.setVisibility(View.GONE); dataBinding.bantouLy.setVisibility(View.GONE); - + completeRecording(false, -1000); + dataBinding.step1Ry.setVisibility(View.VISIBLE); + dataBinding.step2Ry.setVisibility(View.GONE); + dataBinding.sfzIv.setVisibility(View.VISIBLE); qingkong(); new Handler().postDelayed(() -> { Intent intent = new Intent(getActivity(), MainActivity.class); diff --git a/verification/src/main/res/mipmap-xxhdpi/luzhi_img.png b/verification/src/main/res/mipmap-xxhdpi/luzhi_img.png index d2e0b56..5d26bb1 100644 Binary files a/verification/src/main/res/mipmap-xxhdpi/luzhi_img.png and b/verification/src/main/res/mipmap-xxhdpi/luzhi_img.png differ diff --git a/verification/src/main/res/mipmap-xxhdpi/luzhi_img1.png b/verification/src/main/res/mipmap-xxhdpi/luzhi_img1.png index fd7d0bc..05ac003 100644 Binary files a/verification/src/main/res/mipmap-xxhdpi/luzhi_img1.png and b/verification/src/main/res/mipmap-xxhdpi/luzhi_img1.png differ