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
7b83e4fc
Commit
7b83e4fc
authored
Aug 26, 2020
by
Vladislav Bogdashkin
🎣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix google sdk 29 nullability issues
parent
19597003
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
47 additions
and
43 deletions
+47
-43
misc.xml
.idea/misc.xml
+1
-1
DownloadTourDialogController.kt
...ctor/dialogs/tour_chooser/DownloadTourDialogController.kt
+36
-32
AppVersionManager.kt
...oompark/data/service/version_control/AppVersionManager.kt
+2
-2
TourModel.kt
...ava/com/biganto/visual/roompark/domain/model/TourModel.kt
+4
-4
albums.kt
...n/java/com/biganto/visual/roompark/domain/model/albums.kt
+2
-2
LoadTourConfig.kt
...anto/visual/roompark/player/unity_utils/LoadTourConfig.kt
+2
-2
No files found.
.idea/misc.xml
View file @
7b83e4fc
...
@@ -148,7 +148,7 @@
...
@@ -148,7 +148,7 @@
</profile-state>
</profile-state>
</entry>
</entry>
</component>
</component>
<component
name=
"ProjectRootManager"
version=
"2"
languageLevel=
"JDK_1_8"
default=
"true"
project-jdk-name=
"
1.8
"
project-jdk-type=
"JavaSDK"
>
<component
name=
"ProjectRootManager"
version=
"2"
languageLevel=
"JDK_1_8"
default=
"true"
project-jdk-name=
"
JDK
"
project-jdk-type=
"JavaSDK"
>
<output
url=
"file://$PROJECT_DIR$/build/classes"
/>
<output
url=
"file://$PROJECT_DIR$/build/classes"
/>
</component>
</component>
<component
name=
"ProjectType"
>
<component
name=
"ProjectType"
>
...
...
app/src/main/java/com/biganto/visual/roompark/conductor/dialogs/tour_chooser/DownloadTourDialogController.kt
View file @
7b83e4fc
...
@@ -65,7 +65,7 @@ class DownloadTourDialogController : Controller {
...
@@ -65,7 +65,7 @@ class DownloadTourDialogController : Controller {
.
inject
(
this
)
.
inject
(
this
)
}
}
private
val
tour
:
TourModel
by
lazy
{
private
val
tour
:
TourModel
?
by
lazy
{
args
.
getParcelable
<
TourModel
>(
DOWNLOAD_TOUR_ID_KEY
)
args
.
getParcelable
<
TourModel
>(
DOWNLOAD_TOUR_ID_KEY
)
}
}
...
@@ -105,41 +105,45 @@ class DownloadTourDialogController : Controller {
...
@@ -105,41 +105,45 @@ class DownloadTourDialogController : Controller {
downloadToken
=
DownloadUseCase
.
CancellationToken
(
false
)
downloadToken
=
DownloadUseCase
.
CancellationToken
(
false
)
downloadTourTitleText
.
text
=
tour
.
title
tour
?.
let
{
tourModel
->
Glide
.
with
(
view
)
downloadTourTitleText
.
text
=
tourModel
.
title
.
load
(
tour
.
previewUrl
)
Glide
.
with
(
view
)
.
transform
(
BlurTransformation
(
13
,
8
)
.
load
(
tourModel
.
previewUrl
)
,
ColorFilterTransformation
(
0
x99000000
.
toInt
()))
.
transform
(
BlurTransformation
(
13
,
8
)
.
into
(
downloaderBg
)
,
ColorFilterTransformation
(
0
x99000000
.
toInt
()))
.
into
(
downloaderBg
)
disposables
.
add
(
downloader
.
downloadTour
(
tour
.
tour_id
,
downloadToken
)
disposables
.
add
(
.
onErrorReturn
{
Timber
.
e
(
it
);
TourPreviewEntity
()
}
downloader
.
downloadTour
(
tourModel
.
tour_id
,
downloadToken
)
// .onErrorReturn { parseError(it);TourPreviewEntity() }
.
onErrorReturn
{
Timber
.
e
(
it
);
TourPreviewEntity
()
}
.
subscribeOn
(
Schedulers
.
io
())
.
subscribeOn
(
Schedulers
.
io
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
(
.
subscribe
(
{
model
->
{
model
->
updateProgressBar
(
model
.
downloadedFiles
,
model
.
overallFiles
)
updateProgressBar
(
model
.
downloadedFiles
,
model
.
overallFiles
)
if
(
model
.
overallFiles
==
model
.
downloadedFiles
)
if
(
model
.
overallFiles
==
model
.
downloadedFiles
)
activity
?.
let
{
activity
?.
let
{
startPlayer
(
it
,
fromEntity
(
model
))
startPlayer
(
it
,
fromEntity
(
model
))
handleBack
()
handleBack
()
}
}
}
}
,{
error
->
,{
error
->
Timber
.
e
(
error
)
Timber
.
e
(
error
)
snackbar
.
showSnackBar
(
error
.
localizedMessage
)
snackbar
.
showSnackBar
(
error
.
localizedMessage
)
}
}
))
))
cancelDownloadText
.
setOnClickListener
{
handleBack
()
}
cancelDownloadText
.
setOnClickListener
{
handleBack
()
}
// downloadTour(it.tour.tour_id, downloadToken)
}
?:
::
tourError
// view.findViewById<View>(R.id.close_current_button).setOnClickListener { handleBack() }
return
view
return
view
}
}
private
fun
tourError
(){
Timber
.
e
(
"Tour not been initialized by key: $DOWNLOAD_TOUR_ID_KEY"
)
snackbar
.
showSnackBar
(
"Ошибка! Данные тура не найдены."
)
handleBack
()
}
private
fun
updateProgressBar
(
curr
:
Int
,
max
:
Int
){
private
fun
updateProgressBar
(
curr
:
Int
,
max
:
Int
){
...
...
app/src/main/java/com/biganto/visual/roompark/data/service/version_control/AppVersionManager.kt
View file @
7b83e4fc
...
@@ -120,8 +120,8 @@ data class UpdateAppModel(
...
@@ -120,8 +120,8 @@ data class UpdateAppModel(
val
downloadUrl
:
String
?
val
downloadUrl
:
String
?
)
:
Parcelable
{
)
:
Parcelable
{
constructor
(
parcel
:
Parcel
)
:
this
(
constructor
(
parcel
:
Parcel
)
:
this
(
parcel
.
readString
(),
parcel
.
readString
()
?:
error
(
"current version not read"
)
,
parcel
.
readString
(),
parcel
.
readString
()
?:
error
(
"new version not read"
)
,
parcel
.
readByte
()
!=
0
.
toByte
(),
parcel
.
readByte
()
!=
0
.
toByte
(),
parcel
.
readString
(),
parcel
.
readString
(),
parcel
.
readString
())
{
parcel
.
readString
())
{
...
...
app/src/main/java/com/biganto/visual/roompark/domain/model/TourModel.kt
View file @
7b83e4fc
...
@@ -32,17 +32,17 @@ data class TourModel (
...
@@ -32,17 +32,17 @@ data class TourModel (
)
:
Parcelable
{
)
:
Parcelable
{
constructor
(
parcel
:
Parcel
)
:
this
(
constructor
(
parcel
:
Parcel
)
:
this
(
parcel
.
readString
(),
parcel
.
readString
()
?:
error
(
"tour id not read"
)
,
parcel
.
readSerializable
()
as
Date
,
parcel
.
readSerializable
()
as
Date
,
parcel
.
readSerializable
()
as
Date
,
parcel
.
readSerializable
()
as
Date
,
TourType
.
valueOf
(
parcel
.
readString
()),
TourType
.
valueOf
(
parcel
.
readString
()
?:
error
(
"tour type not read"
)
),
parcel
.
readString
(),
parcel
.
readString
()
?:
error
(
"tour title not read"
)
,
parcel
.
readString
(),
parcel
.
readString
(),
parcel
.
readString
(),
parcel
.
readString
(),
parcel
.
readByte
()
!=
0
.
toByte
(),
parcel
.
readByte
()
!=
0
.
toByte
(),
parcel
.
readString
(),
parcel
.
readString
(),
parcel
.
readInt
(),
parcel
.
readInt
(),
DownloadState
.
valueOf
(
parcel
.
readString
()),
DownloadState
.
valueOf
(
parcel
.
readString
()
?:
error
(
"tour state not read"
)
),
parcel
.
readLong
(),
parcel
.
readLong
(),
parcel
.
readLong
(),
parcel
.
readLong
(),
parcel
.
readInt
(),
parcel
.
readInt
(),
...
...
app/src/main/java/com/biganto/visual/roompark/domain/model/albums.kt
View file @
7b83e4fc
...
@@ -64,8 +64,8 @@ data class PhotoResolutionModel(
...
@@ -64,8 +64,8 @@ data class PhotoResolutionModel(
val
resHeight
:
Int
val
resHeight
:
Int
)
:
Parcelable
{
)
:
Parcelable
{
constructor
(
parcel
:
Parcel
)
:
this
(
constructor
(
parcel
:
Parcel
)
:
this
(
parcel
.
readString
(),
parcel
.
readString
()
?:
error
(
"resName not read"
)
,
parcel
.
readString
(),
parcel
.
readString
()
?:
error
(
"photo url not read"
)
,
parcel
.
readInt
(),
parcel
.
readInt
(),
parcel
.
readInt
()
parcel
.
readInt
()
)
)
...
...
app/src/main/java/com/biganto/visual/roompark/player/unity_utils/LoadTourConfig.kt
View file @
7b83e4fc
...
@@ -18,8 +18,8 @@ data class LoadTourConfig(
...
@@ -18,8 +18,8 @@ data class LoadTourConfig(
constructor
(
parcel
:
Parcel
)
:
this
(
constructor
(
parcel
:
Parcel
)
:
this
(
parcel
.
readInt
(),
parcel
.
readInt
(),
parcel
.
readInt
(),
parcel
.
readInt
(),
parcel
.
readString
(),
parcel
.
readString
()
?:
error
(
"cache uri not read"
)
,
parcel
.
readString
(),
parcel
.
readString
()
?:
error
(
"meta uri not read"
)
,
parcel
.
readString
(),
parcel
.
readString
(),
parcel
.
readInt
()!=
0
,
parcel
.
readInt
()!=
0
,
parcel
.
readInt
()
==
1
parcel
.
readInt
()
==
1
...
...
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