Merge branch 'feature/upgrade_alinetworkdiagnosis_0.2.0.1' into develop

Author: gzbleu

aliyun_sls_android_network_diagnosis/build.gradle

@@ -7,7 +7,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 29
         versionCode 1
-        versionName "2.0.15"
+        versionName "2.0.16"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

aliyun_sls_android_network_diagnosis/libs/alinetworkdiagnosis-0.1.9.9.jar

@@ -137,6 +137,7 @@ class Request {
         public String domain;
         public Object context;
         public boolean multiplePortsDetect = true;
+        public Map<String, String> extension;
     }
 
     class HttpRequest extends PingRequest {

aliyun_sls_android_network_diagnosis/libs/alinetworkdiagnosis-0.2.0.1.jar

@@ -300,6 +300,9 @@ public void http(HttpRequest request, Callback2 callback) {
             request.context
         );
         config.setMultiplePortsDetect(enableMultiplePortsDetect || request.multiplePortsDetect);
+        if (null != request.extension) {
+            config.setDetectExtension(new HashMap<>(request.extension));
+        }
         Diagnosis.startHttpPing(config);
     }
     // endregion
@@ -373,6 +376,9 @@ public void ping(PingRequest pingRequest, Callback2 callback) {
         );
 
         config.setMultiplePortsDetect(enableMultiplePortsDetect || pingRequest.multiplePortsDetect);
+        if (null != pingRequest.extension) {
+            config.setDetectExtension(new HashMap<>(pingRequest.extension));
+        }
         Diagnosis.startPing(config);
     }
     // endregion
@@ -434,6 +440,9 @@ public void tcpPing(TcpPingRequest request, Callback2 callback) {
             request.context
         );
         config.setMultiplePortsDetect(enableMultiplePortsDetect || request.multiplePortsDetect);
+        if (null != request.extension) {
+            config.setDetectExtension(new HashMap<>(request.extension));
+        }
         Diagnosis.startTcpPing(config);
     }
 
@@ -512,6 +521,9 @@ public void mtr(MtrRequest request, Callback2 callback) {
         config.protocol = request.protocol.protocol;
 
         config.setMultiplePortsDetect(enableMultiplePortsDetect || request.multiplePortsDetect);
+        if (null != request.extension) {
+            config.setDetectExtension(new HashMap<>(request.extension));
+        }
         Diagnosis.startMtr(config);
     }
     // endregion
@@ -582,6 +594,9 @@ public void dns(DnsRequest dnsRequest, Callback2 callback) {
             dnsRequest.context
         );
         config.setMultiplePortsDetect(enableMultiplePortsDetect || dnsRequest.multiplePortsDetect);
+        if (null != dnsRequest.extension) {
+            config.setDetectExtension(new HashMap<>(dnsRequest.extension));
+        }
         Diagnosis.startDns(config);
     }
     // endregion

aliyun_sls_android_network_diagnosis/libs/arm64-v8a/libalinetworkdiagnosis.so

@@ -66,8 +66,8 @@ public void onCreate() {
 
         NetworkDiagnosisCredentials networkDiagnosisCredentials = credentials.getNetworkDiagnosisCredentials();
         networkDiagnosisCredentials.secretKey = PreferenceUtils.getNetworkSecKey(this);
-        networkDiagnosisCredentials.endpoint = "https://cn-hangzhou.log.aliyuncs.com";
-        networkDiagnosisCredentials.project = "zaiyun-test5";
+        networkDiagnosisCredentials.endpoint = "https://cn-beijing.log.aliyuncs.com";
+        networkDiagnosisCredentials.project = "mobile-demo-beijing-b";
 
         SLSAndroid.setUtdid(this, "123123131232");
         SLSAndroid.setLogLevel(Log.VERBOSE);