Skip to content

Commit fe089e5

Browse files
racerxdlracerxdl
committed
Revised few stuff to compile again
1 parent 7601aa6 commit fe089e5

File tree

11 files changed

+52
-73
lines changed

11 files changed

+52
-73
lines changed

‎.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<classpath>
33
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
44
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
5-
<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
5+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
66
<classpathentry kind="src" path="src"/>
77
<classpathentry kind="src" path="gen"/>
88
<classpathentry kind="output" path="bin/classes"/>

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/bin
2+
/gen
3+
gen
4+
bin

‎AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
android:allowBackup="true"
3232
android:icon="@drawable/ic_launcher_alt"
3333
android:label="@string/app_name"
34-
android:theme="@style/AppTheme"
35-
android:hardwareAccelerated="true">
34+
android:theme="@style/AppTheme">
3635
<meta-data android:name="com.google.android.maps.v2.API_KEY"
3736
android:value="***REMOVED***"/>
3837
<activity

‎libs/android-support-v4.jar‎

633 KB
Binary file not shown.

‎project.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=Google Inc.:Google APIs:17
15-
android.library.reference.1=../../../../libs/facebook-android-sdk-3.0.1/facebook
16-
android.library.reference.2=../../../../../../opt/android/sdk/extras/google/google_play_services/libproject/google-play-services_lib
14+
target=android-10
15+
android.library.reference.1=../../../../../../opt/android/sdk/extras/google/google_play_services/libproject/google-play-services_lib
16+
android.library.reference.2=../../../../../../opt/android/facebook/facebook-android-sdk-3.14.1/facebook

‎res/values-v11/styles.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎res/values-v14/styles.xml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/com/tvs/signaltracker/CommonHandler.java‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,10 @@ public static void DoResend() {
276276
if(sig == null)
277277
Log.i("ST","NULL ERROR");
278278
if(sig.state == 0) {
279-
if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
280-
new HSAPI.SendSignal().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, sig);
281-
} else {
279+
// new HSAPI.SendSignal().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, sig);
280+
//} else {
282281
new HSAPI.SendSignal().execute(sig);
283-
}
282+
//}
284283
count++;
285284
rawcount++;
286285
}else if (Signals.get(i).state == 1)
@@ -299,11 +298,11 @@ else if (Signals.get(i).state == 2 & CommonHandler.dbman != null)
299298
for(int i=0;i<Towers.size();i++) {
300299
TowerObject tower = Towers.get(i);
301300
if(tower.state == 0) {
302-
if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
303-
new HSAPI.SendTower().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, tower);
304-
} else {
301+
//if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
302+
// new HSAPI.SendTower().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, tower);
303+
//} else {
305304
new HSAPI.SendTower().execute(tower);
306-
}
305+
//}
307306

308307
count++;
309308
rawcount++;
@@ -343,11 +342,11 @@ public static void AddSignal(double lat, double lon, short signal, float weight,
343342
}
344343
if(ServiceMode < 3) {
345344
if((WifiSend & WifiConnected) | !WifiSend) {
346-
if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
347-
new HSAPI.SendSignal().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, tmp);
348-
} else {
345+
//if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
346+
// new HSAPI.SendSignal().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, tmp);
347+
//} else {
349348
new HSAPI.SendSignal().execute(tmp);
350-
}
349+
//}
351350
}
352351
}
353352
if(add) {
@@ -397,17 +396,17 @@ public static void AddTower(double lat, double lon) {
397396
if(ServiceMode < 3) {
398397
//HSAPI.AddTower(lat,lon,Operator);
399398
if((WifiSend & WifiConnected) | !WifiSend) {
400-
if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
401-
new HSAPI.SendTower().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, tmp);
402-
} else {
399+
//if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
400+
// new HSAPI.SendTower().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, tmp);
401+
//} else {
403402
new HSAPI.SendTower().execute(tmp);
404-
}
403+
//}
405404
}else if(!WifiSend){
406-
if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
407-
new HSAPI.SendTower().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, tmp);
408-
} else {
405+
//if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
406+
// new HSAPI.SendTower().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, tmp);
407+
//} else {
409408
new HSAPI.SendTower().execute(tmp);
410-
}
409+
//}
411410
}
412411
}
413412
if(add) {

‎src/com/tvs/signaltracker/MainScreen.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,11 @@ private void setUpMap() {
249249
map.getUiSettings().setZoomGesturesEnabled(!controlLocked);
250250
map.getUiSettings().setZoomControlsEnabled(false);
251251
map.getUiSettings().setCompassEnabled(false);
252-
if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
253-
LoadToMapTask = new LoadToMap().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
254-
} else {
252+
//if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
253+
// LoadToMapTask = new LoadToMap().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
254+
//} else {
255255
LoadToMapTask = new LoadToMap().execute();
256-
}
256+
//}
257257
TileProvider tileProvider = new UrlTileProvider(256, 256) {
258258
@Override
259259
public synchronized URL getTileUrl(int x, int y, int zoom) {

‎src/com/tvs/signaltracker/Settings.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,18 +136,18 @@ public void onClick(View v) {
136136
towersent = false;
137137
signalsent = false;
138138
if(CommonHandler.Signals != null)
139-
if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
140-
sst = new SendSignalTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, CommonHandler.Signals);
141-
} else {
139+
//if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
140+
// sst = new SendSignalTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, CommonHandler.Signals);
141+
//} else {
142142
sst = new SendSignalTask().execute(CommonHandler.Signals);
143-
}
143+
//}
144144

145145
if(CommonHandler.Towers != null)
146-
if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
147-
stt = new SendTowerTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, CommonHandler.Towers);
148-
} else {
146+
//if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
147+
// stt = new SendTowerTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, CommonHandler.Towers);
148+
//} else {
149149
stt = new SendTowerTask().execute(CommonHandler.Towers);
150-
}
150+
//}
151151

152152
}
153153
});
@@ -158,11 +158,11 @@ public void onClick(View v) {
158158
public void onClick(View v) {
159159
downloadoperator.setText(getResources().getString(R.string.downloading));
160160
downloadoperator.setClickable(false);
161-
if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
162-
downloadops = new DownloadOpsTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, CommonHandler.Signals);
163-
} else {
161+
//if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB ) {
162+
// downloadops = new DownloadOpsTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, CommonHandler.Signals);
163+
//} else {
164164
downloadops = new DownloadOpsTask().execute(CommonHandler.Signals);
165-
}
165+
//}
166166
}
167167
});
168168
facebookLogin.setOnClickListener(new View.OnClickListener() {

0 commit comments

Comments
 (0)