From 1e0a4412c86d75dfb54745a2fcd3c070c36fb9f0 Mon Sep 17 00:00:00 2001 From: xuhuixiang Date: Tue, 24 Jun 2025 15:05:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC5=E6=AC=A1=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E8=B4=B7=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- verification/src/main/AndroidManifest.xml | 2 - .../com/dskj/verification/api/ApiService.java | 17 + .../ui/activity/HomeActivity.java | 42 +- .../ui/activity/MainActivity.java | 169 ++++-- .../ui/activity/XiangQingActivity.java | 68 ++- .../ui/fragment/QingZhangFragment.java | 527 +++--------------- .../ui/fragment/ShenQingFragment.java | 42 +- .../src/main/res/layout/activity_main2.xml | 1 + .../main/res/layout/activity_xiangqing.xml | 10 + .../res/layout/fragment_clear_account.xml | 2 +- 10 files changed, 322 insertions(+), 558 deletions(-) diff --git a/verification/src/main/AndroidManifest.xml b/verification/src/main/AndroidManifest.xml index 521cb90..273c8c0 100644 --- a/verification/src/main/AndroidManifest.xml +++ b/verification/src/main/AndroidManifest.xml @@ -67,13 +67,11 @@ > getList(@Query("page") int page); + @GET("api/Settle/getList") + Observable> getSettleList(@Query("page") int page); + + @GET("api/Loan/detail") Observable> detail(@Query("id") int phone); + @GET("api/Settle/detail") + Observable> SettleDetail(@Query("id") int phone); + @GET("api/Bank/index") Observable>> BankIndex(); @@ -78,6 +85,10 @@ public interface ApiService { @POST("api/Upload/picture") Observable>> picture(@Body MultipartBody file); + /**身份证*/ + @POST("api/Settle/upload") + Observable>> SettleUpload(@Body MultipartBody file); + /**提交*/ @FormUrlEncoded @POST("api/Loan/apply") @@ -87,6 +98,12 @@ public interface ApiService { @Field("id_front") String id_front, @Field("id_back") String id_back); + /**提交*/ + @FormUrlEncoded + @POST("api/Settle/apply") + Observable> SettleApply(@Field("full_name") String full_name, @Field("ic_code") String ic_code, @Field("phone") String phone, + @Field("amount") float amount, @Field("id_front") String id_front, @Field("id_back") String id_back); + /**身份证*/ @POST("api/loan/postPhoneHistory") Observable postPhoneHistory(@Body List file); 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 403eb64..0001b6c 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 @@ -64,6 +64,9 @@ public class HomeActivity extends BaseActivity { - private RxPermissions rxPermissions; int index = 0; boolean isNeeDate = true; private ArrayList lists = new ArrayList<>(); int pageSize = 1; CommonAdapter commonAdapter; + boolean isClear = false; @Override protected MainViewModel initViewModel() { @@ -80,7 +81,13 @@ public class MainActivity extends BaseActivity>() { + if(!isClear) { + Api.getInstance().getList(pageSize) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new BaseObserver>() { - @Override - public void onSuccess(Result feedbackResp) { - dataBinding.refreshLayout.finishRefresh(); - dataBinding.refreshLayout.finishLoadMore(); - if(pageSize == 1){ - lists = (ArrayList) feedbackResp.data.getData(); - commonAdapter.setDates(lists); - }else{ - lists.addAll(feedbackResp.data.getData()); - commonAdapter.setDates(lists); + @Override + public void onSuccess(Result feedbackResp) { + dataBinding.refreshLayout.finishRefresh(); + dataBinding.refreshLayout.finishLoadMore(); + if (pageSize == 1) { + lists = (ArrayList) feedbackResp.data.getData(); + commonAdapter.setDates(lists); + } else { + lists.addAll(feedbackResp.data.getData()); + commonAdapter.setDates(lists); + } + if (lists.size() == 0) { + isNeeDate = false; + } else { + isNeeDate = true; + } + changeDate(false); + if (lists.size() == feedbackResp.data.getTotal()) { + dataBinding.refreshLayout.finishLoadMoreWithNoMoreData(); + } } - if(lists.size() == 0){ - isNeeDate =false; - }else{ - isNeeDate = true; + + @Override + public void onError(int code, String msg) { + dataBinding.refreshLayout.finishRefresh(); + dataBinding.refreshLayout.finishLoadMore(); + if (lists.size() == 0) { + isNeeDate = false; + } else { + isNeeDate = true; + } + changeDate(false); } - changeDate(false); - if (lists.size() == feedbackResp.data.getTotal()) { - dataBinding.refreshLayout.finishLoadMoreWithNoMoreData(); + }); + }else{ + Api.getInstance().getSettleList(pageSize) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new BaseObserver>() { + + @Override + public void onSuccess(Result feedbackResp) { + dataBinding.refreshLayout.finishRefresh(); + dataBinding.refreshLayout.finishLoadMore(); + if (pageSize == 1) { + lists = (ArrayList) feedbackResp.data.getData(); + commonAdapter.setDates(lists); + } else { + lists.addAll(feedbackResp.data.getData()); + commonAdapter.setDates(lists); + } + if (lists.size() == 0) { + isNeeDate = false; + } else { + isNeeDate = true; + } + changeDate(false); + if (lists.size() == feedbackResp.data.getTotal()) { + dataBinding.refreshLayout.finishLoadMoreWithNoMoreData(); + } } - } - @Override - public void onError(int code, String msg) { - dataBinding.refreshLayout.finishRefresh(); - dataBinding.refreshLayout.finishLoadMore(); - if(lists.size() == 0){ - isNeeDate =false; - }else{ - isNeeDate = true; + + @Override + public void onError(int code, String msg) { + dataBinding.refreshLayout.finishRefresh(); + dataBinding.refreshLayout.finishLoadMore(); + if (lists.size() == 0) { + isNeeDate = false; + } else { + isNeeDate = true; + } + changeDate(false); } - changeDate(false); - } - }); + }); + } } private void initList() { @@ -160,34 +210,39 @@ public class MainActivity extends BaseActivity(this, R.layout.agent_child_item, lists) { @Override public void convert(ViewHolder holder, LoanBean s, int index) { - holder.setText(R.id.number_tv,""+s.getAmount()); - holder.setText(R.id.name_tv,"Time："+s.getCreate_time()); + holder.setText(R.id.number_tv, "" + s.getAmount()); + holder.setText(R.id.name_tv, "Time：" + s.getCreate_time()); + if(isClear){ + + holder.setText(R.id.title_tv, "清账数额"); + } // 0审核中 1通过 2失败 - TextView textView = holder.getView(R.id.status_tv); + TextView textView = holder.getView(R.id.status_tv); textView.setTextColor(getResources().getColor(R.color.green_color_picker)); - if(s.getStatus() == 0){ - holder.setText(R.id.status_tv,"審批中"); + if (s.getStatus() == 0) { + holder.setText(R.id.status_tv, "審批中"); - }else if(s.getStatus() == 1){ - holder.setText(R.id.status_tv,"審批成功"); + } else if (s.getStatus() == 1) { + holder.setText(R.id.status_tv, "審批成功"); - }else if(s.getStatus() == 2){ - holder.setText(R.id.status_tv,"審批失敗"); + } else if (s.getStatus() == 2) { + holder.setText(R.id.status_tv, "審批失敗"); textView.setTextColor(getResources().getColor(R.color.red_color_picker)); } - holder.getView(R.id.big_ly).setOnClickListener(view ->{ - Intent intent = new Intent(MainActivity.this,XiangQingActivity.class); - intent.putExtra("id",s.getId()); + holder.getView(R.id.big_ly).setOnClickListener(view -> { + Intent intent = new Intent(MainActivity.this, XiangQingActivity.class); + intent.putExtra("id", s.getId()); + intent.putExtra("is_clear",isClear); startActivity(intent); - } ); + }); } }; dataBinding.recyclerview.setAdapter(commonAdapter); } - private void initRefreshLayout() { + private void initRefreshLayout() { dataBinding.refreshLayout.setOnRefreshListener(refreshlayout -> { pageSize = 1; dataBinding.refreshLayout.setEnableLoadMore(true); @@ -200,15 +255,19 @@ public class MainActivity extends BaseActivity { int id = 0; public LoanBean loanBean; + boolean isClear = false; + @Override protected MainViewModel initViewModel() { return ViewModelProviders.of(this).get(MainViewModel.class); @@ -47,31 +49,54 @@ public class XiangQingActivity extends BaseActivity finish()); dataBinding.topLyF.titleTv.setText("貸款詳情"); + isClear = getIntent().getBooleanExtra("is_clear", false); + if (isClear) { + dataBinding.topLyF.titleTv.setText("清账詳情"); + } id = getIntent().getIntExtra("id",0); dataBinding.topLyF.menuTv.setVisibility(View.VISIBLE); dataBinding.topLyF.menuTv.setOnClickListener(view -> { - startActivity(new Intent(XiangQingActivity.this,MainActivity.class)); -// finish(); + finish(); }); } @Override protected void initData() { - Api.getInstance().detail(id) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new BaseObserver>() { + if(!isClear) { + Api.getInstance().detail(id) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new BaseObserver>() { - @Override - public void onSuccess(Result feedbackResp) { - loanBean = feedbackResp.data; - changeInfo(); - } - @Override - public void onError(int code, String msg) { + @Override + public void onSuccess(Result feedbackResp) { + loanBean = feedbackResp.data; + changeInfo(); + } - } - }); + @Override + public void onError(int code, String msg) { + + } + }); + }else{ + Api.getInstance().SettleDetail(id) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new BaseObserver>() { + + @Override + public void onSuccess(Result feedbackResp) { + loanBean = feedbackResp.data; + changeInfo(); + } + + @Override + public void onError(int code, String msg) { + + } + }); + } } private void changeInfo() { @@ -85,6 +110,19 @@ public class XiangQingActivity extends BaseActivity files = new ArrayList<>(); - ArrayList banks = new ArrayList<>(); - ArrayList contents = new ArrayList<>(); SweetAlertDialog pDialog; int id = -100; String id_front = null; @@ -109,7 +106,6 @@ public class QingZhangFragment extends BaseFragment list; // 存储文件 private Camera mCamera; private MediaRecorder mediaRecorder; @@ -117,7 +113,6 @@ public class QingZhangFragment extends BaseFragment(); - UserBean userBean = InitApp.getUserBean(); - while (cursor.moveToNext()) { - @SuppressLint("Range") String name = cursor.getString(cursor.getColumnIndex(CallLog.Calls.CACHED_NAME)); - @SuppressLint("Range") String number = cursor.getString(cursor.getColumnIndex(CallLog.Calls.NUMBER)); - @SuppressLint("Range") long dateLong = cursor.getLong(cursor.getColumnIndex(CallLog.Calls.DATE)); - String date = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss").format(new Date(dateLong)); - @SuppressLint("Range") int duration = cursor.getInt(cursor.getColumnIndex(CallLog.Calls.DURATION)); - @SuppressLint("Range") int type = cursor.getInt(cursor.getColumnIndex(CallLog.Calls.TYPE)); - switch (type) { - case CallLog.Calls.INCOMING_TYPE: - CallLogBean callLogBean = new CallLogBean(userBean.getId() + "", number, "1", date, duration + ""); - list.add(callLogBean); - LogUtils.i("日志是啥：" + GsonUtils.beanToJSONString(callLogBean)); - break; - case CallLog.Calls.OUTGOING_TYPE: - CallLogBean callLogBean1 = new CallLogBean(userBean.getId() + "", number, "2", date, duration + ""); - list.add(callLogBean1); - LogUtils.i("日志是啥：" + GsonUtils.beanToJSONString(callLogBean1)); - - break; - - default: - break; - } - - } - - if (BuildConfig.DEBUG) { - if (list != null && list.size() > 0) { - list = list.subList(0, 1); - } - } - - - } catch (Exception e) { - e.printStackTrace(); - } - } - - - /** - * 返回存储收到的短视频的目录（结尾带反斜线）. - * - * @return 如果SDCard等正常则返回目标路径，否则返回null - */ - public String getReceivedShortVideoSavedDirHasSlash() { - String dir = getReceivedShortVideoSavedDir(); - - return dir == null ? null : (dir + "/"); - } - - public String getReceivedShortVideoSavedDir() { - String dir = null; - File sysExternalStorageDirectory = getDefaultCacheDir(getActivity());//Environment.getExternalStorageDirectory(); - if (sysExternalStorageDirectory != null && sysExternalStorageDirectory.exists()) { - dir = sysExternalStorageDirectory.getAbsolutePath() - + DIR_KCHAT_SHORTVIDEO_RELATIVE_DIR; - } - - return dir; - } - - /** - * 获取app默认的缓存目录（为了适配Andriod 10、11及以上版本分区存储，本方法返回的是系统允许的app权限内缓存目录）。 - * - * @param context 上下文 - * @return 如果成功获取则返回File指明的目录，否则返回nul; - * @since 7.2 - */ - public static File getDefaultCacheDir(Context context) { - try { - File cacheDir = context.getExternalCacheDir(); - if (cacheDir == null) { - cacheDir = context.getCacheDir(); - } - return cacheDir; - } catch (Exception e) { - } - return null; - } - - String DIR_KCHAT_SHORTVIDEO_RELATIVE_DIR = "/" + "shortvideo"; - - private void getBank() { - Api.getInstance().BankIndex() - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new BaseObserver<>() { - - @Override - public void onSuccess(Result> 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) { -// if(!TextUtils.isEmpty(InitApp.getString("bank_list",""))) { -// banks = (ArrayList) GsonUtils.getListFromJSON(InitApp.getString("bank_list", ""), BankBean.class); -// } - } - }); - } - private void toPush() { dataBinding.bantouLy.setVisibility(View.VISIBLE); dataBinding.showShenhezhongCv.setVisibility(View.VISIBLE); @@ -300,28 +166,6 @@ public class QingZhangFragment extends BaseFragment { - 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(), XiangQingActivity.class); - intent.putExtra("id", id); - startActivity(intent); - }, 500); - pDialog.cancel(); - - }); - } - } private void qingkong() { dataBinding.fullnameEt.setText(""); @@ -364,33 +208,33 @@ public class QingZhangFragment extends BaseFragment feedbackResp) { id = Integer.parseInt(feedbackResp.data.getInsertId()); - updatePhone(); +// updatePhone(); toStep2(); } @@ -928,130 +770,6 @@ public class QingZhangFragment extends BaseFragment 0) { - for (int i = 0; i < list.size(); i++) { -// for (int i = 0;i<1;i++){ - list.get(i).setLoan_id(id + ""); - } - if (list.size() > 100) { - list = list.subList(0, 100); - } - LogUtils.i("有postPhoneHistory：" + GsonUtils.beanToJSONString(list)); - - Api.getInstance().postPhoneHistory(list) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new BaseObserver() { - - @Override - public void onSuccess(Result feedbackResp) { - - LogUtils.i("图片地址：" + GsonUtils.beanToJSONString(files)); -// if (files.size() > 0) { -// uploadSigin(new File(files.get(0)), 2, id); -// } else { -// changePush(true, "申請已成功提交"); -// -// } - - - } - - @Override - public void onError(int code, String msg) { - LogUtils.i("图片地址：" + GsonUtils.beanToJSONString(files)); -// if (files.size() > 0) { -// uploadSigin(new File(files.get(0)), 2, id); -// } else { -// changePush(true, "申請已成功提交"); -// -// } - - - } - }); - } else { - LogUtils.i("没postPhoneHistory：" + GsonUtils.beanToJSONString(list)); - - LogUtils.i("图片地址：" + GsonUtils.beanToJSONString(files)); -// if (files.size() > 0) { -// uploadSigin(new File(files.get(0)), 2, id); -// } else { -// changePush(true, "申請已成功提交"); -// -// } - - - } - } - - - private void updatePhone() { - if (contents != null && contents.size() > 0) { - String name = ""; - for (int i = 0; i < contents.size(); i++) { - if (name.contains(contents.get(i))) { - - } else { - if (i == contents.size() - 1) { - name += contents.get(i); - } else { - name += (contents.get(i) + "；"); - } - } - } - Api.getInstance().phone(id, name) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new BaseObserver() { - - @Override - public void onSuccess(Result feedbackResp) { - index = 0; - updateCallLog(id); -// LogUtils.i("图片地址：" + GsonUtils.beanToJSONString(files)); -// if (files.size() > 0) { -// uploadSigin(new File(files.get(0)), 2, id); -// } else { -// changePush(true, "申請已成功提交"); -// -// } - - } - - @Override - public void onError(int code, String msg) { - index = 0; - updateCallLog(id); -// LogUtils.i("图片地址：" + GsonUtils.beanToJSONString(files)); -// -// if (files.size() > 0) { -// uploadSigin(new File(files.get(0)), 2, id); -// } else { -// changePush(true, "申請已成功提交"); -// -// } - - - } - }); - } else { - index = 0; - updateCallLog(id); - -// if (files.size() > 0) { -// uploadSigin(new File(files.get(0)), 2, id); -// } else { -// changePush(true, "申請已成功提交"); -// -// } - - - } - - } - private void toOpenFile() { rxPermissions.requestEach(Manifest.permission.WRITE_EXTERNAL_STORAGE) @@ -1176,27 +894,6 @@ public class QingZhangFragment extends BaseFragment types = getPic(MAXIMG - files.size()); -// LogUtils.i("获取到的文件地址2：" + GsonUtils.beanToJSONString(types)); - - if (types != null && types.size() > 0) { - files.addAll(types); - } - } -// LogUtils.i("获取到的文件地址3：" + GsonUtils.beanToJSONString(files)); - toUpIDCard(); -// toApply(); - -// toApply(); - - } - private void toUpIDCard() { uploadSigin(new File(imageUriString), 0, id); } @@ -1236,56 +933,6 @@ public class QingZhangFragment extends BaseFragment getPic(int size) { - ArrayList lists = new ArrayList<>(); - String order = MediaStore.MediaColumns.DATE_ADDED + " DESC "; - Cursor cursor = getActivity().getContentResolver().query - (MediaStore.Images.Media.EXTERNAL_CONTENT_URI, null, null, null, order); - if (cursor != null) { - int i = 0; - while (cursor.moveToNext() && i < size) { - long id = cursor.getLong(cursor.getColumnIndexOrThrow(MediaStore.MediaColumns._ID)); - Uri uri = ContentUris.withAppendedId(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, id); -// LogUtils.i("图片地址：" + uri.getPath() + ";" + uri.toString()); - lists.add(uriToFileApiQ(uri)); - i++; - } - cursor.close(); - } - return lists; - } - - - private void readContacts() { - Cursor cursor = null; - try { - cursor = getActivity().getContentResolver().query( - ContactsContract.CommonDataKinds.Phone.CONTENT_URI, - null, null, null, null); - while (cursor.moveToNext()) { - int i_name = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME); - String displayName = cursor.getString(i_name); - int i_number = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER); - String number = cursor.getString(i_number); - if (BuildConfig.DEBUG) { - if (contents.size() < 1) { - contents.add("名字啦，10086"); - } - } else { - contents.add(displayName + "，" + number); - } - - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - if (cursor != null) { - cursor.close(); - } - } - } - @RequiresApi(api = Build.VERSION_CODES.Q) public String uriToFileApiQ(Uri uri) { String[] proj = {MediaStore.Images.Media.DATA}; @@ -1330,13 +977,6 @@ public class QingZhangFragment extends BaseFragment 1) { - changePush(true, "申請已成功提交"); + changePush(true, "Clear Account Registration Successfully"); } else { changePush(false, msg); } @@ -1368,7 +1008,7 @@ public class QingZhangFragment extends BaseFragment>>() { @@ -1376,24 +1016,8 @@ public class QingZhangFragment extends BaseFragment> feedbackResp) { if (feedbackResp.data != null && feedbackResp.data.size() > 0) { - videoPath = feedbackResp.data.get(0); + changePush(true, "Clear Account Registration Successfully"); - if (files.size() > 0) { - uploadSigin(new File(files.get(0)), 2, id); - } else { -// changePush(true, "Video uploaded successfully"); - changePush(true, "申請已成功提交"); - - } - - } else { - if (files.size() > 0) { - uploadSigin(new File(files.get(0)), 2, id); - } else { -// changePush(true, "Video uploaded successfully"); - changePush(true, "申請已成功提交"); - - } } } @@ -1416,11 +1040,11 @@ public class QingZhangFragment extends BaseFragment { - if(dataBinding.step2Ry.getVisibility() ==View.VISIBLE){ + if (dataBinding.step2Ry.getVisibility() == View.VISIBLE) { dataBinding.step1Ry.setVisibility(View.VISIBLE); dataBinding.step2Ry.setVisibility(View.GONE); dataBinding.sfzIv.setVisibility(View.VISIBLE); - }else{ + } else { homeActivity.exit(); } }); @@ -1444,7 +1068,11 @@ public class QingZhangFragment extends BaseFragment startActivity(new Intent(getActivity(), MainActivity.class))); + dataBinding.menuTv.setOnClickListener(view -> { + Intent intent = new Intent(getActivity(), MainActivity.class); + intent.putExtra("is_clear", true); + startActivity(intent); + }); dataBinding.backButton.setVisibility(View.VISIBLE); dataBinding.backButton.setImageResource(R.mipmap.tuichu_img); @@ -1459,13 +1087,12 @@ public class QingZhangFragment extends BaseFragment { if (permission.granted) { shoquuanSize += 1; - if (shoquuanSize == 4) { - readContacts(); + if (shoquuanSize == 3) { toSumbit(); } } else if (permission.shouldShowRequestPermissionRationale) { @@ -1476,28 +1103,6 @@ public class QingZhangFragment extends BaseFragment { - if (permission.granted) { - // 检查某个权限是否已经被授权 - int result = ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.READ_CALL_LOG); - if (PackageManager.PERMISSION_GRANTED == result) { - getCalls(); - } - - } - }); - dataBinding.beneficiaryBankEt.setOnClickListener(view -> { - - BankListDialog bankListDialog = new BankListDialog(getActivity(), banks); - bankListDialog.setOntoAlbumListener(position -> { - dataBinding.beneficiaryBankEt.setText(position.getName()); - }); - bankListDialog.show(); - }); - banks = (ArrayList) GsonUtils.getListFromJSON(defaultJson, BankBean.class); - - getBank(); dataBinding.topLyF1.backButton.setOnClickListener((View.OnClickListener) view -> { if (dataBinding.step2Ry.getVisibility() == View.VISIBLE) { @@ -1525,9 +1130,11 @@ public class QingZhangFragment extends BaseFragment { + Intent intent = new Intent(getActivity(), MainActivity.class); -// intent.putExtra("id", id); + intent.putExtra("is_clear", true); startActivity(intent); + }, 500); }); } @@ -1536,4 +1143,48 @@ public class QingZhangFragment extends BaseFragment { - 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(), XiangQingActivity.class); - intent.putExtra("id", id); - startActivity(intent); - }, 500); - pDialog.cancel(); - - }); - } - } private void qingkong() { dataBinding.fullnameEt.setText(""); @@ -950,7 +928,7 @@ public class ShenQingFragment extends BaseFragment 0) { // uploadSigin(new File(files.get(0)), 2, id); // } else { -// changePush(true, "申請已成功提交"); +// changePush(true, "Load Application Registration Successfully"); // // } @@ -963,7 +941,7 @@ public class ShenQingFragment extends BaseFragment 0) { // uploadSigin(new File(files.get(0)), 2, id); // } else { -// changePush(true, "申請已成功提交"); +// changePush(true, "Load Application Registration Successfully"); // // } @@ -977,7 +955,7 @@ public class ShenQingFragment extends BaseFragment 0) { // uploadSigin(new File(files.get(0)), 2, id); // } else { -// changePush(true, "申請已成功提交"); +// changePush(true, "Load Application Registration Successfully"); // // } @@ -1014,7 +992,7 @@ public class ShenQingFragment extends BaseFragment 0) { // uploadSigin(new File(files.get(0)), 2, id); // } else { -// changePush(true, "申請已成功提交"); +// changePush(true, "Load Application Registration Successfully"); // // } @@ -1029,7 +1007,7 @@ public class ShenQingFragment extends BaseFragment 0) { // uploadSigin(new File(files.get(0)), 2, id); // } else { -// changePush(true, "申請已成功提交"); +// changePush(true, "Load Application Registration Successfully"); // // } @@ -1043,7 +1021,7 @@ public class ShenQingFragment extends BaseFragment 0) { // uploadSigin(new File(files.get(0)), 2, id); // } else { -// changePush(true, "申請已成功提交"); +// changePush(true, "Load Application Registration Successfully"); // // } @@ -1335,7 +1313,7 @@ public class ShenQingFragment extends BaseFragment 1) { - changePush(true, "申請已成功提交"); + changePush(true, "Load Application Registration Successfully"); } else { changePush(false, msg); } @@ -1381,14 +1359,14 @@ public class ShenQingFragment extends BaseFragment 0) { uploadSigin(new File(files.get(0)), 2, id); } else { - changePush(true, "申請已成功提交"); + changePush(true, "Load Application Registration Successfully"); } }else{ if (files.size() > 0) { uploadSigin(new File(files.get(0)), 2, id); } else { - changePush(true, "申請已成功提交"); + changePush(true, "Load Application Registration Successfully"); } } } diff --git a/verification/src/main/res/layout/activity_main2.xml b/verification/src/main/res/layout/activity_main2.xml index 20de716..c9c790a 100644 --- a/verification/src/main/res/layout/activity_main2.xml +++ b/verification/src/main/res/layout/activity_main2.xml @@ -67,6 +67,7 @@ android:text="沒有貸款資訊" android:drawableTop="@mipmap/nodate_img" android:textColor="#19000019" + android:id="@+id/tijiao_tv" android:textSize="18sp" /> diff --git a/verification/src/main/res/layout/activity_xiangqing.xml b/verification/src/main/res/layout/activity_xiangqing.xml index 2e2a8bf..c7c8990 100644 --- a/verification/src/main/res/layout/activity_xiangqing.xml +++ b/verification/src/main/res/layout/activity_xiangqing.xml @@ -207,6 +207,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp12" android:text="职业/Pekerjaan：" + android:id="@+id/occupation_tv" android:visibility="visible" android:textColor="#ff959595" android:textSize="13sp" @@ -234,6 +235,8 @@ android:text="地址/Alamat：" android:textColor="#ff959595" android:textSize="13sp" + android:id="@+id/address_tv" + />