diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/SimCenterPop.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/SimCenterPop.kt index 3522218..6793381 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/SimCenterPop.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/cuspop/SimCenterPop.kt @@ -6,6 +6,7 @@ import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity import com.lxj.xpopup.core.CenterPopupView import kotlinx.android.synthetic.main.pop_sim_center.view.* +import org.bouncycastle.jcajce.provider.symmetric.Rijndael /** @@ -17,10 +18,14 @@ import kotlinx.android.synthetic.main.pop_sim_center.view.* class SimCenterPop(context: Context) : CenterPopupView(context), View.OnClickListener { lateinit var content: String + lateinit var titleLeft: String + lateinit var titleReft: String lateinit var secMessage: String - constructor(context: Context, message: String) : this(context) { + constructor(context: Context, message: String,titleLeft:String = "取消",titleRight: String = "去注册") : this(context) { content = message + this.titleReft = titleRight + this.titleLeft = titleLeft } @@ -28,6 +33,8 @@ class SimCenterPop(context: Context) : CenterPopupView(context), View.OnClickLis override fun onCreate() { super.onCreate() + tvCancel.text = titleLeft + tvOk.text = titleReft tvCancel.setOnClickListener(this) tvOk.setOnClickListener(this) tvContent.text = "$content" diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java index 43042e3..cec8357 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java @@ -29,6 +29,7 @@ import com.arpa.hndahesudintocctmsdriver.cuspop.SimCenterPop; import com.arpa.hndahesudintocctmsdriver.event.HomeEvent; import com.arpa.hndahesudintocctmsdriver.event.PersonEvent; import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent; +import com.arpa.hndahesudintocctmsdriver.ui.wallet.UpBankActivity; import com.arpa.hndahesudintocctmsdriver.util.MessageUtils; import com.arpa.hndahesudintocctmsdriver.util.PickerUtils; import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil; @@ -167,9 +168,15 @@ public class CertificatesActivity extends BaseAppCompatActivity { finish(); //上传身份证信息后 跳转上传驾驶证信息页面 - Intent in = new Intent(con, CertificatesActivity.class); - in.putExtra("index", 1); - startActivity(in); +// Intent in = new Intent(con, CertificatesActivity.class); +// in.putExtra("index", 1); +// startActivity(in); + + + //上传身份证信息后 跳转上传银行卡信息页面 + Intent in333=new Intent(con, UpBankActivity.class); + in333.putExtra("type",1); + startActivity(in333); } else { Toast.makeText(con, bb.getMsg(), Toast.LENGTH_SHORT).show(); @@ -579,9 +586,14 @@ public class CertificatesActivity extends BaseAppCompatActivity { case 0: finish(); //上传身份证信息后 跳转上传驾驶证信息页面 - Intent in1 = new Intent(con, CertificatesActivity.class); - in1.putExtra("index", 1); - startActivity(in1); +// Intent in1 = new Intent(con, CertificatesActivity.class); +// in1.putExtra("index", 1); +// startActivity(in1); + + //上传身份证信息后 跳转上传银行卡信息页面 + Intent in333=new Intent(con, UpBankActivity.class); + in333.putExtra("type",1); + startActivity(in333); break; case 1: //传驾驶证信息页面 跳转实名认证 diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java index 097c2e5..bac142d 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java @@ -36,6 +36,7 @@ import com.amap.api.maps.model.LatLng; import com.amap.api.maps.model.Marker; import com.amap.api.maps.model.MarkerOptions; import com.amap.api.maps.model.MyLocationStyle; +import com.arpa.hndahesudintocctmsdriver.bean.BankCardListBean; import com.arpa.hndahesudintocctmsdriver.bean.DriverExpireBean; import com.arpa.hndahesudintocctmsdriver.bean.ImageConfig; import com.arpa.hndahesudintocctmsdriver.bean.JTT; @@ -43,8 +44,10 @@ import com.arpa.hndahesudintocctmsdriver.constant.JTTConstant; import com.arpa.hndahesudintocctmsdriver.event.HomeEvent; import com.arpa.hndahesudintocctmsdriver.parts.StartOrderParts; import com.arpa.hndahesudintocctmsdriver.report.JTTProcess; +import com.arpa.hndahesudintocctmsdriver.request.WalletRequest; import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity; import com.arpa.hndahesudintocctmsdriver.ui.news.NewActivity; +import com.arpa.hndahesudintocctmsdriver.ui.wallet.UpBankActivity; import com.arpa.hndahesudintocctmsdriver.util.MessageUtils; import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil; import com.bumptech.glide.Glide; @@ -139,6 +142,23 @@ public class HomeFragment extends BaseFragment { refreshLayout.finishRefresh(500); keys = false; } + + //银行卡信息接收 + if(CacheGroup.cacheList.get(dataName2)!=null){ + BankCardListBean bcb=new Gson().fromJson(CacheGroup.cacheList.get(dataName2), BankCardListBean.class); + if(bcb.getCode()==200){ + if(bcb.getData() ==null || bcb.getData().getRecords()==null || bcb.getData().getRecords().size()<1){ + new MessageUtils().showSimCenPop(con, "缺少银行卡可能会导致运费无法结算,是否去添加!","取消","确认", () -> { + Intent in333=new Intent(con, UpBankActivity.class); + startActivity(in333); + }); + } + }else{ + Toast.makeText(con,bcb.getMsg(),Toast.LENGTH_SHORT).show(); + } + CacheGroup.cacheList.remove(dataName2); + } + if (CacheGroup.cacheList.get("userdata") != null) { ub = gson.fromJson(CacheGroup.cacheList.get("userdata"), UserBean.class); if (ub.getCode() == 200) { @@ -545,10 +565,11 @@ public class HomeFragment extends BaseFragment { ur.upApp(); hyr.getHuoYuan(1, 100); ur.getImage(1); - + WalletRequest qr=new WalletRequest(con,hd); if (UiAuxiliary.isLogin(con)) { ur.User(); + qr.getBankCardList(); ur.getDriverExpire(); hyr.startOrder(0); ur.driverAuthData(); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/UpBankActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/UpBankActivity.java index 5282e71..6ca573e 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/UpBankActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/wallet/UpBankActivity.java @@ -13,6 +13,8 @@ import android.widget.Toast; import androidx.annotation.Nullable; +import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity; +import com.arpa.hndahesudintocctmsdriver.util.MessageUtils; import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickHelper; import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickListener; import com.bumptech.glide.Glide; @@ -47,7 +49,7 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic private ImageView up_bank_img; private EditText bank_name, bank_number; - private TextView submit; + private TextView submit, skip; private ImageView return_btn; public GetImageAlert gia = new GetImageAlert(); String path; @@ -62,9 +64,9 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic case RequsetCodeConstants.SUCCESS: if (CacheGroup.cacheList.get("OCR_BANK") != null) { ib = new Gson().fromJson(CacheGroup.cacheList.get("OCR_BANK"), OCRBankBean.class); + customDialog.dismiss(); if (ib.getCode() == 200) { initView(null); - customDialog.dismiss(); WalletFragment.isInsBank = true; } else { Toast.makeText(con, ib.getMsg(), Toast.LENGTH_SHORT).show(); @@ -74,6 +76,11 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic if (CacheGroup.cacheList.get("insBank") != null) { BaseBean bb = new Gson().fromJson(CacheGroup.cacheList.get("insBank"), BaseBean.class); if (bb.getCode() == 200) { + if (type == 1) { + Intent in = new Intent(con, CertificatesActivity.class); + in.putExtra("index", 1); + startActivity(in); + } customDialog.dismiss(); Toast.makeText(con, "绑定成功", Toast.LENGTH_SHORT).show(); finish(); @@ -94,6 +101,13 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic private CustomDialog customDialog; + + /** + * 1:司机注册自动跳转 + * 0:钱包添加银行卡 + */ + private int type = 0; + @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -101,19 +115,31 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic setContentView(R.layout.activity_bank_auth); act = this; con = this; + Bundle extras = getIntent().getExtras(); + if (extras != null) { + type = getIntent().getExtras().getInt("type"); + } up_bank_img = findViewById(R.id.up_bank_img); bank_name = findViewById(R.id.bank_name); bank_number = findViewById(R.id.bank_number); submit = findViewById(R.id.submit); + skip = findViewById(R.id.skip); return_btn = findViewById(R.id.return_btn); qr = new WalletRequest(con, hd); up_bank_img.setOnClickListener(v -> { gia.showPopueWindow(this); }); submit.setOnClickListener(new OnLimitClickHelper(this)); + skip.setOnClickListener(new OnLimitClickHelper(this)); return_btn.setOnClickListener(v -> { finish(); }); + + if (type == 1) { + skip.setVisibility(View.VISIBLE); + } else { + skip.setVisibility(View.GONE); + } } @Override @@ -178,6 +204,13 @@ public class UpBankActivity extends BaseAppCompatActivity implements OnLimitClic Toast.makeText(con, "请先上传图片", Toast.LENGTH_SHORT).show(); } break; + case R.id.skip: + new MessageUtils().showSimCenPop(con, "确定跳过银行卡?,可能会导致运费无法结算!","取消","确认", () -> { + Intent in = new Intent(con, CertificatesActivity.class); + in.putExtra("index", 1); + startActivity(in); + }); + break; } } } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/MessageUtils.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/MessageUtils.kt index d921c9c..5899596 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/MessageUtils.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/MessageUtils.kt @@ -27,7 +27,8 @@ class MessageUtils { XPopup.Builder(ctx) // .hasNavigationBar(false) .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象,推荐设置这个 - .asCustom(MessagePop(ctx, message).setOnMyItemClickListener(object : MessagePop.OnMyItemClickListener{ + .asCustom(MessagePop(ctx, message).setOnMyItemClickListener(object : + MessagePop.OnMyItemClickListener { override fun onItemClick(startTime: String, endTime: String) { } })) @@ -38,14 +39,19 @@ class MessageUtils { XPopup.Builder(ctx) // .hasNavigationBar(false) .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象,推荐设置这个 - .asCustom(MessagePop(ctx, message,message2).setOnMyItemClickListener(object : MessagePop.OnMyItemClickListener{ + .asCustom(MessagePop(ctx, message, message2).setOnMyItemClickListener(object : + MessagePop.OnMyItemClickListener { override fun onItemClick(startTime: String, endTime: String) { } })) .show() } - fun showSimCenPop(ctx: Context, message: String,onMyItemClickListener: SimCenterPop.OnMyItemClickListener){ + fun showSimCenPop( + ctx: Context, + message: String, + onMyItemClickListener: SimCenterPop.OnMyItemClickListener + ) { // XPopup.Builder(ctx) // // .hasNavigationBar(false) @@ -62,7 +68,35 @@ class MessageUtils { XPopup.Builder(ctx) // .hasNavigationBar(false) .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象,推荐设置这个 - .asCustom(SimCenterPop(ctx,message).setOnMyItemClickListener(onMyItemClickListener)) + .asCustom(SimCenterPop(ctx, message).setOnMyItemClickListener(onMyItemClickListener)) + .show() + + } + + fun showSimCenPop( + ctx: Context, + message: String, + left: String, + right: String, + onMyItemClickListener: SimCenterPop.OnMyItemClickListener + ) { + +// XPopup.Builder(ctx) // +// .hasNavigationBar(false) +// .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象,推荐设置这个 +// .asCustom(SimCenterPop(ctx,message).setOnMyItemClickListener(object : SimCenterPop.OnMyItemClickListener{ +// override fun onItemClick() { +// val intent = Intent(ctx, CertificatesActivity::class.java) +// intent.putExtra("index", type) +// ctx.startActivity(intent) +// } +// })) +// .show() + + XPopup.Builder(ctx) // + .hasNavigationBar(false) + .isDestroyOnDismiss(true) //对于只使用一次的弹窗对象,推荐设置这个 + .asCustom(SimCenterPop(ctx, message,left,right).setOnMyItemClickListener(onMyItemClickListener)) .show() } diff --git a/app/src/main/res/layout/activity_bank_auth.xml b/app/src/main/res/layout/activity_bank_auth.xml index b2bfb8e..04086a2 100644 --- a/app/src/main/res/layout/activity_bank_auth.xml +++ b/app/src/main/res/layout/activity_bank_auth.xml @@ -5,34 +5,50 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@drawable/bg_theme" android:id="@+id/activity_bank_auth"> + + + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_58"> + - + android:scaleType="fitXY" + android:src="@mipmap/return_lefts" /> + + + + + + + + + + + + + + + + + + + + + + + + + + android:textColor="@color/red"> + + + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" + android:scaleType="fitXY" + android:src="@mipmap/bank_img" /> + + android:layout_marginBottom="@dimen/dp_21" + android:text="点击上传银行卡正面照" /> + + + - + android:elevation="@dimen/dp_1" + android:orientation="vertical" + android:padding="@dimen/dp_14"> + + + + + + + - + + + android:ellipsize="end" + android:inputType="text" + android:maxLines="1" + android:paddingTop="@dimen/dp_10" + android:paddingBottom="@dimen/dp_10" + android:textColor="#ff000000" + android:textSize="@dimen/sp_13" /> + + android:background="@drawable/bottom_xu" /> + + - + + + android:ellipsize="end" + android:inputType="number" + android:maxLines="1" + android:paddingTop="@dimen/dp_10" + android:paddingBottom="@dimen/dp_10" + android:textColor="#ff000000" + android:textSize="@dimen/sp_13" /> + + + + + +