From 95aa373de53e645b121253c71ad562d9e2aee63e Mon Sep 17 00:00:00 2001 From: andrewleo2013 Date: Thu, 31 Jan 2013 11:21:34 +0800 Subject: [PATCH] refine code --- .../qa/emmagee/activity/MainPageActivity.java | 4 ++-- .../qa/emmagee/activity/SettingsActivity.java | 2 +- .../netease/qa/emmagee/service/EmmageeService.java | 5 +---- src/com/netease/qa/emmagee/utils/CpuInfo.java | 3 +-- src/com/netease/qa/emmagee/utils/MemoryInfo.java | 2 +- src/com/netease/qa/emmagee/utils/MyApplication.java | 3 --- src/com/netease/qa/emmagee/utils/TrafficInfo.java | 12 ++++-------- 7 files changed, 10 insertions(+), 21 deletions(-) diff --git a/src/com/netease/qa/emmagee/activity/MainPageActivity.java b/src/com/netease/qa/emmagee/activity/MainPageActivity.java index 0398da4..48b82e1 100644 --- a/src/com/netease/qa/emmagee/activity/MainPageActivity.java +++ b/src/com/netease/qa/emmagee/activity/MainPageActivity.java @@ -164,7 +164,7 @@ public class MainPageActivity extends Activity { } /** - * set menu options 设置菜单，初始化程序中的menu选项，可以进行设置，使程序退出 + * set menu options */ public boolean onCreateOptionsMenu(Menu menu) { menu.add(0, Menu.FIRST, 0, "退出").setIcon( @@ -192,7 +192,7 @@ public class MainPageActivity extends Activity { } /** - * create a dialog 创建对话框 + * create a dialog */ protected Dialog onCreateDialog(int id) { switch (id) { diff --git a/src/com/netease/qa/emmagee/activity/SettingsActivity.java b/src/com/netease/qa/emmagee/activity/SettingsActivity.java index 3a2c544..8a3b245 100644 --- a/src/com/netease/qa/emmagee/activity/SettingsActivity.java +++ b/src/com/netease/qa/emmagee/activity/SettingsActivity.java @@ -65,7 +65,7 @@ public class SettingsActivity extends Activity { edtTime.setText(time); chkFloat.setChecked(floatingTag); - // edtTime.setInputType(InputType.TYPE_CLASS_NUMBER); //设置只能输入数字其他不能输入 + // edtTime.setInputType(InputType.TYPE_CLASS_NUMBER); btnSave.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { diff --git a/src/com/netease/qa/emmagee/service/EmmageeService.java b/src/com/netease/qa/emmagee/service/EmmageeService.java index 9d2dea4..4eec626 100644 --- a/src/com/netease/qa/emmagee/service/EmmageeService.java +++ b/src/com/netease/qa/emmagee/service/EmmageeService.java @@ -144,7 +144,7 @@ public class EmmageeService extends Service { } /** - * write the test result to csv service第一次执行的时候需要创建一个csv文件，同时写入一些数据 + * write the test result to csv format report */ private void createResultCsv() { Calendar cal = Calendar.getInstance(); @@ -202,16 +202,13 @@ public class EmmageeService extends Service { wmParams.gravity = Gravity.LEFT | Gravity.TOP; wmParams.x = 0; wmParams.y = 0; - // 设置悬浮窗口长宽数据 wmParams.width = WindowManager.LayoutParams.WRAP_CONTENT; wmParams.height = WindowManager.LayoutParams.WRAP_CONTENT; wmParams.format = 1; windowManager.addView(viFloatingWindow, wmParams); viFloatingWindow.setOnTouchListener(new OnTouchListener() { public boolean onTouch(View v, MotionEvent event) { - // 获取相对屏幕的坐标，即以屏幕左上角为原点 x = event.getRawX(); - // 25是系统状态栏的高度 y = event.getRawY() - 25; switch (event.getAction()) { case MotionEvent.ACTION_DOWN: diff --git a/src/com/netease/qa/emmagee/utils/CpuInfo.java b/src/com/netease/qa/emmagee/utils/CpuInfo.java index 1e1d2b4..cfd12a9 100644 --- a/src/com/netease/qa/emmagee/utils/CpuInfo.java +++ b/src/com/netease/qa/emmagee/utils/CpuInfo.java @@ -122,7 +122,6 @@ public class CpuInfo { fomart.setMinimumFractionDigits(2); readCpuStat(); - // 清除arraylist中的值 CpuUsedRatio.clear(); try { @@ -179,6 +178,7 @@ public class CpuInfo { } + //TODO coming soon // public String cpuinfo() { // String sys_info = ""; // String s; @@ -293,5 +293,4 @@ public class CpuInfo { // } // return "0"; // } - } diff --git a/src/com/netease/qa/emmagee/utils/MemoryInfo.java b/src/com/netease/qa/emmagee/utils/MemoryInfo.java index c6104b9..792f1fc 100644 --- a/src/com/netease/qa/emmagee/utils/MemoryInfo.java +++ b/src/com/netease/qa/emmagee/utils/MemoryInfo.java @@ -75,7 +75,7 @@ public class MemoryInfo { memoryInfo[0].getTotalSharedDirty(); // int memSize = memoryInfo[0].dalvikPrivateDirty; - // TODO 不一定是PSS，可能是其他的 + // TODO PSS int memSize = memoryInfo[0].getTotalPss(); // int memSize = memoryInfo[0].getTotalPrivateDirty(); return memSize; diff --git a/src/com/netease/qa/emmagee/utils/MyApplication.java b/src/com/netease/qa/emmagee/utils/MyApplication.java index 3d85e96..e4737eb 100644 --- a/src/com/netease/qa/emmagee/utils/MyApplication.java +++ b/src/com/netease/qa/emmagee/utils/MyApplication.java @@ -4,9 +4,6 @@ import android.app.Application; import android.view.WindowManager; public class MyApplication extends Application { - - private static final String LOG_TAG = "Emmagee-" - + MyApplication.class.getSimpleName(); private WindowManager.LayoutParams wmParams = new WindowManager.LayoutParams(); diff --git a/src/com/netease/qa/emmagee/utils/TrafficInfo.java b/src/com/netease/qa/emmagee/utils/TrafficInfo.java index 06be9ea..4478daf 100644 --- a/src/com/netease/qa/emmagee/utils/TrafficInfo.java +++ b/src/com/netease/qa/emmagee/utils/TrafficInfo.java @@ -29,10 +29,10 @@ public class TrafficInfo { long rcvTraffic = -1; long sndTraffic = -1; try { - RandomAccessFile raf_r = new RandomAccessFile(rcvPath, "r"); - RandomAccessFile raf_s = new RandomAccessFile(sndPath, "r"); - rcvTraffic = Long.parseLong(raf_r.readLine()); - sndTraffic = Long.parseLong(raf_s.readLine()); + RandomAccessFile rafRcv = new RandomAccessFile(rcvPath, "r"); + RandomAccessFile rafSnd = new RandomAccessFile(sndPath, "r"); + rcvTraffic = Long.parseLong(rafRcv.readLine()); + sndTraffic = Long.parseLong(rafSnd.readLine()); } catch (FileNotFoundException e) { rcvTraffic = -1; sndTraffic = -1; @@ -47,9 +47,5 @@ public class TrafficInfo { return -1; } else return (rcvTraffic + sndTraffic); - /* - * traf_r = TrafficStats.getUidRxBytes(ActivityMain.uid); traf_s = - * TrafficStats.getUidTxBytes(ActivityMain.uid); - */ } } -- GitLab