From bd6a8872438a35d47821c5d5da7fe149e5fed3ab Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期三, 21 六月 2023 09:53:36 +0800
Subject: [PATCH] 处理收不到广播
---
app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt | 67 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 21 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt b/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
index 677545c..433350c 100644
--- a/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
+++ b/app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt
@@ -215,7 +215,11 @@
moveCamera(aMap, carMarker!!.position)
}
5, 6 -> {
- moveCamera(aMap, carMarker!!.position, endMarker!!.position)
+ if (endMarker == null){
+ moveCamera(aMap, carMarker!!.position)
+ }else{
+ moveCamera(aMap, carMarker!!.position, endMarker!!.position)
+ }
}
}
}
@@ -232,11 +236,18 @@
}
5, 6 -> {
-// startAMapNavi(endMarker!!)
- startActivity<GPSNaviActivity>(
- "start" to carMarker!!.position,
- "end" to endMarker!!.position
- )
+ if (endMarker == null){
+ toast("暂无终点")
+ }else{
+ startActivity<GPSNaviActivity>(
+ "start" to carMarker!!.position,
+ "end" to endMarker!!.position
+ )
+ }
+
+ }
+ else -> {
+
}
}
}
@@ -366,8 +377,11 @@
private fun initMineLocation() {
AMapKit.initLocation(this, AMapLocationListener {
it?.let {
- MyApplication.aMapLocation = it
- carMarker!!.position = LatLng(it.latitude, it.longitude)
+// toast("errorCode=="+it.errorCode.toString()+"latitude=="+it.latitude.toString())
+ if (it.errorCode == 0) {
+ MyApplication.aMapLocation = it
+ carMarker!!.position = LatLng(it.latitude, it.longitude)
+ }
}
orderBean.let {
when (it.data.orderState) {
@@ -417,7 +431,19 @@
}
}
})
+ }else{
+ var view =
+ creatCarView()
+ carMarker?.setIcon(getIcon(view))
+ if (isMove) {
+ moveCamera(aMap, carMarker!!.position)
+ }
}
+ }
+
+ fun creatNullView(): View {
+ val carView = createView(R.layout.view_no, this)
+ return carView
}
@@ -429,6 +455,7 @@
map["orderType"] = orderType
callNet(this, Api.queryOrderInfo, map) {
orderBean = gson.fromJson(it, OrderBean::class.java)
+ MyApplication.upLog("TripActivity callOrder 订单状态：${orderBean.data.orderState}")
showUi(orderBean)
// Handler(Looper.getMainLooper()).postDelayed({
// startActivity<SlabOrderOverActivity>("orderId" to orderBean.data.orderId.toString() , "orderType" to orderBean.data.type.toString())
@@ -478,6 +505,7 @@
tv_time.text = it.data.travelTime
tv_start_address.text = it.data.startAddress
tv_end_address.text = it.data.endAddress
+ tv_end_address.visibility = if (it.data.endAddress.isNullOrEmpty()) View.GONE else View.VISIBLE
tv_red_money.text = it.data.tipMoney.toString() + "元小费"
tv_phone.text = orderBean.data.phone
showStatueMapUI(it)
@@ -502,7 +530,7 @@
view.iv_img.setImageResource(R.mipmap.zhongdian)
endMarker = addMarker(aMap, it.data.endLat, it.data.endLon, view, "")
}
- endMarker!!.isVisible = false
+ endMarker?.isVisible = false
if (carMarker == null) {
val carView = creatCarView("")
carMarker = addMarker(
@@ -528,6 +556,13 @@
carView.iv_img.setImageResource(R.mipmap.icon_car)
carView.tv_hint.visible()
carView.tv_hint.text = content
+ return carView
+ }
+
+ fun creatCarView(): View {
+ val carView = createView(R.layout.item_map_market, this)
+ carView.iv_img.setImageResource(R.mipmap.icon_car)
+ carView.tv_hint.gone()
return carView
}
@@ -585,7 +620,8 @@
intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK;
intent.action = "wisdom.intent.action.topLight";
intent.putExtra("state", 0)
- sendBroadcast(intent);
+ sendBroadcast(intent)
+ MyApplication.upLog("TripActivity clickBroad():发送广播 ${intent.action} state:${0}")
}
private fun startTimeStart(waitTime: Int) {
@@ -639,17 +675,6 @@
}
}
- fun getTance(startLatLng: LatLng, endLatLng: LatLng, onclick: (tance: Float) -> Unit) {
- AMapKit.initRouteLine(
- this,
- startLatLng,
- endLatLng,
- object : (MutableList<LatLng>, Float, Long) -> Unit {
- override fun invoke(p1: MutableList<LatLng>, p2: Float, p3: Long) {
- onclick(p2)
- }
- })
- }
override fun setOnclick() {
--
Gitblit v1.7.1