From 6857339169b09ee156d01d91b467a47a5f5489cc Mon Sep 17 00:00:00 2001 From: yeeunyuk Date: Wed, 23 Nov 2022 18:52:17 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8E=AB/=EB=AC=B8=EC=A7=84=ED=91=9C/=EC=83=81?= =?UTF-8?q?=EB=8B=B4=EC=8B=A0=EC=B2=AD=20=EB=A1=9C=EA=B7=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80,=20=ED=95=84=EC=9A=94=EC=97=86=EB=8A=94=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../myapplication/ui/hospital/ApplyData.java | 46 ------------------- .../ui/hospital/Fragment_hospital.java | 2 +- .../ui/hospital/Fragment_hospital_detail.java | 11 +++-- .../ui/petSelect/PetSelectActivity.java | 15 ------ .../ui/questionNaire/Fragment_Question.java | 1 + 5 files changed, 9 insertions(+), 66 deletions(-) delete mode 100644 application/app/src/main/java/com/mnchatbot/myapplication/ui/hospital/ApplyData.java diff --git a/application/app/src/main/java/com/mnchatbot/myapplication/ui/hospital/ApplyData.java b/application/app/src/main/java/com/mnchatbot/myapplication/ui/hospital/ApplyData.java deleted file mode 100644 index fbbeff6..0000000 --- a/application/app/src/main/java/com/mnchatbot/myapplication/ui/hospital/ApplyData.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.mnchatbot.myapplication.ui.hospital; - -import com.google.gson.annotations.SerializedName; - -public class ApplyData { - @SerializedName("petSerial") - public int petSerial; - //문진표 스피너 선택값 - @SerializedName("medicalSerial") - public int medicalSerial; - @SerializedName("partnerSerial") - public int partnerSerial; - - @SerializedName("apptDate") - public String h_date; - @SerializedName("apptTime") - public String h_time; - - @SerializedName("apptMemberName") - public String h_Name; - @SerializedName("apptMemberTel") - public String h_num; - - //예상 비용 안내여부 - @SerializedName("apptBill") - public boolean h_bill; - @SerializedName("apptReason") - public String h_reson; - @SerializedName("apptImage") - public String h_Image; - - public ApplyData(int petSerial, int medicalSerial, int partnerSerial, String h_Name, String h_num, String h_date, String h_time, boolean h_bill, String h_reson, String h_Image) { - this.petSerial = petSerial; - this.medicalSerial = medicalSerial; - this.partnerSerial = partnerSerial; - - this.h_Name = h_Name; - this.h_num = h_num; - this.h_date = h_date; - this.h_time = h_time; - this.h_bill = h_bill; - this.h_reson = h_reson; - this.h_Image = h_Image; - - } -} diff --git a/application/app/src/main/java/com/mnchatbot/myapplication/ui/hospital/Fragment_hospital.java b/application/app/src/main/java/com/mnchatbot/myapplication/ui/hospital/Fragment_hospital.java index 7be8796..19a4899 100644 --- a/application/app/src/main/java/com/mnchatbot/myapplication/ui/hospital/Fragment_hospital.java +++ b/application/app/src/main/java/com/mnchatbot/myapplication/ui/hospital/Fragment_hospital.java @@ -148,7 +148,7 @@ public void addItem(int HospSerial, String HospType, String HospitalName, String item.setfield(field); mList.add(item); } - //모든 연계병원 보기 + //모든 동물병원 보기 public void call_totalList(){ String region = City1Name; String city = City2Name; diff --git a/application/app/src/main/java/com/mnchatbot/myapplication/ui/hospital/Fragment_hospital_detail.java b/application/app/src/main/java/com/mnchatbot/myapplication/ui/hospital/Fragment_hospital_detail.java index 77dab57..09136d5 100644 --- a/application/app/src/main/java/com/mnchatbot/myapplication/ui/hospital/Fragment_hospital_detail.java +++ b/application/app/src/main/java/com/mnchatbot/myapplication/ui/hospital/Fragment_hospital_detail.java @@ -266,6 +266,8 @@ public void onResponse(Call call, Response respo if (response.isSuccessful()) { Qndata = response.body().data; if (Qndata == null) { + Log.d("문진표 스피너", "데이터 없음"); + Toast.makeText(getActivity(), "문진표를 작성해주세요.", Toast.LENGTH_SHORT).show(); } else { for(int i=0; i< Qndata.size(); i++) { mSerial = Qndata.get(i).getMedicalFormSerial(); @@ -331,7 +333,7 @@ public void sendData() { map.put("apptReason", apptReason); //Uri 타입 파일 경로가지는 requestBody 객체 생성 - RequestBody requestFile = RequestBody.create(MediaType.parse("image/jpg"), String.valueOf(mImageCaptureUri)); //요부분을 잘 모르겠음. + RequestBody requestFile = RequestBody.create(MediaType.parse("image/jpg"), String.valueOf(mImageCaptureUri)); File IImage = directory_AAI; //requestBody로 Multipart.Part 객체 생성 if (IImage == null) {body = null;} @@ -385,6 +387,7 @@ public void onTimeSet(TimePicker view, int hourOfDay, int minute) { // 카메라 촬영 후 이미지 가져오기 public void TakePhoto() { + //카메라 호출 Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder(); StrictMode.setVmPolicy(builder.build()); @@ -426,14 +429,14 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { intent.putExtra("aspectY", 1); // CROP 박스의 Y축 비율 intent.putExtra("scale", true); intent.putExtra("return-data", true); - Log.d("크롭!", "성공"); + Log.d("크롭", "성공"); startActivityForResult(intent, CROP_FROM_IMAGE); // CROP_FROM_CAMERA case문 이동 break; } case CROP_FROM_IMAGE: { - Log.d("크롭~", "성공"); + Log.d("크롭 이미지 보여주기", "성공"); if(resultCode != RESULT_OK) { return;} final Bundle extras = data.getExtras(); // CROP된 이미지를 저장하기 위한 FILE 경로 >> Provider의 문제? @@ -445,7 +448,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { storeCropImage(photo, filePath); // CROP된 이미지를 외부저장소, 앨범에 저장한다. absoultePath = filePath; break; - } + } else {Log.d("extras", "데이터 없음"); } // 임시 파일 삭제 File f = new File(mImageCaptureUri.getPath()); diff --git a/application/app/src/main/java/com/mnchatbot/myapplication/ui/petSelect/PetSelectActivity.java b/application/app/src/main/java/com/mnchatbot/myapplication/ui/petSelect/PetSelectActivity.java index dc15730..d38db7a 100644 --- a/application/app/src/main/java/com/mnchatbot/myapplication/ui/petSelect/PetSelectActivity.java +++ b/application/app/src/main/java/com/mnchatbot/myapplication/ui/petSelect/PetSelectActivity.java @@ -84,21 +84,6 @@ public void onClick(View view){ }); } - /*사용자가 작성한 반려동물 정보 불러오기 - @Override - protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent intent) { - super.onActivityResult(requestCode, resultCode, intent); - - if (resultCode == Activity.RESULT_OK) { - if (intent !=null) { - /*String petName = intent.getStringExtra("petName"); - String CATDOG = intent.getStringExtra("CATDOG"); - addItem(petName, CATDOG, ); - mRecyclerViewAdapter.notifyDataSetChanged(); - callPetList(); - } - } - }*/ // 리사이클러뷰에 데이터추가 public void addItem(String mainText, String imgName, int petSerial){ diff --git a/application/app/src/main/java/com/mnchatbot/myapplication/ui/questionNaire/Fragment_Question.java b/application/app/src/main/java/com/mnchatbot/myapplication/ui/questionNaire/Fragment_Question.java index 020b330..cf74568 100644 --- a/application/app/src/main/java/com/mnchatbot/myapplication/ui/questionNaire/Fragment_Question.java +++ b/application/app/src/main/java/com/mnchatbot/myapplication/ui/questionNaire/Fragment_Question.java @@ -144,6 +144,7 @@ public void onResponse(Call call, Response respo if (response.isSuccessful()) { Qndata = response.body().data; if (Qndata == null) { + {Log.d("문진표", "데이터 없음");} } else { for(int i=0; i< Qndata.size(); i++) { int mSerial = Qndata.get(i).getMedicalFormSerial();