光环助手V2.4优化汇总(20170302)

app/src/main/java/com/gh/gamecenter/CleanApkActivity.java

@@ -55,7 +55,7 @@ public class CleanApkActivity extends BaseActivity implements CleanApkAdapter.On
 
         mNodataSkipLl.setVisibility(View.GONE);
 
-        mAdapter = new CleanApkAdapter(this, mApkDeleteBtn);
+        mAdapter = new CleanApkAdapter(this, mApkDeleteBtn, mApkSelectAll);
         mApkRv.setLayoutManager(new LinearLayoutManager(this));
         mApkRv.setAdapter(mAdapter);
 
@@ -63,12 +63,24 @@ public class CleanApkActivity extends BaseActivity implements CleanApkAdapter.On
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 ArrayMap<Integer, Boolean> selectPosition =  new ArrayMap<>();
+                ArrayMap<Integer, Boolean> selectPosition1 = mAdapter.getSelectPosition();
                 int itemCount = mAdapter.getItemCount();
                 if (isChecked) {
                     for (int i = 0; i < itemCount; i++) {
                         selectPosition.put(i, true);
                     }
                 } else {
+                    int selectCount = 0;
+                    for (Integer integer : selectPosition1.keySet()) {
+                        if (selectPosition1.get(integer)) {
+                            selectCount ++;
+                        }
+                    }
+
+                    if (selectCount != itemCount) {
+                        return;
+                    }
+
                     for (int i = 0; i < itemCount; i++) {
                         selectPosition.put(i, false);
                     }
@@ -82,6 +94,7 @@ public class CleanApkActivity extends BaseActivity implements CleanApkAdapter.On
 
         mNodataSkipBtn.setText("去首页看看");
         mNodataSkipTv.setText("安装包已清理干净\n快去发现更多好玩的游戏吧！");
+        mNodataSkipTv.setLineSpacing(0, 1.5f);
 
     }
 
@@ -159,9 +172,11 @@ public class CleanApkActivity extends BaseActivity implements CleanApkAdapter.On
         DecimalFormat df = new DecimalFormat("#.00");
         String sizeName = df.format(allSize) + "MB";
         Utils.toast(CleanApkActivity.this, "删除成功，已为您节省" + sizeName + "空间");
-
+        mApkDeleteBtn.setText("一键删除");
         mAdapter.notifyDataSetChanged(); // 刷新Adapter position
 
+        updateScanData();
+
         if (apkList.size() == 0) { // 全部删除
             mNodataSkipLl.setVisibility(View.VISIBLE);
             mInstallAllData.setVisibility(View.GONE);
@@ -169,24 +184,28 @@ public class CleanApkActivity extends BaseActivity implements CleanApkAdapter.On
         }
     }
 
-    @Override
-    public void onScanOver() {
-        mApkDeleteBtn.setText("立即删除");
-        mApkDeleteBtn.setBackgroundResource(R.drawable.game_item_btn_red_style);
-
+    private void updateScanData(){
         long allSize = 0;
-
         List<InstallGameEntity> apkList = mAdapter.getApkList();
         for (InstallGameEntity installGameEntity : apkList) {
             allSize = allSize + installGameEntity.getGameSize();
         }
 
         double size = (((float)allSize/1024)/1024);
-        DecimalFormat df = new DecimalFormat("#.00");
+        DecimalFormat df = new DecimalFormat("0.00");
         String sizeName = df.format(size) + "MB";
 
         mApkCount.setText(Html.fromHtml("找到" + apkList.size() + "个安装包，占用"
                 + "<font color=\"#ff4147\">" + sizeName + "</font>"+ "空间"));
+    }
+
+    @Override
+    public void onScanOver() {
+        mApkDeleteBtn.setText("立即删除");
+        mApkDeleteBtn.setBackgroundResource(R.drawable.game_item_btn_red_style);
+
+        updateScanData();
+
         mScanPb.setVisibility(View.GONE);
         mApkSelectAll.setVisibility(View.VISIBLE);
         mApkSelectAll.setChecked(true);