From 70eb43779a5299323599250c3426aa979f7f7cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cgujinjie=E2=80=9D?= <gujinjie@innobuddy.com>
Date: Mon, 19 Jun 2017 11:09:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E6=8E=A5=E5=85=A5=E6=AD=A5?=
 =?UTF-8?q?=E9=AA=A4=EF=BC=8C=E6=94=AF=E6=8C=81=E4=B8=80=E9=94=AE=E5=B1=8F?=
 =?UTF-8?q?=E8=94=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/jaygoo/jacocotest/TestActivity.java  | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/jaygoo/jacocotest/TestActivity.java b/app/src/main/java/jaygoo/jacocotest/TestActivity.java
index de79e3d..e2d9ea1 100644
--- a/app/src/main/java/jaygoo/jacocotest/TestActivity.java
+++ b/app/src/main/java/jaygoo/jacocotest/TestActivity.java
@@ -12,14 +12,10 @@
 import com.karumi.dexter.PermissionToken;
 import com.karumi.dexter.listener.PermissionRequest;
 import com.karumi.dexter.listener.multi.MultiplePermissionsListener;
-
 import java.util.List;
-
 import jaygoo.jacocohelper.JacocoHelper;
 
 
-
-
 /**
  * 手动测试代码覆盖率
  * Useage:
@@ -29,11 +25,12 @@
  * 3、开始测试，测试结束后点击生成报告将ec文件pull到本地项目 PROJECT_PATH 路径中，具体命令可查看日志Loge<Pull>
  * PROJECT_PATH '项目路径/app/build/' + 'outputs/code-coverage/'
  * 4、./gradlew jacocoTestReport 然后到 /app/build/reports里查看相关报告
+ *
  */
 public class TestActivity extends AppCompatActivity {
 
     //请修改为自己的项目路径，后面的文件夹如果没有可以通过./gradlew jacocoInit创建
-    private static String PROJECT_PATH = "/Users/mac/Github/JacocoTestHelper/app/build/outputs/code-coverage/";
+    private static String PROJECT_PATH = "/Users/mac/Github/JacocoTestHelper";
     static final String[] PERMISSIONS = new String[]{
             Manifest.permission.WRITE_EXTERNAL_STORAGE,
             Manifest.permission.READ_EXTERNAL_STORAGE,
@@ -44,22 +41,11 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_test);
         JacocoHelper.init(PROJECT_PATH,true);
-        Dexter.withActivity(this).withPermissions(PERMISSIONS)
-                .withListener(new MultiplePermissionsListener() {
-                    @Override
-                    public void onPermissionsChecked(MultiplePermissionsReport report) {
-                        if (report.areAllPermissionsGranted()){
-                            Toast.makeText(getApplication(),"权限获取成功！",Toast.LENGTH_LONG).show();
-                        }
-                    }
-
-                    @Override
-                    public void onPermissionRationaleShouldBeShown(List<PermissionRequest> permissions, PermissionToken token) {
-
-                    }
-                }).check();
-
+        initPermissions();
+        initView();
+    }
 
+    private void initView() {
         findViewById(R.id.function1_btn).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -88,7 +74,6 @@ public void onClick(View v) {
             }
         });
 
-
         findViewById(R.id.report_btn).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -98,6 +83,25 @@ public void onClick(View v) {
         });
     }
 
+    /**
+     * for above 6.0 android system
+     */
+    private void initPermissions() {
+        Dexter.withActivity(this).withPermissions(PERMISSIONS)
+                .withListener(new MultiplePermissionsListener() {
+                    @Override
+                    public void onPermissionsChecked(MultiplePermissionsReport report) {
+                        if (report.areAllPermissionsGranted()){
+                            Toast.makeText(getApplication(),"权限获取成功！",Toast.LENGTH_LONG).show();
+                        }
+                    }
+
+                    @Override
+                    public void onPermissionRationaleShouldBeShown(List<PermissionRequest> permissions, PermissionToken token) {
+                    }
+                }).check();
+    }
+
     private void function1(){
         Toast.makeText(getApplication(),"方法一",Toast.LENGTH_SHORT).show();
     }