Merge branch 'feature/jni' into develop

Author: KimBoWoon

build.gradle

@@ -8,7 +8,6 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -27,5 +26,3 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-
-apply from: rootProject.file('gradle/dependencies.gradle')

example/build.gradle

@@ -23,6 +23,12 @@ android {
         }
     }
 
+    packagingOptions {
+        exclude 'lib/x86_64/libmodule.so'
+        exclude 'lib/arm64-v8a/libmodule.so'
+        exclude 'lib/x86/libmodule.so'
+        exclude 'lib/armeabi-v7a/libmodule.so'
+    }
 }
 
 dependencies {

gradle/dependencies.gradle

@@ -1,5 +1,6 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+#Wed Mar 28 20:38:17 KST 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -17,21 +17,21 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.android.support:appcompat-v7:26.1.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
 
-    api dep.volley
-    implementation dep.acracore
+    api 'com.android.volley:volley:1.0.0'
+    implementation 'ch.acra:acra-core:5.0.0'
+
+    implementation files('libs/module-release.aar')
 }

logcat/build.gradle

@@ -20,9 +20,9 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--keep public final class Logcat
-
--renamesourcefileattribute SourceFile
-
--keep class com.android.volley.**
--keep class org.acra.**
+#-keep public final class *
+#
+#-renamesourcefileattribute SourceFile
+#
+#-keep class com.android.volley.**
+#-keep class org.acra.**

logcat/libs/module-release.aar

@@ -1,6 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.logcat">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application android:name=".crashlogger.CreateAcra">
 
     </application>

logcat/proguard-rules.pro

@@ -3,8 +3,9 @@
 import android.net.Uri;
 import android.util.Log;
 
-import com.android.logcat.vo.LogVO;
+import com.android.logcat.module.Constant;
 import com.android.logcat.util.TransferType;
+import com.android.logcat.vo.LogVO;
 import com.android.volley.DefaultRetryPolicy;
 import com.android.volley.Request;
 import com.android.volley.Response;
@@ -19,7 +20,7 @@ public class HttpService implements HttpServiceList {
     private String makeURL(TransferType type) {
         Uri.Builder uri = new Uri.Builder();
         uri.scheme("http");
-        uri.encodedAuthority("52.231.31.239:8080");
+        uri.encodedAuthority(Constant.getAddress() + ":" + Constant.getPort());
 //        uri.encodedAuthority("192.168.0.7:8080");
 
         switch (type) {
@@ -47,19 +48,22 @@ private JSONObject makeLogDataJSON(LogVO data) {
             jsonObject.put("level", data.getLevel());
             jsonObject.put("time", data.getTime());
 
-            memoryInfo.put("totalMemory", data.getMemory().getTotalMemory());
-            memoryInfo.put("availMemory", data.getMemory().getAvailMemory());
-            memoryInfo.put("memoryPercentage", data.getMemory().getMemoryPercentage());
-            memoryInfo.put("threshold", data.getMemory().getThreshold());
-            memoryInfo.put("lowMemory", data.getMemory().isLowMemory());
-            memoryInfo.put("debugNativeFree", data.getMemory().getDebugNativeFree());
-            memoryInfo.put("debugNativeAllocated", data.getMemory().getDebugNativeAllocated());
-            memoryInfo.put("debugNativeAvailable", data.getMemory().getDebugNativeAvailable());
-            memoryInfo.put("nativeFreeMemory", data.getMemory().getNativeFreeMemory());
-            memoryInfo.put("nativeMaxMemory", data.getMemory().getNativeMaxMemory());
-            memoryInfo.put("nativeTotalMemory", data.getMemory().getNativeTotalMemory());
-
-            jsonObject.put("memoryInfo", memoryInfo);
+            if (data.getMemory() != null) {
+                memoryInfo.put("totalMemory", data.getMemory().getTotalMemory());
+                memoryInfo.put("availMemory", data.getMemory().getAvailMemory());
+                memoryInfo.put("memoryPercentage", data.getMemory().getMemoryPercentage());
+                memoryInfo.put("threshold", data.getMemory().getThreshold());
+                memoryInfo.put("lowMemory", data.getMemory().isLowMemory());
+                memoryInfo.put("debugNativeFree", data.getMemory().getDebugNativeFree());
+                memoryInfo.put("debugNativeAllocated", data.getMemory().getDebugNativeAllocated());
+                memoryInfo.put("debugNativeAvailable", data.getMemory().getDebugNativeAvailable());
+                memoryInfo.put("nativeFreeMemory", data.getMemory().getNativeFreeMemory());
+                memoryInfo.put("nativeMaxMemory", data.getMemory().getNativeMaxMemory());
+                memoryInfo.put("nativeTotalMemory", data.getMemory().getNativeTotalMemory());
+
+                jsonObject.put("memoryInfo", memoryInfo);
+            }
+
             return jsonObject;
         } catch (JSONException e) {
             e.printStackTrace();

logcat/src/main/AndroidManifest.xml

@@ -4,15 +4,9 @@
 import android.app.ActivityManager.MemoryInfo;
 import android.content.Context;
 import android.os.Debug;
-import android.util.Log;
 
 import com.android.logcat.vo.MemoryVO;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
 import static android.content.Context.ACTIVITY_SERVICE;
 
 /**
@@ -23,8 +17,6 @@ public class MemoryChecker {
     private Context context;
     private MemoryInfo activityMemoryInfo;
     private ActivityManager activityManager;
-    private List<ActivityManager.RunningAppProcessInfo> runningAppProcesses;
-    private Map<Integer, String> pidMap;
 
     public MemoryChecker(Context context) {
         this.context = context;