Small changes and warning cleanup
Этот коммит содержится в:
@@ -3,20 +3,29 @@
|
||||
package="org.traccar.client"
|
||||
android:versionCode="6"
|
||||
android:versionName="1.5">
|
||||
<application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
|
||||
<activity android:name="TraccarActivity"
|
||||
|
||||
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="17" />
|
||||
|
||||
<uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission>
|
||||
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
|
||||
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
|
||||
|
||||
<application android:label="@string/app_name" android:icon="@drawable/ic_launcher" android:allowBackup="true">
|
||||
|
||||
<activity
|
||||
android:name="TraccarActivity"
|
||||
android:label="@string/app_name"
|
||||
android:windowSoftInputMode="stateHidden">
|
||||
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
|
||||
</activity>
|
||||
|
||||
<service android:name=".TraccarService" />
|
||||
|
||||
</application>
|
||||
<uses-sdk android:minSdkVersion="4"
|
||||
android:targetSdkVersion="16" />
|
||||
<uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission>
|
||||
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
|
||||
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
|
||||
|
||||
</manifest>
|
||||
|
||||
@@ -11,4 +11,4 @@
|
||||
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
|
||||
|
||||
# Project target.
|
||||
target=android-16
|
||||
target=Google Inc.:Google APIs:17
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
*/
|
||||
package org.traccar.client;
|
||||
|
||||
import java.io.*;
|
||||
import java.net.*;
|
||||
import java.util.*;
|
||||
import android.os.Handler;
|
||||
import android.content.Intent;
|
||||
import java.io.OutputStream;
|
||||
import java.net.Socket;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.Handler;
|
||||
|
||||
/**
|
||||
* Connection with autoreconnect
|
||||
|
||||
@@ -17,6 +17,7 @@ package org.traccar.client;
|
||||
|
||||
import java.util.Formatter;
|
||||
import java.util.Locale;
|
||||
|
||||
import android.location.Location;
|
||||
|
||||
/**
|
||||
@@ -38,6 +39,7 @@ public class Protocol {
|
||||
checksum ^= b;
|
||||
}
|
||||
f.format("*%02x\r\n", (int) checksum);
|
||||
f.close();
|
||||
|
||||
return s.toString();
|
||||
}
|
||||
@@ -64,6 +66,7 @@ public class Protocol {
|
||||
checksum ^= b;
|
||||
}
|
||||
f.format("*%02x\r\n", (int) checksum);
|
||||
f.close();
|
||||
|
||||
return s.toString();
|
||||
}
|
||||
|
||||
@@ -15,15 +15,17 @@
|
||||
*/
|
||||
package org.traccar.client;
|
||||
|
||||
import java.io.*;
|
||||
import java.net.*;
|
||||
import java.util.*;
|
||||
import android.app.Service;
|
||||
import android.content.*;
|
||||
import android.location.*;
|
||||
import android.os.*;
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.IntentFilter;
|
||||
import android.location.Location;
|
||||
import android.location.LocationListener;
|
||||
import android.location.LocationManager;
|
||||
import android.os.Bundle;
|
||||
import android.os.IBinder;
|
||||
import android.telephony.TelephonyManager;
|
||||
import android.widget.Toast;
|
||||
|
||||
/**
|
||||
* Background service
|
||||
@@ -72,6 +74,7 @@ public class TraccarService extends Service implements LocationListener {
|
||||
}
|
||||
|
||||
private BroadcastReceiver updateReceiver = new BroadcastReceiver() {
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
// Send config
|
||||
intent = new Intent(Traccar.MSG_SERVICE_CONFIG);
|
||||
|
||||
Ссылка в новой задаче
Block a user