Merge pull request #35 from aserbao/aserbao_1.0

Aserbao 1.0
aserbao · Jul 3, 2020 · 9538f14 · 9538f14
2 parents 95a4960 + ada9032
commit 9538f14
Show file tree

Hide file tree

Showing 21 changed files with 1,387 additions and 26 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -36,6 +36,15 @@ android {
             path "CMakeLists.txt"
         }
     }
+
+    testOptions {
+        unitTests.all {
+            // All the usual Gradle options.
+            jvmArgs '-XX:MaxPermSize=256m'
+        }
+
+        unitTests.returnDefaultValues = true
+    }
 }
 
 dependencies {
@@ -57,6 +66,10 @@ dependencies {
     implementation 'com.googlecode.mp4parser:isoparser:1.1.21'
     implementation files('libs/fmod.jar')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+
+    testCompile 'junit:junit:4.12'
+    testCompile "org.mockito:mockito-core:1.9.5"
 }
 repositories {
     mavenCentral()

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,19 +8,25 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application
-        android:debuggable="true"
         android:name=".base.MyApplication"
         android:allowBackup="true"
+        android:debuggable="true"
         android:hardwareAccelerated="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_lanuch"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/MyTheme">
-        <activity android:name=".blocks.others.changeVoice.ChangeVoiceActivity"></activity>
-        <activity android:name=".blocks.mediaCodec.show.MediaCodecShowOnGlSurfaceView" />
-        <activity android:name=".HomeActivity">
+        <activity android:name=".WelcomeActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
+        <activity android:name=".blocks.atestcases.TestCaseActivity" />
+        <activity android:name=".blocks.others.changeVoice.ChangeVoiceActivity" />
+        <activity android:name=".blocks.mediaCodec.show.MediaCodecShowOnGlSurfaceView" />
+        <activity android:name=".HomeActivity"></activity>
         <activity android:name=".blocks.BlocksActivity" />
         <activity android:name=".blocks.mediaCodec.MediaCodecActivity" />
         <activity android:name=".whole.WholeActivity" />
@@ -34,12 +40,8 @@
         <activity android:name=".blocks.mediaCodec.bigflake.BigflakeActivity" />
         <activity
             android:name=".whole.record.RecorderActivity"
-            android:screenOrientation="portrait" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            android:screenOrientation="portrait">
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
         <activity android:name=".blocks.mediaCodec.bigflake.encodeDecode.EncodeDecodeActivity" />
         <activity android:name=".blocks.mediaCodec.bigflake.extractDecodeEditEncodeMux.ExtractDecodeEditEncodeMuxActivity" />
@@ -55,9 +57,7 @@
         <activity android:name=".blocks.others.OthersActivity" />
         <activity android:name=".blocks.others.audioStyle.AudioStyleActivity" />
         <activity android:name=".blocks.ffmpeg.FFmpegActivity" />
-
-        <activity android:name=".whole.createVideoByVoice.CreateVideoByAudioDbActivity">
-        </activity>
+        <activity android:name=".whole.createVideoByVoice.CreateVideoByAudioDbActivity" />
         <activity
             android:name=".whole.pickvideo.VideoPickActivity"
             android:screenOrientation="portrait" />

diff --git a/app/src/main/java/com/aserbao/androidcustomcamera/WelcomeActivity.kt b/app/src/main/java/com/aserbao/androidcustomcamera/WelcomeActivity.kt
@@ -0,0 +1,48 @@
+package com.aserbao.androidcustomcamera
+
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.ObjectAnimator
+import android.animation.PropertyValuesHolder
+import android.content.Intent
+import android.util.Log
+import com.aserbao.androidcustomcamera.base.activity.BaseActivity
+import com.aserbao.androidcustomcamera.utils.CheckPermissionUtil
+import com.aserbao.androidcustomcamera.whole.record.RecorderActivity
+import kotlinx.android.synthetic.main.activity_welcome.*
+
+
+class WelcomeActivity : BaseActivity() {
+
+    override fun setLayoutId(): Int {
+        return R.layout.activity_welcome
+    }
+
+    override fun initView() {
+        super.initView()
+    }
+
+    fun exectorAnimator(){
+        val valuesHolder0 = PropertyValuesHolder.ofFloat("scaleX", 1.0f, 1.5f)
+        val valuesHolder1 = PropertyValuesHolder.ofFloat("scaleY", 1.0f, 1.5f)
+        val objectAnimator: ObjectAnimator = ObjectAnimator.ofPropertyValuesHolder(bgIV, valuesHolder0, valuesHolder1)
+        objectAnimator.addListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator?) {
+                super.onAnimationEnd(animation)
+                startActivity(Intent(this@WelcomeActivity, RecorderActivity::class.java))
+                finish()
+            }
+        })
+        objectAnimator.setDuration(2000).start()
+    }
+
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String?>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        Log.e("TAG", "onRequestPermissionsResult: $requestCode")
+        if(CheckPermissionUtil.isCameraGranted()) {
+            exectorAnimator()
+        }else{
+            startRequestPermission()
+        }
+    }
+}
diff --git a/app/src/main/java/com/aserbao/androidcustomcamera/base/activity/BaseActivity.java b/app/src/main/java/com/aserbao/androidcustomcamera/base/activity/BaseActivity.java
@@ -30,7 +30,7 @@ public void onCreate(Bundle savedInstanceState) {
         initView();
     }
 
-    private void startRequestPermission() {
+    protected void startRequestPermission() {
         ActivityCompat.requestPermissions(this,BASIC_PERMISSIONS,123);
     }
     public void initView(){