denghuan/GLDriver
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

行驶证资料完善以及添加挂车判断，从业资格证添加默认。错误处理

Browse Source
This commit is contained in:
lijia 2024-04-12 16:36:27 +08:00
parent d40d2783c9
commit 548003a5d9
20 changed files with 155 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/dahe/gldriver/adapter/CarsAdapter.kt
View File

@ -28,6 +28,7 @@ class CarsAdapter :
R.id.tvCarWei,
"""${
if (!item?.approvedLoad.isNullOrEmpty()) item?.approvedLoad?.toFloat()
?.div(1000) else if (!item?.tractionWeight.isNullOrEmpty()) item?.tractionWeight?.toFloat()
?.div(1000) else 0
}吨"""
)

2
app/src/main/java/com/dahe/gldriver/bean/OcrBean.kt
View File

@ -90,7 +90,7 @@ data class DataX(
val totalWeight: String = "",//总质量
val permittedWeight: String = "",//核定载质量
val tractionWeight: String = "",//准牵引总质量
val overallDimension: String = "",//6915×2550×3960mm
var overallDimension: String = "",//6915×2550×3960mm
val plateColorCode: String = "",//车牌颜色
val inspectionRecord: String = "",//检验有效期至2023年06月吉J 有效期
val issueDate: String = "",//发证日期

1
app/src/main/java/com/dahe/gldriver/bean/UserBean.kt
View File

@ -13,6 +13,7 @@ data class UserBean(
var token :String,
var userid :String,
var id :String,
var idcard :String,
var roleId :String,
var contactPhone :String,
var uname :String,

110
app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt
View File

@ -35,11 +35,11 @@ class AuthDrivingActivity : BaseActivity<ActivityAuthDrivingBinding>() {
var upDrivingInfoBean = UpDrivingInfoBean()
override fun initView(savedInstanceState: Bundle?) {
setStatusBarColor(R.color.white)
setTitleBar("实名认证"){
if (ActivityUtils.isActivityExistsInStack(HomeActivity::class.java)){
setTitleBar("实名认证") {
if (ActivityUtils.isActivityExistsInStack(HomeActivity::class.java)) {
finish()
}else{//homeactivity不存在,需跳转homeactivity
ActivityUtils.startActivity(mContext,HomeActivity::class.java)
} else {//homeactivity不存在,需跳转homeactivity
ActivityUtils.startActivity(mContext, HomeActivity::class.java)
}
}
binding.btnOk.setOnClickListener {
@ -79,7 +79,11 @@ class AuthDrivingActivity : BaseActivity<ActivityAuthDrivingBinding>() {
tvCarType.setOnClickListener {
//车辆类型
DicUtils.getInstance()
.selectDicCarType(mContext, this@AuthDrivingActivity, isLoading = true) { position, item ->
.selectDicCarType(
mContext,
this@AuthDrivingActivity,
isLoading = true
) { position, item ->
var data = item as DiCarColor
var isHasFow = data.dictLabel.contains("牵引车")
@ -93,7 +97,7 @@ class AuthDrivingActivity : BaseActivity<ActivityAuthDrivingBinding>() {
}
}
tvEnd.setOnClickListener {
PickerUtils.getInstance().showDateSim(this@AuthDrivingActivity,"有效结束日期") {
PickerUtils.getInstance().showDateSim(this@AuthDrivingActivity, "有效结束日期") {
tvEnd.text = it
}
}
@ -122,8 +126,8 @@ class AuthDrivingActivity : BaseActivity<ActivityAuthDrivingBinding>() {
*/
private fun selFrontPic() {
OcrUtils.getInstance().ocrDriveing(mContext, this) { picPath, result ->
if (result?.data?.face==null){
ToastUtils.showToast(mContext,"请选择正确证件照片")
if (result?.data?.face == null) {
ToastUtils.showToast(mContext, "请选择正确证件照片")
return@ocrDriveing
}
@ -162,8 +166,8 @@ class AuthDrivingActivity : BaseActivity<ActivityAuthDrivingBinding>() {
private fun selBackPic() {
OcrUtils.getInstance().ocrDriveing(mContext, this) { picPath, result ->
if (result?.data?.back==null){
ToastUtils.showToast(mContext,"请选择正确证件照片")
if (result?.data?.back == null) {
ToastUtils.showToast(mContext, "请选择正确证件照片")
return@ocrDriveing
}
ImageLoader.getInstance()
@ -181,59 +185,42 @@ class AuthDrivingActivity : BaseActivity<ActivityAuthDrivingBinding>() {
binding.tvEnd.text = changeDateNoneFormat
}
}
//车长
val split = it.overallDimension.split("mm")[0].split("X")
if (split!=null&&split.size>2){
upDrivingInfoBean.run {
carLong = split[0]
carWidth = split[1]
carHeight = split[2]
}
}
if (it.tractionWeight.contains("kg")){
//牵引总质量
if (it.tractionWeight.contains("kg")) {
upDrivingInfoBean.tractionWeight = it.tractionWeight.split("kg")[0]
}
upDrivingInfoBean.energySignCode = it.energySign
upDrivingInfoBean.barcodeNumber = it.barcodeNumber
upDrivingInfoBean.overallDimension = it.overallDimension
binding.run {
etCurbWeight.setText(it.curbWeight)//整备质量
etPermittedWeight.setText(it.permittedWeight)//
//核定载质量
if (it.permittedWeight.contains("kg")) {
upDrivingInfoBean.approvedLoad = it.permittedWeight.split("kg")[0]
}
upDrivingInfoBean.run {
overallDimension = it.overallDimension
energySignCode = it.energySign
barcodeNumber = it.barcodeNumber
overallDimension = it.overallDimension
}
//车长
if (it.overallDimension.contains("mm")) {
var overall = it.overallDimension.replace("mm", "")
var splits = overall.split("×")
if (splits.size == 3) {
upDrivingInfoBean.carLong = splits[0]
upDrivingInfoBean.carWidth = splits[1]
upDrivingInfoBean.carHeight = splits[2]
}
}
// binding.run {
// etCurbWeight.setText(it.curbWeight)//整备质量
// etPermittedWeight.setText(it.permittedWeight)//
// }
}
}
// PopsUtils.getInstance().showSimSelPic(mContext) {
// var data = it[0]
// ossServiceUtil.asyncPutImage(data.realPath, this@AuthDrivingActivity)
// ossServiceUtil.setResultCallBack { data, oldPath ->
// run {
// DataManager.getInstance().recognizeVehicleLicense(oldPath)
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(
// BaseObserver(mContext,
// object : RxHttpCallBack<OcrPersonBean>() {
// override fun onSuccess(t: CommonResponseBean<OcrPersonBean>) {
// super.onSuccess(t)
//// t.data.data.back?.data.let {
//// driverInfoBean.licensePhotoBackUrl = oldPath
//// }
// }
// })
// )
//
// }
// }
//
//
// ImageLoader.getInstance().loadRoundImage(mContext, data.realPath, 12, binding.ivBack)
// }
}
private fun subMit() {
@ -269,9 +256,12 @@ class AuthDrivingActivity : BaseActivity<ActivityAuthDrivingBinding>() {
super.onSuccess(t)
if (upDrivingInfoBean.isTrailer == "1") {
finish()
ActivityUtils.startActivity(mContext, AuthTrailerActivity::class.java,Bundle().apply {
putString(AppConfig.CAR_ID,t.data.carId)
})
ActivityUtils.startActivity(
mContext,
AuthTrailerActivity::class.java,
Bundle().apply {
putString(AppConfig.CAR_ID, t.data.carId)
})
} else {
ActivityUtils.startActivity(mContext, AuthSuccActivity::class.java)
}

8
app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthQualificationActivity.kt
View File

@ -8,6 +8,7 @@ import com.dahe.gldriver.net.BaseObserver
import com.dahe.gldriver.net.DataManager
import com.dahe.gldriver.net.RxHttpCallBack
import com.dahe.gldriver.oss.OssServiceUtil
import com.dahe.gldriver.utils.SPUtils
import com.dahe.mylibrary.utils.PickerUtils
import com.dahe.mylibrary.base.BaseActivity
import com.dahe.mylibrary.net.CommonResponseBean
@ -30,11 +31,12 @@ class AuthQualificationActivity : BaseActivity<ActivityAuthQualificationBinding>
override fun initView(savedInstanceState: Bundle?) {
setStatusBarColor(R.color.white)
setTitleBar("实名认证", true)
binding.btnOk.setOnClickListener {
subMit()
}
binding.run {
etId.setText(SPUtils.instance.getUserInfo(mContext).idcard)
btnOk.setOnClickListener {
subMit()
}
tvDate.run {
setOnClickListener {
PickerUtils.getInstance()

42
app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditDrivingActivity.kt
View File

@ -234,24 +234,36 @@ class EditDrivingActivity : BaseActivity<ActivityAuthDrivingBinding>() {
binding.tvEnd.text = changeDateNoneFormat
}
}
//车长
val split = it.overallDimension.split("mm")[0].split("X")
if (split != null && split.size > 2) {
upDrivingInfoBean.run {
carLong = split[0]
carWidth = split[1]
carHeight = split[2]
}
}
if (it.tractionWeight.contains("kg")){
//牵引总质量
if (it.tractionWeight.contains("kg")) {
upDrivingInfoBean.tractionWeight = it.tractionWeight.split("kg")[0]
}
upDrivingInfoBean.energySignCode = it.energySign
upDrivingInfoBean.barcodeNumber = it.barcodeNumber
binding.run {
etCurbWeight.setText(it.curbWeight)//整备质量
etPermittedWeight.setText(it.permittedWeight)//核定载质量
//核定载质量
if (it.permittedWeight.contains("kg")) {
upDrivingInfoBean.approvedLoad = it.permittedWeight.split("kg")[0]
}
//车长
if (it.overallDimension.contains("mm")) {
var overall = it.overallDimension.replace("mm", "")
var splits = overall.split("×")
if (splits.size == 3) {
upDrivingInfoBean.carLong = splits[0]
upDrivingInfoBean.carWidth = splits[1]
upDrivingInfoBean.carHeight = splits[2]
}
}
upDrivingInfoBean.run {
overallDimension = it.overallDimension
energySignCode = it.energySign
barcodeNumber = it.barcodeNumber
overallDimension = it.overallDimension
}
// binding.run {
// etCurbWeight.setText(it.curbWeight)//整备质量
// etPermittedWeight.setText(it.permittedWeight)//核定载质量
// }
}
}
}

6
app/src/main/java/com/dahe/gldriver/ui/account/authperson/EditQualificationActivity.kt
View File

@ -10,6 +10,7 @@ import com.dahe.gldriver.net.DataManager
import com.dahe.gldriver.net.RxHttpCallBack
import com.dahe.gldriver.oss.OssServiceUtil
import com.dahe.gldriver.utils.OcrUtils
import com.dahe.gldriver.utils.SPUtils
import com.dahe.glex.bean.UserDetail
import com.dahe.mylibrary.utils.PickerUtils
import com.dahe.mylibrary.base.BaseActivity
@ -77,9 +78,8 @@ class EditQualificationActivity : BaseActivity<ActivityAuthQualificationBinding>
etId.isEnabled = false
ivFront.isEnabled = false
}
tvDate.setText(upQuaInfo.qualificationCertificateEffectiveEnd)
etId.setText(upQuaInfo.qualificationCertificateNo)
tvDate.text = upQuaInfo.qualificationCertificateEffectiveEnd
etId.setText(if (upQuaInfo.qualificationCertificateNo.isNullOrEmpty()) SPUtils.instance.getUserInfo(mContext).idcard else upQuaInfo.qualificationCertificateNo)
ImageLoader.getInstance()
.loadRoundImage(

2
app/src/main/java/com/dahe/gldriver/ui/mine/InviteRecordActivity.kt
View File

@ -87,7 +87,7 @@ class InviteRecordActivity : BaseActivity<ActivityInviteRecordBinding>(), Refres
override fun onSuccess(t: CommonResponseBean<MutableList<InviteRecord>>) {
super.onSuccess(t)
if (mRefreshPage === 1) {
if (t.data.size == 0) {
if (t.data==null||t.data.size == 0) {
adapter.submitList(null)
adapter.setStateViewLayout(mContext, R.layout.empty_view)
} else {

2
app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt
View File

@ -193,6 +193,8 @@ class MineFragment : BaseFragment<FragmentMineBinding>(), View.OnClickListener,
.subscribe(BaseObserver(mContext, object : RxHttpCallBack<UserBean>() {
override fun onSuccess(t: CommonResponseBean<UserBean>) {
super.onSuccess(t)
if (t==null||t.data==null)
return
UserUtils.instance.updateUser(mContext, t.data)
binding.refresh.finishRefresh()
refreshView()

39
app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarDetailActivity.kt
View File

@ -36,6 +36,7 @@ class CarDetailActivity : BaseActivity<ActivityCarDetailBinding>(), View.OnClick
private lateinit var CarDetail: CarDetail
private var firstMissingInfo = -1
private var allInfoCount = 2
override fun initView(savedInstanceState: Bundle?) {
setStatusHeightParams(binding.rlTop)
setTitleBar("车辆详情", true)
@ -161,7 +162,17 @@ class CarDetailActivity : BaseActivity<ActivityCarDetailBinding>(), View.OnClick
var doneInfoCount = 0
firstMissingInfo = -1
CarDetail = data
binding.run {
if (data.isTrailer == "1") {
cvTrai.visibility = View.VISIBLE
allInfoCount = 3
} else {
cvTrai.visibility = View.GONE
allInfoCount = 2
}
var missInfo = ""
if (data.vehicleNum.isNullOrEmpty()) {
@ -172,17 +183,22 @@ class CarDetailActivity : BaseActivity<ActivityCarDetailBinding>(), View.OnClick
doneInfoCount++
tvInfo.text = """${data.vehicleNum} ${data.vehicleType}"""
}
if (data.trailerVehicleNum.isNullOrEmpty()) {
tvDriverInfo.text = "证件缺失将无法进行接单"
missInfo =
if (missInfo.isNullOrEmpty()) missInfo.plus("挂车行驶证") else missInfo.plus("、挂车行驶证")
if (firstMissingInfo == -1) {
firstMissingInfo = 2
if (data.isTrailer == "1") {
if (data.trailerVehicleNum.isNullOrEmpty()) {
tvDriverInfo.text = "证件缺失将无法进行接单"
missInfo =
if (missInfo.isNullOrEmpty()) missInfo.plus("挂车行驶证") else missInfo.plus(
"、挂车行驶证"
)
if (firstMissingInfo == -1) {
firstMissingInfo = 2
}
} else {
doneInfoCount++
tvDriverInfo.text = """${data.trailerVehicleNum} ${data.trailerVehicleType}"""
}
} else {
doneInfoCount++
tvDriverInfo.text = """${data.trailerVehicleNum} ${data.trailerVehicleType}"""
}
if (data.roadLicense.isNullOrEmpty()) {
tvQualiInfo.text = "证件缺失将无法进行接单"
missInfo =
@ -198,14 +214,13 @@ class CarDetailActivity : BaseActivity<ActivityCarDetailBinding>(), View.OnClick
}
btnNext.text = if (doneInfoCount == 3) "已完成" else "继续认证"
btnNext.text = if (doneInfoCount == allInfoCount) "已完成" else "继续认证"
tvContent.text =
if (missInfo.isNullOrEmpty()) "认证成功,请接单把!!!" else missInfo.plus("缺失")
llId.visibility = if (data.vehicleNum.isNullOrEmpty()) View.GONE else View.VISIBLE
btnId.visibility = if (data.vehicleNum.isNullOrEmpty()) View.VISIBLE else View.GONE
llDriver.visibility =
if (data.trailerVehicleNum.isNullOrEmpty()) View.GONE else View.VISIBLE
btnDriver.visibility =
@ -215,7 +230,7 @@ class CarDetailActivity : BaseActivity<ActivityCarDetailBinding>(), View.OnClick
btnQua.visibility =
if (data.roadLicense.isNullOrEmpty()) View.VISIBLE else View.GONE
circleBarView2.progress = doneInfoCount * 100 / 3
circleBarView2.progress = doneInfoCount * 100 / allInfoCount
}
}

5
app/src/main/java/com/dahe/gldriver/ui/mine/activity/PersonInfoActivity.kt
View File

@ -70,7 +70,7 @@ class PersonInfoActivity : BaseActivity<ActivityPersonInfoBinding>(), View.OnCli
.subscribe(BaseObserver(mContext, object : RxHttpCallBack<UserDetail>() {
override fun onSuccess(t: CommonResponseBean<UserDetail>) {
super.onSuccess(t)
if (t.data==null)
if (t == null || t.data == null)
return
initViewByData(t.data)
}
@ -145,7 +145,8 @@ class PersonInfoActivity : BaseActivity<ActivityPersonInfoBinding>(), View.OnCli
4 -> ActivityUtils.startActivityForResult(
this@PersonInfoActivity,
AuthFaceActivity::class.java,
Bundle().apply { putBoolean(AppConfig.IS_SUPPLEMENT, true) },1)
Bundle().apply { putBoolean(AppConfig.IS_SUPPLEMENT, true) }, 1
)
}
}
}

5
app/src/main/java/com/dahe/gldriver/ui/mine/activity/SettingActivity.kt
View File

@ -5,6 +5,7 @@ import android.view.View
import com.dahe.gldriver.R
import com.dahe.gldriver.databinding.ActivitySettingBinding
import com.dahe.gldriver.push.PushHelper
import com.dahe.gldriver.ui.account.LoginActivity
import com.dahe.gldriver.utils.CommonPopUtils
import com.dahe.gldriver.utils.SPUtils
import com.dahe.glex.bean.UserBean
@ -60,8 +61,8 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>(), View.OnClickList
CommonPopUtils.getInstance()
.showCommCenterPop(mContext, content = "您确定退出当前app么?") {
SPUtils.instance.removeUserToken(mContext)
ActivityUtils.finishAllActivities()
showToast("清除token")
ActivityUtils.startLoginActivity(mContext,LoginActivity::class.java)
// ActivityUtils.finishAllActivities()
}
}
}

6
app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillAppraiseActivity.kt
View File

@ -237,12 +237,6 @@ class WaybillAppraiseActivity : BaseActivity<ActivityWaybillUnloadBinding>() {
adapter = WaybillNodeAdapter()
adapter as WaybillNodeAdapter
}.apply {
setOnItemClickListener { _, _, position ->
ActivityUtils.startActivity(
mContext,
WaybillLoadActivity::class.java,
Bundle().apply { putString(AppConfig.ORDER_ID, items[position].orderId) })
}
addOnItemChildClickListener(R.id.btnOk) { adapter, view, position ->
ActivityUtils.startActivity(mContext, WaybillDetailActivity::class.java)
}

6
app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillDetailActivity.kt
View File

@ -156,12 +156,6 @@ class WaybillDetailActivity : BaseActivity<ActivityWaybillDetailBinding>() {
adapter = WaybillNodeAdapter()
adapter as WaybillNodeAdapter
}.apply {
setOnItemClickListener { _, _, position ->
ActivityUtils.startActivity(
mContext,
WaybillLoadActivity::class.java,
Bundle().apply { putString(AppConfig.ORDER_ID, items[position].orderId) })
}
addOnItemChildClickListener(R.id.btnOk) { adapter, view, position ->
ActivityUtils.startActivity(mContext, WaybillDetailActivity::class.java)
}

6
app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillLoadActivity.kt
View File

@ -259,12 +259,6 @@ class WaybillLoadActivity : BaseActivity<ActivityWaybillLoadBinding>() {
adapter = WaybillNodeAdapter()
adapter as WaybillNodeAdapter
}.apply {
setOnItemClickListener { _, _, position ->
ActivityUtils.startActivity(
mContext,
WaybillLoadActivity::class.java,
Bundle().apply { putString(AppConfig.ORDER_ID, items[position].orderId) })
}
addOnItemChildClickListener(R.id.btnOk) { adapter, view, position ->
ActivityUtils.startActivity(mContext, WaybillDetailActivity::class.java)
}

6
app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUnlLoadActivity.kt
View File

@ -226,12 +226,6 @@ class WaybillUnlLoadActivity : BaseActivity<ActivityWaybillUnloadBinding>() {
adapter = WaybillNodeAdapter()
adapter as WaybillNodeAdapter
}.apply {
setOnItemClickListener { _, _, position ->
ActivityUtils.startActivity(
mContext,
WaybillLoadActivity::class.java,
Bundle().apply { putString(AppConfig.ORDER_ID, items[position].orderId) })
}
addOnItemChildClickListener(R.id.btnOk) { adapter, view, position ->
ActivityUtils.startActivity(mContext, WaybillDetailActivity::class.java)
}

2
app/src/main/java/com/dahe/gldriver/utils/SPUtils.kt
View File

@ -36,7 +36,7 @@ class SPUtils private constructor() : BaseSPUtils() {
*
* @param context
*/
fun getUserInfo(context: Context?): UserBean? {
fun getUserInfo(context: Context?): UserBean {
return JsonUtils.getInstance()
.fromJson(
BaseSPUtils.get(context, BaseSPUtils.USER_INFO_KEY, "") as String,

27
app/src/main/java/com/dahe/gldriver/utils/UserUtils.kt
View File

@ -40,22 +40,17 @@ class UserUtils private constructor(){
//设置推送别名
PushHelper.setAlias(context,userBean)
// TODO: 临时注释替换
ActivityUtils.startActivity(
context,
SelectRoleActivity::class.java
)
// if (userBean.isCarCaptain == "9") {//是否是车队长（0=否,1=是,9=未选择）
// ActivityUtils.startActivity(
// context,
// SelectRoleActivity::class.java
// )
// } else {
// ActivityUtils.startActivity(
// context,
// HomeActivity::class.java
// )
// }
if (userBean.isCarCaptain == "9") {//是否是车队长（0=否,1=是,9=未选择）
ActivityUtils.startActivity(
context,
SelectRoleActivity::class.java
)
} else {
ActivityUtils.startActivity(
context,
HomeActivity::class.java
)
}
ActivityUtils.finishToActivity(LoginActivity::class.java,true)
}

4
app/src/main/res/layout/activity_car_detail.xml
View File

@ -153,6 +153,7 @@
<LinearLayout
android:id="@+id/llId"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tvInfo"
@ -166,7 +167,6 @@
android:background="@color/color_c" />
<LinearLayout
android:id="@+id/llId"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_46"
android:gravity="center"
@ -228,6 +228,8 @@
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/cvTrai"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"

23
mylibrary/src/main/java/com/dahe/mylibrary/utils/ActivityUtils.java
View File

@ -58,6 +58,15 @@ public class ActivityUtils {
context.startActivity(intent);
}
public static void startLoginActivity(@NonNull Context context, @NonNull Class<?> clz) {
Intent intent = new Intent(context, clz);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
context.startActivity(intent);
}
/**
* 启动Activity
*
@ -291,8 +300,8 @@ public class ActivityUtils {
*
* @param isIncludeSelf 是否结束该activity自己
*/
public static boolean finishToActivityAndGoNew(Context ctx ,@NonNull final Class<?> clz,@NonNull final Class<?> newclz,
final boolean isIncludeSelf) {
public static boolean finishToActivityAndGoNew(Context ctx, @NonNull final Class<?> clz, @NonNull final Class<?> newclz,
final boolean isIncludeSelf) {
List<Activity> activities = CommonBaseLibrary.activityList;
for (int i = activities.size() - 1; i >= 0; --i) {
Activity aActivity = activities.get(i);
@ -300,7 +309,7 @@ public class ActivityUtils {
if (isIncludeSelf) {
finishActivity(aActivity);
}
startActivity(ctx,newclz);
startActivity(ctx, newclz);
return true;
} else {
finishActivity(aActivity);
@ -315,7 +324,7 @@ public class ActivityUtils {
*
* @param isIncludeSelf 是否结束该activity自己
*/
public static boolean finishToActivityAndGoNew(Context ctx ,@NonNull final Class<?> clz,@NonNull final Class<?> newclz,Bundle bundle,
public static boolean finishToActivityAndGoNew(Context ctx, @NonNull final Class<?> clz, @NonNull final Class<?> newclz, Bundle bundle,
final boolean isIncludeSelf) {
List<Activity> activities = CommonBaseLibrary.activityList;
for (int i = activities.size() - 1; i >= 0; --i) {
@ -324,7 +333,7 @@ public class ActivityUtils {
if (isIncludeSelf) {
finishActivity(aActivity);
}
startActivity(ctx,newclz,bundle);
startActivity(ctx, newclz, bundle);
return true;
} else {
finishActivity(aActivity);
@ -376,14 +385,14 @@ public class ActivityUtils {
*
* @param clz 本activity的类名
*/
public static void finishOtherActivitiesToNew(Context context,@NonNull final Class<?> clz) {
public static void finishOtherActivitiesToNew(Context context, @NonNull final Class<?> clz) {
List<Activity> activities = CommonBaseLibrary.activityList;
for (Activity activity : activities) {
if (!activity.getClass().equals(clz)) {
finishActivity(activity);
}
}
startActivity(context,clz);
startActivity(context, clz);
}
/**