Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
android_vedio
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_vedio
Commits
e69baab0
Commit
e69baab0
authored
Jan 04, 2024
by
mengcuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化
parent
04862c7d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
20 deletions
+23
-20
SplashActivity.kt
...java/com/duben/xixiplaylet/ui/activitys/SplashActivity.kt
+3
-3
MainFragment.kt
...in/java/com/duben/xixiplaylet/ui/fragment/MainFragment.kt
+8
-7
TxVideoActivity.kt
...in/java/com/duben/xixiplaylet/video/tx/TxVideoActivity.kt
+1
-1
activity_aboutus.xml
video/app/src/main/res/layout/activity_aboutus.xml
+1
-1
item_block_view.xml
video/app/src/main/res/layout/item_block_view.xml
+10
-8
No files found.
video/app/src/main/java/com/duben/xixiplaylet/ui/activitys/SplashActivity.kt
View file @
e69baab0
...
...
@@ -70,9 +70,9 @@ class SplashActivity : BaseActivity() {
}
private
fun
initData
()
{
if
(!
TextUtils
.
isEmpty
(
UserManager
.
getInstance
().
userID
)){
TrackManager
.
getInstance
().
firstShowVedio
()
}
//
if(!TextUtils.isEmpty(UserManager.getInstance().userID)){
//
TrackManager.getInstance().firstShowVedio()
//
}
val
firstSplash
=
get
().
getBoolean
(
Constant
.
FIRST_SPLASH
,
true
)
if
(!
firstSplash
)
{
...
...
video/app/src/main/java/com/duben/xixiplaylet/ui/fragment/MainFragment.kt
View file @
e69baab0
...
...
@@ -99,11 +99,12 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
// homePresenter.getSoltVedio()
// }
if
(
UserManager
.
getInstance
().
newFlag
&&
!
UserManager
.
getInstance
().
vipFlag
)
{
val
bundle
=
Bundle
()
bundle
.
putBoolean
(
VipActivity
.
IS_MAIN
,
true
)
readyGo
(
VipActivity
::
class
.
java
,
bundle
)
}
// if (UserManager.getInstance().newFlag && !UserManager.getInstance().vipFlag) {
// val bundle = Bundle()
// bundle.putBoolean(VipActivity.IS_MAIN, true)
// readyGo(VipActivity::class.java, bundle)
// }
homePresenter
.
getSoltVedio
()
}
override
fun
onDestroy
()
{
...
...
@@ -134,7 +135,7 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
homePresenter
.
topTabs
()
homePresenter
.
orders
()
TrackManager
.
getInstance
().
getMyInfo
()
showRecommendAct
()
//
showRecommendAct()
}
}
}
...
...
@@ -335,7 +336,7 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
LocalVedioManager
.
startVedioDetailActivityForType
(
requireActivity
(),
data
.
vedioMsg
)
}
else
{
if
(
UserManager
.
getInstance
().
newFlag
&&
!
UserManager
.
getInstance
().
vipFlag
)
{
homePresenter
.
getRecommendVedio
()
//
homePresenter.getRecommendVedio()
val
bundle
=
Bundle
()
bundle
.
putBoolean
(
VipActivity
.
IS_MAIN
,
true
)
...
...
video/app/src/main/java/com/duben/xixiplaylet/video/tx/TxVideoActivity.kt
View file @
e69baab0
...
...
@@ -126,7 +126,7 @@ class TxVideoActivity : BaseActivity(), View.OnClickListener, VideoView,
fm_bottom
.
visibility
=
View
.
VISIBLE
val
readIndex
=
getRealIndex
(
it
)
showVipCountDialog
(
readIndex
)
//
showVipCountDialog(readIndex)
localShowLucky
(
readIndex
)
// videoIndex -> seeIndex
...
...
video/app/src/main/res/layout/activity_aboutus.xml
View file @
e69baab0
...
...
@@ -115,7 +115,7 @@
android:layout_marginLeft=
"30dp"
android:layout_marginRight=
"30dp"
android:gravity=
"center"
android:text=
"
Copyright © 2020
Inc."
android:text=
"
津ICP备2023001076号-3A\n\nCopyright © 2024
Inc."
android:textColor=
"#454A69"
android:textSize=
"12sp"
/>
</LinearLayout>
...
...
video/app/src/main/res/layout/item_block_view.xml
View file @
e69baab0
...
...
@@ -51,6 +51,15 @@
android:gravity=
"center"
android:text=
"试看已结束"
/>
<Button
android:id=
"@+id/vip"
android:layout_width=
"230dp"
android:layout_height=
"40dp"
android:layout_marginBottom=
"10dp"
android:background=
"@mipmap/bg_detail_bottom"
android:textColor=
"@color/white"
android:visibility=
"gone"
/>
<Button
android:id=
"@+id/unlock"
android:layout_width=
"230dp"
...
...
@@ -61,14 +70,7 @@
android:text=
"看广告解锁1集"
android:textColor=
"@color/white"
/>
<Button
android:id=
"@+id/vip"
android:layout_width=
"230dp"
android:layout_height=
"40dp"
android:layout_marginBottom=
"10dp"
android:background=
"@mipmap/bg_detail_bottom"
android:textColor=
"@color/white"
android:visibility=
"gone"
/>
</LinearLayout>
...
...
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