From 79e336c1cce643200eccf18cb09439ae28a975f4 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Wed, 13 Aug 2014 13:42:11 +0200 Subject: [PATCH] Removed Gson. Changed logged throughput to long instead of double. Fixed 3g cellid in logs --- app/app.iml | 1 + app/src/main/assets/www/about.html | 1 - .../uecontrol/core/UeControlExecutor.java | 6 +++++- .../uecontrol/gui/util/CSVWriter.java | 19 +++++++++++++----- app/src/main/res/drawable-hdpi/ic_action.png | Bin 536 -> 0 bytes app/src/main/res/drawable-mdpi/ic_action.png | Bin 351 -> 0 bytes app/src/main/res/drawable-xhdpi/ic_action.png | Bin 660 -> 0 bytes .../main/res/drawable-xxhdpi/ic_action.png | Bin 1004 -> 0 bytes 8 files changed, 20 insertions(+), 7 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_action.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_action.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_action.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_action.png diff --git a/app/app.iml b/app/app.iml index 7582c3b..d7767e3 100755 --- a/app/app.iml +++ b/app/app.iml @@ -67,6 +67,7 @@ + diff --git a/app/src/main/assets/www/about.html b/app/src/main/assets/www/about.html index e2f597e..640193a 100755 --- a/app/src/main/assets/www/about.html +++ b/app/src/main/assets/www/about.html @@ -11,7 +11,6 @@
  • GraphView (http://android-graphview.org/)
  • SweetiePlus Icons (http://sublink.ca/)
  • DynamicListView (https://android.googlesource.com)
    • -
  • Icons8 http://Icons8.com
  • Android-logging-log4j (https://code.google.com/p/android-logging-log4j/)
  • Log4j (http://logging.apache.org/log4j)
  • dom4J (http://dom4j.sourceforge.net/)
    • diff --git a/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java b/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java index c2d0333..19dff82 100755 --- a/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java +++ b/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java @@ -9,10 +9,14 @@ import org.apache.log4j.Logger; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.FileWriter; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutput; import java.io.ObjectOutputStream; +import java.io.Writer; +import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; @@ -22,7 +26,7 @@ import java.util.List; public class UeControlExecutor implements Runnable, UeBehaviour.DataHandledListener { private static final Logger log = Logger.getLogger(UeControlExecutor.class); - private List behaviours; + private ArrayList behaviours; private UeBehaviour currentlyActive; private boolean terminate; private Thread thread; diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/util/CSVWriter.java b/app/src/main/java/com/ericsson/uecontrol/gui/util/CSVWriter.java index ef5d1de..e0a2130 100755 --- a/app/src/main/java/com/ericsson/uecontrol/gui/util/CSVWriter.java +++ b/app/src/main/java/com/ericsson/uecontrol/gui/util/CSVWriter.java @@ -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 cellList = telMan.getNeighboringCellInfo(); if(cellList != null) { for (int i = 0; i < cellList.size(); i++) { diff --git a/app/src/main/res/drawable-hdpi/ic_action.png b/app/src/main/res/drawable-hdpi/ic_action.png deleted file mode 100644 index b3844509d8fd60dea7f7ddf67072b32ab42e0583..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 536 zcmV+z0_XjSP)Y5S>l%3ltj>v=Fhd*CdFIL=Z6`mf}A+8!H>jlvY+2p1lZZMFm05RxW34lg1_@ z0TEO9fu3(QCqZ*(_LlQ5Fb5C9W_EYp%)flI)mYR0Cbcn`xRJOQ)3hz$>bp@5B{ zth+-bHX+j=AXg(dwMOgH=c*($2-v4kZ0U~;E99mNB;L*-Hy$kO9+8n-Ng4qaeU8b< zE~`wCvbr9SR^3+Jw1xZ@#wsxoNcEAC$!ilZoeP|mIulT`q$v+Ed*I7v970O5(-7tm zYO)%K5Qk703vdX1T0k=w;){$gG7ce5r#YDmdk1kc$2T$G#QaVCeG20Hpb>LW;wJ2i ztZCjDep@lrg?wwH*HB1So_{{G7?|`S97}1@r?@M2kz#E8Qq*+zP=PZNLclqJG6f%H zo-kf-@t-WQ_a=kDzP&)MID|4m{egCmM-76jI0II@6Fj-_>9ky-=%#4Y&Y%a7hc|K< z@j5hv4NH4n8m~JeJ@WuGIyAzD5iGi$y88bPjjE|4lGpP&A7)Z zfur@n8Dp~pUxW@EIFNDjz=wE_6VF(a>=e?NAH_TT;q0(y{wS?rck;vhOkL-;i-k^^ zJv#(u6vj<${P;d}LE;(-wtwkgQWE~`m+f}l-*t}rfEG>~FK5QjBcB)&1;X6ocrErf@$O*mtke#(#IcNoNzf8FLvabLLN=lK*bS@wi{;eQNK-&jvN$tlcc z?)*Qy@#T6e=T$#zPt8tI5Kf!BDe1@gH~cA#x7#0t8QP09>#$iqQD!mT$9(BPnBil# sS6jP0J1T;v3SHMyyBZ>NrQZq|TnqLoo;I)41hN=BUHx3vIVCg!01+RG{r~^~ diff --git a/app/src/main/res/drawable-xhdpi/ic_action.png b/app/src/main/res/drawable-xhdpi/ic_action.png deleted file mode 100644 index 0477cc3129bf80b73dea00998d7c5c07d95b97a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 660 zcmV;F0&D$=P)c3EM&FNN~~=xBweuZ&?a3-nRHg#rMRCW zO(2~h=cN(xhvZCl{odiBNY2^YOg5A3H}F`Notb^_n>T+SpOK6glkxb405AhGjsT}X z#uI>xAg92gOo4i%Bqpp%l%GKVmthr==sce1U}e}CtN<&*^01$<9&G2geaCZ4#B}lO zz&0c@Eh&6y%e|Z1E`4^J0rkd3IQ;^_-iDK{I!u0Z8t@#{lRe^(lE|)|TU_Q51gxFz+R}He(GVX@z?89oCB* z1b`Xf?IOr2z%_u2Aa?<7gFFW$J?B{4@gT&LAdkYl3-B_;+aRyQ?s75OsTix|F(DEo1Q%8O zB}A;zEkYUgY-p|A-gA7rYwhLu0$^U^w)kjhfc54pY;(a020&Cr_U%6bp6RQ=Y{kP2 zfF4-dFx3Pfc2R}sganhSBR)`ZCzMn-Uawt{aBLnaJc~CSN!R5oI$V|T)KmYo!heUl zuvw7e=PUcD#Wgz=n1NDUpQm91rMONHRgCKt!6^Tu7VnkUCrT+;K38IT^|jR`wg<+J zvxWXF&=!p0a25E&klUCC99P1Vr8Yu2478IEC z;2hJr!y6BAzSDVNBcqMRt-0D5UvH|iQ@&dDNaEbzX%ly>{3+G;r8e$&)LZ7S-+Rw@ zX8Ha0*?Zp1{3zOeQ}{FWv+lpL z`CD!k=lc6_lzwmBSDE|#HJ?5%IFq+y&D5|@68gqF^JYcdxm@pb zuj{krD|Qxzrx(i@EPg&K`M=Y=4+`CEN4)$$+BjfPloZAJCCTB}) z_1EPe4DQ`LpsZx}ZSnbo-izz*%bu3qUZi@h-nXFtmsrzo19Nsoi-UzsPrW|#%f}rq zT$gJsxX0~r`F4kbrq6muAD-Hl!EtY?MYr&r2NsNVnV-BT$IsgF`Q)_D>jkrgb-ErH zcttBU-JX*W$kHBoOGxm}GnQ^8i=Io;-g|TM2 zhq8YJsWq)%QV^9C{a?7!Rr8VY#5>iu)e5_hz1@6Nuj`TOQ~e8@axV2h*if3Z`M|cD zW`15PD^_uL{`YvfUFpKqmwTSr$6vATGrZfq=5*xZoP8OKR_~hgwc@{S`dtOBa4w<4 zjIn<_#dG?Ve?8t}R2Q}5`r^M=9Pef1>)iOaqFy{F|9Iu=lT|ad-vs_iwB>j!=Xv3m zMbnm9MO8YES(y{RzW;jti=FK>hxq9>lN6S@3$<)FnqRM&Y#kK(ea+9