Skip to content

GitLab

Commit a04ae4ef authored by p x's avatar p x
Browse files

11

parent 1c773639
Hide whitespace changes
Inline Side-by-side
.kotlin/errors/errors-1769593974856.log 0 → 100644
View file @ a04ae4ef
kotlin version: 2.0.21
error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
1. Kotlin compile daemon is ready
error message: The daemon has terminated unexpectedly on startup attempt #2 with error code: 0. The daemon process output:
1. Kotlin compile daemon is ready
Problems may have occurred during auto-selection of GC. The preferred GC is Parallel GC.
If the problems persist, try adding the JVM option to the Kotlin daemon JVM arguments: -XX:-UseParallelGC.
GC auto-selection logic is disabled temporary for the next daemon startup.
app/build.gradle.kts
View file @ a04ae4ef
plugins {
alias(libs.plugins.android.application)
// alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.android)
// alias(libs.plugins.jetbrains.kotlin.android)
// id("kotlin-kapt")
}
......@@ -31,9 +31,9 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
// kotlinOptions {
// jvmTarget = "11"
// }
kotlinOptions {
jvmTarget = "11"
}
buildFeatures {
dataBinding = true
viewBinding = true
......@@ -56,7 +56,7 @@ android {
}
dependencies {
api(fileTree(mapOf("dir" to "libs","include" to listOf("*.jar", "*.aar"))))
implementation(fileTree(mapOf("dir" to "libs","include" to listOf("*.jar", "*.aar"))))
// implementation(fileTree(mapOf("dir" to "libs","include" to listOf("*.jar", "*.aar"))))
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.appcompat)
......@@ -70,25 +70,31 @@ dependencies {
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
api(project(":mapapi"))
// implementation(project(":mapapi"))
//16进制解析类
implementation(project(":sixteen_parse"))
implementation("com.google.code.gson:gson:2.12.0")
// ViewModel ktx
// implementation("com.google.code.gson:gson:2.12.0")
implementation("com.squareup.okhttp3:okhttp:3.12.0")
implementation("com.google.code.gson:gson:2.8.6")
// ViewModel
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
//fragment-ktx
implementation("androidx.fragment:fragment-ktx:1.8.0")
//IO库用来读写文件（局部图加载模型）
implementation("org.apache.commons:commons-io:1.3.2")
// 权限请求框架
implementation("com.guolindev.permissionx:permissionx:1.8.1")
// https://github.com/CymChad/BaseRecyclerViewAdapterHelper/ RecyclerView 适配器
implementation("io.github.cymchad:BaseRecyclerViewAdapterHelper4:4.1.7")
}
configurations.all {
resolutionStrategy.dependencySubstitution {
if (file("${rootProject.projectDir}/fusedLibrary/build/repo").exists()) {
substitute(project(":fusedLibrary"))
.using(module("my-company:my-fused-library:1.0"))
}
}
}
//configurations.all {
// resolutionStrategy.dependencySubstitution {
// if (file("${rootProject.projectDir}/fusedLibrary/build/repo").exists()) {
// substitute(project(":fusedLibrary"))
// .using(module("my-company:my-fused-library:1.0"))
// }
// }
//}
app/src/main/java/com/sd/demo/ui/THighMapActivity.kt
View file @ a04ae4ef
......@@ -4,22 +4,21 @@ import android.content.Intent
import android.os.Bundle
import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.activityViewModels
import androidx.lifecycle.lifecycleScope
import com.cusc.map.fragments.SharedVm
import com.google.gson.Gson
import com.cusc.map.map2d.CalcuMapUtil
import com.cusc.map.map2d.cdata.LatLng
import com.cusc.map.map3d.AllLine
import com.cusc.map.map3d.CarNavPath
import com.cusc.map.map3d.ThreeHighMap
import com.cusc.map.map2d.CalcuMapUtil
import com.cusc.map.map2d.cdata.LatLng
import com.cusc.map.scenario.CuscVehicle
import com.cusc.map.scenario.PerceptionManager
import com.cusc.map.scenario.V2xWarn
import com.cusc.map.scenario.bean.Percept
import com.cusc.map.scenario.bean.VehiclePos
import com.cusc.map.ui.MapView.OnMapReadyLis
import com.cusc.map.ui.MapReadyView
import com.cusc.map.ui.MapView.OnMapReadyLis
import com.google.gson.Gson
import com.sd.demo.bean.mock.MRoutes
import com.sd.demo.bean.mock.PerceptionBean
import com.sd.demo.databinding.ActivityHighMapBinding
......
app/src/main/res/layout/content_show_my_loc_landian.xml deleted 100644 → 0
View file @ 1c773639
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<fragment
android:id="@+id/nav_host_fragment_content_show_my_loc_landian"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:defaultNavHost="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navGraph="@navigation/nav_graph" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/navigation/nav_graph.xml deleted 100644 → 0
View file @ 1c773639
<?xml version="1.0" encoding="utf-8"?>
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/nav_graph"
app:startDestination="@id/FirstFragment">
<fragment
android:id="@+id/FirstFragment"
android:name="com.sd.demo.ui.FirstFragment"
android:label="@string/first_fragment_label"
tools:layout="@layout/fragment_first">
<action
android:id="@+id/action_FirstFragment_to_SecondFragment"
app:destination="@id/SecondFragment" />
</fragment>
<fragment
android:id="@+id/SecondFragment"
android:name="com.sd.demo.ui.SecondFragment"
android:label="@string/second_fragment_label"
tools:layout="@layout/fragment_second">
<action
android:id="@+id/action_SecondFragment_to_FirstFragment"
app:destination="@id/FirstFragment" />
</fragment>
</navigation>
\ No newline at end of file
build.gradle.kts
View file @ a04ae4ef
......@@ -8,6 +8,6 @@ plugins {
alias(libs.plugins.kotlin.android) apply false
// alias(libs.plugins.jetbrains.kotlin.android) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.android.fusedlibrary) apply false
// alias(libs.plugins.android.fusedlibrary) apply false
// alias(libs.plugins.legacy.kapt) apply false
}
mapapi/build.gradle.kts
View file @ a04ae4ef
......@@ -38,18 +38,24 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlin {
compilerOptions {
languageVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0
// Optional: Set jvmTarget
// jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11
}
kotlinOptions {
jvmTarget = "11"
}
buildFeatures {
// dataBinding = true
viewBinding = true
}
android.libraryVariants.all {
outputs.all {
if (this is com.android.build.gradle.internal.api.LibraryVariantOutputImpl) {
// val config = project.android.defaultConfig
// val versionName = config.versionName
// val formatter = DateTimeFormatter.ofPattern("yyyy_MM_dd_HHmm")
// val createTime = LocalDateTime.now().format(formatter)
outputFileName = "cusc_map_${version}.aar"
}
}
}
}
dependencies {
......
sixteen_parse/build.gradle.kts
View file @ a04ae4ef
plugins {
alias(libs.plugins.android.library)
// alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.android)
}
android {
......@@ -29,9 +29,9 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
// kotlinOptions {
// jvmTarget = "11"
// }
kotlinOptions {
jvmTarget = "11"
}
}
dependencies {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment