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 0000000..a2df40b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/home_part.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_message.png b/app/src/main/res/drawable-xxhdpi/icon_message.png new file mode 100644 index 0000000..7dc84f8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_message.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_mine_cars.png b/app/src/main/res/drawable-xxhdpi/icon_mine_cars.png new file mode 100644 index 0000000..a612cb7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_mine_cars.png differ diff --git a/app/src/main/res/layout/activity_auth_bankcard.xml b/app/src/main/res/layout/activity_auth_bankcard.xml index 275908d..f574b29 100644 --- a/app/src/main/res/layout/activity_auth_bankcard.xml +++ b/app/src/main/res/layout/activity_auth_bankcard.xml @@ -50,15 +50,35 @@ android:textColor="@color/black" android:textSize="@dimen/sp_16"> - - + > + + + + + + + @@ -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