Pull Request for Assignment2 by Group10

.gitignore

@@ -14,3 +14,4 @@
 .cxx
 local.properties
 /.idea/
+secrets.properties

Change_by_haoning_0208.md

@@ -0,0 +1,78 @@
+**Date**: 2026-02-08
+
+### New Fields Added
+1. **trajectory_id** (string) - For naming/identifying trajectories
+2. **initial_position** (GNSSPosition) - Starting position of trajectory
+3. **test_points** (repeated GNSSPosition) - Test points for positioning algorithms
+4. **sensor_info** - Information for 7 sensors:
+    - accelerometer_info
+    - gyroscope_info
+    - rotation_vector_info
+    - magnetometer_info
+    - barometer_info
+    - light_sensor_info
+    - proximity_info
+5. **WiFiAPData.rtt_enabled** (bool) - RTT support flag
+6. **BleData** enhanced with:
+    - mac_address, name, tx_power_level
+    - advertise_flags, service_uuids, manufacturer_data
+
+---
+
+### Breaking Changes - API Updates
+
+### Class Name Changes
+
+| Old Name          | New Name |
+|-------------------|----------|
+| `Pdr_Sample`      | `RelativePosition` |
+| `GNSS_Sample`     | `GNSSReading` |
+| `WiFi_Sample`     | `Fingerprint` |
+| `Mac_Scan`        | `RFScan` |
+| `Motion_Sampleq`  | `IMUReading` |
+| `Position_Sample` | `MagnetometerReading` |
+| `Pressure_Sample` | `BarometerReading` |
+| `Light_Sample`    | `LightReading` |
+| `AP_Data`         | `WiFiAPData` |
+
+### Method Name Changes
+
+| Old Method | New Method |
+|------------|------------|
+| `addRfScans()` | `addRfScans()` |
+| `addWifiData()` | `addWifiFingerprints()` |
+| `addPositionData()` | `addMagnetometerData()` |
+| `getPositionDataCount()` | `getMagnetometerDataCount()` |
+| `getWifiDataCount()` | `getWifiFingerprintsCount()` |
+
+### Structure Changes
+
+**IMU Data** - Now uses Vector3/Quaternion:
+```java
+// OLD
+.setAccX(x).setAccY(y).setAccZ(z)
+
+// NEW
+.setAcc(Traj.Vector3.newBuilder().setX(x).setY(y).setZ(z).build())
+```
+
+**GNSS Data** - Position nested in GNSSPosition:
+```java
+// OLD
+.setLatitude(lat).setLongitude(lon).setAltitude(alt)
+
+// NEW
+.setPosition(Traj.GNSSPosition.newBuilder()
+    .setLatitude(lat).setLongitude(lon).setAltitude(alt).build())
+```
+
+---
+
+### Files Modified
+
+- `Traj.java` - Regenerated from proto
+- `SensorFusion.java` - Updated API calls
+- `ServerCommunications.java` - Updated API calls
+- `app/build.gradle` - Updated protobuf dependency to 4.29.6
+
+---

app/build.gradle

@@ -25,6 +25,9 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
+        manifestPlaceholders = [
+                MAPS_API_KEY: localProperties['MAPS_API_KEY'] ?: ''
+        ]
         // Example of referencing secrets (if you use secrets.properties):
         buildConfigField "String", "MAPS_API_KEY",
                 "\"${localProperties['MAPS_API_KEY'] ?: ''}\""
@@ -73,7 +76,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     implementation 'com.google.android.material:material:1.12.0'
 
-    implementation 'com.google.protobuf:protobuf-java:3.0.0'
+    implementation 'com.google.protobuf:protobuf-java:4.29.6'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation "com.google.protobuf:protobuf-java-util:3.0.0"
     implementation "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava"

app/src/main/AndroidManifest.xml

@@ -32,6 +32,16 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
+    <!-- Bluetooth Permissions -->
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN"
+        android:usesPermissionFlags="neverForLocation" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-feature
+        android:name="android.hardware.bluetooth_le"
+        android:required="false" />
+
     <!-- Location -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
@@ -84,7 +94,7 @@
     <!-- Google Maps API key metadata -->
     <meta-data
         android:name="com.google.android.geo.API_KEY"
-        android:value="@string/google_maps_key"/>
+        android:value="${MAPS_API_KEY}"/>
 
     <activity
         android:name="com.openpositioning.PositionMe.presentation.activity.MainActivity"