Merge branch 'release/0.5.7'

chrhsmt · Nov 5, 2017 · 8e230a9 · 8e230a9
2 parents 93c6d58 + bd5107a
commit 8e230a9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -21,7 +21,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 26
         versionCode 1
-        versionName "0.5.6"
+        versionName "0.5.7"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         // Enabling multidex support.
         multiDexEnabled true

diff --git a/app/src/main/java/com/chrhsmt/sisheng/ReibunActivity.kt b/app/src/main/java/com/chrhsmt/sisheng/ReibunActivity.kt
@@ -24,6 +24,9 @@ import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.Response
 import java.io.IOException
+import android.view.animation.AlphaAnimation
+
+
 
 class ReibunActivity : AppCompatActivity() {
 
@@ -140,7 +143,6 @@ class ReibunActivity : AppCompatActivity() {
                 when (this@ReibunActivity.service!!.isRunning()) {
                     true -> Thread.sleep(1000)
                 }
-                Thread.sleep(1000)
 
                 this@ReibunActivity.runOnUiThread {
                     nowStatus = REIBUN_STATUS.NORMAL
@@ -295,13 +297,19 @@ class ReibunActivity : AppCompatActivity() {
                 // 録音ボタン：録音中、再生ボタン：再生不可
                 btnRokuon.setBackgroundResource(R.drawable.shape_round_button_press)
                 btnRokuon.setEnabled(true)
+                val alphaAnimation = AlphaAnimation(1.0f, 0.7f)
+                alphaAnimation.duration = 1000
+                alphaAnimation.fillAfter = true
+                alphaAnimation.repeatCount = -1
+                btnRokuon.startAnimation(alphaAnimation)
                 btnOtehon.setBackgroundResource(R.drawable.shape_round_button_disable)
                 btnOtehon.setEnabled(false)
             }
             REIBUN_STATUS.ANALYZING -> {
                 // 録音ボタン：録音不可、再生ボタン：再生不可
                 btnRokuon.setBackgroundResource(R.drawable.shape_round_button_disable)
                 btnRokuon.setEnabled(false)
+                btnRokuon.clearAnimation()
                 btnOtehon.setBackgroundResource(R.drawable.shape_round_button_disable)
                 btnOtehon.setEnabled(false)
             }