Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Room Park Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vladislav Bogdashkin
Room Park Android
Commits
ee2d844f
Commit
ee2d844f
authored
Mar 17, 2020
by
Vladislav Bogdashkin
🎣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add tour preview to model as api updated
parent
811a6796
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
2 deletions
+9
-2
response.kt
...ual/roompark/data/repository/api/retrofit/raw/response.kt
+2
-1
Estate.kt
...isual/roompark/data/repository/db/requrey/model/Estate.kt
+3
-0
raw2entity.kt
...anto/visual/roompark/data/repository/mapper/raw2entity.kt
+1
-0
DealPreviewModel.kt
.../biganto/visual/roompark/domain/model/DealPreviewModel.kt
+1
-1
deals.kt
...in/java/com/biganto/visual/roompark/domain/model/deals.kt
+2
-0
No files found.
app/src/main/java/com/biganto/visual/roompark/data/repository/api/retrofit/raw/response.kt
View file @
ee2d844f
...
@@ -35,7 +35,8 @@ data class EstateRaw(
...
@@ -35,7 +35,8 @@ data class EstateRaw(
val
plan_jpg
:
PlanRaw
?,
val
plan_jpg
:
PlanRaw
?,
val
url
:
String
,
val
url
:
String
,
val
album_id
:
Int
,
val
album_id
:
Int
,
val
multitour_id
:
Int
?
val
multitour_id
:
Int
?,
val
multitour_preview
:
String
?
)
)
data class
PlanRaw
(
data class
PlanRaw
(
...
...
app/src/main/java/com/biganto/visual/roompark/data/repository/db/requrey/model/Estate.kt
View file @
ee2d844f
...
@@ -38,6 +38,9 @@ interface Estate : Persistable {
...
@@ -38,6 +38,9 @@ interface Estate : Persistable {
@get
:
Nullable
@get
:
Nullable
val
multitourId
:
Int
?
val
multitourId
:
Int
?
@get
:
Nullable
val
multitourPreview
:
String
?
val
info_building
:
Int
val
info_building
:
Int
val
info_section_begin
:
Int
val
info_section_begin
:
Int
val
info_floor
:
Int
val
info_floor
:
Int
...
...
app/src/main/java/com/biganto/visual/roompark/data/repository/mapper/raw2entity.kt
View file @
ee2d844f
...
@@ -137,6 +137,7 @@ fun fromRaw(raw:EstateRaw):EstateEntity{
...
@@ -137,6 +137,7 @@ fun fromRaw(raw:EstateRaw):EstateEntity{
entity
.
setRooms
(
raw
.
common_info
.
rooms
)
entity
.
setRooms
(
raw
.
common_info
.
rooms
)
entity
.
setAlbumId
(
raw
.
album_id
)
entity
.
setAlbumId
(
raw
.
album_id
)
entity
.
setMultitourId
(
raw
.
multitour_id
)
entity
.
setMultitourId
(
raw
.
multitour_id
)
entity
.
setMultitourPreview
(
raw
.
multitour_preview
)
entity
.
setUrl
(
raw
.
url
)
entity
.
setUrl
(
raw
.
url
)
entity
.
setInfo_floor_max
(
raw
.
common_info
.
floor_max
)
entity
.
setInfo_floor_max
(
raw
.
common_info
.
floor_max
)
...
...
app/src/main/java/com/biganto/visual/roompark/domain/model/DealPreviewModel.kt
View file @
ee2d844f
...
@@ -35,7 +35,7 @@ data class DealPreviewModel(
...
@@ -35,7 +35,7 @@ data class DealPreviewModel(
data
.
first
.
amount_pay_sum
,
data
.
first
.
amount_pay_sum
,
arrayListOf
<
Int
?>(
data
.
first
.
estate
.
multitourId
),
arrayListOf
<
Int
?>(
data
.
first
.
estate
.
multitourId
),
false
,
false
,
null
,
data
.
first
.
estate
.
multitourPreview
,
data
.
second
data
.
second
)
)
}
}
...
...
app/src/main/java/com/biganto/visual/roompark/domain/model/deals.kt
View file @
ee2d844f
...
@@ -56,6 +56,7 @@ data class EstateModel(
...
@@ -56,6 +56,7 @@ data class EstateModel(
val
rooms
:
Int
?=
null
,
val
rooms
:
Int
?=
null
,
val
albumId
:
Int
?=
null
,
val
albumId
:
Int
?=
null
,
val
multitourId
:
Int
?=
null
,
val
multitourId
:
Int
?=
null
,
val
multitourPreview
:
String
?=
null
,
val
commonInfo
:
CommonInfoModel
?
=
null
,
val
commonInfo
:
CommonInfoModel
?
=
null
,
val
url
:
String
?
val
url
:
String
?
)
)
...
@@ -94,6 +95,7 @@ fun fromEntity(entity:EstateEntity): EstateModel {
...
@@ -94,6 +95,7 @@ fun fromEntity(entity:EstateEntity): EstateModel {
rooms
=
entity
.
rooms
,
rooms
=
entity
.
rooms
,
albumId
=
entity
.
albumId
,
albumId
=
entity
.
albumId
,
multitourId
=
entity
.
multitourId
,
multitourId
=
entity
.
multitourId
,
multitourPreview
=
entity
.
multitourPreview
,
commonInfo
=
CommonInfoModel
(
commonInfo
=
CommonInfoModel
(
building
=
entity
.
info_building
,
building
=
entity
.
info_building
,
section_begin
=
entity
.
sectionBegin
,
section_begin
=
entity
.
sectionBegin
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment