From 8d3abcea63af0b9eb684b79b47b10db17c6688ab Mon Sep 17 00:00:00 2001 From: lijia Date: Tue, 7 May 2024 10:03:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E6=B3=A8=E5=86=8C=EF=BC=8C?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=A4=A7=E5=9B=BE=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 5 + .../adapter/MineCarsAdapter.kt | 51 +++ .../authperson/AuthBankCardActivity.kt | 10 + .../authperson/AuthQualificationActivity.kt | 28 +- .../authperson/EditBankCardActivity.kt | 17 +- .../authperson/EditQualificationActivity.kt | 22 +- .../ui/home/HomeFragment.kt | 24 +- .../ui/home/activity/BusinessActivity.kt | 2 +- .../ui/home/activity/MessageActivity.kt | 88 ++++ .../ui/mine/MineFragment.kt | 136 ++++-- .../ui/mine/activity/SettingActivity.kt | 42 ++ .../utils/CommonPopUtils.kt | 24 ++ .../main/res/drawable-xxhdpi/home_part.png | Bin 0 -> 5076 bytes .../main/res/drawable-xxhdpi/icon_message.png | Bin 0 -> 1194 bytes .../res/drawable-xxhdpi/icon_mine_cars.png | Bin 0 -> 1972 bytes .../res/layout/activity_auth_bankcard.xml | 29 +- .../layout/activity_auth_qualification.xml | 30 +- app/src/main/res/layout/activity_message.xml | 23 ++ app/src/main/res/layout/activity_setting.xml | 389 ++++++++++++++---- app/src/main/res/layout/fragment_home.xml | 23 ++ app/src/main/res/layout/fragment_mine.xml | 144 +++++-- app/src/main/res/layout/item_cars_mine.xml | 99 +++++ 22 files changed, 1023 insertions(+), 163 deletions(-) create mode 100644 app/src/main/java/com/arpa/hndahesudintocctmsdriver/adapter/MineCarsAdapter.kt create mode 100644 app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/activity/MessageActivity.kt create mode 100644 app/src/main/res/drawable-xxhdpi/home_part.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_message.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_mine_cars.png create mode 100644 app/src/main/res/layout/activity_message.xml create mode 100644 app/src/main/res/layout/item_cars_mine.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b00e233..5f121f0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -258,6 +258,11 @@ android:configChanges="keyboardHidden|orientation|locale" android:screenOrientation="portrait" android:windowSoftInputMode="adjustPan|stateHidden" /> + () { + override fun onBindViewHolder(holder: QuickViewHolder, position: Int, item: CarBean?) { + holder.run { + setText(R.id.tvCarNum, item?.vehicleNum) + setText(R.id.tvCarType, item?.vehicleType) +// setText(R.id.tvCarLen, """${if (!item?.carLong.isNullOrEmpty()) item?.carLong else ""}mm""") + setText( + R.id.tvCarWei, + """${if (!item?.carLong.isNullOrEmpty()) item?.carLong?.toDouble()?.div(1000) else ""}m/${ + if (!item?.approvedLoad.isNullOrEmpty()) item?.approvedLoad?.toFloat() + ?.div(1000) else if (!item?.tractionWeight.isNullOrEmpty()) item?.tractionWeight?.toFloat() + ?.div(1000) else 0 + }吨""" + ) + +// setGone(R.id.tvNotic, +// !(item?.roadLicenseValidityOverdue=="1") +// ) +// +// ImageLoader.getInstance() +// .loadRoundImage(context, item?.carUrl, 6, getView(R.id.ivHead)) + } + } + + override fun onCreateViewHolder( + context: Context, + parent: ViewGroup, + viewType: Int + ): QuickViewHolder { + // 返回一个 ViewHolder + return QuickViewHolder(R.layout.item_cars_mine, parent) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthBankCardActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthBankCardActivity.kt index 13ebec9..89ec597 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthBankCardActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthBankCardActivity.kt @@ -1,6 +1,7 @@ package com.arpa.hndahesudintocctmsdriver.ui.account.authperson import android.os.Bundle +import android.view.View import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.bean.OcrPersonBean import com.arpa.hndahesudintocctmsdriver.bean.UpBankInfoBean @@ -9,6 +10,7 @@ import com.arpa.hndahesudintocctmsdriver.net.BaseObserver import com.arpa.hndahesudintocctmsdriver.net.DataManager import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack import com.arpa.hndahesudintocctmsdriver.oss.OssServiceUtil +import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils import com.arpa.mylibrary.base.BaseActivity import com.arpa.mylibrary.net.CommonResponseBean import com.arpa.mylibrary.utils.ActivityUtils @@ -38,6 +40,13 @@ class AuthBankCardActivity : BaseActivity() { subMit() } ivFront.setOnClickListener { + if (bankInfo.driverBankcardPhotoUrl.isNullOrEmpty()){ + selBankPic() + }else{ + CommonPopUtils.getInstance().showOnePic(mContext,ivFront,bankInfo.driverBankcardPhotoUrl) + } + } + tvChangeFront.setOnClickListener { selBankPic() } } @@ -72,6 +81,7 @@ class AuthBankCardActivity : BaseActivity() { it.etId.setText(cardNumber) it.tvBankName.setText(bankName) } + binding.tvChangeFront.visibility = View.VISIBLE } } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthQualificationActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthQualificationActivity.kt index 456222a..2502b66 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthQualificationActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/AuthQualificationActivity.kt @@ -1,6 +1,7 @@ package com.arpa.hndahesudintocctmsdriver.ui.account.authperson import android.os.Bundle +import android.view.View import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.bean.UpQualiInfoBean import com.arpa.hndahesudintocctmsdriver.databinding.ActivityAuthQualificationBinding @@ -8,6 +9,7 @@ import com.arpa.hndahesudintocctmsdriver.net.BaseObserver import com.arpa.hndahesudintocctmsdriver.net.DataManager import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack import com.arpa.hndahesudintocctmsdriver.oss.OssServiceUtil +import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils import com.arpa.mylibrary.utils.PickerUtils import com.arpa.mylibrary.base.BaseActivity import com.arpa.mylibrary.net.CommonResponseBean @@ -49,19 +51,25 @@ class AuthQualificationActivity : BaseActivity } ivFront.setOnClickListener { - PopsUtils.getInstance().showSimSelPic(mContext) { - var data = it[0] - ossServiceUtil.asyncPutImage(data.realPath, this@AuthQualificationActivity) - ossServiceUtil.setResultCallBack { data, oldPath -> - upQuaInfo.qualificationCertificatePhotoUrl = oldPath - runOnUiThread { - ImageLoader.getInstance() - .loadRoundImage(mContext, it[0].realPath, 12, ivFront) + if (upQuaInfo.qualificationCertificatePhotoUrl.isNullOrEmpty()){ + PopsUtils.getInstance().showSimSelPic(mContext) { + var data = it[0] + ossServiceUtil.asyncPutImage(data.realPath, this@AuthQualificationActivity) + ossServiceUtil.setResultCallBack { data, oldPath -> + upQuaInfo.qualificationCertificatePhotoUrl = oldPath + binding.tvChangeFront.visibility = View.VISIBLE + runOnUiThread { + ImageLoader.getInstance() + .loadRoundImage(mContext, it[0].realPath, 12, ivFront) + } + } - } - + }else{ + CommonPopUtils.getInstance().seeBigPic(mContext,ivFront,upQuaInfo.qualificationCertificatePhotoUrl) } + + } } } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditBankCardActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditBankCardActivity.kt index 7dbc3f1..8a2b36f 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditBankCardActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditBankCardActivity.kt @@ -12,6 +12,8 @@ import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack import com.arpa.hndahesudintocctmsdriver.oss.OssServiceUtil import com.arpa.hndahesudintocctmsdriver.utils.UserUtils import com.arpa.glex.bean.UserDetail +import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils +import com.arpa.hndahesudintocctmsdriver.utils.OcrUtils import com.arpa.mylibrary.base.BaseActivity import com.arpa.mylibrary.net.CommonResponseBean import com.arpa.mylibrary.utils.ActivityUtils @@ -45,6 +47,14 @@ class EditBankCardActivity : BaseActivity() { subMit() } ivFront.setOnClickListener { + if (!perInfoBean.driverBankcardPhotoUrl.isNullOrEmpty()) + CommonPopUtils.getInstance().seeBigPic( + mContext, + binding.ivFront, + perInfoBean.driverBankcardPhotoUrl + ) + } + tvChangeFront.setOnClickListener { selBankPic() } } @@ -63,9 +73,11 @@ class EditBankCardActivity : BaseActivity() { if (isOnlyShow) { tvBankName.isEnabled = false etId.isEnabled = false - ivFront.isEnabled = false + llOk.visibility = View.GONE +// ivFront.isEnabled = false } - + tvChangeFront.visibility = + if (perInfoBean.driverBankcardPhotoUrl.isNullOrEmpty() || isOnlyShow) View.GONE else View.VISIBLE etId.setText(perInfoBean.driverBankcardNumber) tvBankName.setText(perInfoBean.driverBankcardAddress) ImageLoader.getInstance() @@ -82,6 +94,7 @@ class EditBankCardActivity : BaseActivity() { private fun selBankPic() { + PopsUtils.getInstance().showSimSelPic(mContext) { it -> var data1 = it[0] ossServiceUtil.asyncPutImage(data1.realPath, this@EditBankCardActivity) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditQualificationActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditQualificationActivity.kt index 37d1e5f..a5386c5 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditQualificationActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditQualificationActivity.kt @@ -1,6 +1,7 @@ package com.arpa.hndahesudintocctmsdriver.ui.account.authperson import android.os.Bundle +import android.view.View import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.base.AppConfig import com.arpa.hndahesudintocctmsdriver.databinding.ActivityAuthQualificationBinding @@ -10,6 +11,7 @@ import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack import com.arpa.hndahesudintocctmsdriver.utils.OcrUtils import com.arpa.hndahesudintocctmsdriver.utils.UserUtils import com.arpa.glex.bean.UserDetail +import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils import com.arpa.mylibrary.utils.PickerUtils import com.arpa.mylibrary.base.BaseActivity import com.arpa.mylibrary.net.CommonResponseBean @@ -29,7 +31,7 @@ class EditQualificationActivity : BaseActivity var upQuaInfo = UserDetail() override fun initView(savedInstanceState: Bundle?) { setStatusBarColor(R.color.white) - setTitleBar("实名认证"){ + setTitleBar("实名认证") { setResult(RESULT_OK) finish() } @@ -52,6 +54,15 @@ class EditQualificationActivity : BaseActivity } ivFront.setOnClickListener { + if (!upQuaInfo.qualificationCertificatePhotoUrl.isNullOrEmpty()) + CommonPopUtils.getInstance().seeBigPic( + mContext, + binding.ivFront, + upQuaInfo.qualificationCertificatePhotoUrl + ) + } + + tvChangeFront.setOnClickListener { OcrUtils.getInstance() .noOcrUpPic(mContext, this@EditQualificationActivity) { picPath, _ -> ImageLoader.getInstance() @@ -74,13 +85,15 @@ class EditQualificationActivity : BaseActivity var isOnlyShow = intent.extras?.getBoolean(AppConfig.IS_ONLY_SHOW, false) == true if (isOnlyShow) { + llOk.visibility = View.GONE tvDate.isEnabled = false etId.isEnabled = false - ivFront.isEnabled = false +// ivFront.isEnabled = false } tvDate.text = upQuaInfo.qualificationCertificateEffectiveEnd // etId.setText(if (upQuaInfo.qualificationCertificateNo.isNullOrEmpty()) SPUtils.instance.getUserInfo(mContext).idcard else upQuaInfo.qualificationCertificateNo) - + tvChangeFront.visibility = + if (upQuaInfo.qualificationCertificatePhotoUrl.isNullOrEmpty() || isOnlyShow) View.GONE else View.VISIBLE ImageLoader.getInstance() .loadRoundImage( mContext, @@ -114,7 +127,7 @@ class EditQualificationActivity : BaseActivity showToast("修改成功") val goNextPersonInfo = UserUtils.instance.goNextPersonInfo(upQuaInfo) if (goNextPersonInfo != null) { - ActivityUtils.startActivity(mContext,goNextPersonInfo) + ActivityUtils.startActivity(mContext, goNextPersonInfo) } setResult(RESULT_OK) finish() @@ -122,6 +135,7 @@ class EditQualificationActivity : BaseActivity })) } } + override fun onBackPressed() { super.onBackPressed() setResult(RESULT_OK) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt index 8ca4dd7..3ee1059 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.kt @@ -30,6 +30,8 @@ import com.arpa.glex.bean.OrderBean import com.arpa.glex.bean.UserBean import com.arpa.glex.bean.UserDetail import com.arpa.hndahesudintocctmsdriver.bean.MyJtt +import com.arpa.hndahesudintocctmsdriver.ui.account.authperson.AuthPartyActivity +import com.arpa.hndahesudintocctmsdriver.ui.home.activity.MessageActivity import com.arpa.hndahesudintocctmsdriver.utils.GDLocationUtils import com.arpa.mylibrary.base.BaseFragment import com.arpa.mylibrary.callback.RefreshCallBack @@ -56,7 +58,7 @@ class HomeFragment : BaseFragment(), RefreshCallBack { GridBean("司机之家", R.drawable.home_driver), GridBean("咨询客服", R.drawable.home_ask), GridBean("问卷调查", R.drawable.home_que), - GridBean("知识竞赛", R.drawable.home_know), + GridBean("党员认证", R.drawable.home_part), ) override fun onFragmentVisibleChange(isVisible: Boolean) { @@ -122,13 +124,15 @@ class HomeFragment : BaseFragment(), RefreshCallBack { } 3 -> { - ActivityUtils.startActivity( - mContext, - WebActivity::class.java, - Bundle().apply { - putString("url", "https://ks.wjx.top/vm/h6Jqu8A.aspx") - putString("title", gridDatas[i].title) - }) + ActivityUtils.startActivity(mContext, AuthPartyActivity::class.java) + +// ActivityUtils.startActivity( +// mContext, +// WebActivity::class.java, +// Bundle().apply { +// putString("url", "https://ks.wjx.top/vm/h6Jqu8A.aspx") +// putString("title", gridDatas[i].title) +// }) } } } @@ -144,6 +148,10 @@ class HomeFragment : BaseFragment(), RefreshCallBack { showToast("敬请期待") } + llMessage.setOnClickListener { + ActivityUtils.startActivity(mContext,MessageActivity::class.java) + } + // llNotic.setOnClickListener { // val userInfo = SPUtils.instance.getUserInfo(mContext) // if (userInfo?.isCarCaptain == "1") {//是否是车队长（0=否,1=是,9=未选择） diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/activity/BusinessActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/activity/BusinessActivity.kt index c065922..3fc31c3 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/activity/BusinessActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/activity/BusinessActivity.kt @@ -29,7 +29,7 @@ import com.luck.picture.lib.utils.DensityUtil * @ClassName BusinessActivity * @Author john * @Date 2024/3/25 11:24 - * @Description TODO + * @Description 司机之家 */ class BusinessActivity : BaseActivity(), PoiSearch.OnPoiSearchListener { var listType: List = arrayListOf( diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/activity/MessageActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/activity/MessageActivity.kt new file mode 100644 index 0000000..843b7f6 --- /dev/null +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/activity/MessageActivity.kt @@ -0,0 +1,88 @@ +package com.arpa.hndahesudintocctmsdriver.ui.home.activity + +import android.graphics.Color +import android.os.Bundle +import android.widget.LinearLayout +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import com.arpa.hndahesudintocctmsdriver.R +import com.arpa.hndahesudintocctmsdriver.adapter.MessageAdapter +import com.arpa.hndahesudintocctmsdriver.bean.MessageBean +import com.arpa.hndahesudintocctmsdriver.databinding.ActivityMessageBinding +import com.arpa.hndahesudintocctmsdriver.net.BaseObserver +import com.arpa.hndahesudintocctmsdriver.net.DataManager +import com.arpa.hndahesudintocctmsdriver.net.RxHttpCallBack +import com.arpa.hndahesudintocctmsdriver.ui.HomeActivity +import com.arpa.mylibrary.base.BaseActivity +import com.arpa.mylibrary.callback.RefreshCallBack +import com.arpa.mylibrary.net.CommonResponseBean +import com.arpa.mylibrary.recycleviewswipe.RecycleViewDivider +import com.arpa.mylibrary.utils.ActivityUtils +import com.arpa.mylibrary.utils.ConvertUtils +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers +import io.reactivex.rxjava3.schedulers.Schedulers + +/** + * @ClassName MessageActivity + * @Author john + * @Date 2024/5/7 09:10 + * @Description TODO + */ +class MessageActivity : BaseActivity(), RefreshCallBack { + lateinit var adapter: MessageAdapter + override fun initView(savedInstanceState: Bundle?) { + setStatusBarColor(R.color.white) + setTitleBar("消息",true) + setRefresh(binding.refresh, this) + adapter = binding.recyclerView.run { + layoutManager = LinearLayoutManager(mContext, RecyclerView.VERTICAL, false) + addItemDecoration( + RecycleViewDivider( + LinearLayout.VERTICAL, + ConvertUtils.dp2px(16.0f), + Color.TRANSPARENT + ) + ) + adapter = MessageAdapter() + adapter as MessageAdapter + }.apply { + isStateViewEnable = true + setOnItemClickListener { _, _, position -> + DataManager.getInstance().messageRead(items[position].messageId) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { + override fun onSuccess(t: CommonResponseBean) { + super.onSuccess(t) + initDate() + } + })) + } + } + } + + override fun initDate() { + DataManager.getInstance().messageList() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(BaseObserver(mContext, object : RxHttpCallBack>() { + override fun onSuccess(t: CommonResponseBean>) { + super.onSuccess(t) + if (t.data == null || t.data.size == 0) { + adapter.submitList(null) + adapter.setStateViewLayout(mContext, R.layout.empty_view) + } else { + adapter.submitList(t.data) + } + setFinishRefresh( + binding.refresh, + t.total > mRefreshPage * mRefreshCount + ) + } + })) + } + + override fun getRefreshDate(stat: Int, page: Int, count: Int) { + initDate() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/MineFragment.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/MineFragment.kt index 33514b9..2cbb0c1 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/MineFragment.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/MineFragment.kt @@ -1,8 +1,12 @@ package com.arpa.hndahesudintocctmsdriver.ui.mine +import android.graphics.Color import android.os.Bundle import android.view.View +import android.widget.LinearLayout import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.adapter.GridItemAdapter import com.arpa.hndahesudintocctmsdriver.base.AppConfig @@ -33,11 +37,19 @@ import com.arpa.glex.bean.CardInfo import com.arpa.glex.bean.UserBean import com.arpa.glex.bean.UserDetail import com.arpa.glex.bean.WalletInfo +import com.arpa.hndahesudintocctmsdriver.adapter.CarsAdapter +import com.arpa.hndahesudintocctmsdriver.adapter.MineCarsAdapter +import com.arpa.hndahesudintocctmsdriver.bean.CarBean +import com.arpa.hndahesudintocctmsdriver.ui.account.authperson.AuthDrivingActivity +import com.arpa.hndahesudintocctmsdriver.ui.mine.activity.CarDetailActivity +import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils import com.arpa.mylibrary.base.BaseFragment import com.arpa.mylibrary.callback.RefreshCallBack import com.arpa.mylibrary.net.CommonResponseBean +import com.arpa.mylibrary.recycleviewswipe.RecycleViewDivider import com.arpa.mylibrary.utils.ActivityUtils import com.arpa.mylibrary.utils.BaseUtils +import com.arpa.mylibrary.utils.ConvertUtils import com.arpa.mylibrary.utils.ImageLoader import com.arpa.mylibrary.utils.MobileInfoUtils import com.arpa.mylibrary.utils.PhoneFormatCheckUtils @@ -46,23 +58,25 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.schedulers.Schedulers class MineFragment : BaseFragment(), View.OnClickListener, RefreshCallBack { - private val tools = mutableListOf( - GridBean("车队管理", R.drawable.car_team), - GridBean("车辆管理", R.drawable.car_manage), - GridBean("司机课堂", R.drawable.mine_class), - GridBean("评价管理", R.drawable.rate) - ) - private val plats = mutableListOf( - GridBean("平台规则", R.drawable.rules), - GridBean("常见问题", R.drawable.question), - GridBean("联系我们", R.drawable.call_us), - GridBean("意见反馈", R.drawable.opin), - GridBean("红色方向盘", R.drawable.part_dir), - GridBean("检查更新", R.drawable.update), - GridBean("关于我们", R.drawable.about), - GridBean("设置", R.drawable.setting) - ) + lateinit var carAdapter: MineCarsAdapter +// private val tools = mutableListOf( +// GridBean("车队管理", R.drawable.car_team), +// GridBean("车辆管理", R.drawable.car_manage), +// GridBean("司机课堂", R.drawable.mine_class), +// GridBean("评价管理", R.drawable.rate) +// ) +// +// private val plats = mutableListOf( +// GridBean("平台规则", R.drawable.rules), +// GridBean("常见问题", R.drawable.question), +// GridBean("联系我们", R.drawable.call_us), +// GridBean("意见反馈", R.drawable.opin), +// GridBean("红色方向盘", R.drawable.part_dir), +// GridBean("检查更新", R.drawable.update), +// GridBean("关于我们", R.drawable.about), +// GridBean("设置", R.drawable.setting) +// ) override fun onFragmentVisibleChange(isVisible: Boolean) { if (isVisible) { @@ -78,19 +92,19 @@ class MineFragment : BaseFragment(), View.OnClickListener, binding.run { //初始化常用工具 - gvTools.run { - adapter = GridItemAdapter(mContext, tools, R.layout.grid_mine_item) - setOnItemClickListener { _, _, i, _ -> - goTools(i) - } - } +// gvTools.run { +// adapter = GridItemAdapter(mContext, tools, R.layout.grid_mine_item) +// setOnItemClickListener { _, _, i, _ -> +// goTools(i) +// } +// } //初始化平台规则 - gvPlat.run { - adapter = GridItemAdapter(mContext, plats, R.layout.grid_mine_item) - setOnItemClickListener { _, _, i, _ -> - goPlats(i) - } - } +// gvPlat.run { +// adapter = GridItemAdapter(mContext, plats, R.layout.grid_mine_item) +// setOnItemClickListener { _, _, i, _ -> +// goPlats(i) +// } +// } rlMoney.setOnClickListener { ActivityUtils.startActivity(mContext, WalletActivity::class.java) @@ -135,6 +149,51 @@ class MineFragment : BaseFragment(), View.OnClickListener, } + llCars.setOnClickListener { + if (SPUtils.instance.getUserInfo(mContext)?.isCarCaptain == "1") {//车队长 + ActivityUtils.startActivity(mContext, CarTeamManActivity::class.java) + } else {//司机 + ActivityUtils.startActivity(mContext, DriverTeamsActivity::class.java) + } + } + + llClass.setOnClickListener { + ActivityUtils.startActivity(mContext, QuesActivity::class.java) + } + + llSetting.setOnClickListener { + ActivityUtils.startActivity(mContext, SettingActivity::class.java) + } + + + carAdapter = recycler.run { + layoutManager = LinearLayoutManager(mContext, RecyclerView.VERTICAL, false) + addItemDecoration( + RecycleViewDivider( + LinearLayout.VERTICAL, + ConvertUtils.dp2px(16.0f), + Color.TRANSPARENT + ) + ) + adapter = MineCarsAdapter() + adapter as MineCarsAdapter + }.apply { + isStateViewEnable = true + setOnItemClickListener { _, _, position -> + + ActivityUtils.startActivity( + mContext, + CarDetailActivity::class.java, + Bundle().apply { putString(AppConfig.CAR_ID, items[position].carId) }) + } + } + + tvAddCar.setOnClickListener { + ActivityUtils.startActivity(mContext, AuthDrivingActivity::class.java,Bundle().apply { + putBoolean(AppConfig.IS_GO_MINE,true) + }) + } + // llNotic.setOnClickListener { // val userInfo = SPUtils.instance.getUserInfo(mContext) // if (userInfo?.isCarCaptain == "1") {//是否是车队长（0=否,1=是,9=未选择） @@ -277,6 +336,27 @@ class MineFragment : BaseFragment(), View.OnClickListener, if (userInfo?.isCarCaptain == "1") {//是否是车队长（0=否,1=是,9=未选择） binding.llNotic.visibility = View.GONE } else { + + //司机车辆显示 + DataManager.getInstance().carList() + .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) + .subscribe( + BaseObserver(mContext, object : RxHttpCallBack>() { + override fun onSuccess(t: CommonResponseBean>) { + super.onSuccess(t) + if (t.data == null || t.data.size == 0) { + carAdapter.submitList(null) + carAdapter.setStateViewLayout(mContext, R.layout.empty_view) + } else { + carAdapter?.submitList(t.data) + } + + + } + }) + ) + + DataManager.getInstance().getDriverDocIntegrity() .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) .subscribe(BaseObserver(mContext, object : RxHttpCallBack() { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/SettingActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/SettingActivity.kt index 1620f77..25dbe64 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/SettingActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/SettingActivity.kt @@ -2,12 +2,18 @@ package com.arpa.hndahesudintocctmsdriver.ui.mine.activity import android.os.Bundle import android.view.View +import androidx.appcompat.app.AppCompatActivity import cn.jpush.android.ups.JPushUPSManager import com.arpa.hndahesudintocctmsdriver.R +import com.arpa.hndahesudintocctmsdriver.base.WebActivity import com.arpa.hndahesudintocctmsdriver.databinding.ActivitySettingBinding +import com.arpa.hndahesudintocctmsdriver.utils.AppVersionUtils import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils import com.arpa.hndahesudintocctmsdriver.utils.UserUtils import com.arpa.mylibrary.base.BaseActivity +import com.arpa.mylibrary.utils.ActivityUtils +import com.arpa.mylibrary.utils.AppUtils +import com.arpa.mylibrary.utils.BaseUtils /** * @ClassName SettingActivity @@ -22,6 +28,42 @@ class SettingActivity : BaseActivity(), View.OnClickList binding.run { rlOne.setOnClickListener(this@SettingActivity) rlTwo.setOnClickListener(this@SettingActivity) + + llRules.setOnClickListener { + ActivityUtils.startActivity(mContext, RulesActivity::class.java) + } + + llRates.setOnClickListener { + ActivityUtils.startActivity(mContext, RateManActivity::class.java) + } + + llQues.setOnClickListener { + ActivityUtils.startActivity(mContext, ComProActivity::class.java) + } + + llCallMe.setOnClickListener { + BaseUtils.callPhone(this@SettingActivity,"拨打电话","13783631930") + } + + llAbout.setOnClickListener { + ActivityUtils.startActivity(mContext, WebActivity::class.java, Bundle().apply { + putString("title", "关于我们") + putString("url", "http://www.dahehuoyun.com/index.html") + }) + } + + llFeed.setOnClickListener { + ActivityUtils.startActivity(mContext, WebActivity::class.java, Bundle().apply { + putString("title", "意见反馈") + putString("url", "https://support.qq.com/products/335639") + }) + } + + llUpdate.setOnClickListener { + AppVersionUtils.getInstance().checkVersion(mContext) + } + + tvVersion.text = """当前版本V${AppUtils.getAppVersionName()}""" } } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/CommonPopUtils.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/CommonPopUtils.kt index 7b9e652..300af7d 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/CommonPopUtils.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/CommonPopUtils.kt @@ -181,6 +181,30 @@ class CommonPopUtils private constructor() { .show() } + + /** + * 点击查看大图-单张 + * @param context Context + * @param imageView ImageView + * @param picPath String + */ + fun seeBigPic(context: Context,imageView: ImageView,picPath:String){ + XPopup.Builder(context) + .asImageViewer( + imageView, + picPath, + false, + -1, + -1, + ConvertUtils.dp2px(10F), + false, + Color.rgb(32, 36, 46), + SmartGlideImageLoader(R.mipmap.ic_launcher_round), + null + ) + .show() + } + /** * app版本检查 * @param context Context diff --git a/app/src/main/res/drawable-xxhdpi/home_part.png b/app/src/main/res/drawable-xxhdpi/home_part.png new file mode 100644 index 0000000000000000000000000000000000000000..a2df40b23358ab3ca87f02d2e3d63ec30cd616ea GIT binary patch literal 5076 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 - - + > + + + + + + + @@ -153,6 +173,7 @@ android:background="@color/white"> - - + android:layout_marginBottom="@dimen/dp_22"> + + + + + + + @@ -150,6 +169,7 @@ android:background="@color/white"> + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index aeffcda..350125c 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -1,97 +1,334 @@ - + android:layout_height="match_parent"> + android:layout_height="match_parent" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + android:layout_marginTop="@dimen/dp_20" + android:layout_marginBottom="@dimen/dp_20" + android:gravity="center" + android:text="ICP备案号:豫ICP备09025418号-24A" /> - + - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 095cf75..13ccafc 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -44,6 +44,7 @@ android:background="@color/white"> + + + + + + + + - - - - + + + + + + android:layout_marginLeft="@dimen/dp_16" + android:layout_marginRight="@dimen/dp_16" + android:background="@color/color_c" /> + + + + + + + + + + + - + + + + + diff --git a/app/src/main/res/layout/item_cars_mine.xml b/app/src/main/res/layout/item_cars_mine.xml new file mode 100644 index 0000000..c0783b7 --- /dev/null +++ b/app/src/main/res/layout/item_cars_mine.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file