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

Move packages to org.vato

Browse Source
This commit is contained in:
Piv
2020-03-22 21:04:28 +10:30
parent bd735fd6b0
commit faffc97043
16 changed files with 45 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -5,7 +5,7 @@ android {
compileSdkVersion 29 compileSdkVersion 29
buildToolsVersion "29.0.2" buildToolsVersion "29.0.2"
defaultConfig { defaultConfig {
applicationId "com.example.carcontroller" applicationId "org.vato.carcontroller"
minSdkVersion 26 minSdkVersion 26
targetSdkVersion 29 targetSdkVersion 29
versionCode 1 versionCode 1

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

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

6
app/src/main/java/com/example/carcontroller/LIDAR/LidarTrackingController.java → app/src/main/java/org/vato/carcontroller/LIDAR/LidarTrackingController.java
View File

@@ -1,10 +1,10 @@
package com.example.carcontroller.LIDAR; package org.vato.carcontroller.LIDAR;
import android.os.Bundle; import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import com.example.carcontroller.R; import org.vato.carcontroller.R;
public class LidarTrackingController extends AppCompatActivity { public class LidarTrackingController extends AppCompatActivity {
@@ -31,7 +31,7 @@ public class LidarTrackingController extends AppCompatActivity {
protected void onPause() { protected void onPause() {
super.onPause(); super.onPause();
if (lidarMap != null) { if (lidarMap != null) {
lidarMap.pause(); lidarMap.stop();
} }
} }

16
app/src/main/java/com/example/carcontroller/LIDAR/LidarView.java → app/src/main/java/org/vato/carcontroller/LIDAR/LidarView.java
View File

@@ -1,4 +1,4 @@
package com.example.carcontroller.LIDAR; package org.vato.carcontroller.LIDAR;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
@@ -13,12 +13,12 @@ import android.view.SurfaceView;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
import com.example.carcontroller.Empty; import org.vato.carcontroller.Empty;
import com.example.carcontroller.Int32Value; import org.vato.carcontroller.Int32Value;
import com.example.carcontroller.PersonTrackingGrpc; import org.vato.carcontroller.PersonTrackingGrpc;
import com.example.carcontroller.PointScan; import org.vato.carcontroller.PointScan;
import com.example.carcontroller.Updaters.AbstractUpdater; import org.vato.carcontroller.Updaters.AbstractUpdater;
import com.example.carcontroller.Updaters.ZmqUpdater; import org.vato.carcontroller.Updaters.ZmqUpdater;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -146,7 +146,7 @@ public class LidarView extends SurfaceView implements AbstractUpdater.MapChanged
this.y = y; this.y = y;
} }
static Point fromProtoPoint(com.example.carcontroller.Point point) { static Point fromProtoPoint(org.vato.carcontroller.Point point) {
return fromHist(point.getDistance(), point.getAngle()); return fromHist(point.getDistance(), point.getAngle());
} }

6
app/src/main/java/com/example/carcontroller/MainActivity.java → app/src/main/java/org/vato/carcontroller/MainActivity.java
View File

@@ -1,4 +1,4 @@
package com.example.carcontroller; package org.vato.carcontroller;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -9,8 +9,8 @@ import android.view.View;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import com.example.carcontroller.LIDAR.LidarTrackingController; import org.vato.carcontroller.LIDAR.LidarTrackingController;
import com.example.carcontroller.SLAM.SlamController; import org.vato.carcontroller.SLAM.SlamController;
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {

2
app/src/main/java/com/example/carcontroller/PiLoader.java → app/src/main/java/org/vato/carcontroller/PiLoader.java
View File

@@ -1,4 +1,4 @@
package com.example.carcontroller; package org.vato.carcontroller;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

6
app/src/main/java/com/example/carcontroller/SLAM/SlamController.java → app/src/main/java/org/vato/carcontroller/SLAM/SlamController.java
View File

@@ -1,4 +1,4 @@
package com.example.carcontroller.SLAM; package org.vato.carcontroller.SLAM;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
@@ -7,8 +7,8 @@ import android.widget.SeekBar;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
import com.example.carcontroller.PiLoader; import org.vato.carcontroller.PiLoader;
import com.example.carcontroller.R; import org.vato.carcontroller.R;
public class SlamController extends AppCompatActivity implements SeekBar.OnSeekBarChangeListener { public class SlamController extends AppCompatActivity implements SeekBar.OnSeekBarChangeListener {

17
app/src/main/java/com/example/carcontroller/SLAM/SlamView.java → app/src/main/java/org/vato/carcontroller/SLAM/SlamView.java
View File

@@ -1,4 +1,4 @@
package com.example.carcontroller.SLAM; package org.vato.carcontroller.SLAM;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
@@ -12,15 +12,16 @@ import android.view.SurfaceView;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
import com.example.carcontroller.Empty;
import com.example.carcontroller.SlamControlGrpc;
import com.example.carcontroller.SlamDetails;
import com.example.carcontroller.SlamLocation;
import com.example.carcontroller.SlamScan;
import com.example.carcontroller.Updaters.AbstractUpdater;
import com.example.carcontroller.Updaters.ZmqUpdater;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import org.vato.carcontroller.Empty;
import org.vato.carcontroller.SlamControlGrpc;
import org.vato.carcontroller.SlamDetails;
import org.vato.carcontroller.SlamLocation;
import org.vato.carcontroller.SlamScan;
import org.vato.carcontroller.Updaters.AbstractUpdater;
import org.vato.carcontroller.Updaters.ZmqUpdater;
import io.grpc.ManagedChannel; import io.grpc.ManagedChannel;
import io.grpc.ManagedChannelBuilder; import io.grpc.ManagedChannelBuilder;
import io.grpc.stub.StreamObserver; import io.grpc.stub.StreamObserver;

2
app/src/main/java/com/example/carcontroller/SettingsActivity.java → app/src/main/java/org/vato/carcontroller/SettingsActivity.java
View File

@@ -1,4 +1,4 @@
package com.example.carcontroller; package org.vato.carcontroller;
import android.os.Bundle; import android.os.Bundle;

10
app/src/main/java/com/example/carcontroller/SimpleController.java → app/src/main/java/org/vato/carcontroller/SimpleController.java
View File

@@ -1,15 +1,11 @@
package com.example.carcontroller; package org.vato.carcontroller;
import androidx.appcompat.app.AppCompatActivity;
import androidx.preference.PreferenceManager;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.widget.SeekBar; import android.widget.SeekBar;
import java.util.concurrent.CountDownLatch; import androidx.appcompat.app.AppCompatActivity;
import androidx.preference.PreferenceManager;
import io.grpc.stub.StreamObserver;
public class SimpleController extends AppCompatActivity implements SeekBar.OnSeekBarChangeListener { public class SimpleController extends AppCompatActivity implements SeekBar.OnSeekBarChangeListener {

2
app/src/main/java/com/example/carcontroller/Updaters/AbstractUpdater.java → app/src/main/java/org/vato/carcontroller/Updaters/AbstractUpdater.java
View File

@@ -1,4 +1,4 @@
package com.example.carcontroller.Updaters; package org.vato.carcontroller.Updaters;
import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.InvalidProtocolBufferException;
import com.google.protobuf.MessageLite; import com.google.protobuf.MessageLite;

2
app/src/main/java/com/example/carcontroller/Updaters/ZmqUpdater.java → app/src/main/java/org/vato/carcontroller/Updaters/ZmqUpdater.java
View File

@@ -1,4 +1,4 @@
package com.example.carcontroller.Updaters; package org.vato.carcontroller.Updaters;
import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.InvalidProtocolBufferException;
import com.google.protobuf.MessageLite; import com.google.protobuf.MessageLite;

2
app/src/main/proto/SlamController.proto
View File

@@ -1,7 +1,7 @@
syntax = "proto3"; syntax = "proto3";
option java_multiple_files = true; option java_multiple_files = true;
option java_package = "com.example.carcontroller"; option java_package = "org.vato.carcontroller";
option java_outer_classname = "SlamControllerProto"; option java_outer_classname = "SlamControllerProto";
import "empty.proto"; import "empty.proto";

2
app/src/main/proto/empty.proto
View File

@@ -1,7 +1,7 @@
syntax = "proto3"; syntax = "proto3";
option java_multiple_files = true; option java_multiple_files = true;
option java_package = "com.example.carcontroller"; option java_package = "org.vato.carcontroller";
option java_outer_classname = "EmptyProto"; option java_outer_classname = "EmptyProto";
message Empty{ message Empty{

2
app/src/main/proto/lidar_tracker.proto
View File

@@ -3,7 +3,7 @@ syntax = "proto3";
package persontracking; package persontracking;
option java_multiple_files = true; option java_multiple_files = true;
option java_package = "com.example.carcontroller"; option java_package = "org.vato.carcontroller";
option java_outer_classname = "PersonTrackingProto"; option java_outer_classname = "PersonTrackingProto";
import "empty.proto"; import "empty.proto";

2
app/src/main/proto/motorService.proto
View File

@@ -4,7 +4,7 @@ syntax = "proto3";
package MotorControl; package MotorControl;
option java_multiple_files = true; option java_multiple_files = true;
option java_package = "com.example.carcontroller"; option java_package = "org.vato.carcontroller";
option java_outer_classname = "MotorServiceProto"; option java_outer_classname = "MotorServiceProto";
message ThrottleRequest{ message ThrottleRequest{