diff --git a/app/src/main/java/org/ntlab/amaryllis/client/VoiceActivity.java b/app/src/main/java/org/ntlab/amaryllis/client/VoiceActivity.java
index 3fc6e18..91be140 100644
--- a/app/src/main/java/org/ntlab/amaryllis/client/VoiceActivity.java
+++ b/app/src/main/java/org/ntlab/amaryllis/client/VoiceActivity.java
@@ -48,8 +48,8 @@
Record.setOnClickListener(new View.OnClickListener(){
public void onClick(View x){
System.out.println("!!!");
- TextView textView1 = (TextView)findViewById(R.id.Notice);
- textView1.setText("Record Start!");
+ //TextView textView1 = (TextView)findViewById(R.id.Notice);
+ //textView1.setText("Record Start!");
startRecord();
}
});
@@ -57,8 +57,8 @@
Button Playback = (Button)findViewById(R.id.button2);
Playback.setOnClickListener(new View.OnClickListener(){
public void onClick(View x){
- TextView textView1 = (TextView)findViewById(R.id.Notice);
- textView1.setText("Playback Start!");
+ //TextView textView1 = (TextView)findViewById(R.id.Notice);
+ //textView1.setText("Playback Start!");
startPlay();
}
});
@@ -66,6 +66,7 @@
//再生開始&再生中止
+ //次は再生が終わった時の処理を書いていく事。
private void startPlay(){
ImageView Stoping = findViewById(R.id.Stoping);
ImageView Playing = findViewById(R.id.Playing);
@@ -75,6 +76,8 @@
//mp = MediaPlayer.create(this,R.raw.bgm);
if(mp.isPlaying()){
+ TextView textView1 = (TextView)findViewById(R.id.Notice);
+ textView1.setText("Playback Stop!");
mp.stop();//再生を中断
//mp.pause();//途中から再生を再開したい時はこっちを使う必要があるかも
@@ -131,7 +134,8 @@
} catch (Exception e) {
e.printStackTrace();
}
-
+ TextView textView1 = (TextView)findViewById(R.id.Notice);
+ textView1.setText("Playback Start!");
mp.seekTo(0);
mp.start();//再生スタート
Playing.setAlpha(1.0f);
@@ -160,6 +164,8 @@
if(StartChange == 0) {
try {
+ TextView textView1 = (TextView)findViewById(R.id.Notice);
+ textView1.setText("Record End!");
mr.stop();
mr.reset();
mr.release();
@@ -169,6 +175,8 @@
}
}else {
try {
+ TextView textView1 = (TextView)findViewById(R.id.Notice);
+ textView1.setText("Record Start!");
mr = new MediaRecorder();
mr.setAudioSource(MediaRecorder.AudioSource.MIC);
mr.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7d686f3..e1be0c7 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -37,18 +37,6 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.431"
app:navGraph="@navigation/mobile_navigation" />
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_maps.xml b/app/src/main/res/layout/fragment_maps.xml
index e17f020..9ca86a0 100644
--- a/app/src/main/res/layout/fragment_maps.xml
+++ b/app/src/main/res/layout/fragment_maps.xml
@@ -6,30 +6,35 @@
android:layout_height="match_parent"
tools:context=".fragment.MapsFragment">
-
+
+ app:layout_constraintStart_toStartOf="@+id/map"
+ app:layout_constraintTop_toTopOf="@+id/map" />
+ android:id="@+id/frameLayout"
+ android:layout_width="83dp"
+ android:layout_height="65dp"
+ android:layout_marginTop="256dp"
+ app:layout_constraintEnd_toEndOf="@+id/map"
+ app:layout_constraintHorizontal_bias="0.315"
+ app:layout_constraintStart_toEndOf="@+id/button"
+ app:layout_constraintTop_toTopOf="@+id/map">
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="@+id/map"
+ app:layout_constraintTop_toTopOf="@+id/map"
+ app:layout_constraintVertical_bias="0.546" />
-
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintStart_toStartOf="@+id/map"
+ app:layout_constraintTop_toTopOf="@+id/map"
+ app:layout_constraintVertical_bias="0.478" />
\ No newline at end of file