From 4c51daa245a37c8d987ce368c09eaf76292f20a3 Mon Sep 17 00:00:00 2001 From: lijia Date: Wed, 7 Feb 2024 09:33:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=EF=BC=8C=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=AD=89=E9=80=89=E6=8B=A9=E5=99=A8=E5=B0=81=E8=A3=85=E4=BD=BF?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 9 ++ .../authperson/AuthBankCardActivity.kt | 16 ++- .../account/authperson/AuthDriverActivity.kt | 28 ++-- .../account/authperson/AuthDrivingActivity.kt | 24 +++- .../account/authperson/AuthPersonActivity.kt | 29 +++- .../authperson/AuthQualificationActivity.kt | 12 +- .../ui/account/authperson/AuthRoadActivity.kt | 21 ++- .../ui/account/authteam/AuthTeamActivity.kt | 89 ++++++++++-- .../com/dahe/gldriver/ui/mine/MineFragment.kt | 3 +- .../ui/mine/activity/CarTeamActivity.kt | 21 +++ .../waybill/activity/WaybillUpPicActivity.kt | 33 +++-- app/src/main/res/drawable-xxhdpi/business.png | Bin 0 -> 36808 bytes .../res/layout/activity_auth_bankcard.xml | 1 + .../main/res/layout/activity_auth_driver.xml | 6 +- .../main/res/layout/activity_auth_driving.xml | 3 + .../main/res/layout/activity_auth_person.xml | 2 + .../layout/activity_auth_qualification.xml | 1 + .../main/res/layout/activity_auth_road.xml | 2 + .../main/res/layout/activity_auth_team.xml | 23 +-- app/src/main/res/layout/activity_car_team.xml | 134 ++++++++++++++++++ .../com/dahe/mylibrary/base/BaseActivity.java | 31 +++- .../com/dahe/mylibrary/base/BaseSingleton.kt | 2 +- .../mylibrary/callback/OnPicResultListener.kt | 13 ++ .../com/dahe/mylibrary/pop/PopBottomPic.kt | 21 ++- .../com/dahe/mylibrary/pop/PopNorBottomPic.kt | 120 ++++++++++++++++ .../com/dahe/mylibrary/utils/PickerUtils.kt | 28 ++-- .../com/dahe/mylibrary/utils/PopsUtils.kt | 51 +++++++ .../dahe/mylibrary/utils/SelectPicUtils.kt | 3 +- .../src/main/res/layout/choice_car_timg.xml | 5 +- .../src/main/res/layout/choice_norcar_img.xml | 73 ++++++++++ 30 files changed, 712 insertions(+), 92 deletions(-) create mode 100644 app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarTeamActivity.kt create mode 100644 app/src/main/res/drawable-xxhdpi/business.png create mode 100644 app/src/main/res/layout/activity_car_team.xml create mode 100644 mylibrary/src/main/java/com/dahe/mylibrary/callback/OnPicResultListener.kt create mode 100644 mylibrary/src/main/java/com/dahe/mylibrary/pop/PopNorBottomPic.kt rename app/src/main/java/com/dahe/gldriver/utils/PickDateUtils.kt => mylibrary/src/main/java/com/dahe/mylibrary/utils/PickerUtils.kt (71%) create mode 100644 mylibrary/src/main/java/com/dahe/mylibrary/utils/PopsUtils.kt create mode 100644 mylibrary/src/main/res/layout/choice_norcar_img.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3976070..eeb977f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -236,6 +236,15 @@ android:configChanges="keyboardHidden|orientation|locale" android:screenOrientation="portrait" android:windowSoftInputMode="adjustPan|stateHidden" /> + + + + + diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthBankCardActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthBankCardActivity.kt index 8244692..08716b8 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthBankCardActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthBankCardActivity.kt @@ -5,6 +5,8 @@ import com.dahe.gldriver.R import com.dahe.gldriver.databinding.ActivityAuthBankcardBinding import com.dahe.mylibrary.base.BaseActivity import com.dahe.mylibrary.utils.ActivityUtils +import com.dahe.mylibrary.utils.ImageLoader +import com.dahe.mylibrary.utils.PopsUtils /** * @ClassName AuthBankCardActivity @@ -15,9 +17,17 @@ import com.dahe.mylibrary.utils.ActivityUtils class AuthBankCardActivity : BaseActivity() { override fun initView(savedInstanceState: Bundle?) { setStatusBarColor(R.color.white) - setTitleBar("实名认证",true) - binding.btnOk.setOnClickListener { - ActivityUtils.startActivity(mContext,AuthFaceActivity::class.java) + setTitleBar("实名认证", true) + + binding.run { + btnOk.setOnClickListener { + ActivityUtils.startActivity(mContext, AuthFaceActivity::class.java) + } + ivFront.setOnClickListener { + PopsUtils.getInstance().showSimSelPic(mContext) { + ImageLoader.getInstance().loadRoundImage(mContext, it[0].path, 12, ivFront) + } + } } } diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDriverActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDriverActivity.kt index 3abcc5b..e55255c 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDriverActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDriverActivity.kt @@ -3,13 +3,11 @@ package com.dahe.gldriver.ui.account.authperson import android.os.Bundle import com.dahe.gldriver.R import com.dahe.gldriver.databinding.ActivityAuthDriverBinding -import com.dahe.gldriver.utils.PickDateUtils -import com.dahe.gldriver.utils.SPUtils +import com.dahe.mylibrary.utils.PickerUtils import com.dahe.mylibrary.base.BaseActivity import com.dahe.mylibrary.utils.ActivityUtils -import com.dahe.mylibrary.utils.ToastUtils -import com.github.gzuliyujiang.wheelpicker.contract.OnDatePickedListener -import com.github.gzuliyujiang.wheelpicker.entity.DateEntity +import com.dahe.mylibrary.utils.ImageLoader +import com.dahe.mylibrary.utils.PopsUtils /** * @ClassName AuthRoleActivity @@ -29,7 +27,7 @@ class AuthDriverActivity : BaseActivity() { tvStart.run { setOnClickListener { - PickDateUtils.getInstance() + PickerUtils.getInstance() .showDate(this@AuthDriverActivity, "有效起始日期") { year, month, day -> this.text = "$year-$month-$day" } @@ -37,7 +35,7 @@ class AuthDriverActivity : BaseActivity() { } tvEnd.run { setOnClickListener { - PickDateUtils.getInstance() + PickerUtils.getInstance() .showDate(this@AuthDriverActivity, "有效结束日期") { year, month, day -> this.text = "$year-$month-$day" } @@ -45,13 +43,27 @@ class AuthDriverActivity : BaseActivity() { } tvCarType.run { setOnClickListener { - PickDateUtils.getInstance() + PickerUtils.getInstance() .showSelectCarType(this@AuthDriverActivity, "选择准驾车型") { _, item -> this.text = item.toString() } } } + ivFront.setOnClickListener { + PopsUtils.getInstance().showSimSelPic(mContext){ + var data = it[0] + ImageLoader.getInstance().loadRoundImage(mContext,data.path,12,ivFront) + } + } + + ivBack.setOnClickListener { + PopsUtils.getInstance().showSimSelPic(mContext){ + var data = it[0] + ImageLoader.getInstance().loadRoundImage(mContext,data.path,12,ivBack) + } + } + } } diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt index 6a86e1a..860ddf9 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthDrivingActivity.kt @@ -5,6 +5,8 @@ import com.dahe.gldriver.R import com.dahe.gldriver.databinding.ActivityAuthDrivingBinding import com.dahe.mylibrary.base.BaseActivity import com.dahe.mylibrary.utils.ActivityUtils +import com.dahe.mylibrary.utils.ImageLoader +import com.dahe.mylibrary.utils.PopsUtils /** * @ClassName AuthRoleActivity @@ -15,9 +17,27 @@ import com.dahe.mylibrary.utils.ActivityUtils class AuthDrivingActivity : BaseActivity() { override fun initView(savedInstanceState: Bundle?) { setStatusBarColor(R.color.white) - setTitleBar("实名认证",true) + setTitleBar("实名认证", true) binding.btnOk.setOnClickListener { - ActivityUtils.startActivity(mContext,AuthRoadActivity::class.java) + ActivityUtils.startActivity(mContext, AuthRoadActivity::class.java) + } + binding.run { + ivFront.setOnClickListener { + PopsUtils.getInstance().showSimSelPic(mContext) { + ImageLoader.getInstance().loadRoundImage(mContext, it[0].path, 12, ivFront) + } + } + + ivBack.setOnClickListener { + PopsUtils.getInstance().showSimSelPic(mContext) { + ImageLoader.getInstance().loadRoundImage(mContext, it[0].path, 12, ivBack) + } + } + ivCar.setOnClickListener { + PopsUtils.getInstance().showSimSelPic(mContext) { + ImageLoader.getInstance().loadRoundImage(mContext, it[0].path, 12, ivCar) + } + } } } diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthPersonActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthPersonActivity.kt index 194f4fc..792d0ad 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthPersonActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthPersonActivity.kt @@ -3,9 +3,11 @@ package com.dahe.gldriver.ui.account.authperson import android.os.Bundle import com.dahe.gldriver.R import com.dahe.gldriver.databinding.ActivityAuthPersonBinding -import com.dahe.gldriver.utils.PickDateUtils +import com.dahe.mylibrary.utils.PickerUtils import com.dahe.mylibrary.base.BaseActivity import com.dahe.mylibrary.utils.ActivityUtils +import com.dahe.mylibrary.utils.ImageLoader +import com.dahe.mylibrary.utils.PopsUtils import com.dahe.mylibrary.utils.ToastUtils /** @@ -18,14 +20,15 @@ class AuthPersonActivity : BaseActivity() { override fun initView(savedInstanceState: Bundle?) { setStatusBarColor(R.color.white) setTitleBar("实名认证", true) - binding.btnOk.setOnClickListener { - ActivityUtils.startActivity(mContext, AuthDriverActivity::class.java) - } binding.run { + + btnOk.setOnClickListener { + ActivityUtils.startActivity(mContext, AuthDriverActivity::class.java) + } tvStart.run { setOnClickListener { - PickDateUtils.getInstance() + PickerUtils.getInstance() .showDate(this@AuthPersonActivity,"有效起始日期") { year, month, day -> this.text = "$year-$month-$day" } @@ -33,12 +36,26 @@ class AuthPersonActivity : BaseActivity() { } tvEnd.run { setOnClickListener { - PickDateUtils.getInstance() + PickerUtils.getInstance() .showDate(this@AuthPersonActivity,"有效结束日期") { year, month, day -> this.text = "$year-$month-$day" } } } + + ivFront.setOnClickListener { + PopsUtils.getInstance().showSimSelPic(mContext){ + var data = it[0] + ImageLoader.getInstance().loadRoundImage(mContext,data.path,12,ivFront) + } + } + + ivBack.setOnClickListener { + PopsUtils.getInstance().showSimSelPic(mContext){ + var data = it[0] + ImageLoader.getInstance().loadRoundImage(mContext,data.path,12,ivBack) + } + } } } diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthQualificationActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthQualificationActivity.kt index dd9d694..fd24661 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthQualificationActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthQualificationActivity.kt @@ -3,9 +3,11 @@ package com.dahe.gldriver.ui.account.authperson import android.os.Bundle import com.dahe.gldriver.R import com.dahe.gldriver.databinding.ActivityAuthQualificationBinding -import com.dahe.gldriver.utils.PickDateUtils +import com.dahe.mylibrary.utils.PickerUtils import com.dahe.mylibrary.base.BaseActivity import com.dahe.mylibrary.utils.ActivityUtils +import com.dahe.mylibrary.utils.ImageLoader +import com.dahe.mylibrary.utils.PopsUtils /** * @ClassName AuthQualificationActivity @@ -24,12 +26,18 @@ class AuthQualificationActivity : BaseActivity binding.run { tvDate.run { setOnClickListener { - PickDateUtils.getInstance() + PickerUtils.getInstance() .showDate(this@AuthQualificationActivity,"选择有效期至") { year, month, day -> this.text = "$year-$month-$day" } } } + + ivFront.setOnClickListener { + PopsUtils.getInstance().showSimSelPic(mContext){ + ImageLoader.getInstance().loadRoundImage(mContext,it[0].path,12,ivFront) + } + } } } diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthRoadActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthRoadActivity.kt index 5ae3a52..e96e400 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthRoadActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authperson/AuthRoadActivity.kt @@ -6,6 +6,10 @@ import com.dahe.gldriver.databinding.ActivityAuthRoadBinding import com.dahe.gldriver.ui.account.SelectRoleActivity import com.dahe.mylibrary.base.BaseActivity import com.dahe.mylibrary.utils.ActivityUtils +import com.dahe.mylibrary.utils.ImageLoader +import com.dahe.mylibrary.utils.PickerUtils +import com.dahe.mylibrary.utils.PopsUtils +import com.github.gzuliyujiang.wheelpicker.contract.OnDatePickedListener /** * @ClassName AuthRoadActivity @@ -17,8 +21,21 @@ class AuthRoadActivity : BaseActivity() { override fun initView(savedInstanceState: Bundle?) { setStatusBarColor(R.color.white) setTitleBar("实名认证",true) - binding.btnOk.setOnClickListener { - ActivityUtils.startActivity(mContext, SelectRoleActivity::class.java) + binding.run { + btnOk.setOnClickListener { + ActivityUtils.startActivity(mContext, SelectRoleActivity::class.java) + } + + tvDate.setOnClickListener { + PickerUtils.getInstance().showDate(this@AuthRoadActivity){ year, month, day -> + + } + } + ivFront.setOnClickListener { + PopsUtils.getInstance().showSimSelPic(mContext) { + ImageLoader.getInstance().loadRoundImage(mContext, it[0].path, 12, ivFront) + } + } } } diff --git a/app/src/main/java/com/dahe/gldriver/ui/account/authteam/AuthTeamActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/account/authteam/AuthTeamActivity.kt index 10c3d24..c16fc0b 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/account/authteam/AuthTeamActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/account/authteam/AuthTeamActivity.kt @@ -2,9 +2,14 @@ package com.dahe.gldriver.ui.account.authteam import android.os.Bundle import android.view.View +import android.widget.ImageView import com.dahe.gldriver.R import com.dahe.gldriver.databinding.ActivityAuthTeamBinding import com.dahe.mylibrary.base.BaseActivity +import com.dahe.mylibrary.utils.ImageLoader +import com.dahe.mylibrary.utils.PickerUtils +import com.dahe.mylibrary.utils.PopsUtils +import com.dahe.mylibrary.utils.ToastUtils /** * @ClassName AuthTeamActivity @@ -12,30 +17,98 @@ import com.dahe.mylibrary.base.BaseActivity * @Date 2024/1/25 16:44 * @Description 个人车队认证 */ -class AuthTeamActivity : BaseActivity() { +class AuthTeamActivity : BaseActivity(), View.OnClickListener { private var checkTeamType = 0 //0代表运输公司，1代表个人车队 override fun initView(savedInstanceState: Bundle?) { setStatusBarColor(R.color.white) - setTitleBar("身份认证",true) + setTitleBar("身份认证", true) - binding.rgTeam.setOnCheckedChangeListener { _, i -> - changeTeamType(if (i==binding.rbCom.id) 0 else 1) + binding.run { + rgTeam.setOnCheckedChangeListener { _, i -> + changeTeamType(if (i == binding.rbCom.id) 0 else 1) + } + + ivBusiness.setOnClickListener { + PopsUtils.getInstance().showSimSelPic(mContext) { + ImageLoader.getInstance().loadRoundImage(mContext, it[0].path, 12, ivBusiness) + } + } + + //运输公司 本人身份证 + ivPerFront.setOnClickListener { + PopsUtils.getInstance().showSimSelPic(mContext) { + ImageLoader.getInstance().loadRoundImage(mContext, it[0].path, 12, ivPerFront) + } + } + + ivPerBack.setOnClickListener { + PopsUtils.getInstance().showSimSelPic(mContext) { + ImageLoader.getInstance().loadRoundImage(mContext, it[0].path, 12, ivPerBack) + } + } + //个人车队 本人身份证 + ivFront.setOnClickListener { + PopsUtils.getInstance().showSimSelPic(mContext) { + ImageLoader.getInstance().loadRoundImage(mContext, it[0].path, 12, ivFront) + } + } + + ivBank.setOnClickListener { + PopsUtils.getInstance().showSimSelPic(mContext) { + ImageLoader.getInstance().loadRoundImage(mContext, it[0].path, 12, ivBank) + } + } + + ivBank.setOnClickListener { + PopsUtils.getInstance().showSimSelPic(mContext) { + ImageLoader.getInstance().loadRoundImage(mContext, it[0].path, 12, ivBank) + } + } + + ivRoad.setOnClickListener { + PopsUtils.getInstance().showSimSelPic(mContext) { + ImageLoader.getInstance().loadRoundImage(mContext, it[0].path, 12, ivRoad) + } + } + + tvComDate.setOnClickListener { + PickerUtils.getInstance() + .showDate(this@AuthTeamActivity, "请选择有效期至") { year, month, day -> + tvComDate.text = "$year-$month-$day" + } + } + + tvPerDate.setOnClickListener { + PickerUtils.getInstance() + .showDate(this@AuthTeamActivity, "请选择有效期至") { year, month, day -> + tvPerDate.text = "$year-$month-$day" + } + } } + } override fun initDate() { } - private fun changeTeamType(type : Int){ + private fun changeTeamType(type: Int) { checkTeamType = type - if (0==checkTeamType){ + if (0 == checkTeamType) { binding.llCom.visibility = View.VISIBLE binding.llPerson.visibility = View.GONE - }else{ + } else { binding.llCom.visibility = View.GONE binding.llPerson.visibility = View.VISIBLE } } -} \ No newline at end of file + + override fun onClick(view: View?) { + super.onClick(view) +// when(view?.id){ +// binding.llCom.id->{} +// } + } +} + diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt index 91c0996..db2859e 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/MineFragment.kt @@ -8,6 +8,7 @@ import com.dahe.gldriver.base.WebActivity import com.dahe.gldriver.bean.GridBean import com.dahe.gldriver.databinding.FragmentMineBinding import com.dahe.gldriver.ui.account.authperson.AuthPartyActivity +import com.dahe.gldriver.ui.mine.activity.CarTeamActivity import com.dahe.gldriver.ui.mine.activity.CarsManActivity import com.dahe.gldriver.ui.mine.activity.RulesActivity import com.dahe.gldriver.ui.mine.activity.WalletActivity @@ -122,7 +123,7 @@ class MineFragment : BaseFragment(), View.OnClickListener { private fun goPlats(pos: Int) { when (pos) { 0 -> { - ActivityUtils.startActivity(mContext, RulesActivity::class.java) + ActivityUtils.startActivity(mContext, CarTeamActivity::class.java) } 1 -> { diff --git a/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarTeamActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarTeamActivity.kt new file mode 100644 index 0000000..946a869 --- /dev/null +++ b/app/src/main/java/com/dahe/gldriver/ui/mine/activity/CarTeamActivity.kt @@ -0,0 +1,21 @@ +package com.dahe.gldriver.ui.mine.activity + +import android.os.Bundle +import com.dahe.gldriver.databinding.ActivityCarTeamBinding +import com.dahe.mylibrary.base.BaseActivity + +/** + * @ClassName CarTeamActivity + * @Author john + * @Date 2024/2/6 16:38 + * @Description 车队管理 + */ +class CarTeamActivity : BaseActivity() { + override fun initView(savedInstanceState: Bundle?) { + setStatusHeightParams(binding.rlTop) + setTitleBar("车队管理",true,true) + } + + override fun initDate() { + } +} \ No newline at end of file diff --git a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt index 5cad3a0..8be8413 100644 --- a/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt +++ b/app/src/main/java/com/dahe/gldriver/ui/waybill/activity/WaybillUpPicActivity.kt @@ -8,14 +8,14 @@ import com.dahe.gldriver.databinding.ActivityWaybillUppicBinding import com.dahe.mylibrary.adapter.GridImageAdapter import com.dahe.mylibrary.adapter.GridImageAdapter.OnItemClickListener import com.dahe.mylibrary.base.BaseActivity -import com.dahe.mylibrary.pop.PopBottomPic +import com.dahe.mylibrary.callback.OnPicResultListener import com.dahe.mylibrary.utils.ActivityUtils +import com.dahe.mylibrary.utils.PopsUtils import com.dahe.mylibrary.utils.ToastUtils import com.dahe.mylibrary.weight.FullyGridLayoutManager import com.luck.picture.lib.decoration.GridSpacingItemDecoration import com.luck.picture.lib.entity.LocalMedia import com.luck.picture.lib.utils.DensityUtil -import com.lxj.xpopup.XPopup /** * @ClassName WaybillUpPicActivity @@ -64,25 +64,25 @@ class WaybillUpPicActivity : BaseActivity() { var myAdapter = GridImageAdapter(mContext, mData) - myAdapter.setOnItemClickListener(object :OnItemClickListener{ + myAdapter.setOnItemClickListener(object : OnItemClickListener { override fun onItemClick(v: View?, position: Int) { } override fun openPicture() { - XPopup.Builder(mContext) - .hasShadowBg(true) - .dismissOnBackPressed(true) - .dismissOnTouchOutside(true) - .moveUpToKeyboard(false) //如果不加这个，评论弹窗会移动到软键盘上面 - .isViewMode(true) - .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个 - .asCustom(PopBottomPic(mContext,myAdapter, onPicResultListener = { - ToastUtils.showToast(mContext,it.size.toString()) - myAdapter.data.addAll(it) - myAdapter.notifyDataSetChanged() - })) - .show() + PopsUtils.getInstance().showSelPic(mContext,myAdapter){ + myAdapter.data.addAll(it) + myAdapter.notifyDataSetChanged() + } +// XPopup.Builder(mContext) +// .dismissOnTouchOutside(true) +// .asCustom(PopBottomPic(mContext, myAdapter, onPicResultListener = { +// ToastUtils.showToast(mContext, it.size.toString()) +// myAdapter.data.addAll(it) +// myAdapter.notifyDataSetChanged() +// })) +// .show() + } }) @@ -91,6 +91,5 @@ class WaybillUpPicActivity : BaseActivity() { } - } } \ No newline at end of file diff --git a/app/src/main/res/drawable-xxhdpi/business.png b/app/src/main/res/drawable-xxhdpi/business.png new file mode 100644 index 0000000000000000000000000000000000000000..1c15c607e8eac7383d59ee4c36668a041303cdfd GIT binary patch literal 36808 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 V#|2gnaz4U-Y^ + android:background="@drawable/driver_front"/> + android:background="@drawable/driver_back"/> diff --git a/app/src/main/res/layout/activity_auth_driving.xml b/app/src/main/res/layout/activity_auth_driving.xml index 5cea2f5..a39f62e 100644 --- a/app/src/main/res/layout/activity_auth_driving.xml +++ b/app/src/main/res/layout/activity_auth_driving.xml @@ -51,6 +51,7 @@ + android:background="@drawable/business"> + android:background="@drawable/road"> + android:background="@drawable/person_front"/> + android:background="@drawable/person_back"/> @@ -343,7 +346,7 @@ android:textColor="@color/black" android:textSize="@dimen/sp_15"> - + tools:text="1990-05-24 至 2020-05-23"/> @@ -409,6 +412,7 @@ android:background="@drawable/person_front"> - + tools:text="1990-05-24 至 2020-05-23"> @@ -549,7 +554,7 @@ android:layout_height="@dimen/dp_97" android:layout_gravity="center_horizontal" android:layout_marginTop="@dimen/dp_20" - + android:id="@+id/ivBank" android:background="@drawable/bank_card"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mylibrary/src/main/java/com/dahe/mylibrary/base/BaseActivity.java b/mylibrary/src/main/java/com/dahe/mylibrary/base/BaseActivity.java index 29ba5a9..7ed1d9f 100644 --- a/mylibrary/src/main/java/com/dahe/mylibrary/base/BaseActivity.java +++ b/mylibrary/src/main/java/com/dahe/mylibrary/base/BaseActivity.java @@ -174,6 +174,28 @@ public abstract class BaseActivity extends AppCompatActi } + /** + * 设置标题以及主题颜色 + */ + protected void setTitleBar(String title, boolean isWhite, boolean isBack) { + mToolbar = (Toolbar) findViewById(R.id.common_toolbar); + mToolbar.setBackgroundColor(statusColor == -1 ? Color.TRANSPARENT : ContextCompat.getColor(mContext, statusColor)); + + if (isBack) { + mToolbar.setNavigationIcon(isWhite ? R.drawable.left : R.drawable.left_black); + mToolbar.setNavigationOnClickListener(view -> finish()); + } + if (!TextUtils.isEmpty(title)) {// + ((TextView) findViewById(R.id.common_toolBar_title)).setTextColor(isWhite ? getColor(R.color.colorWhite) : getColor(R.color.black)); + ((TextView) findViewById(R.id.common_toolBar_title)).setText(title); + } + if (isWhite){ + StatusBar.cancelLightStatusBar(this);//图标文字白色 + } + + } + + /** * 显示右边标题 * @@ -202,10 +224,13 @@ public abstract class BaseActivity extends AppCompatActi * 设置距离顶部距离 */ protected void setStatusHeightParams(View llContent) { - RelativeLayout.LayoutParams closeLayoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); - closeLayoutParams.topMargin = ConvertUtils.dp2px(8) + BarUtils.getStatusBarHeight(); +// RelativeLayout.LayoutParams closeLayoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); // closeLayoutParams.topMargin = BarUtils.getStatusBarHeight(); - llContent.setLayoutParams(closeLayoutParams); +// closeLayoutParams.topMargin = BarUtils.getStatusBarHeight(); +// llContent.setLayoutParams(closeLayoutParams); + + + llContent.setPadding(0,BarUtils.getStatusBarHeight(),0,0); } protected abstract void initView(Bundle savedInstanceState); diff --git a/mylibrary/src/main/java/com/dahe/mylibrary/base/BaseSingleton.kt b/mylibrary/src/main/java/com/dahe/mylibrary/base/BaseSingleton.kt index e110d54..436b26e 100644 --- a/mylibrary/src/main/java/com/dahe/mylibrary/base/BaseSingleton.kt +++ b/mylibrary/src/main/java/com/dahe/mylibrary/base/BaseSingleton.kt @@ -5,7 +5,7 @@ package com.dahe.mylibrary.base * @Author 用户 * @Date 2023/12/29 09:49 * @Description //要实现单例类，就只需要继承这个 BaseSingleton 即可 - //P为参数,T为返回值 +//P为参数,T为返回值 */ abstract class BaseSingleton { diff --git a/mylibrary/src/main/java/com/dahe/mylibrary/callback/OnPicResultListener.kt b/mylibrary/src/main/java/com/dahe/mylibrary/callback/OnPicResultListener.kt new file mode 100644 index 0000000..1dd27c7 --- /dev/null +++ b/mylibrary/src/main/java/com/dahe/mylibrary/callback/OnPicResultListener.kt @@ -0,0 +1,13 @@ +package com.dahe.mylibrary.callback + +import com.luck.picture.lib.entity.LocalMedia + +/** + * @ClassName OnPicResultListener + * @Author john + * @Date 2024/2/6 14:48 + * @Description TODO + */ +fun interface OnPicResultListener { + fun onResult(result: MutableList) +} \ No newline at end of file diff --git a/mylibrary/src/main/java/com/dahe/mylibrary/pop/PopBottomPic.kt b/mylibrary/src/main/java/com/dahe/mylibrary/pop/PopBottomPic.kt index ae4c015..09cf53a 100644 --- a/mylibrary/src/main/java/com/dahe/mylibrary/pop/PopBottomPic.kt +++ b/mylibrary/src/main/java/com/dahe/mylibrary/pop/PopBottomPic.kt @@ -4,6 +4,7 @@ import android.content.Context import android.widget.Button import com.dahe.mylibrary.R import com.dahe.mylibrary.adapter.GridImageAdapter +import com.dahe.mylibrary.callback.OnPicResultListener import com.dahe.mylibrary.utils.SelectPicUtils import com.dahe.mylibrary.utils.ToastUtils import com.dahe.mylibrary.weight.GlideEngine @@ -26,11 +27,11 @@ import kotlin.math.min class PopBottomPic( context: Context, myAdapter: GridImageAdapter, - onPicResultListener: onPicResultListener + onPicResultListener: OnPicResultListener ) : BottomPopupView(context) { - private var listener: onPicResultListener + private var listener: OnPicResultListener var myAdapter: GridImageAdapter init { @@ -38,12 +39,14 @@ class PopBottomPic( this.myAdapter = myAdapter } + override fun getImplLayoutId() = R.layout.choice_car_timg override fun onCreate() { super.onCreate() var paizhao = findViewById