fix:动态申请电话权限

zbx911 · Jul 10, 2018 · 835ccfa · 835ccfa
1 parent affa362
commit 835ccfa
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,6 +7,8 @@ android {
             keyPassword '333333'
             storeFile file('./darkal.jks')
             storePassword '333333'
+            v1SigningEnabled true
+            v2SigningEnabled true
         }
     }
     dexOptions {

diff --git a/app/src/main/java/cn/darkal/networkdiagnosis/Activity/MainActivity.java b/app/src/main/java/cn/darkal/networkdiagnosis/Activity/MainActivity.java
@@ -659,15 +659,15 @@ private void handleUriStartupParams() {
 
 
     public void createZip(final Runnable callback) {
-        showLoading("打包中");
-
         Runnable runnable = new Runnable() {
             @Override
             public void run() {
                 new Thread(new Runnable() {
                     @Override
                     public void run() {
                         try {
+                            showLoading("打包中");
+
                             final Har har = getFiltedHar();
                             final File saveHarFile = new File(Environment.getExternalStorageDirectory() + "/har/test.har");
                             har.writeTo(saveHarFile);

diff --git a/app/src/main/java/cn/darkal/networkdiagnosis/Task/TraceTask.java b/app/src/main/java/cn/darkal/networkdiagnosis/Task/TraceTask.java
@@ -1,6 +1,11 @@
 package cn.darkal.networkdiagnosis.Task;
 
+import android.Manifest;
+import android.app.Activity;
 import android.content.Context;
+import android.content.pm.PackageManager;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
 import android.widget.TextView;
 
 import com.netease.LDNetDiagnoService.LDNetDiagnoListener;
@@ -18,10 +23,9 @@
 public class TraceTask extends BaseTask  implements LDNetDiagnoListener {
     String url;
     TextView resultTextView;
-    Context context;
-    String result;
+    Activity context;
 
-    public TraceTask(Context context , String url, TextView resultTextView)  {
+    public TraceTask(Activity context , String url, TextView resultTextView)  {
         super(url, resultTextView);
         this.context = context;
         this.url = url;
@@ -37,15 +41,21 @@ public Runnable getExecRunnable() {
         @Override
         public void run() {
             try{
-//                TraceRouteWithPing traceRouteWithPing = new TraceRouteWithPing(url, TraceTask.this);
-//                traceRouteWithPing.executeTraceRoute();
-                LDNetDiagnoService _netDiagnoService = new LDNetDiagnoService(context.getApplicationContext(),
-                        "NetworkDiagnosis", "网络诊断应用", DeviceUtils.getVersion(context), "",
-                        "", url, "", "",
-                        "", "", TraceTask.this);
-                // 设置是否使用JNIC 完成traceroute
-                _netDiagnoService.setIfUseJNICTrace(true);
-                _netDiagnoService.execute();
+                int permissionCheck = ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE);
+
+                if (permissionCheck != PackageManager.PERMISSION_GRANTED) {
+                    ActivityCompat.requestPermissions(context, new String[]{Manifest.permission.READ_PHONE_STATE}, 1);
+                } else {
+//                    TraceRouteWithPing traceRouteWithPing = new TraceRouteWithPing(url, TraceTask.this);
+//                    traceRouteWithPing.executeTraceRoute();
+                    LDNetDiagnoService _netDiagnoService = new LDNetDiagnoService(context.getApplicationContext(),
+                            "NetworkDiagnosis", "网络诊断应用", DeviceUtils.getVersion(context), "",
+                            "", url, "", "",
+                            "", "", TraceTask.this);
+                    // 设置是否使用JNIC 完成traceroute
+                    _netDiagnoService.setIfUseJNICTrace(true);
+                    _netDiagnoService.execute();
+                }
             }
             catch (Exception e){
                 resultTextView.post(new updateResultRunnable(e.toString() + "\n"));

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">HttpInterceptor</string>
+    <string name="app_name">AndroidHttpCapture</string>
 
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>