From 2b79ff319f7ffb2507742aedbabcf3fcccfd41f4 Mon Sep 17 00:00:00 2001
From: AllenTom <qweasdzxczse2@gmail.com>
Date: Sun, 22 Sep 2024 20:02:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                          |  7 ++-
 .../java/com/aiosman/riderpro/MainActivity.kt |  5 +--
 .../riderpro/ui/post/SelectLocationModal.kt   | 45 +++++++++----------
 3 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 871c475..45fab86 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -14,8 +14,8 @@ android {
         applicationId = "com.aiosman.riderpro"
         minSdk = 24
         targetSdk = 34
-        versionCode = 100003
-        versionName = "1.0.000.3"
+        versionCode = 1000011
+        versionName = "1.0.000.11"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -91,7 +91,6 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
-    implementation(libs.places)
     implementation(libs.androidx.animation)
     implementation("io.coil-kt:coil-compose: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-perf")
     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")
 }
 
diff --git a/app/src/main/java/com/aiosman/riderpro/MainActivity.kt b/app/src/main/java/com/aiosman/riderpro/MainActivity.kt
index b1dd66e..8ff22c1 100644
--- a/app/src/main/java/com/aiosman/riderpro/MainActivity.kt
+++ b/app/src/main/java/com/aiosman/riderpro/MainActivity.kt
@@ -33,7 +33,6 @@ import com.aiosman.riderpro.ui.NavigationRoute
 import com.aiosman.riderpro.ui.navigateToPost
 import com.aiosman.riderpro.ui.post.NewPostViewModel
 import com.aiosman.riderpro.utils.Utils
-import com.google.android.libraries.places.api.Places
 import com.google.firebase.analytics.FirebaseAnalytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -88,9 +87,7 @@ class MainActivity : ComponentActivity() {
         // 沉浸式状态栏
         WindowCompat.setDecorFitsSystemWindows(window, false)
         // 初始化 Places SDK
-        if (!Places.isInitialized()) {
-            Places.initialize(applicationContext, "AIzaSyDpgLDH1-SECw_pdjJq_msynq1XrxwgKVI")
-        }
+
         // 初始化 Firebase Analytics
 //        analytics = Firebase.analytics
         // 请求通知权限
diff --git a/app/src/main/java/com/aiosman/riderpro/ui/post/SelectLocationModal.kt b/app/src/main/java/com/aiosman/riderpro/ui/post/SelectLocationModal.kt
index 31b3913..3d37eb4 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/post/SelectLocationModal.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/post/SelectLocationModal.kt
@@ -1,6 +1,5 @@
 package com.aiosman.riderpro.ui.post
 
-import android.util.Log
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 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.sp
 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(
     val name: String,
@@ -60,24 +55,24 @@ fun SelectLocationModal(
         )
     }
 
-    fun searchAddrWithGoogleMap(query: String) {
-        val placesClient: PlacesClient = Places.createClient(context)
-        val placeFields: List<Place.Field> =
-            listOf(Place.Field.ID, Place.Field.NAME, Place.Field.ADDRESS)
-        val request = SearchByTextRequest.newInstance(query, placeFields)
-        placesClient.searchByText(request)
-            .addOnSuccessListener { response ->
-                val place = response.places
-                searchPlaceAddressResults = place.map {
-                    SearchPlaceAddressResult(it.name ?: "", it.address ?: "")
-                }
-
-            }.addOnFailureListener { exception ->
-                if (exception is ApiException) {
-                    Log.e("SelectLocationModal", "Place not found: ${exception.statusCode}")
-                }
-            }
-    }
+//    fun searchAddrWithGoogleMap(query: String) {
+//        val placesClient: PlacesClient = Places.createClient(context)
+//        val placeFields: List<Place.Field> =
+//            listOf(Place.Field.ID, Place.Field.NAME, Place.Field.ADDRESS)
+//        val request = SearchByTextRequest.newInstance(query, placeFields)
+//        placesClient.searchByText(request)
+//            .addOnSuccessListener { response ->
+//                val place = response.places
+//                searchPlaceAddressResults = place.map {
+//                    SearchPlaceAddressResult(it.name ?: "", it.address ?: "")
+//                }
+//
+//            }.addOnFailureListener { exception ->
+//                if (exception is ApiException) {
+//                    Log.e("SelectLocationModal", "Place not found: ${exception.statusCode}")
+//                }
+//            }
+//    }
     Column(
         modifier = Modifier
             .fillMaxSize()
@@ -105,7 +100,7 @@ fun SelectLocationModal(
             )
         }
         LocationSearchTextInput(queryString, onQueryClick = {
-            searchAddrWithGoogleMap(queryString)
+//            searchAddrWithGoogleMap(queryString)
         }) {
             queryString = it
         }