From a141213b3234d2d83ffb6a5d2d42ede0e722d949 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期二, 13 六月 2023 11:57:21 +0800
Subject: [PATCH] 公务出行开发完成
---
app/src/main/java/com/kuanzhai/user/ui/trip/MapTripFragment.kt | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/app/src/main/java/com/kuanzhai/user/ui/trip/MapTripFragment.kt b/app/src/main/java/com/kuanzhai/user/ui/trip/MapTripFragment.kt
index 54ddb30..e2be5d2 100644
--- a/app/src/main/java/com/kuanzhai/user/ui/trip/MapTripFragment.kt
+++ b/app/src/main/java/com/kuanzhai/user/ui/trip/MapTripFragment.kt
@@ -32,7 +32,7 @@
import com.flyco.tablayout.listener.CustomTabEntity
import com.flyco.tablayout.listener.OnTabSelectListener
import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.kuanzhai.user.OkApplication
+import com.kuanzhai.user.KuanzhaiApplication
import com.kuanzhai.user.R
import com.kuanzhai.user.network.HttpManager
import com.kuanzhai.user.network.requestByF
@@ -43,7 +43,6 @@
import com.kuanzhai.user.dialog.SpecialCountDialog
import com.kuanzhai.user.dialog.TipDialog
import com.kuanzhai.user.network.entity.CarPrice
-import com.kuanzhai.user.network.request
import com.kuanzhai.user.ui.ChooseCityActivity
import com.kuanzhai.user.ui.mine.EditEmergencyActivity
import com.kuanzhai.user.ui.mine.SetEmergencyActivity
@@ -183,7 +182,7 @@
var mLocationOption = AMapLocationClientOption()
mlocationClient.setLocationListener{p0 ->
p0?.let {
- if (!p0.city.isNullOrEmpty() && p0.city != OkApplication.chooseCityName && !isChangeCity) {
+ if (!p0.city.isNullOrEmpty() && p0.city != KuanzhaiApplication.chooseCityName && !isChangeCity) {
isChangeCity = true
showChangeCity()
mlocationClient.stopLocation()
@@ -212,8 +211,8 @@
aMap.animateCamera(
CameraUpdateFactory.newLatLngZoom(
LatLng(
- OkApplication.lat,
- OkApplication.lon
+ KuanzhaiApplication.lat,
+ KuanzhaiApplication.lon
), 15f
)
)
@@ -225,7 +224,7 @@
callPhone(mainActivity.phoneEmergency)
}
tv_service.setOnClickListener {
- callPhone(OkApplication.phoneService)
+ callPhone(KuanzhaiApplication.phoneService)
}
tv_start.setOnClickListener {
startActivityForResult<ChoosePositionActivity>(1)
@@ -372,7 +371,7 @@
private fun makeOrder() {
if (mainActivity.checkLogin() && mainActivity.checkPhone()) {
- if (OkApplication.emergency.isEmpty()) {
+ if (KuanzhaiApplication.emergency.isEmpty()) {
myToast("请设置紧急联系人")
startActivity<SetEmergencyActivity>(
"name" to "no",
@@ -400,8 +399,8 @@
endLon,
1,
orderType,
- OkApplication.lat,
- OkApplication.lon,
+ KuanzhaiApplication.lat,
+ KuanzhaiApplication.lon,
startName,
startLat,
startLon,
@@ -491,10 +490,10 @@
aMap.setOnMyLocationChangeListener {
it as Inner_3dMap_location
Log.e(Const.Tag, "出租车：lat:" + it.latitude + ",lon:" + it.longitude)
- OkApplication.lat = it.latitude
- OkApplication.lon = it.longitude
- OkApplication.address = it.address
- OkApplication.cityCode = it.extras.getString("adcode") ?: ""
+ KuanzhaiApplication.lat = it.latitude
+ KuanzhaiApplication.lon = it.longitude
+ KuanzhaiApplication.address = it.address
+ KuanzhaiApplication.cityCode = it.extras.getString("adcode") ?: ""
if (locCount < 1) {
if (mainActivity.lat != 0.0)
aMap.animateCamera(
@@ -649,7 +648,7 @@
*/
private fun getBottomAds() {
if (mainActivity.isOpen)
- HttpManager.getAds(2, OkApplication.chooseCityCode).requestByF(this,false) { _, data ->
+ HttpManager.getAds(2, KuanzhaiApplication.chooseCityCode).requestByF(this,false) { _, data ->
data?.let {
it.forEach {
val view = layoutInflater.inflate(R.layout.item_img_ads, null)
@@ -914,12 +913,11 @@
aMap.animateCamera(
CameraUpdateFactory.newLatLngZoom(
LatLng(
- OkApplication.lat,
- OkApplication.lon
+ KuanzhaiApplication.lat,
+ KuanzhaiApplication.lon
), 15f
)
)
- mainActivity.updateTipAlpha(1f)
//出租车重置
cl_taxi.gone()
--
Gitblit v1.7.1