Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
android_freeworld
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
android
android_freeworld
Commits
d456924d
Commit
d456924d
authored
Jul 31, 2021
by
fengruiyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.1.0.0的版本可以测试
parent
c7934779
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
HomeFragment.kt
app/src/main/java/com/mints/street/main/home/HomeFragment.kt
+2
-2
FreeZoneFragment.kt
...rc/main/java/com/mints/street/main/vr/FreeZoneFragment.kt
+6
-4
No files found.
app/src/main/java/com/mints/street/main/home/HomeFragment.kt
View file @
d456924d
...
...
@@ -109,8 +109,8 @@ class HomeFragment : BaseFragment<FragmentHomeBinding, HomeViewModel>(), SensorE
SearchMapActivity
.
startSearchMapActivity
(
this
)
}
RxUtils
.
onMultiClick
(
binding
.
ivClick
){
if
(
userManager
.
getVipFlag
())
{
//是会员
MintsWebViewActivity
.
startWebView
(
""
)
if
(
userManager
.
userIsLogin
()
&&
userManager
.
getVipFlag
())
{
//是会员
viewModel
.
authorized
(
""
,
currentLat
.
toString
(),
currentLon
.
toString
()
)
}
else
{
startActivity
(
OpenvipActivity
::
class
.
java
)
}
...
...
app/src/main/java/com/mints/street/main/vr/FreeZoneFragment.kt
View file @
d456924d
...
...
@@ -25,6 +25,8 @@ class FreeZoneFragment : BaseFragment<FragmentFreeZoneBinding, FreeZoneViewModel
private
var
vLayout
:
VirtualLayoutManager
?
=
null
private
var
mAdapter
:
DelegateAdapter
?
=
null
private
var
gridMapAdapter
:
GridMapAdapter
?
=
null
//private var enterDestinationAdapter: EnterDestinationAdapter? = null
override
fun
initContentView
(
inflater
:
LayoutInflater
?,
container
:
ViewGroup
?,
...
...
@@ -58,10 +60,10 @@ class FreeZoneFragment : BaseFragment<FragmentFreeZoneBinding, FreeZoneViewModel
viewModel
.
VrmapBean
.
observe
(
this
,
Observer
<
VrmapBean
>
{
binding
.
srlMy
.
finishRefresh
(
true
)
/*
if(enterDestinationAdapter == null){
enterDestinationAdapter = EnterDestinationAdapter(context!!,it.abroad )
mAdapter?.addAdapter(enterDestinationAdapter)
}*/
//
if(enterDestinationAdapter == null){
//
enterDestinationAdapter = EnterDestinationAdapter(context!!,it.abroad )
//
mAdapter?.addAdapter(enterDestinationAdapter)
// }
if
(
gridMapAdapter
==
null
){
gridMapAdapter
=
GridMapAdapter
(
context
!!
,
it
.
internal
)
mAdapter
?.
addAdapter
(
gridMapAdapter
)
...
...
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