From dabe4b0540ef9f62ff59431a8d33fd5fb206303d Mon Sep 17 00:00:00 2001 From: HyoseungJun <39950673+HyoseungJun@users.noreply.github.com> Date: Wed, 13 Nov 2019 16:42:07 +0900 Subject: [PATCH 01/10] typo modify --- LOOKID/app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LOOKID/app/src/main/AndroidManifest.xml b/LOOKID/app/src/main/AndroidManifest.xml index 52ed5b5..489672b 100644 --- a/LOOKID/app/src/main/AndroidManifest.xml +++ b/LOOKID/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ - + Date: Sat, 16 Nov 2019 18:27:55 +0900 Subject: [PATCH 02/10] Fix Res_Activity_json --- LOOKID/app/src/main/AndroidManifest.xml | 2 +- .../lookid/Activity/Main_Activity.kt | 3 - .../lookid/Activity/ResInfo_Activity.kt | 6 +- .../Activity/ReservationLast_Activity.kt | 21 +++---- .../lookid/Activity/Reservation_Activity.kt | 21 +++++-- .../lookid/Activity/SignIn_Activity.kt | 3 - .../lookid/Activity/SignUp_Activity.kt | 3 - .../lookid/Activity/UserInfo_Activity.kt | 5 +- .../lookid/Control/Child_adapter.kt | 23 ++++---- .../lookid/Control/Group_adapter.kt | 26 ++++---- .../java/lookid_front/lookid/Control/Json.kt | 25 ++++++-- .../lookid/Control/User_Control.kt | 2 +- .../lookid/Dialog/Basic_Dialog.kt | 18 ++++-- .../lookid/Entity/Child_Entity.kt | 6 +- .../lookid/Entity/Group_Entity.kt | 6 +- .../lookid_front/lookid/Entity/User_Entity.kt | 20 +++---- .../src/main/res/layout/dialog_loading.xml | 4 +- .../main/res/layout/dialog_res_childlist.xml | 59 ++++++++++++++----- .../app/src/main/res/layout/row_res_group.xml | 3 - LOOKID/app/src/main/res/values/dimens.xml | 2 + LOOKID/app/src/main/res/values/styles.xml | 15 ++++- 21 files changed, 169 insertions(+), 104 deletions(-) diff --git a/LOOKID/app/src/main/AndroidManifest.xml b/LOOKID/app/src/main/AndroidManifest.xml index 489672b..52ed5b5 100644 --- a/LOOKID/app/src/main/AndroidManifest.xml +++ b/LOOKID/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ - + startActivity(Intent(applicationContext, Main_Activity::class.java).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)) finish() - }).show() + },true).show() + } + + fun Dialog_cancel(){ + Basic_Dialog(this@ReservationLast_Activity,"취소","정말로 취소하시겠습니까?", DialogInterface.OnClickListener { _, _ -> + val intent = Intent(applicationContext, Main_Activity::class.java) + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) + startActivity(intent) + finish() + },true).show() } } inner class asynctask : AsyncTask(){ @@ -113,17 +122,9 @@ class ReservationLast_Activity : AppCompatActivity(){ fun reslast_ClickListener(view : View){ when(view.id){ - R.id.reslast_cancel_Button ->{ - Basic_Dialog(this,"취소","정말로 취소하시겠습니까?", DialogInterface.OnClickListener { _, _ -> - val intent = Intent(applicationContext, Main_Activity::class.java) - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) - startActivity(intent) - finish() - }).show() - } + R.id.reslast_cancel_Button -> ResLast_Control().Dialog_cancel() R.id.reslast_payment_Button ->{ //서버에 포스트로 결제정보 보내기 - Log.d("ResLast_Activity",Gson().toJson(reservation_Entity)) ResLast_Control().Dialog_res() } R.id.reslast_refund_View-> Refund_Dialog(this).create().show() diff --git a/LOOKID/app/src/main/java/lookid_front/lookid/Activity/Reservation_Activity.kt b/LOOKID/app/src/main/java/lookid_front/lookid/Activity/Reservation_Activity.kt index c3588b4..c9c75cd 100644 --- a/LOOKID/app/src/main/java/lookid_front/lookid/Activity/Reservation_Activity.kt +++ b/LOOKID/app/src/main/java/lookid_front/lookid/Activity/Reservation_Activity.kt @@ -1,6 +1,7 @@ package lookid_front.lookid.Activity import android.app.DatePickerDialog +import android.content.DialogInterface import android.content.Intent import android.os.Bundle import android.support.v4.widget.NestedScrollView @@ -14,6 +15,7 @@ import kotlinx.android.synthetic.main.activity_reservation.* import lookid_front.lookid.Control.* import lookid_front.lookid.Dialog.Address_Dialog import lookid_front.lookid.Dialog.Bank_Dialog +import lookid_front.lookid.Dialog.Basic_Dialog import lookid_front.lookid.Entity.Group_Entity import lookid_front.lookid.Entity.Reservation_Entity import lookid_front.lookid.R @@ -48,7 +50,7 @@ class Reservation_Activity : AppCompatActivity() { val user = User_Control(applicationContext).get_user() res_name_EditText.setText(user.name) res_phone_EditText.setText(user.phone) - res_bank_number_EditText.setText(user.bank_number) + res_bank_number_EditText.setText(user.bank_num) res_bank_holder_EditText.setText(user.bank_holder) userinfo_bank_name_TextView.text = user.bank_name } @@ -171,12 +173,19 @@ class Reservation_Activity : AppCompatActivity() { bank_Dialog.show() } + fun Dialog_cancel(){ + Basic_Dialog(this@Reservation_Activity,"취소","정말로 뒤로 가시겠습니까?\n작성하신 내용이 초기화 됩니다.", + DialogInterface.OnClickListener { _, _ -> + finish() + },true).show() + } + //결제 정보 초기화 함수 fun res_init():Boolean{ Reservation_Entity.r_name = res_resname_EditText.text.toString() Reservation_Entity.user.name = res_name_EditText.text.toString() Reservation_Entity.user.phone = res_phone_EditText.text.toString() - Reservation_Entity.user.bank_number = res_bank_number_EditText.text.toString() + Reservation_Entity.user.bank_num = res_bank_number_EditText.text.toString() Reservation_Entity.user.bank_holder = res_bank_holder_EditText.text.toString() Reservation_Entity.user.bank_name = userinfo_bank_name_TextView.text.toString() Reservation_Entity.r_date = dateFormat.format(Date()) @@ -224,20 +233,22 @@ class Reservation_Activity : AppCompatActivity() { Reservation_Control().pay_init() if(Reservation_Control().res_init()) { Toast.makeText(applicationContext, "예약 정보를 모두 입력해주세요", Toast.LENGTH_LONG).show() - Log.d("Res_Acitivity",Reservation_Entity.toString()) - Log.d("Res_Acitivity",Gson().toJson(Reservation_Entity)) return } - Log.d("Res_Acitivity",Reservation_Entity.toString()) val intent = Intent(applicationContext, ReservationLast_Activity::class.java) intent.putExtra("res", Reservation_Entity) intent.putExtra("res_devicenum" , group_Adapter.getDevice_num()) intent.putExtra("res_useday" , useDay) startActivity(intent) + Log.d("Res_Acitivity",Json().reservation(Reservation_Entity)) } R.id.res_bank_name_Button->Reservation_Control().Dialog_bankname() R.id.res_startdate_TextView ->Reservation_Control().Dialog_DatePicker(0) R.id.res_enddate_TextView ->Reservation_Control().Dialog_DatePicker(1) } } + + override fun onBackPressed() { + Reservation_Control().Dialog_cancel() + } } \ No newline at end of file diff --git a/LOOKID/app/src/main/java/lookid_front/lookid/Activity/SignIn_Activity.kt b/LOOKID/app/src/main/java/lookid_front/lookid/Activity/SignIn_Activity.kt index 4a521a2..1c07c6d 100644 --- a/LOOKID/app/src/main/java/lookid_front/lookid/Activity/SignIn_Activity.kt +++ b/LOOKID/app/src/main/java/lookid_front/lookid/Activity/SignIn_Activity.kt @@ -1,7 +1,6 @@ package lookid_front.lookid.Activity import android.content.Intent -import android.graphics.Color import android.os.AsyncTask import android.support.v7.app.AppCompatActivity import android.os.Bundle @@ -14,10 +13,8 @@ import kotlinx.android.synthetic.main.activity_signin.* import lookid_front.lookid.Control.Okhttp import lookid_front.lookid.Control.User_Control import lookid_front.lookid.Control.Json -import lookid_front.lookid.Dialog.Refund2_Dialog import lookid_front.lookid.Entity.User_Entity import lookid_front.lookid.R -import lookid_front.lookid.View.StateEditText import org.json.JSONObject class SignIn_Activity : AppCompatActivity() { diff --git a/LOOKID/app/src/main/java/lookid_front/lookid/Activity/SignUp_Activity.kt b/LOOKID/app/src/main/java/lookid_front/lookid/Activity/SignUp_Activity.kt index 76f873f..9148a53 100644 --- a/LOOKID/app/src/main/java/lookid_front/lookid/Activity/SignUp_Activity.kt +++ b/LOOKID/app/src/main/java/lookid_front/lookid/Activity/SignUp_Activity.kt @@ -2,7 +2,6 @@ package lookid_front.lookid.Activity import android.app.AlertDialog import android.content.DialogInterface -import android.graphics.Color import android.os.AsyncTask import android.support.v7.app.AppCompatActivity import android.os.Bundle @@ -11,14 +10,12 @@ import android.text.TextWatcher import android.util.Log import android.view.View import android.widget.* -import com.google.gson.Gson import kotlinx.android.synthetic.main.activity_signup.* import lookid_front.lookid.Dialog.Loading_Dialog import lookid_front.lookid.Control.Okhttp import lookid_front.lookid.Control.Json import lookid_front.lookid.Dialog.Address_Dialog import lookid_front.lookid.Dialog.Bank_Dialog -import lookid_front.lookid.Entity.Reservation_Entity import lookid_front.lookid.Entity.User_Entity import lookid_front.lookid.R import org.json.JSONObject diff --git a/LOOKID/app/src/main/java/lookid_front/lookid/Activity/UserInfo_Activity.kt b/LOOKID/app/src/main/java/lookid_front/lookid/Activity/UserInfo_Activity.kt index bff693d..e1dbc7d 100644 --- a/LOOKID/app/src/main/java/lookid_front/lookid/Activity/UserInfo_Activity.kt +++ b/LOOKID/app/src/main/java/lookid_front/lookid/Activity/UserInfo_Activity.kt @@ -19,7 +19,6 @@ import lookid_front.lookid.Dialog.Address_Dialog import lookid_front.lookid.Dialog.Bank_Dialog import lookid_front.lookid.Entity.User_Entity import lookid_front.lookid.R -import lookid_front.lookid.R.id.* import org.json.JSONObject class UserInfo_Activity : AppCompatActivity() { @@ -52,7 +51,7 @@ class UserInfo_Activity : AppCompatActivity() { userinfo_address_TextView.text = user.address userinfo_addressDet_EditText.setText(user.address_detail) userinfo_bank_name_TextView.text = user.bank_name - userinfo_bank_number_EditText.setText(user.bank_number) + userinfo_bank_number_EditText.setText(user.bank_num) userinfo_bank_holder_EditText.setText(user.bank_holder) } @@ -79,7 +78,7 @@ class UserInfo_Activity : AppCompatActivity() { user.address = userinfo_address_TextView.text.toString() user.address_detail = userinfo_addressDet_EditText.text.toString() user.bank_name = userinfo_bank_name_TextView.text.toString() - user.bank_number = userinfo_bank_number_EditText.text.toString() + user.bank_num = userinfo_bank_number_EditText.text.toString() user.bank_holder = userinfo_bank_holder_EditText.text.toString() //1. User_Control update User_Control(applicationContext).set_user(user) diff --git a/LOOKID/app/src/main/java/lookid_front/lookid/Control/Child_adapter.kt b/LOOKID/app/src/main/java/lookid_front/lookid/Control/Child_adapter.kt index 8ef00db..d85db6e 100644 --- a/LOOKID/app/src/main/java/lookid_front/lookid/Control/Child_adapter.kt +++ b/LOOKID/app/src/main/java/lookid_front/lookid/Control/Child_adapter.kt @@ -11,11 +11,12 @@ import android.view.ViewGroup import android.widget.EditText import android.widget.TextView import android.widget.Toast +import lookid_front.lookid.Entity.Child_Entity import lookid_front.lookid.R class Child_adapter(val context: Context) : RecyclerView.Adapter() { var res_state : Boolean = false - var childlist = ArrayList() + var childlist = ArrayList() val textWatcher_ary = arrayListOf() constructor(context : Context, res_state : Boolean) : this(context){ this.res_state = res_state @@ -28,7 +29,7 @@ class Child_adapter(val context: Context) : RecyclerView.Adapter(R.id.res_child_name_EditText) @@ -39,7 +40,7 @@ class Child_adapter(val context: Context) : RecyclerView.Adapter){ + fun setlist(list : ArrayList){ childlist = list notifyDataSetChanged() } - fun getlist():ArrayList{return childlist} + fun getlist():ArrayList{return childlist} inner class EditListener(var index: Int) : TextWatcher { override fun afterTextChanged(s: Editable?) { if(!s.toString().isEmpty()) { - Log.d("Res_Group", "차일드 리스트의 $index 번째에 ${s.toString()} 을 넣음") if(index < itemCount) - childlist[index] = s.toString() + childlist[index].name = s.toString() } else { - childlist[index] = "" - Log.d("Res_Group", "그룹 리스트의 $index 번째에 ${s.toString()} 넣지 않음") + childlist[index].name = "" } } override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { } diff --git a/LOOKID/app/src/main/java/lookid_front/lookid/Control/Group_adapter.kt b/LOOKID/app/src/main/java/lookid_front/lookid/Control/Group_adapter.kt index acabe51..39bea34 100644 --- a/LOOKID/app/src/main/java/lookid_front/lookid/Control/Group_adapter.kt +++ b/LOOKID/app/src/main/java/lookid_front/lookid/Control/Group_adapter.kt @@ -77,7 +77,7 @@ class Group_adapter(val context: Context, val grouplist : ArrayList{ - if(!editText!!.text.isNullOrEmpty()){ val id = editText!!.text.toString() //id를 이용 검색 @@ -171,6 +170,7 @@ class Group_adapter(val context: Context, val grouplist : ArrayList(){ override fun doInBackground(vararg params: String): String { //GET_관리자 검색 @@ -249,4 +240,11 @@ class Group_adapter(val context: Context, val grouplist : ArrayList, //피보호자 리스트 + var child_list: ArrayList, //피보호자 리스트 var admin_list: ArrayList, //관리자 리스트 var name: String //그룹명 ) : Serializable{ - constructor() : this(0, arrayListOf(), arrayListOf(), "") + constructor() : this(0, arrayListOf(), arrayListOf(), "") fun isnull() : Boolean{ if(child_list.size == 0 || admin_list.size == 0) return true for(i in 0 until child_list.size){ - if(child_list[i].isEmpty()) + if(child_list[i].name.isNullOrEmpty()) return true } for(i in 0 until admin_list.size){ diff --git a/LOOKID/app/src/main/java/lookid_front/lookid/Entity/User_Entity.kt b/LOOKID/app/src/main/java/lookid_front/lookid/Entity/User_Entity.kt index 5d4c65a..df8c32b 100644 --- a/LOOKID/app/src/main/java/lookid_front/lookid/Entity/User_Entity.kt +++ b/LOOKID/app/src/main/java/lookid_front/lookid/Entity/User_Entity.kt @@ -3,24 +3,24 @@ package lookid_front.lookid.Entity import java.io.Serializable data class User_Entity( - var id : String?, //아이디 - var name : String?, //사용자 이름 - var phone : String?, //사용자 번호 - var email : String?, //사용자 이메일 - var address : String?, //사용자 주소 - var bank_name : String?, //은행명 - var bank_number : String?, //계좌번호 - var bank_holder : String? //예금주 + var id: String?, //아이디 + var name: String?, //사용자 이름 + var phone: String?, //사용자 번호 + var email: String?, //사용자 이메일 + var address: String?, //사용자 주소 + var bank_name: String?, //은행명 + var bank_num: String?, //계좌번호 + var bank_holder: String? //예금주 ) : Serializable{ var address_detail : String? = null constructor() : this("","","","","","","","") fun isresnull() : Boolean{ if(name.isNullOrEmpty() || phone.isNullOrEmpty() || address.isNullOrEmpty() || bank_name.isNullOrEmpty() || - bank_number.isNullOrEmpty() || bank_holder.isNullOrEmpty()) + bank_num.isNullOrEmpty() || bank_holder.isNullOrEmpty()) return true return false } - fun bank_toString() : String{ return "${bank_name} ${bank_number}\n예금주명 : ${bank_holder}"} + fun bank_toString() : String{ return "${bank_name} ${bank_num}\n예금주명 : ${bank_holder}"} } diff --git a/LOOKID/app/src/main/res/layout/dialog_loading.xml b/LOOKID/app/src/main/res/layout/dialog_loading.xml index bf4f776..44166fe 100644 --- a/LOOKID/app/src/main/res/layout/dialog_loading.xml +++ b/LOOKID/app/src/main/res/layout/dialog_loading.xml @@ -6,9 +6,9 @@ + android:layout_centerVertical="true" + android:progress="@android:integer/config_longAnimTime" /> \ No newline at end of file diff --git a/LOOKID/app/src/main/res/layout/dialog_res_childlist.xml b/LOOKID/app/src/main/res/layout/dialog_res_childlist.xml index 54bdbf6..6579566 100644 --- a/LOOKID/app/src/main/res/layout/dialog_res_childlist.xml +++ b/LOOKID/app/src/main/res/layout/dialog_res_childlist.xml @@ -9,36 +9,61 @@ android:id="@+id/dialog_res_child_View" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginLeft="10dp" + android:gravity="center_vertical" android:orientation="horizontal"> + android:textAppearance="@style/TextAppearance.AppCompat.Body2" + android:textSize="16sp" + android:textStyle="bold" /> - + + + android:background="@drawable/view_round_white_edge_second" + android:gravity="center_vertical" + android:orientation="horizontal" + android:padding="5dp"> + + + +