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
135a70ad
Commit
135a70ad
authored
Sep 26, 2023
by
mengcuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化流程
parent
c6b27f97
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
43 additions
and
27 deletions
+43
-27
NineActivity.kt
...in/java/com/duben/dayplaylet/ui/activitys/NineActivity.kt
+3
-1
WatchRecordActivity.kt
.../com/duben/dayplaylet/ui/activitys/WatchRecordActivity.kt
+2
-2
MainFragment.kt
...ain/java/com/duben/dayplaylet/ui/fragment/MainFragment.kt
+2
-0
MyFragment.kt
.../main/java/com/duben/dayplaylet/ui/fragment/MyFragment.kt
+8
-3
LoadingDialog.java
...n/java/com/duben/dayplaylet/ui/widgets/LoadingDialog.java
+2
-2
shape_draw_adapter.xml
video/app/src/main/res/drawable/shape_draw_adapter.xml
+1
-1
activity_splash.xml
video/app/src/main/res/layout/activity_splash.xml
+3
-3
activity_splash_back.xml
video/app/src/main/res/layout/activity_splash_back.xml
+3
-3
dialog_video_lock.xml
video/app/src/main/res/layout/dialog_video_lock.xml
+10
-9
fragment_draw.xml
video/app/src/main/res/layout/fragment_draw.xml
+1
-0
item_draw_cash.xml
video/app/src/main/res/layout/item_draw_cash.xml
+1
-0
item_msg_pic.xml
video/app/src/main/res/layout/item_msg_pic.xml
+5
-3
item_msg_text.xml
video/app/src/main/res/layout/item_msg_text.xml
+1
-0
dimens.xml
video/app/src/main/res/values/dimens.xml
+1
-0
No files found.
video/app/src/main/java/com/duben/dayplaylet/ui/activitys/NineActivity.kt
View file @
135a70ad
...
@@ -93,7 +93,9 @@ class NineActivity : BaseActivity(), View.OnClickListener {
...
@@ -93,7 +93,9 @@ class NineActivity : BaseActivity(), View.OnClickListener {
when
(
v
.
id
)
{
when
(
v
.
id
)
{
R
.
id
.
iv_nine_back
->
{
R
.
id
.
iv_nine_back
->
{
Handler
(
Looper
.
getMainLooper
()).
postDelayed
({
refreshTaskCount
()
refreshTaskCount
()
},
500
)
finish
()
finish
()
}
}
...
...
video/app/src/main/java/com/duben/dayplaylet/ui/activitys/WatchRecordActivity.kt
View file @
135a70ad
...
@@ -35,8 +35,8 @@ class WatchRecordActivity : BaseActivity(), WatchRecordView {
...
@@ -35,8 +35,8 @@ class WatchRecordActivity : BaseActivity(), WatchRecordView {
override
fun
initViewsAndEvents
()
{
override
fun
initViewsAndEvents
()
{
watchRecordPresenter
.
attachView
(
this
)
watchRecordPresenter
.
attachView
(
this
)
AppConfig
.
mainShowHalfAd
=
true
//
AppConfig.mainShowHalfAd = true
HalfScreenManager
.
getInstance
().
preLoadAd
(
this
)
//
HalfScreenManager.getInstance().preLoadAd(this)
tv_title
.
text
=
"观看记录"
tv_title
.
text
=
"观看记录"
iv_left_icon
.
visibility
=
View
.
VISIBLE
iv_left_icon
.
visibility
=
View
.
VISIBLE
...
...
video/app/src/main/java/com/duben/dayplaylet/ui/fragment/MainFragment.kt
View file @
135a70ad
...
@@ -181,6 +181,7 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
...
@@ -181,6 +181,7 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
when
(
carrierType
)
{
when
(
carrierType
)
{
Constant
.
CARRIERTYPE_REWARD_FIRST
->
{
Constant
.
CARRIERTYPE_REWARD_FIRST
->
{
Handler
(
Looper
.
getMainLooper
()).
postDelayed
({
Handler
(
Looper
.
getMainLooper
()).
postDelayed
({
tv_cash
.
text
=
"18.88元"
ConsumerToastUtil
.
showAwardText
(
requireContext
(),
userInfo
?.
rewardCoin
?:
0
,
0
)
ConsumerToastUtil
.
showAwardText
(
requireContext
(),
userInfo
?.
rewardCoin
?:
0
,
0
)
Handler
(
Looper
.
getMainLooper
()).
postDelayed
({
Handler
(
Looper
.
getMainLooper
()).
postDelayed
({
addAnimation
(
iv_main_tempanim
,
iv_cash
,
R
.
mipmap
.
ic_redpkg
)
addAnimation
(
iv_main_tempanim
,
iv_cash
,
R
.
mipmap
.
ic_redpkg
)
...
@@ -195,6 +196,7 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
...
@@ -195,6 +196,7 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
},
300
)
},
300
)
},
1400
)
},
1400
)
Handler
(
Looper
.
getMainLooper
()).
postDelayed
({
Handler
(
Looper
.
getMainLooper
()).
postDelayed
({
tv_cash
.
text
=
"18.88元"
showSignDialog
()
showSignDialog
()
},
2000
)
},
2000
)
},
300
)
},
300
)
...
...
video/app/src/main/java/com/duben/dayplaylet/ui/fragment/MyFragment.kt
View file @
135a70ad
...
@@ -10,7 +10,6 @@ import com.duben.dayplaylet.ad.AdManager
...
@@ -10,7 +10,6 @@ import com.duben.dayplaylet.ad.AdManager
import
com.duben.dayplaylet.ad.AdStatusListener
import
com.duben.dayplaylet.ad.AdStatusListener
import
com.duben.dayplaylet.ad.NoPreAdManager
import
com.duben.dayplaylet.ad.NoPreAdManager
import
com.duben.dayplaylet.ad.express.MyExpressManager
import
com.duben.dayplaylet.ad.express.MyExpressManager
import
com.duben.dayplaylet.ad.half.HalfScreenManager
import
com.duben.dayplaylet.common.AppConfig
import
com.duben.dayplaylet.common.AppConfig
import
com.duben.dayplaylet.common.Constant
import
com.duben.dayplaylet.common.Constant
import
com.duben.dayplaylet.manager.UserManager
import
com.duben.dayplaylet.manager.UserManager
...
@@ -93,7 +92,6 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
...
@@ -93,7 +92,6 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
override
fun
onFragmentFirstVisible
()
{
override
fun
onFragmentFirstVisible
()
{
super
.
onFragmentFirstVisible
()
super
.
onFragmentFirstVisible
()
HalfScreenManager
.
getInstance
().
showAd
(
requireActivity
(),
null
)
}
}
override
fun
onDestroy
()
{
override
fun
onDestroy
()
{
...
@@ -167,8 +165,15 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
...
@@ -167,8 +165,15 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
pb_task
.
progress
=
data
.
diMsg
.
complete
pb_task
.
progress
=
data
.
diMsg
.
complete
pb_task
.
max
=
data
.
diMsg
.
max
pb_task
.
max
=
data
.
diMsg
.
max
tv_task_count
.
text
=
"今日剩余${data.diMsg.max - data.diMsg.complete}次"
tv_task_count
.
text
=
SpanUtils
()
.
append
(
"今日剩余"
)
.
setForegroundColor
(
requireContext
().
resources
.
getColor
(
R
.
color
.
black
))
.
append
(
"${data.diMsg.max - data.diMsg.complete}"
)
.
setForegroundColor
(
requireContext
().
resources
.
getColor
(
R
.
color
.
red
))
.
append
(
"次"
)
.
setForegroundColor
(
requireContext
().
resources
.
getColor
(
R
.
color
.
black
))
.
create
()
tasksAdapter
?.
taskData
=
data
.
list
tasksAdapter
?.
taskData
=
data
.
list
recy_tasks
.
adapter
?.
notifyDataSetChanged
()
recy_tasks
.
adapter
?.
notifyDataSetChanged
()
...
...
video/app/src/main/java/com/duben/dayplaylet/ui/widgets/LoadingDialog.java
View file @
135a70ad
...
@@ -88,11 +88,11 @@ public class LoadingDialog extends Dialog {
...
@@ -88,11 +88,11 @@ public class LoadingDialog extends Dialog {
ll
.
setVisibility
(
View
.
VISIBLE
);
ll
.
setVisibility
(
View
.
VISIBLE
);
GlideUtils
.
INSTANCE
.
loadImageViewGif
(
getContext
(),
R
.
drawable
.
ic_loading_dot
,
ivDot
);
GlideUtils
.
INSTANCE
.
loadImageViewGif
(
getContext
(),
R
.
drawable
.
ic_loading_dot
,
ivDot
);
int
paddingTB
=
BubbleUtils
.
dp2px
(
3
0
);
int
paddingTB
=
BubbleUtils
.
dp2px
(
2
0
);
int
paddingSE
=
BubbleUtils
.
dp2px
(
10
);
int
paddingSE
=
BubbleUtils
.
dp2px
(
10
);
tv
.
setPadding
(
paddingSE
,
paddingTB
,
paddingSE
,
0
);
tv
.
setPadding
(
paddingSE
,
paddingTB
,
paddingSE
,
0
);
tv
.
setTypeface
(
Typeface
.
defaultFromStyle
(
Typeface
.
BOLD
));
tv
.
setTypeface
(
Typeface
.
defaultFromStyle
(
Typeface
.
BOLD
));
int
dimen
=
getContext
().
getResources
().
getDimensionPixelSize
(
R
.
dimen
.
font_size_
3
0
);
int
dimen
=
getContext
().
getResources
().
getDimensionPixelSize
(
R
.
dimen
.
font_size_
2
0
);
tv
.
setTextSize
(
TypedValue
.
COMPLEX_UNIT_PX
,
dimen
);
tv
.
setTextSize
(
TypedValue
.
COMPLEX_UNIT_PX
,
dimen
);
tv2
.
setTypeface
(
Typeface
.
defaultFromStyle
(
Typeface
.
BOLD
));
tv2
.
setTypeface
(
Typeface
.
defaultFromStyle
(
Typeface
.
BOLD
));
...
...
video/app/src/main/res/drawable/shape_draw_adapter.xml
View file @
135a70ad
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
android:shape=
"rectangle"
>
android:shape=
"rectangle"
>
<!-- 填充的颜色 -->
<!-- 填充的颜色 -->
<stroke
<stroke
android:width=
"
2
dp"
android:width=
"
1
dp"
android:color=
"@color/red"
/>
android:color=
"@color/red"
/>
<solid
android:color=
"@color/white"
/>
<solid
android:color=
"@color/white"
/>
<!-- 设置按钮的四个角为弧形 -->
<!-- 设置按钮的四个角为弧形 -->
...
...
video/app/src/main/res/layout/activity_splash.xml
View file @
135a70ad
...
@@ -6,8 +6,8 @@
...
@@ -6,8 +6,8 @@
<ImageView
<ImageView
android:id=
"@+id/app_logo"
android:id=
"@+id/app_logo"
android:layout_width=
"
wrap_content
"
android:layout_width=
"
76dp
"
android:layout_height=
"
wrap_content
"
android:layout_height=
"
76dp
"
android:layout_centerHorizontal=
"true"
android:layout_centerHorizontal=
"true"
android:layout_marginTop=
"90dp"
android:layout_marginTop=
"90dp"
android:src=
"@mipmap/ic_launcher_main"
/>
android:src=
"@mipmap/ic_launcher_main"
/>
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
android:layout_below=
"@+id/app_logo"
android:layout_below=
"@+id/app_logo"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_centerHorizontal=
"true"
android:layout_centerHorizontal=
"true"
android:layout_marginTop=
"
3
0dp"
android:layout_marginTop=
"
2
0dp"
android:src=
"@mipmap/ic_splash_top"
android:src=
"@mipmap/ic_splash_top"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
...
...
video/app/src/main/res/layout/activity_splash_back.xml
View file @
135a70ad
...
@@ -6,8 +6,8 @@
...
@@ -6,8 +6,8 @@
<ImageView
<ImageView
android:id=
"@+id/app_logo"
android:id=
"@+id/app_logo"
android:layout_width=
"
wrap_content
"
android:layout_width=
"
76dp
"
android:layout_height=
"
wrap_content
"
android:layout_height=
"
76dp
"
android:layout_centerHorizontal=
"true"
android:layout_centerHorizontal=
"true"
android:layout_marginTop=
"90dp"
android:layout_marginTop=
"90dp"
android:src=
"@mipmap/ic_launcher_main"
/>
android:src=
"@mipmap/ic_launcher_main"
/>
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
android:layout_below=
"@+id/app_logo"
android:layout_below=
"@+id/app_logo"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_centerHorizontal=
"true"
android:layout_centerHorizontal=
"true"
android:layout_marginTop=
"
3
0dp"
android:layout_marginTop=
"
2
0dp"
android:src=
"@mipmap/ic_splash_top"
android:src=
"@mipmap/ic_splash_top"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
...
...
video/app/src/main/res/layout/dialog_video_lock.xml
View file @
135a70ad
...
@@ -28,10 +28,10 @@
...
@@ -28,10 +28,10 @@
android:id=
"@+id/tv_title"
android:id=
"@+id/tv_title"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"1
40
dp"
android:layout_marginTop=
"1
36
dp"
android:layout_marginBottom=
"
2
0dp"
android:layout_marginBottom=
"
1
0dp"
android:textColor=
"@color/black"
android:textColor=
"@color/black"
android:textSize=
"2
0
sp"
android:textSize=
"2
2
sp"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"并领取最高"
android:text=
"并领取最高"
android:textSize=
"
18
sp"
android:textSize=
"
20
sp"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
/>
app:layout_constraintStart_toStartOf=
"parent"
/>
...
@@ -64,7 +64,7 @@
...
@@ -64,7 +64,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
" 10 "
android:text=
" 10 "
android:textColor=
"@color/red"
android:textColor=
"@color/red"
android:textSize=
"
18
sp"
android:textSize=
"
20
sp"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toStartOf=
"@id/tv_info3"
app:layout_constraintEnd_toStartOf=
"@id/tv_info3"
app:layout_constraintStart_toEndOf=
"@id/tv_info1"
app:layout_constraintStart_toEndOf=
"@id/tv_info1"
...
@@ -75,7 +75,7 @@
...
@@ -75,7 +75,7 @@
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"元红包"
android:text=
"元红包"
android:textSize=
"
18
sp"
android:textSize=
"
20
sp"
app:constraintSet=
"@id/tv_info2"
app:constraintSet=
"@id/tv_info2"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
...
@@ -85,8 +85,9 @@
...
@@ -85,8 +85,9 @@
<Button
<Button
android:id=
"@+id/unlock"
android:id=
"@+id/unlock"
android:layout_width=
"243dp"
android:layout_width=
"266dp"
android:layout_height=
"48dp"
android:layout_height=
"54dp"
android:textSize=
"16sp"
android:background=
"@mipmap/ic_btn_unlock"
android:background=
"@mipmap/ic_btn_unlock"
android:textColor=
"@color/white"
/>
android:textColor=
"@color/white"
/>
...
@@ -98,7 +99,7 @@
...
@@ -98,7 +99,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@id/ll"
android:layout_below=
"@id/ll"
android:layout_marginStart=
"30dp"
android:layout_marginStart=
"30dp"
android:layout_marginTop=
"
2
0dp"
android:layout_marginTop=
"
1
0dp"
android:layout_marginEnd=
"@dimen/font_size_30"
android:layout_marginEnd=
"@dimen/font_size_30"
android:background=
"@drawable/shape_bg_write"
/>
android:background=
"@drawable/shape_bg_write"
/>
...
...
video/app/src/main/res/layout/fragment_draw.xml
View file @
135a70ad
...
@@ -51,6 +51,7 @@
...
@@ -51,6 +51,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_horizontal"
android:layout_gravity=
"center_horizontal"
android:layout_marginTop=
"20dp"
android:layout_marginTop=
"20dp"
android:layout_marginBottom=
"20dp"
/>
android:layout_marginBottom=
"20dp"
/>
<TextView
<TextView
...
...
video/app/src/main/res/layout/item_draw_cash.xml
View file @
135a70ad
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
android:id=
"@+id/root_view"
android:id=
"@+id/root_view"
android:layout_width=
"104dp"
android:layout_width=
"104dp"
android:layout_height=
"54dp"
android:layout_height=
"54dp"
android:layout_marginTop=
"8dp"
android:layout_marginLeft=
"6dp"
android:layout_marginLeft=
"6dp"
android:layout_marginEnd=
"6dp"
android:layout_marginEnd=
"6dp"
android:background=
"@drawable/shape_draw_adapter_none"
>
android:background=
"@drawable/shape_draw_adapter_none"
>
...
...
video/app/src/main/res/layout/item_msg_pic.xml
View file @
135a70ad
...
@@ -43,17 +43,19 @@
...
@@ -43,17 +43,19 @@
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"6dp"
android:layout_marginBottom=
"6dp"
android:textSize=
"13sp"
android:text=
"@string/app_name"
/>
android:text=
"@string/app_name"
/>
<FrameLayout
<FrameLayout
android:layout_width=
"2
2
0dp"
android:layout_width=
"2
3
0dp"
android:layout_height=
"100dp"
>
android:layout_height=
"100dp"
>
<ImageView
<ImageView
android:id=
"@+id/iv_content"
android:id=
"@+id/iv_content"
android:layout_width=
"200dp"
android:layout_width=
"230dp"
android:layout_height=
"85dp"
android:layout_height=
"100dp"
android:scaleType=
"fitXY"
android:src=
"@mipmap/bg_redpkg_enable"
/>
android:src=
"@mipmap/bg_redpkg_enable"
/>
<com.airbnb.lottie.LottieAnimationView
<com.airbnb.lottie.LottieAnimationView
...
...
video/app/src/main/res/layout/item_msg_text.xml
View file @
135a70ad
...
@@ -43,6 +43,7 @@
...
@@ -43,6 +43,7 @@
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"6dp"
android:layout_marginBottom=
"6dp"
android:textSize=
"13sp"
android:text=
"@string/app_name"
/>
android:text=
"@string/app_name"
/>
...
...
video/app/src/main/res/values/dimens.xml
View file @
135a70ad
...
@@ -27,6 +27,7 @@
...
@@ -27,6 +27,7 @@
<!-- 字体 -->
<!-- 字体 -->
<dimen
name=
"font_size_14"
>
14sp
</dimen>
<dimen
name=
"font_size_14"
>
14sp
</dimen>
<dimen
name=
"font_size_16"
>
16sp
</dimen>
<dimen
name=
"font_size_16"
>
16sp
</dimen>
<dimen
name=
"font_size_20"
>
20sp
</dimen>
<dimen
name=
"font_size_30"
>
30sp
</dimen>
<dimen
name=
"font_size_30"
>
30sp
</dimen>
</resources>
</resources>
\ No newline at end of file
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