kopia lustrzana https://github.com/sh123/codec2_talkie
rodzic
968a213bc6
commit
7e6e0bc43e
|
@ -13,7 +13,9 @@ import androidx.appcompat.app.ActionBar;
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
import androidx.preference.PreferenceManager;
|
import androidx.preference.PreferenceManager;
|
||||||
|
|
||||||
|
import com.radio.codec2talkie.BuildConfig;
|
||||||
import com.radio.codec2talkie.R;
|
import com.radio.codec2talkie.R;
|
||||||
|
import com.radio.codec2talkie.protocol.Aprs;
|
||||||
import com.radio.codec2talkie.protocol.aprs.tools.AprsSymbolTable;
|
import com.radio.codec2talkie.protocol.aprs.tools.AprsSymbolTable;
|
||||||
import com.radio.codec2talkie.settings.PreferenceKeys;
|
import com.radio.codec2talkie.settings.PreferenceKeys;
|
||||||
|
|
||||||
|
@ -30,6 +32,9 @@ import org.osmdroid.views.overlay.mylocation.MyLocationNewOverlay;
|
||||||
public class MapActivity extends AppCompatActivity {
|
public class MapActivity extends AppCompatActivity {
|
||||||
private static final String TAG = MapActivity.class.getSimpleName();
|
private static final String TAG = MapActivity.class.getSimpleName();
|
||||||
|
|
||||||
|
private static final double MAP_STARTUP_ZOOM = 5.0;
|
||||||
|
private static final double MAP_FOLLOW_ZOOM = 14.0;
|
||||||
|
|
||||||
private MapView _mapView;
|
private MapView _mapView;
|
||||||
private IMapController _mapController;
|
private IMapController _mapController;
|
||||||
private MyLocationNewOverlay _myLocationNewOverlay;
|
private MyLocationNewOverlay _myLocationNewOverlay;
|
||||||
|
@ -47,7 +52,7 @@ public class MapActivity extends AppCompatActivity {
|
||||||
if (actionBar != null) actionBar.setDisplayHomeAsUpEnabled(true);
|
if (actionBar != null) actionBar.setDisplayHomeAsUpEnabled(true);
|
||||||
|
|
||||||
Context context = getApplicationContext();
|
Context context = getApplicationContext();
|
||||||
Configuration.getInstance().setUserAgentValue("C2T");
|
Configuration.getInstance().setUserAgentValue(Aprs.APRS_ID + " " + BuildConfig.VERSION_NAME);
|
||||||
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
|
SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
|
||||||
|
|
||||||
// my symbol
|
// my symbol
|
||||||
|
@ -61,7 +66,7 @@ public class MapActivity extends AppCompatActivity {
|
||||||
|
|
||||||
// controller
|
// controller
|
||||||
_mapController = _mapView.getController();
|
_mapController = _mapView.getController();
|
||||||
_mapController.zoomTo(5.0);
|
_mapController.zoomTo(MAP_STARTUP_ZOOM);
|
||||||
|
|
||||||
// compass
|
// compass
|
||||||
InternalCompassOrientationProvider compassOrientationProvider = new InternalCompassOrientationProvider(context) {
|
InternalCompassOrientationProvider compassOrientationProvider = new InternalCompassOrientationProvider(context) {
|
||||||
|
@ -149,7 +154,18 @@ public class MapActivity extends AppCompatActivity {
|
||||||
}
|
}
|
||||||
_mapStations.showMovingStations(showMoving);
|
_mapStations.showMovingStations(showMoving);
|
||||||
return true;
|
return true;
|
||||||
|
} else if (itemId == R.id.map_menu_move_map) {
|
||||||
|
if (item.isChecked()) {
|
||||||
|
item.setChecked(false);
|
||||||
|
_myLocationNewOverlay.disableFollowLocation();
|
||||||
|
} else {
|
||||||
|
item.setChecked(true);
|
||||||
|
_myLocationNewOverlay.enableFollowLocation();
|
||||||
|
_mapController.zoomTo(MAP_FOLLOW_ZOOM);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -312,7 +312,7 @@ public class AprsIs implements Protocol, Runnable {
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getLoginCommand() {
|
private String getLoginCommand() {
|
||||||
String cmd = "user " + new AX25Callsign(_callsign, _ssid).toString() + " pass " + _passcode + " vers " + "C2T " + BuildConfig.VERSION_NAME;
|
String cmd = "user " + new AX25Callsign(_callsign, _ssid).toString() + " pass " + _passcode + " vers " + Aprs.APRS_ID + " " + BuildConfig.VERSION_NAME;
|
||||||
if (_filterRadius > 0) {
|
if (_filterRadius > 0) {
|
||||||
cmd += " filter m/" + _filterRadius;
|
cmd += " filter m/" + _filterRadius;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item
|
||||||
|
android:id="@+id/map_menu_move_map"
|
||||||
|
android:title="@string/map_menu_move_map"
|
||||||
|
android:checkable="true"
|
||||||
|
android:checked="false"/>
|
||||||
<item
|
<item
|
||||||
android:id="@+id/map_menu_rotate_map"
|
android:id="@+id/map_menu_rotate_map"
|
||||||
android:title="@string/map_menu_rotate_map"
|
android:title="@string/map_menu_rotate_map"
|
||||||
|
|
|
@ -369,4 +369,5 @@
|
||||||
<string name="map_menu_show_moving">Show moving stations</string>
|
<string name="map_menu_show_moving">Show moving stations</string>
|
||||||
<string name="aprs_text_packets_enable_title">Enable text packets</string>
|
<string name="aprs_text_packets_enable_title">Enable text packets</string>
|
||||||
<string name="aprs_text_packets_enable_summary">Send lora aprs compatible text packets (0x3c,0xff,0x01 prefix)</string>
|
<string name="aprs_text_packets_enable_summary">Send lora aprs compatible text packets (0x3c,0xff,0x01 prefix)</string>
|
||||||
|
<string name="map_menu_move_map">Move map with own position</string>
|
||||||
</resources>
|
</resources>
|
Ładowanie…
Reference in New Issue