diff --git a/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java b/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java index 39700eb..96d4b0a 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/Amaryllis.java @@ -9,6 +9,7 @@ private String password=null; private String latitude=null; private String longitude=null; + private String data=null; public void setUid(String uid) { SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE); @@ -79,4 +80,16 @@ return longitude; } + public void setData(String VoiceData) { + SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE); + SharedPreferences.Editor editor = prefData.edit(); + editor.putString("VoiceData", VoiceData); + editor.commit(); + } + public String getData() { + SharedPreferences prefData = getSharedPreferences("pref_data", MODE_PRIVATE); + data = prefData.getString("VoiceData",""); + return data; + } + } diff --git a/app/src/main/java/org/ntlab/amaryllis/client/MyDialogFragment.java b/app/src/main/java/org/ntlab/amaryllis/client/MyDialogFragment.java index 593f3aa..a93c50f 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/MyDialogFragment.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/MyDialogFragment.java @@ -1,6 +1,8 @@ package org.ntlab.amaryllis.client; //import android.app.Activity; +import android.app.Activity; +import android.app.Application; import android.content.Context; import android.os.Bundle; @@ -11,6 +13,7 @@ import androidx.fragment.app.DialogFragment; import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; import android.view.ViewGroup; @@ -18,6 +21,7 @@ import android.widget.EditText; import android.widget.TextView; import android.widget.Button; +import android.widget.Toast; import android.graphics.Color; @@ -26,16 +30,32 @@ import android.view.Window; import android.view.WindowManager; +import org.ntlab.amaryllis.client.entities.Voicememo; +import org.ntlab.amaryllis.client.fragment.MapsFragment; +import org.ntlab.amaryllis.client.resources.VoicememosRest; + import java.util.ArrayList; import java.util.List; +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.jackson.JacksonConverterFactory; + public class MyDialogFragment extends DialogFragment { Button CancelButton; private EditText editText; + Activity amaryllis; + private VoicememosRest voicememosService; + private MapsFragment aaaa; + String toastMessage; //editText = findViewById(R.id.editText); + private String data; + public interface DialogFragmentListener{ @@ -245,6 +265,8 @@ setContentView(R.layout.activity_dialog); + //Amaryllis amaryllis = new Amaryllis(); + //chkbox.setChecked(true); } @@ -263,8 +285,9 @@ @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - //editText = + final int n = 5; + toastMessage = "ああああ"; final Dialog dialog = new Dialog(getActivity()); @@ -276,18 +299,20 @@ // 背景を透明にする dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); - // + //checkbox1のIDを取得 final CheckBox check = dialog.findViewById(R.id.checkbox_1); // OK ボタンのリスナ dialog.findViewById(R.id.positive_button).setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { + //タイトルの入力 EditText editText = ((Dialog)dialog).findViewById(R.id.editTitle); String editTitle = editText.getText().toString(); TextView Title = (TextView)getActivity().findViewById(R.id.VoiceTitle); Title.setText(editTitle); + //概要の入力 EditText editText2 = ((Dialog)dialog).findViewById(R.id.editOverview); String editOverview = editText2.getText().toString(); TextView Overview = (TextView)getActivity().findViewById(R.id.VoiceOverview); @@ -308,16 +333,51 @@ //} //} - //チェックされた状態だった + //checkbox1がチェックされた状態だった if(check.isChecked() == true){ Title.setText("1"); - }else{//チェックされていない状態だった + }else{//checkbox1がチェックされていない状態だった Title.setText("ダメです。"); } + //aaaa = new MapsFragment(); + + + Retrofit retrofit = new Retrofit.Builder() + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/amaryllis/") + .addConverterFactory(JacksonConverterFactory.create()) + .build(); + voicememosService = retrofit.create(VoicememosRest.class); + Amaryllis amaryllis = (Amaryllis) getActivity().getApplication(); + data = amaryllis.getData(); + String str = data.replace("\n",""); + + Call call = voicememosService.postVoicememos(amaryllis.getUid(),amaryllis.getToken(),10,str,35,135,"untitled","abcde"); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + Voicememo voicememo = response.body(); + System.out.println("Success!!!!!!!"); + } + + @Override + public void onFailure(Call call, Throwable t) { + System.out.println("failed!!!!!!!!!!!!!"); + } + }); + + + Toast toast = Toast.makeText(v.getContext(), toastMessage, Toast.LENGTH_LONG); + toast.show(); + + + + + + dismiss(); } }); diff --git a/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java b/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java index 339c9be..adc83b5 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java @@ -143,7 +143,7 @@ .addConverterFactory(JacksonConverterFactory.create()) .build(); voicememosService = retrofit.create(VoicememosRest.class); -// amaryllis = (Amaryllis) getActivity().getApplication(); + amaryllis = (Amaryllis) getActivity().getApplication(); //file = new File(getFilesDir(),"Sample.3gp"); mp = new MediaPlayer(); @@ -288,20 +288,10 @@ in.read(byteData); String data = Base64.encodeToString(byteData, 0,byteData.length, Base64.DEFAULT); + //voice = data; + amaryllis.setData(data); - Call call = voicememosService.postVoicememos(amaryllis.getUid(),amaryllis.getToken(),10,data,35,135,"untitled",""); - call.enqueue(new Callback() { - @Override - public void onResponse(Call call, Response response) { - Voicememo voicememo = response.body(); - } - - @Override - public void onFailure(Call call, Throwable t) { - - } - }); StartChange = 1; R_Stoping.setAlpha(1.0f); R_Playing.setAlpha(0.0f); diff --git a/app/src/main/java/org/ntlab/amaryllis/client/resources/VoicememosRest.java b/app/src/main/java/org/ntlab/amaryllis/client/resources/VoicememosRest.java index 7b7ed11..acdb953 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/resources/VoicememosRest.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/resources/VoicememosRest.java @@ -1,6 +1,8 @@ package org.ntlab.amaryllis.client.resources; +import android.widget.TextView; + import org.ntlab.amaryllis.client.entities.Voicememo; import org.ntlab.amaryllis.client.entities.VoicememosEditFixResponse; import org.ntlab.amaryllis.client.entities.VoicememosFavosDeleteResponse; diff --git a/app/src/main/res/layout/activity_dialog.xml b/app/src/main/res/layout/activity_dialog.xml index dd1ba29..cc52780 100644 --- a/app/src/main/res/layout/activity_dialog.xml +++ b/app/src/main/res/layout/activity_dialog.xml @@ -87,25 +87,63 @@ android:textStyle= "bold" android:text="・該当するカテゴリを選択してください" /> - + - + + + + + + + + + + + +