From 4da6aeca9af5e34d4439059090cfb2e4aaf6b795 Mon Sep 17 00:00:00 2001
From: zhangjr <jecrryz@126.com>
Date: Tue, 3 Dec 2019 15:57:52 +0800
Subject: [PATCH] init commit2

---
 app/build.gradle                                   | 14 +++++++++++++-
 app/src/main/AndroidManifest.xml                   | 10 ++--------
 app/src/main/java/com/zjr/app/MainActivity.java    | 13 +++++++++++++
 .../com/zjr/{recorder => app}/PermissionUtil.java  |  2 +-
 .../com/zjr/{recorder => app}/RecordActivity.java  |  4 +++-
 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml |  5 -----
 app/src/main/res/values/strings.xml                |  2 +-
 build.gradle                                       |  4 +++-
 lib_recorder/build.gradle                          |  2 ++
 .../java/com/zjr/recorder/AudioRecordEngine.java   |  1 +
 settings.gradle                                    |  2 +-
 11 files changed, 40 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/java/com/zjr/app/MainActivity.java
 rename app/src/main/java/com/zjr/{recorder => app}/PermissionUtil.java (99%)
 rename app/src/main/java/com/zjr/{recorder => app}/RecordActivity.java (98%)
 delete mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

diff --git a/app/build.gradle b/app/build.gradle
index 4797314..09613a6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,24 +2,36 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 28
+
+
     defaultConfig {
-        applicationId "com.zjr.recorder"
+        applicationId "com.zjr.app"
         minSdkVersion 21
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation project(path: ':lib_recorder')
+
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3f73807..4c97fd9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.zjr.recorder">
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    package="com.zjr.app">
 
     <application
         android:allowBackup="true"
@@ -14,8 +9,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".RecordActivity"
-            android:windowSoftInputMode="stateHidden">
+        <activity android:name=".RecordActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/zjr/app/MainActivity.java b/app/src/main/java/com/zjr/app/MainActivity.java
new file mode 100644
index 0000000..457d2ea
--- /dev/null
+++ b/app/src/main/java/com/zjr/app/MainActivity.java
@@ -0,0 +1,13 @@
+package com.zjr.app;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+    }
+}
diff --git a/app/src/main/java/com/zjr/recorder/PermissionUtil.java b/app/src/main/java/com/zjr/app/PermissionUtil.java
similarity index 99%
rename from app/src/main/java/com/zjr/recorder/PermissionUtil.java
rename to app/src/main/java/com/zjr/app/PermissionUtil.java
index 4a80691..94e8144 100644
--- a/app/src/main/java/com/zjr/recorder/PermissionUtil.java
+++ b/app/src/main/java/com/zjr/app/PermissionUtil.java
@@ -1,4 +1,4 @@
-package com.zjr.recorder;
+package com.zjr.app;
 
 import android.app.Activity;
 import android.content.pm.PackageManager;
diff --git a/app/src/main/java/com/zjr/recorder/RecordActivity.java b/app/src/main/java/com/zjr/app/RecordActivity.java
similarity index 98%
rename from app/src/main/java/com/zjr/recorder/RecordActivity.java
rename to app/src/main/java/com/zjr/app/RecordActivity.java
index 2281102..ff16d74 100644
--- a/app/src/main/java/com/zjr/recorder/RecordActivity.java
+++ b/app/src/main/java/com/zjr/app/RecordActivity.java
@@ -1,4 +1,4 @@
-package com.zjr.recorder;
+package com.zjr.app;
 
 import android.Manifest;
 import android.os.Bundle;
@@ -9,6 +9,8 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import com.zjr.recorder.FileFormat;
+import com.zjr.recorder.Recorder;
 import com.zjr.recorder.audiotrack.AudioTrackManager;
 import com.zjr.recorder.listener.OnRecordListener;
 import com.zjr.recorder.listener.OnVolumeListener;
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index eca70cf..0000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8c6c0f0..af25a20 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">recorder</string>
+    <string name="app_name">audiorecorder</string>
 </resources>
diff --git a/build.gradle b/build.gradle
index 02199bb..4cc594a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,9 +6,11 @@ buildscript {
         jcenter()
         
     }
+
     dependencies {
         classpath 'com.android.tools.build:gradle:3.4.1'
-        
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/lib_recorder/build.gradle b/lib_recorder/build.gradle
index 8d98b84..b6a344a 100644
--- a/lib_recorder/build.gradle
+++ b/lib_recorder/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+group='com.github.jeryz'
 
 android {
     compileSdkVersion 28
diff --git a/lib_recorder/src/main/java/com/zjr/recorder/AudioRecordEngine.java b/lib_recorder/src/main/java/com/zjr/recorder/AudioRecordEngine.java
index 759fc25..96431b9 100644
--- a/lib_recorder/src/main/java/com/zjr/recorder/AudioRecordEngine.java
+++ b/lib_recorder/src/main/java/com/zjr/recorder/AudioRecordEngine.java
@@ -143,6 +143,7 @@ public void start() {
             startRecordThread();
         } else {
             Log.e(TAG, "state uninitialized");
+            setState(OnRecordListener.STATE_ERROR, "uninitialized");
         }
 
         String c = channelConfig == AudioFormat.CHANNEL_IN_STEREO ? "stereo" : "mono";
diff --git a/settings.gradle b/settings.gradle
index 938a9a3..4460be5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':lib_recorder'
+include ':lib_recorder', ':app'