Removed Gson.

Changed logged throughput to long instead of double.
Fixed 3g cellid in logs
This commit is contained in:
Ziver Koc 2014-08-13 13:42:11 +02:00
parent bd82634b6b
commit 79e336c1cc
8 changed files with 20 additions and 7 deletions

View file

@ -71,8 +71,8 @@ public class CSVWriter {
StringBuilder line = new StringBuilder();
line.append(getTime()).append(DELIMITER);
line.append(behaviour).append(DELIMITER);
line.append(down).append(DELIMITER);
line.append(up).append(DELIMITER);
line.append((long)down).append(DELIMITER);
line.append((long)up).append(DELIMITER);
line.append(getRat()).append(DELIMITER);
line.append(getCellIds()).append(DELIMITER);
line.append(getSSID()).append(DELIMITER);
@ -135,9 +135,18 @@ public class CSVWriter {
StringBuilder data = new StringBuilder();
GsmCellLocation location = (GsmCellLocation) telMan.getCellLocation();
if(location != null)
return ""+location.getCid();
if(location != null) {
switch(telMan.getNetworkType()){
case TelephonyManager.NETWORK_TYPE_UMTS:
case TelephonyManager.NETWORK_TYPE_HSPA:
case TelephonyManager.NETWORK_TYPE_HSDPA:
case TelephonyManager.NETWORK_TYPE_HSUPA:
case TelephonyManager.NETWORK_TYPE_HSPAP:
return ""+(location.getCid() & 0xFFFF);
default:
return ""+location.getCid();
}
}
/*List<NeighboringCellInfo> cellList = telMan.getNeighboringCellInfo();
if(cellList != null) {
for (int i = 0; i < cellList.size(); i++) {