Skip to content

Commit 9c7f125

Browse files
Mingyu0626Mingyu0626
committed
Merge remote-tracking branch 'origin/master' into mgchoi
# Conflicts: # app/src/main/java/com/example/dongsan2mong/adapter/HouseInfoDataAdapter.kt # app/src/main/java/com/example/dongsan2mong/fragment/DibshomeFragment.kt # app/src/main/java/com/example/dongsan2mong/fragment/LatesthomeFragment.kt
2 parents 9125b4c + 118f869 commit 9c7f125

File tree

7 files changed

+95
-18
lines changed

7 files changed

+95
-18
lines changed

‎app/src/main/java/com/example/dongsan2mong/activity/ClusterActivity.kt

+6-1
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,19 @@ class ClusterActivity : AppCompatActivity() {
110110
override fun onStop() {
111111
super.onStop()
112112
EventBus.getDefault().unregister(this)
113-
EventBus.getDefault().post(DataEvent(1))
113+
dibshomeArr = adapter.dibshomeArr
114+
EventBus.getDefault().post(DataEvent(1, dibshomeArr!!))
114115

115116
}
116117

117118
@Subscribe(threadMode = ThreadMode.MAIN)
118119
fun printData(event: DataEvent) {
119120
if (event.int == 0) {
120121
Log.d("dataEvent", "mapFragment to ClusterActivity")
122+
dibshomeArr = event.dibsArr
123+
adapter.changeDibshomeArr(dibshomeArr!!)
124+
adapter.notifyDataSetChanged()
125+
121126
}
122127
}
123128
}

‎app/src/main/java/com/example/dongsan2mong/adapter/HouseInfoDataAdapter.kt

