vato007/picar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add print vehicle to car-rs, update android gradle versions

Browse Source
This commit is contained in:
piv
2022-10-15 13:55:21 +10:30
parent 3daa815710
commit 4d8dddbef0
9 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/build.gradle
View File

@@ -4,12 +4,11 @@ plugins{
}
android {
compileSdkVersion 30
buildToolsVersion "29.0.2"
compileSdkVersion 32
defaultConfig {
applicationId "org.vato.carcontroller"
minSdkVersion 26
targetSdkVersion 30
targetSdkVersion 32
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -27,24 +26,25 @@ android {
buildFeatures {
mlModelBinding true
}
namespace 'org.vato.carcontroller'
}
dependencies {
implementation project(':protobuf')
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'com.google.android.material:material:1.3.0'
implementation 'androidx.preference:preference:1.1.1'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.preference:preference:1.2.0'
implementation 'org.tensorflow:tensorflow-lite-support:0.1.0'
implementation 'org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1'
implementation 'org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2'
implementation 'org.tensorflow:tensorflow-lite-gpu:2.3.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
implementation 'io.grpc:grpc-okhttp:1.29.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.29.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.29.0' // CURRENT_GRPC_VERSION
implementation 'javax.annotation:javax.annotation-api:1.2'
implementation 'io.grpc:grpc-protobuf-lite:1.39.0' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.39.0' // CURRENT_GRPC_VERSION
implementation 'javax.annotation:javax.annotation-api:1.3.2'
implementation 'org.zeromq:jeromq:0.5.2'
}

6
app/src/main/AndroidManifest.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.vato.carcontroller">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -12,7 +11,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name="org.vato.carcontroller.SLAM.SlamController"></activity>
<activity android:name="org.vato.carcontroller.SLAM.SlamController" />
<activity android:name="org.vato.carcontroller.LIDAR.LidarTrackingController" />
<activity
android:name="org.vato.carcontroller.SettingsActivity"
@@ -20,6 +19,7 @@
android:parentActivityName="org.vato.carcontroller.MainActivity" />
<activity android:name="org.vato.carcontroller.SimpleController" />
<activity
android:exported="true"
android:name="org.vato.carcontroller.MainActivity"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>