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
694c22e1
Commit
694c22e1
authored
Jul 17, 2021
by
fengruiyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.去除vr页面
parent
e9635526
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
13 deletions
+14
-13
MainActivity.kt
app/src/main/java/com/mints/street/main/MainActivity.kt
+9
-9
activity_main.xml
app/src/main/res/layout/activity_main.xml
+1
-0
menu_navigation.xml
library_base/src/main/res/menu/menu_navigation.xml
+4
-4
No files found.
app/src/main/java/com/mints/street/main/MainActivity.kt
View file @
694c22e1
...
...
@@ -42,7 +42,7 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
binding
.
mainBottom
.
init
{
when
(
it
)
{
R
.
id
.
menu_home
->
binding
.
mainViewpager
.
setCurrentItem
(
0
,
false
)
R
.
id
.
menu_square
->
binding
.
mainViewpager
.
setCurrentItem
(
1
,
false
)
//
R.id.menu_square -> binding.mainViewpager.setCurrentItem(1, false)
R
.
id
.
menu_my
->
{
binding
.
mainViewpager
.
setCurrentItem
(
2
,
false
)
// stopAnim()
...
...
@@ -50,13 +50,13 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
}
}
//加载本地GIF动图
ImageLoader
.
ImageBuilder
.
with
(
this
)
.
setDrawable
(
R
.
mipmap
.
ic_earth_map
)
.
setTargetView
(
binding
.
ivTakephoto
).
start
()
//
ImageLoader.ImageBuilder.with(this)
//
.setDrawable(R.mipmap.ic_earth_map)
//
.setTargetView(binding.ivTakephoto).start()
binding
.
mainBottom
.
interceptLongClick
(
R
.
id
.
menu_home
,
R
.
id
.
menu_square
,
//
R.id.menu_square,
R
.
id
.
menu_my
)
...
...
@@ -134,10 +134,10 @@ private fun ViewPager2.initMain(activity: FragmentActivity): ViewPager2 {
//首页
HomeFragment
()
}
1
->
{
//广场
VRFragment
()
}
//
1 -> {
//
//广场
//
VRFragment()
//
}
2
->
{
//个人中心
MyFragment
()
...
...
app/src/main/res/layout/activity_main.xml
View file @
694c22e1
...
...
@@ -46,6 +46,7 @@
app:layout_constraintRight_toRightOf=
"parent"
>
<ImageView
android:visibility=
"gone"
android:id=
"@+id/ivTakephoto"
android:layout_width=
"60dp"
android:layout_height=
"60dp"
...
...
library_base/src/main/res/menu/menu_navigation.xml
View file @
694c22e1
...
...
@@ -7,10 +7,10 @@
android:icon=
"@drawable/menu_main"
android:title=
"@string/bottom_name_home"
/>
<item
android:id=
"@+id/menu_square"
android:icon=
"@drawable/menu_square"
tools:ignore=
"MenuTitle"
/
>
<!-- <item-->
<!-- android:id="@+id/menu_square"-->
<!-- android:icon="@drawable/menu_square"-->
<!-- tools:ignore="MenuTitle" />--
>
<item
...
...
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