变更依赖
This commit is contained in:
@@ -14,8 +14,8 @@ android {
|
|||||||
applicationId = "com.aiosman.riderpro"
|
applicationId = "com.aiosman.riderpro"
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 100003
|
versionCode = 1000011
|
||||||
versionName = "1.0.000.3"
|
versionName = "1.0.000.11"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables {
|
vectorDrawables {
|
||||||
@@ -91,7 +91,6 @@ dependencies {
|
|||||||
androidTestImplementation(libs.androidx.ui.test.junit4)
|
androidTestImplementation(libs.androidx.ui.test.junit4)
|
||||||
debugImplementation(libs.androidx.ui.tooling)
|
debugImplementation(libs.androidx.ui.tooling)
|
||||||
debugImplementation(libs.androidx.ui.test.manifest)
|
debugImplementation(libs.androidx.ui.test.manifest)
|
||||||
implementation(libs.places)
|
|
||||||
implementation(libs.androidx.animation)
|
implementation(libs.androidx.animation)
|
||||||
implementation("io.coil-kt:coil-compose:2.7.0")
|
implementation("io.coil-kt:coil-compose:2.7.0")
|
||||||
implementation("io.coil-kt:coil:2.7.0")
|
implementation("io.coil-kt:coil:2.7.0")
|
||||||
@@ -110,6 +109,6 @@ dependencies {
|
|||||||
implementation("com.google.firebase:firebase-analytics")
|
implementation("com.google.firebase:firebase-analytics")
|
||||||
implementation("com.google.firebase:firebase-perf")
|
implementation("com.google.firebase:firebase-perf")
|
||||||
implementation("com.google.firebase:firebase-messaging-ktx")
|
implementation("com.google.firebase:firebase-messaging-ktx")
|
||||||
implementation ("cn.jiguang.sdk:jpush:5.4.0") // 必选,此处以JPush 5.4.0 版本为例,注意:5.0.0 版本
|
implementation ("cn.jiguang.sdk:jpush-google:5.4.0")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ import com.aiosman.riderpro.ui.NavigationRoute
|
|||||||
import com.aiosman.riderpro.ui.navigateToPost
|
import com.aiosman.riderpro.ui.navigateToPost
|
||||||
import com.aiosman.riderpro.ui.post.NewPostViewModel
|
import com.aiosman.riderpro.ui.post.NewPostViewModel
|
||||||
import com.aiosman.riderpro.utils.Utils
|
import com.aiosman.riderpro.utils.Utils
|
||||||
import com.google.android.libraries.places.api.Places
|
|
||||||
import com.google.firebase.analytics.FirebaseAnalytics
|
import com.google.firebase.analytics.FirebaseAnalytics
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
@@ -88,9 +87,7 @@ class MainActivity : ComponentActivity() {
|
|||||||
// 沉浸式状态栏
|
// 沉浸式状态栏
|
||||||
WindowCompat.setDecorFitsSystemWindows(window, false)
|
WindowCompat.setDecorFitsSystemWindows(window, false)
|
||||||
// 初始化 Places SDK
|
// 初始化 Places SDK
|
||||||
if (!Places.isInitialized()) {
|
|
||||||
Places.initialize(applicationContext, "AIzaSyDpgLDH1-SECw_pdjJq_msynq1XrxwgKVI")
|
|
||||||
}
|
|
||||||
// 初始化 Firebase Analytics
|
// 初始化 Firebase Analytics
|
||||||
// analytics = Firebase.analytics
|
// analytics = Firebase.analytics
|
||||||
// 请求通知权限
|
// 请求通知权限
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package com.aiosman.riderpro.ui.post
|
package com.aiosman.riderpro.ui.post
|
||||||
|
|
||||||
import android.util.Log
|
|
||||||
import androidx.compose.foundation.Image
|
import androidx.compose.foundation.Image
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.clickable
|
import androidx.compose.foundation.clickable
|
||||||
@@ -36,11 +35,7 @@ import androidx.compose.ui.text.input.ImeAction
|
|||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
import com.aiosman.riderpro.R
|
import com.aiosman.riderpro.R
|
||||||
import com.google.android.gms.common.api.ApiException
|
|
||||||
import com.google.android.libraries.places.api.Places
|
|
||||||
import com.google.android.libraries.places.api.model.Place
|
|
||||||
import com.google.android.libraries.places.api.net.PlacesClient
|
|
||||||
import com.google.android.libraries.places.api.net.SearchByTextRequest
|
|
||||||
|
|
||||||
data class SearchPlaceAddressResult(
|
data class SearchPlaceAddressResult(
|
||||||
val name: String,
|
val name: String,
|
||||||
@@ -60,24 +55,24 @@ fun SelectLocationModal(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun searchAddrWithGoogleMap(query: String) {
|
// fun searchAddrWithGoogleMap(query: String) {
|
||||||
val placesClient: PlacesClient = Places.createClient(context)
|
// val placesClient: PlacesClient = Places.createClient(context)
|
||||||
val placeFields: List<Place.Field> =
|
// val placeFields: List<Place.Field> =
|
||||||
listOf(Place.Field.ID, Place.Field.NAME, Place.Field.ADDRESS)
|
// listOf(Place.Field.ID, Place.Field.NAME, Place.Field.ADDRESS)
|
||||||
val request = SearchByTextRequest.newInstance(query, placeFields)
|
// val request = SearchByTextRequest.newInstance(query, placeFields)
|
||||||
placesClient.searchByText(request)
|
// placesClient.searchByText(request)
|
||||||
.addOnSuccessListener { response ->
|
// .addOnSuccessListener { response ->
|
||||||
val place = response.places
|
// val place = response.places
|
||||||
searchPlaceAddressResults = place.map {
|
// searchPlaceAddressResults = place.map {
|
||||||
SearchPlaceAddressResult(it.name ?: "", it.address ?: "")
|
// SearchPlaceAddressResult(it.name ?: "", it.address ?: "")
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
}.addOnFailureListener { exception ->
|
// }.addOnFailureListener { exception ->
|
||||||
if (exception is ApiException) {
|
// if (exception is ApiException) {
|
||||||
Log.e("SelectLocationModal", "Place not found: ${exception.statusCode}")
|
// Log.e("SelectLocationModal", "Place not found: ${exception.statusCode}")
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
@@ -105,7 +100,7 @@ fun SelectLocationModal(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
LocationSearchTextInput(queryString, onQueryClick = {
|
LocationSearchTextInput(queryString, onQueryClick = {
|
||||||
searchAddrWithGoogleMap(queryString)
|
// searchAddrWithGoogleMap(queryString)
|
||||||
}) {
|
}) {
|
||||||
queryString = it
|
queryString = it
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user