Fixed: NetEase#21 NetEase#10

pythonzz · Apr 10, 2014 · a50baea · a50baea
1 parent 244509a
commit a50baea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/com/netease/qa/emmagee/service/EmmageeService.java b/src/com/netease/qa/emmagee/service/EmmageeService.java
@@ -155,7 +155,7 @@ public void onReceive(Context context, Intent intent) {
 				int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, 0);
 
 				int scale = intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1);
-				totalBatt = String.valueOf(level * 100 / scale) + "%";
+				totalBatt = String.valueOf(level * 100 / scale);
 
 				voltage = String.valueOf(intent.getIntExtra(BatteryManager.EXTRA_VOLTAGE, -1) * 1.0 / 1000);
 
@@ -438,8 +438,6 @@ private void dataRefresh() {
 		try {
 			if (Math.abs(Double.parseDouble(currentBatt)) >= 500) {
 				currentBatt = "N/A";
-			} else {
-				currentBatt = currentBatt + "mA";
 			}
 		} catch (Exception e) {
 			currentBatt = "N/A";

diff --git a/src/com/netease/qa/emmagee/utils/CpuInfo.java b/src/com/netease/qa/emmagee/utils/CpuInfo.java
@@ -138,7 +138,7 @@ public String getCpuName() {
 	public ArrayList<String> getCpuRatioInfo(String totalBatt, String currentBatt, String temperature, String voltage) {
 
 		DecimalFormat fomart = new DecimalFormat();
-		// fomart.setGroupingUsed(false);
+		fomart.setGroupingUsed(false);
 		fomart.setMaximumFractionDigits(2);
 		fomart.setMinimumFractionDigits(2);