From b386de74c74a4431b2b735eb77c383b71b3ee5b2 Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期五, 31 七月 2026 14:50:06 +0800
Subject: [PATCH] 修复问题
---
app/src/main/java/com/driver/igotrip/ui/main/MainActivity.kt | 174 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 90 insertions(+), 84 deletions(-)
diff --git a/app/src/main/java/com/driver/igotrip/ui/main/MainActivity.kt b/app/src/main/java/com/driver/igotrip/ui/main/MainActivity.kt
index 4dad5f1..8afe0d7 100644
--- a/app/src/main/java/com/driver/igotrip/ui/main/MainActivity.kt
+++ b/app/src/main/java/com/driver/igotrip/ui/main/MainActivity.kt
@@ -17,14 +17,12 @@
import android.widget.Toast
import cn.sinata.rxnetty.NettyClient
import cn.sinata.xldutils.utils.SPUtils
-import cn.sinata.xldutils.utils.Utils
import cn.sinata.xldutils.utils.clickDelay
import cn.sinata.xldutils.utils.doubleOne
import cn.sinata.xldutils.utils.getVersionName
import cn.sinata.xldutils.utils.gone
import cn.sinata.xldutils.utils.setDrawableLeft
import cn.sinata.xldutils.utils.textColor
-import com.driver.igotrip.BuildConfig
import com.driver.igotrip.R
import com.driver.igotrip.base.BaseEvent
import com.driver.igotrip.base.Const
@@ -79,8 +77,8 @@
}
var homeDataBean: HomeDataBean? = null
- /* var navigator: Navigator? = null
- var vehicleReporter: RidesharingVehicleReporter? = null*/
+ /* var navigator: Navigator? = null
+ var vehicleReporter: RidesharingVehicleReporter? = null*/
private val MSG_REFRESH_LOCATIAON = 1
@@ -121,21 +119,21 @@
override fun setContentView() {
setContentView(R.layout.activity_main)
- /* lifecycleScope.launch {
- while (true){
- delay(5000)
- var map = getMapByAny()
- callNet(false,getDriverOrderMessage, map) {
- Log.e("长连接接口消息: ",it.toString() )
- }
- }
- }*/
+ /* lifecycleScope.launch {
+ while (true){
+ delay(5000)
+ var map = getMapByAny()
+ callNet(false,getDriverOrderMessage, map) {
+ Log.e("长连接接口消息: ",it.toString() )
+ }
+ }
+ }*/
}
override fun initView() {
- // setTitleText(getString(R.string.IGO司机))
+ // setTitleText(getString(R.string.IGO司机))
tv_Left.setDrawableLeft(R.mipmap.icon_nav_user)
- // iv_right_title.setImageResource(R.mipmap.icon_nav_news)
+ // iv_right_title.setImageResource(R.mipmap.icon_nav_news)
findViewById<View>(R.id.img_leftuser).setOnClickListener {
startActivity<MineActivity>()
@@ -155,7 +153,7 @@
// showOrder("","12634","1",10,1)
}
- // initDriver()
+ // initDriver()
MyApplication.isLogin = true
beOnDuty(false)
initCall()
@@ -186,41 +184,41 @@
/**
* 初始化司机sdk
*/
- /* private fun initDriver() {
- if (CacheKey.getKeyStr("vehicleId").isNullOrEmpty())
- return
- NavigationApi.getNavigator(
- this, // Activity
- object : NavigationApi.NavigatorListener {
- override fun onError(p0: Int) {
- Log.e(Const.GoogleDriver.TAG, "初始化司机sdk失败$p0")
- }
+ /* private fun initDriver() {
+ if (CacheKey.getKeyStr("vehicleId").isNullOrEmpty())
+ return
+ NavigationApi.getNavigator(
+ this, // Activity
+ object : NavigationApi.NavigatorListener {
+ override fun onError(p0: Int) {
+ Log.e(Const.GoogleDriver.TAG, "初始化司机sdk失败$p0")
+ }
- override fun onNavigatorReady(navigator: Navigator) {
- // Keep a reference to the Navigator (used to configure and start nav)
- this@MainActivity.navigator = navigator
- Log.e(Const.GoogleDriver.TAG, "初始化司机sdk成功")
- val driverContext =
- DriverContext.builder(application)
- //.setProviderId("i-go-odrd-testing")
- .setProviderId("gopost-475301")
- .setVehicleId(CacheKey.getKeyStr("vehicleId"))
- .setAuthTokenFactory(JsonAuthTokenFactory())
- .setNavigator(navigator)
- .setRoadSnappedLocationProvider(
- NavigationApi.getRoadSnappedLocationProvider(
- application
- )
- )
- .setDriverStatusListener(this@MainActivity)
- .build()
- val ridesharingDriverApi = RidesharingDriverApi.createInstance(driverContext)
- vehicleReporter = ridesharingDriverApi.ridesharingVehicleReporter
- vehicleReporter!!.enableLocationTracking()
- }
- }
- )
- }*/
+ override fun onNavigatorReady(navigator: Navigator) {
+ // Keep a reference to the Navigator (used to configure and start nav)
+ this@MainActivity.navigator = navigator
+ Log.e(Const.GoogleDriver.TAG, "初始化司机sdk成功")
+ val driverContext =
+ DriverContext.builder(application)
+ //.setProviderId("i-go-odrd-testing")
+ .setProviderId("gopost-475301")
+ .setVehicleId(CacheKey.getKeyStr("vehicleId"))
+ .setAuthTokenFactory(JsonAuthTokenFactory())
+ .setNavigator(navigator)
+ .setRoadSnappedLocationProvider(
+ NavigationApi.getRoadSnappedLocationProvider(
+ application
+ )
+ )
+ .setDriverStatusListener(this@MainActivity)
+ .build()
+ val ridesharingDriverApi = RidesharingDriverApi.createInstance(driverContext)
+ vehicleReporter = ridesharingDriverApi.ridesharingVehicleReporter
+ vehicleReporter!!.enableLocationTracking()
+ }
+ }
+ )
+ }*/
override fun onRestart() {
super.onRestart()
@@ -283,7 +281,7 @@
}
}
- var qeeOrderView = object : MyApplication.OrderStatueView {
+ private var qeeOrderView = object : MyApplication.OrderStatueView {
override fun orderInfo(data: OrderSimpleData?) {
data?.let {
when (it.orderType) {
@@ -303,7 +301,8 @@
private fun checkGps() {
if (!AMapKit.isLocServiceEnable(this)) {
- DialogUtil.getDelAndSureDialog(this,
+ DialogUtil.getDelAndSureDialog(
+ this,
getString(R.string.查看定位),
getString(R.string.退出),
getString(
@@ -461,8 +460,8 @@
fun beOnDuty(b: Boolean) {
if (b) {
- // avv_anim.visible()
- // tv_up_avv.visible()
+ // avv_anim.visible()
+ // tv_up_avv.visible()
} else {
avv_anim.gone()
tv_up_avv.gone()
@@ -568,7 +567,7 @@
clickCallOrder()
}
- private fun clickCallOrder(){
+ private fun clickCallOrder() {
tv_car.clickDelay {
if (homeDataBean?.data?.work == 1) {
callNet(Api.work, getMapByAny()) {
@@ -689,33 +688,39 @@
it.find<TextView>(R.id.tv_hint_base).text = warn
}
}
+
private fun showPayDialog() {
val l = SPUtils.getString(Const.language)
- val pay:String
- val off:String
- val msg:String
- val warn:String
- when(l){
- Const.Language.FRENCH->{
+ val pay: String
+ val off: String
+ val msg: String
+ val warn: String
+ when (l) {
+ Const.Language.FRENCH -> {
pay = "Payer"
off = "Fermer"
warn = "Rappel"
- msg = "Vous avez des frais de règlement en attente de paiement, vous ne pouvez recevoir des commandes qu’après paiement, veuillez payer dès que possible"
+ msg =
+ "Vous avez des frais de règlement en attente de paiement, vous ne pouvez recevoir des commandes qu’après paiement, veuillez payer dès que possible"
}
- Const.Language.CHINESE,"zh"->{
+
+ Const.Language.CHINESE, "zh" -> {
pay = "支付"
off = "关闭"
warn = "提示"
msg = "您有一笔结算费待支付，须支付后才能接单，请尽快支付"
}
- else->{
+
+ else -> {
pay = "Pay"
off = "Close"
warn = "Reminder"
- msg = "You have a settlement fee pending payment, you can only receive orders after payment, please pay as soon as possible"
+ msg =
+ "You have a settlement fee pending payment, you can only receive orders after payment, please pay as soon as possible"
}
}
- val delAndSureDialog = getDelAndSureDialog(this,
+ val delAndSureDialog = getDelAndSureDialog(
+ this,
pay,
off,
msg,
@@ -746,9 +751,9 @@
when (event!!.code) {
BaseEvent.START_CAR -> {
beOnDuty(true)
- /* if (vehicleReporter == null) {
- initDriver()
- }*/
+ /* if (vehicleReporter == null) {
+ initDriver()
+ }*/
initCall()
}
@@ -767,8 +772,8 @@
BaseEvent.OFF_LINE -> {
Thread() {
try {
- /* vehicleReporter?.disableLocationTracking()
- RidesharingDriverApi.clearInstance()*/
+ /* vehicleReporter?.disableLocationTracking()
+ RidesharingDriverApi.clearInstance()*/
} catch (e: Exception) {
}
}.start()
@@ -785,20 +790,21 @@
}
- /* override fun updateStatus(
- p0: DriverContext.DriverStatusListener.StatusLevel,
- p1: DriverContext.DriverStatusListener.StatusCode,
- p2: String,
- p3: Throwable?,
- ) {
- Log.e(
- Const.GoogleDriver.TAG,
- "StatusLevel:${p0.name},StatusCode:${p1},p2:${p2},错误信息:${p3?.message}"
- )
- }
+ /* override fun updateStatus(
+ p0: DriverContext.DriverStatusListener.StatusLevel,
+ p1: DriverContext.DriverStatusListener.StatusCode,
+ p2: String,
+ p3: Throwable?,
+ ) {
+ Log.e(
+ Const.GoogleDriver.TAG,
+ "StatusLevel:${p0.name},StatusCode:${p1},p2:${p2},错误信息:${p3?.message}"
+ )
+ }
+ */
override fun onDestroy() {
super.onDestroy()
- RidesharingDriverApi.clearInstance()
- }*/
+ MyApplication.removeOrderView(qeeOrderView)
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1