+31-2
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,36 @@ class HouseInfoDataAdapter(val items: ArrayList<HouseInfoData>, val selected: Ar
3939
// 찜목록에 들어갈 매물 정보 얻기 (리스트로) - searchActivity에서 사용한 adapter의 정보를
4040
// dibshome fragement에 어떻게 가져가지...
4141

42+
fun setAllHeart() {
43+
for (i in items.indices) {
44+
45+
}
46+
}
4247
fun changeDibshomeArr(arr: ArrayList<HouseInfoData>) {
48+
if (dibshomeArr.size != 0) {
49+
println(dibshomeArr[0]!!.price)
50+
}
51+
4352
dibshomeArr.clear()
4453
dibshomeArr.addAll(arr)
54+
if (dibshomeArr.size != 0) {
55+
println(dibshomeArr[0]!!.price)
56+
}
57+
58+
notifyDataSetChanged()
59+
}
60+
61+
fun changeArr(arr: ArrayList<HouseInfoData>) {
62+
if (dibshomeArr.size != 0) {
63+
println(dibshomeArr[0]!!.price)
64+
}
65+
66+
items.clear()
67+
items.addAll(arr)
68+
if (dibshomeArr.size != 0) {
69+
println(dibshomeArr[0]!!.price)
70+
}
71+
4572
notifyDataSetChanged()
4673
}
4774

@@ -60,8 +87,9 @@ class HouseInfoDataAdapter(val items: ArrayList<HouseInfoData>, val selected: Ar
6087

6188
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
6289

63-
// dibshomeArr에 해당 매물이 있다면 찜 아이콘 채워지고, 아니면 stroke만
64-
holder.binding.favorite.isSelected = dibshomeArr.contains(items[position])
90+
if (dibshomeArr.contains(items[position])) {
91+
holder.binding.favorite.setImageResource(R.drawable.icon_home_favorite_solid)
92+
}
6593

6694
holder.binding.typeAndPrice.text = items[position].type + " " +
6795
items[position].price
@@ -71,6 +99,7 @@ class HouseInfoDataAdapter(val items: ArrayList<HouseInfoData>, val selected: Ar
7199
if (items[position].imgURL == "") {
72100
holder.binding.houseImg.setImageResource(R.drawable.img_house_1)
73101
} else {
102+
// Picasso.get().load(items[position].imgURL).into(holder.binding.houseImg)
74103
holder.binding.houseImg.setImageResource(R.drawable.compare_house)
75104
}
76105

‎app/src/main/java/com/example/dongsan2mong/event/DataEvent.kt

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.example.dongsan2mong.event
22

3+
import android.util.Log
4+
import com.example.dongsan2mong.data.HouseInfoData
5+
36
class DataEvent {
47
/*
58
int
@@ -17,10 +20,15 @@ class DataEvent {
1720
*/
1821

1922
var int: Int? = 0
20-
var str: String? = null
21-
23+
var dibsArr: ArrayList<HouseInfoData> = ArrayList()
2224

2325
constructor(int: Int) {
2426
this.int = int
2527
}
28+
29+
constructor(int: Int, arr: ArrayList<HouseInfoData>) {
30+
this.int = int
31+
this.dibsArr = arr
32+
Log.e("dataEvent", "dibs Arr size : ${this.dibsArr.size}")
33+
}
2634
}

‎app/src/main/java/com/example/dongsan2mong/fragment/DibshomeFragment.kt

+26-5
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ class DibshomeFragment : Fragment() {
2020

2121
lateinit var binding: FragmentDibshomeBinding
2222
lateinit var adapter: HouseInfoDataAdapter
23+
var dibshomeArr: ArrayList<HouseInfoData>? = ArrayList()
2324

24-
val data: ArrayList<HouseInfoData> = ArrayList<HouseInfoData>()
25+
var data: ArrayList<HouseInfoData> = ArrayList<HouseInfoData>()
2526
val selected: ArrayList<Boolean> = ArrayList()
2627

2728
override fun onCreateView(
@@ -77,28 +78,48 @@ class DibshomeFragment : Fragment() {
7778
binding.recyclerViewDibshome.adapter = adapter
7879

7980
}
80-
8181
override fun onResume() {
8282
super.onResume()
8383
try {
8484
EventBus.getDefault().register(this)
85-
EventBus.getDefault().post(DataEvent(7))
85+
EventBus.getDefault().post(DataEvent(7, data!!))
8686
} catch (e: Exception) {
8787
}
8888
}
8989

9090
override fun onPause() {
9191
super.onPause()
9292
EventBus.getDefault().unregister(this)
93-
EventBus.getDefault().post(DataEvent(9))
93+
EventBus.getDefault().post(DataEvent(9, data!!))
9494
}
9595

9696
@Subscribe(threadMode = ThreadMode.MAIN)
9797
fun printData(event: DataEvent) {
9898
if (event.int == 6) {
9999
Log.d("dataEvent", "wishlist to dibshome")
100-
} else if (event.int == 8) {
100+
data = event.dibsArr
101+
// for (i in data) {
102+
// println(i)
103+
// }
104+
105+
adapter.changeArr(event.dibsArr)
106+
adapter.changeDibshomeArr(event.dibsArr)
107+
adapter.notifyDataSetChanged()
108+
for (i in adapter.dibshomeArr) {
109+
println("${i} ${i.area} , ${i.floor}, ${i.roomNum}, ${i.location}")
110+
}
111+
for (i in adapter.items) {
112+
println("${i} ${i.area} , ${i.floor}, ${i.roomNum}, ${i.location}")
113+
}
114+
115+
}
116+
else if (event.int == 8) {
101117
Log.d("dataEvent", "latesthome to dibshome")
118+
data = event.dibsArr
119+
// for (i in data) {
120+
// println(i)
121+
// }
122+
adapter.notifyDataSetChanged()
102123
}
103124
}
104125
}

‎app/src/main/java/com/example/dongsan2mong/fragment/LatesthomeFragment.kt

+7-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import org.greenrobot.eventbus.ThreadMode
2020
class LatesthomeFragment : Fragment() {
2121
lateinit var binding: FragmentLatesthomeBinding
2222
lateinit var adapter: HouseInfoDataAdapter
23+
var dibshomeArr: ArrayList<HouseInfoData>? = ArrayList()
2324

2425
val data: ArrayList<HouseInfoData> = ArrayList()
2526
val selected: ArrayList<Boolean> = ArrayList()
@@ -59,23 +60,26 @@ class LatesthomeFragment : Fragment() {
5960
super.onResume()
6061
try {
6162
EventBus.getDefault().register(this)
62-
EventBus.getDefault().post(DataEvent(5))
63+
EventBus.getDefault().post(DataEvent(5, dibshomeArr!!))
6364
} catch (e: Exception) {
6465
}
6566
}
6667

6768
override fun onPause() {
6869
super.onPause()
6970
EventBus.getDefault().unregister(this)
70-
EventBus.getDefault().post(DataEvent(8))
71+
EventBus.getDefault().post(DataEvent(8, dibshomeArr!!))
7172
}
7273

7374
@Subscribe(threadMode = ThreadMode.MAIN)
7475
fun printData(event: DataEvent) {
7576
if (event.int == 4) {
7677
Log.d("dataEvent", "wishlist to latesthome")
77-
} else if (event.int == 9) {
78+
dibshomeArr = event.dibsArr
79+
}
80+
else if (event.int == 9) {
7881
Log.d("dataEvent", "dibshome to latesthome")
82+
dibshomeArr = event.dibsArr
7983
}
8084
}
8185
}

‎app/src/main/java/com/example/dongsan2mong/fragment/MapFragment.kt

+6-2
Original file line numberDiff line numberDiff line change
@@ -1526,21 +1526,25 @@ class MapFragment : Fragment(), OnMapReadyCallback {
15261526
override fun onDetach() {
15271527
super.onDetach()
15281528
EventBus.getDefault().unregister(this)
1529+
EventBus.getDefault().post(DataEvent(2, dibshomeArr))
15291530
}
15301531

15311532
override fun onStop() {
15321533
super.onStop()
1533-
EventBus.getDefault().post(DataEvent(2))
1534-
EventBus.getDefault().post(DataEvent(0))
1534+
1535+
EventBus.getDefault().post(DataEvent(0, dibshomeArr))
15351536
}
15361537

1538+
15371539
@Subscribe(threadMode = ThreadMode.MAIN)
15381540
fun printData(event: DataEvent) {
15391541
if (event.int == 1) {
15401542
Log.d("dataEvent", "ClusterActivity to mapFragment")
1543+
dibshomeArr = event.dibsArr
15411544
}
15421545
else if (event.int == 3) {
15431546
Log.d("dataEvent", "wishlist to mapFragment")
1547+
dibshomeArr = event.dibsArr
15441548
}
15451549
}
15461550
}

‎app/src/main/java/com/example/dongsan2mong/fragment/WishlistFragment.kt

+9-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import android.view.View
77
import android.view.ViewGroup
88
import androidx.fragment.app.Fragment
99
import com.example.dongsan2mong.adapter.WishlistViewPagerAdapter
10+
import com.example.dongsan2mong.data.HouseInfoData
1011
import com.example.dongsan2mong.databinding.FragmentWishlistBinding
1112
import com.example.dongsan2mong.event.DataEvent
1213
import com.google.android.material.tabs.TabLayoutMediator
@@ -17,6 +18,7 @@ import org.greenrobot.eventbus.ThreadMode
1718
class WishlistFragment : Fragment() {
1819
lateinit var binding: FragmentWishlistBinding
1920
val tabtextarr = arrayListOf("최근 본 집", "찜한 집", "검색 프리셋 불러오기")
21+
var dibshomeArr: ArrayList<HouseInfoData>? = ArrayList()
2022

2123
override fun onCreateView(
2224
inflater: LayoutInflater, container: ViewGroup?,
@@ -38,7 +40,7 @@ class WishlistFragment : Fragment() {
3840
override fun onDetach() {
3941
super.onDetach()
4042
EventBus.getDefault().unregister(this)
41-
EventBus.getDefault().post(DataEvent(3))
43+
EventBus.getDefault().post(DataEvent(3, dibshomeArr!!))
4244
}
4345

4446
override fun onStart() {
@@ -53,14 +55,18 @@ class WishlistFragment : Fragment() {
5355
fun printData(event: DataEvent) {
5456
if (event.int == 2) {
5557
Log.d("dataEvent", "mapFragment to wishlist")
58+
println("size : ${event.dibsArr.size}")
59+
dibshomeArr = event.dibsArr
60+
println("size : ${dibshomeArr!!.size}")
61+
5662
}
5763
else if (event.int == 5) {
5864
Log.d("dataEvent", "latesthome to wishlist")
59-
EventBus.getDefault().post(DataEvent(4))
65+
EventBus.getDefault().post(DataEvent(4, dibshomeArr!!))
6066
}
6167
else if (event.int == 7) {
6268
Log.d("dataEvent", "dibshome to wishlist")
63-
EventBus.getDefault().post(DataEvent(6))
69+
EventBus.getDefault().post(DataEvent(6, dibshomeArr!!))
6470
}
6571
}
6672
}

0 commit comments

Comments
 (0)