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-28 10:27:03 +08:00
parent 235ef43d64
commit 80db6ec326
7 changed files with 175 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
app/src/main/java/com/arpa/hndahesudintocctmsdriver/adapter/WaybillListAdapter.kt
View File

@ -16,28 +16,35 @@ import com.arpa.mylibrary.utils.ImageLoader
* @Date 2024/1/23 16:27 * @Date 2024/1/23 16:27
* @Description TODO * @Description TODO
*/ */
class WaybillListAdapter(var isCap : Boolean) : class WaybillListAdapter(var isCap: Boolean) :
BaseQuickAdapter<OrderBean, QuickViewHolder>() { BaseQuickAdapter<OrderBean, QuickViewHolder>() {
override fun onBindViewHolder(holder: QuickViewHolder, position: Int, item: OrderBean?) { override fun onBindViewHolder(holder: QuickViewHolder, position: Int, item: OrderBean?) {
item?.let { item?.let {
holder.run { holder.run {
setText(R.id.tvWaybillId,it.orderNum) setText(R.id.tvWaybillId, it.orderNum)
setText(R.id.tvStatu,OrderUtils.getInstance().getOrderStatu(it.orderStatus)) setText(R.id.tvStatu, OrderUtils.getInstance().getOrderStatu(it.orderStatus))
setText(R.id.tvType,"""${if (it.orderType == "0") "一装一卸" else "一装多卸"}""") setText(R.id.tvType, """${if (it.orderType == "0") "一装一卸" else "一装多卸"}""")
setText(R.id.tvTime,"""${it.loadingDeadline}装货""") setText(R.id.tvTime, """${it.loadingDeadline}装货""")
setText(R.id.tvDis,"""${it.distance}km""") setText(R.id.tvDis, """${it.distance}km""")
setText(R.id.tvCarNum,it.vehicleNum) setText(R.id.tvCarNum, it.vehicleNum)
setText(R.id.tvGood,"""${it.goodItemGrossWeight}吨/${it.goodName}""") setText(R.id.tvGood, """${it.goodItemGrossWeight}吨/${it.goodName}""")
setText(R.id.tvMoney,it.driverFreight) setText(R.id.tvMoney, it.driverFreight)
setText(R.id.tvComName,it.realCompanyName) setText(R.id.tvComName, it.realCompanyName)
setText(R.id.btnOk,OrderUtils.getInstance().getNextByStatu(it.orderStatus)) setText(R.id.btnOk, OrderUtils.getInstance().getNextByStatu(it.orderStatus))
setGone(R.id.btnOk,!(it.orderStatus=="102040"||it.orderStatus=="102050"||it.orderStatus=="102070"||it.orderStatus=="102090"))
if (it.orderStatus=="102070"||it.orderStatus=="102090"){ if (isCap) {
//待结算，已完成 setGone(R.id.btnOk, true)
setGone(R.id.btnOk,it.driverEvaluationStatus=="1") } else {
if (it.orderStatus == "102040" || it.orderStatus == "102050") {
setGone(R.id.btnOk, false)
} else if (it.driverEvaluationStatus != "1" && (it.orderStatus == "102060" || it.orderStatus == "102070" || it.orderStatus == "102090")) {
//三种状态下 并且未评论为 true显示
setGone(R.id.btnOk, false)
}
} }
setGone(R.id.btnOk,isCap)
ImageLoader.getInstance() ImageLoader.getInstance()
.loadRoundImage(context, it.avatar, 6, getView<ImageView>(R.id.ivHead)) .loadRoundImage(context, it.avatar, 6, getView<ImageView>(R.id.ivHead))
@ -45,14 +52,28 @@ class WaybillListAdapter(var isCap : Boolean) :
setText( setText(
R.id.tvStart, R.id.tvStart,
"""${ """${
if (it.loadingCity.length > 1) it.loadingCity.substring(0, 2) else it.loadingCity if (it.loadingCity.length > 1) it.loadingCity.substring(
} ${if (it.loadingArea.length > 1) it.loadingArea.substring(0, 2) else it.loadingArea}""" 0,
2
) else it.loadingCity
} ${
if (it.loadingArea.length > 1) it.loadingArea.substring(
0,
2
) else it.loadingArea
}"""
) )
setText( setText(
R.id.tvEnd, """${ R.id.tvEnd, """${
if (it.receiverCity.length > 1) it.receiverCity.substring(0, 2) else it.receiverCity if (it.receiverCity.length > 1) it.receiverCity.substring(
0,
2
) else it.receiverCity
} ${ } ${
if (it.receiverArea.length > 1) it.receiverArea.substring(0, 2) else it.receiverArea if (it.receiverArea.length > 1) it.receiverArea.substring(
0,
2
) else it.receiverArea
}""" }"""
) )
} }

1
app/src/main/java/com/arpa/hndahesudintocctmsdriver/base/AppConfig.kt
View File

@ -18,6 +18,7 @@ object AppConfig {
const val CAR_ID = "DA_HE_CAR_ID" const val CAR_ID = "DA_HE_CAR_ID"
const val IS_SHOW = "DA_HE_IS_SHOW" const val IS_SHOW = "DA_HE_IS_SHOW"
const val IS_FIRST_OPEN = "DA_HE_IS_FIRST_OPEN" const val IS_FIRST_OPEN = "DA_HE_IS_FIRST_OPEN"
const val IS_BACK = "DA_HE_IS_BACK"
const val WAYBILL_ID = "DA_HE_WAYBILL_ID" const val WAYBILL_ID = "DA_HE_WAYBILL_ID"
const val CHILDRE_ID = "DA_HE_CHILDRE_ID" const val CHILDRE_ID = "DA_HE_CHILDRE_ID"
const val RATE_TYPE = "DA_HE_RATE_TYPE"//0:收到的评价 1:发表的评价 const val RATE_TYPE = "DA_HE_RATE_TYPE"//0:收到的评价 1:发表的评价

15
app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/PushBean.kt Normal file
View File

@ -0,0 +1,15 @@
package com.arpa.hndahesudintocctmsdriver.bean
/**
* @ClassName PushBean
* @Author john
* @Date 2024/4/28 09:34
* @Description TODO
*/
data class PushBean(
val orderId: String,
val carId: String,
val orderNum: String,
val messageType: String,
val orderStatus: String
)

184
app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/PushMessageService.kt
View File

@ -1,31 +1,70 @@
package com.arpa.hndahesudintocctmsdriver.push; package com.arpa.hndahesudintocctmsdriver.push
import android.content.Context; import android.content.Context
import android.content.Intent; import android.content.Intent
import android.util.Log; import android.os.Bundle
import android.util.Log
import cn.jpush.android.api.CmdMessage
import cn.jpush.android.api.CustomMessage
import cn.jpush.android.api.JPushInterface
import cn.jpush.android.api.JPushMessage
import cn.jpush.android.api.NotificationMessage
import cn.jpush.android.service.JPushMessageService
import com.arpa.hndahesudintocctmsdriver.base.AppConfig
import com.arpa.hndahesudintocctmsdriver.bean.PushBean
import com.arpa.hndahesudintocctmsdriver.ui.mine.activity.CarDetailActivity
import com.arpa.hndahesudintocctmsdriver.ui.waybill.activity.WaybillDetailActivity
import com.arpa.hndahesudintocctmsdriver.ui.waybill.activity.WaybillUnlLoadActivity
import com.arpa.mylibrary.utils.ActivityUtils
import com.google.gson.Gson
import cn.jpush.android.api.CmdMessage; class PushMessageService : JPushMessageService() {
import cn.jpush.android.api.CustomMessage; override fun onMessage(context: Context, customMessage: CustomMessage) {
import cn.jpush.android.api.JPushInterface; Log.e(TAG, "[onMessage] $customMessage")
import cn.jpush.android.api.JPushMessage; val intent = Intent("com.jiguang.demo.message")
import cn.jpush.android.api.NotificationMessage; intent.putExtra("msg", customMessage.message)
import cn.jpush.android.service.JPushMessageService; context.sendBroadcast(intent)
public class PushMessageService extends JPushMessageService {
private static final String TAG = "PushMessageService";
@Override
public void onMessage(Context context, CustomMessage customMessage) {
Log.e(TAG, "[onMessage] " + customMessage);
Intent intent = new Intent("com.jiguang.demo.message");
intent.putExtra("msg", customMessage.message);
context.sendBroadcast(intent);
} }
@Override override fun onNotifyMessageOpened(context: Context, message: NotificationMessage) {
public void onNotifyMessageOpened(Context context, NotificationMessage message) { Log.e(TAG, "[onNotifyMessageOpened] $message")
Log.e(TAG, "[onNotifyMessageOpened] " + message); val pushBean = Gson().fromJson(
try{ message.notificationExtras,
PushBean::class.java
)
println("fasdf")
try {
when (pushBean.messageType) {
"100" -> {
if (pushBean.orderStatus=="102030"){
//接单类型
val intent = Intent(context, WaybillDetailActivity::class.java)
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
intent.putExtras(Bundle().apply { putString(AppConfig.ORDER_ID, pushBean.orderId) })
context.startActivity(intent)
}else if (pushBean.orderStatus=="102050"){//卸货类型
val intent = Intent(context, WaybillUnlLoadActivity::class.java)
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
intent.putExtras(Bundle().apply { putString(AppConfig.ORDER_ID, pushBean.orderId) })
context.startActivity(intent)
}
}
"110" -> {
//系统通知
}
"120" -> {
//证件到期
val intent = Intent(context, CarDetailActivity::class.java)
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
intent.putExtras(Bundle().apply { putString(AppConfig.CAR_ID, pushBean.carId) })
context.startActivity(intent)
}
}
//打开自定义的Activity //打开自定义的Activity
// Intent i = new Intent(context, TestActivity.class); // Intent i = new Intent(context, TestActivity.class);
// Bundle bundle = new Bundle(); // Bundle bundle = new Bundle();
@ -34,88 +73,79 @@ public class PushMessageService extends JPushMessageService {
// i.putExtras(bundle); // i.putExtras(bundle);
// i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP ); // i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP );
// context.startActivity(i); // context.startActivity(i);
}catch (Throwable throwable){ } catch (throwable: Throwable) {
} }
} }
@Override override fun onMultiActionClicked(context: Context, intent: Intent) {
public void onMultiActionClicked(Context context, Intent intent) { Log.e(TAG, "[onMultiActionClicked] 用户点击了通知栏按钮")
Log.e(TAG, "[onMultiActionClicked] 用户点击了通知栏按钮"); val nActionExtra = intent.extras!!.getString(JPushInterface.EXTRA_NOTIFICATION_ACTION_EXTRA)
String nActionExtra = intent.getExtras().getString(JPushInterface.EXTRA_NOTIFICATION_ACTION_EXTRA);
//开发者根据不同 Action 携带的 extra 字段来分配不同的动作。 //开发者根据不同 Action 携带的 extra 字段来分配不同的动作。
if (nActionExtra == null) { if (nActionExtra == null) {
Log.d(TAG, "ACTION_NOTIFICATION_CLICK_ACTION nActionExtra is null"); Log.d(TAG, "ACTION_NOTIFICATION_CLICK_ACTION nActionExtra is null")
return; return
} }
if (nActionExtra.equals("my_extra1")) { if (nActionExtra == "my_extra1") {
Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮一"); Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮一")
} else if (nActionExtra.equals("my_extra2")) { } else if (nActionExtra == "my_extra2") {
Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮二"); Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮二")
} else if (nActionExtra.equals("my_extra3")) { } else if (nActionExtra == "my_extra3") {
Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮三"); Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮三")
} else { } else {
Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮未定义"); Log.e(TAG, "[onMultiActionClicked] 用户点击通知栏按钮未定义")
} }
} }
@Override override fun onNotifyMessageArrived(context: Context, message: NotificationMessage) {
public void onNotifyMessageArrived(Context context, NotificationMessage message) { Log.e(TAG, "[onNotifyMessageArrived] $message")
Log.e(TAG, "[onNotifyMessageArrived] " + message);
} }
@Override override fun onNotifyMessageDismiss(context: Context, message: NotificationMessage) {
public void onNotifyMessageDismiss(Context context, NotificationMessage message) { Log.e(TAG, "[onNotifyMessageDismiss] $message")
Log.e(TAG, "[onNotifyMessageDismiss] " + message);
} }
@Override override fun onRegister(context: Context, registrationId: String) {
public void onRegister(Context context, String registrationId) { Log.e(TAG, "[onRegister] $registrationId")
Log.e(TAG, "[onRegister] " + registrationId); val intent = Intent("com.jiguang.demo.message")
Intent intent = new Intent("com.jiguang.demo.message"); intent.putExtra("rid", registrationId)
intent.putExtra("rid", registrationId); context.sendBroadcast(intent)
context.sendBroadcast(intent);
} }
@Override override fun onConnected(context: Context, isConnected: Boolean) {
public void onConnected(Context context, boolean isConnected) { Log.e(TAG, "[onConnected] $isConnected")
Log.e(TAG, "[onConnected] " + isConnected);
} }
@Override override fun onCommandResult(context: Context, cmdMessage: CmdMessage) {
public void onCommandResult(Context context, CmdMessage cmdMessage) { Log.e(TAG, "[onCommandResult] $cmdMessage")
Log.e(TAG, "[onCommandResult] " + cmdMessage);
} }
@Override override fun onTagOperatorResult(context: Context, jPushMessage: JPushMessage) {
public void onTagOperatorResult(Context context, JPushMessage jPushMessage) { TagAliasOperatorHelper.getInstance().onTagOperatorResult(context, jPushMessage)
TagAliasOperatorHelper.getInstance().onTagOperatorResult(context,jPushMessage); super.onTagOperatorResult(context, jPushMessage)
super.onTagOperatorResult(context, jPushMessage);
} }
@Override override fun onCheckTagOperatorResult(context: Context, jPushMessage: JPushMessage) {
public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage) { TagAliasOperatorHelper.getInstance().onCheckTagOperatorResult(context, jPushMessage)
TagAliasOperatorHelper.getInstance().onCheckTagOperatorResult(context,jPushMessage); super.onCheckTagOperatorResult(context, jPushMessage)
super.onCheckTagOperatorResult(context, jPushMessage);
} }
@Override override fun onAliasOperatorResult(context: Context, jPushMessage: JPushMessage) {
public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) { TagAliasOperatorHelper.getInstance().onAliasOperatorResult(context, jPushMessage)
TagAliasOperatorHelper.getInstance().onAliasOperatorResult(context,jPushMessage); super.onAliasOperatorResult(context, jPushMessage)
super.onAliasOperatorResult(context, jPushMessage);
} }
@Override override fun onMobileNumberOperatorResult(context: Context, jPushMessage: JPushMessage) {
public void onMobileNumberOperatorResult(Context context, JPushMessage jPushMessage) { TagAliasOperatorHelper.getInstance().onMobileNumberOperatorResult(context, jPushMessage)
TagAliasOperatorHelper.getInstance().onMobileNumberOperatorResult(context,jPushMessage); super.onMobileNumberOperatorResult(context, jPushMessage)
super.onMobileNumberOperatorResult(context, jPushMessage);
} }
@Override override fun onNotificationSettingsCheck(context: Context, isOn: Boolean, source: Int) {
public void onNotificationSettingsCheck(Context context, boolean isOn, int source) { super.onNotificationSettingsCheck(context, isOn, source)
super.onNotificationSettingsCheck(context, isOn, source); Log.e(TAG, "[onNotificationSettingsCheck] isOn:$isOn,source:$source")
Log.e(TAG, "[onNotificationSettingsCheck] isOn:" + isOn + ",source:" + source);
} }
companion object {
private const val TAG = "PushMessageService"
}
} }

10
app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/authperson/EditBankCardActivity.kt
View File

@ -33,7 +33,7 @@ class EditBankCardActivity : BaseActivity<ActivityAuthBankcardBinding>() {
var perInfoBean: UserDetail = UserDetail() var perInfoBean: UserDetail = UserDetail()
override fun initView(savedInstanceState: Bundle?) { override fun initView(savedInstanceState: Bundle?) {
setStatusBarColor(R.color.white) setStatusBarColor(R.color.white)
setTitleBar("更换银行卡"){ setTitleBar("更换银行卡") {
setResult(RESULT_OK) setResult(RESULT_OK)
finish() finish()
} }
@ -134,10 +134,16 @@ class EditBankCardActivity : BaseActivity<ActivityAuthBankcardBinding>() {
.subscribe(BaseObserver(mContext, object : RxHttpCallBack<Any>() { .subscribe(BaseObserver(mContext, object : RxHttpCallBack<Any>() {
override fun onSuccess(t: CommonResponseBean<Any>) { override fun onSuccess(t: CommonResponseBean<Any>) {
super.onSuccess(t) super.onSuccess(t)
val isBack = intent.extras?.getBoolean(AppConfig.IS_BACK, false)
if (isBack == true) {
setResult(RESULT_OK)
finish()
return
}
showToast("修改成功") showToast("修改成功")
val goNextPersonInfo = UserUtils.instance.goNextPersonInfo(perInfoBean) val goNextPersonInfo = UserUtils.instance.goNextPersonInfo(perInfoBean)
if (goNextPersonInfo != null) { if (goNextPersonInfo != null) {
ActivityUtils.startActivity(mContext,goNextPersonInfo) ActivityUtils.startActivity(mContext, goNextPersonInfo)
} }
setResult(RESULT_OK) setResult(RESULT_OK)
finish() finish()

3
app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/mine/activity/WalletActivity.kt
View File

@ -16,6 +16,7 @@ import com.arpa.hndahesudintocctmsdriver.utils.CommonPopUtils
import com.arpa.glex.bean.UserDetail import com.arpa.glex.bean.UserDetail
import com.arpa.glex.bean.WalletInfo import com.arpa.glex.bean.WalletInfo
import com.arpa.glex.bean.WaterInfo import com.arpa.glex.bean.WaterInfo
import com.arpa.hndahesudintocctmsdriver.base.AppConfig
import com.arpa.mylibrary.base.BaseActivity import com.arpa.mylibrary.base.BaseActivity
import com.arpa.mylibrary.callback.RefreshCallBack import com.arpa.mylibrary.callback.RefreshCallBack
import com.arpa.mylibrary.net.CommonResponseBean import com.arpa.mylibrary.net.CommonResponseBean
@ -42,7 +43,7 @@ class WalletActivity : BaseActivity<ActivityWalletBinding>(), RefreshCallBack {
binding.run { binding.run {
setRefresh(refresh, this@WalletActivity) setRefresh(refresh, this@WalletActivity)
tvLeft.setOnClickListener { tvLeft.setOnClickListener {
ActivityUtils.startActivity(mContext, EditBankCardActivity::class.java) ActivityUtils.startActivity(mContext, EditBankCardActivity::class.java,Bundle().apply { putBoolean(AppConfig.IS_BACK,true) })
} }
tvRight.setOnClickListener { tvRight.setOnClickListener {
getCurrBank() getCurrBank()

4
app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/waybill/activity/WaybillRateActivity.kt
View File

@ -61,9 +61,7 @@ class WaybillRateActivity : BaseActivity<ActivityWaybillRateBinding>() {
private fun subMint() { private fun subMint() {
var orderID = intent.extras?.getString(AppConfig.ORDER_ID,"") var orderID = intent.extras?.getString(AppConfig.ORDER_ID,"")
if (upRate.opinionsStarRating.isNullOrEmpty() || if (upRate.opinionsStarRating.isNullOrEmpty() ||
binding.etContent.text.isNullOrEmpty() || orderID.isNullOrEmpty()
orderID.isNullOrEmpty() ||
upRate.resourcesList.size == 0
) { ) {
showToast("请完善信息") showToast("请完善信息")
return return