Skip to content

A
android_vedio
Commit 3edf7515 authored by jyx's avatar jyx
Browse files
Options

更新我的页面样式

parent 916b59c3
Hide whitespace changes
Inline Side-by-side
Showing with 846 additions and 467 deletions
video/app/src/main/java/com/duben/dayplaylet/mvp/model/IndexList.java
View file @ 3edf7515
...@@ -10,6 +10,16 @@ public class IndexList implements Serializable { ...@@ -10,6 +10,16 @@ public class IndexList implements Serializable {
private List<VedioEpisodeBean> list; private List<VedioEpisodeBean> list;
private ArrayList<String> tip; private ArrayList<String> tip;
private UserBean.UserMsgBean userMsg;
public UserBean.UserMsgBean getUserMsg() {
return userMsg;
}
public void setUserMsg(UserBean.UserMsgBean userMsg) {
this.userMsg = userMsg;
}
public ArrayList<String> getTip() { public ArrayList<String> getTip() {
return tip; return tip;
} }
......
video/app/src/main/java/com/duben/dayplaylet/mvp/model/MusicBean.kt
View file @ 3edf7515
package com.duben.dayplaylet.mvp.model package com.duben.dayplaylet.mvp.model
import com.duben.dayplaylet.mvp.model.UserBean.UserMsgBean
data class MusicBean( data class MusicBean(
val completeCount: Int, //完成的次数(这里的次数不包括翻倍) val completeCount: Int, //完成的次数(这里的次数不包括翻倍)
val nextIsAd: Boolean, //接下来是不是要看广告了 val nextIsAd: Boolean, //接下来是不是要看广告了
val openCash: Boolean, //还能不能提现，不能提现就不展示提现入口了 val openCash: Boolean, //还能不能提现，不能提现就不展示提现入口了
val turnNeedCount: Int //提现需要的次数 val turnNeedCount: Int, //提现需要的次数
val userMsg: UserMsgBean? = null
) )
\ No newline at end of file
video/app/src/main/java/com/duben/dayplaylet/mvp/presenters/DrawCashPresenter.kt 0 → 100644
View file @ 3edf7515
package com.duben.dayplaylet.mvp.presenters
import com.duben.dayplaylet.mvp.views.DrawCashView
class DrawCashPresenter : BasePresenter<DrawCashView>() {
}
\ No newline at end of file
video/app/src/main/java/com/duben/dayplaylet/mvp/views/DrawCashView.kt 0 → 100644
View file @ 3edf7515
package com.duben.dayplaylet.mvp.views
interface DrawCashView : BaseView {
}
\ No newline at end of file
video/app/src/main/java/com/duben/dayplaylet/ui/activitys/MainActivity.kt
View file @ 3edf7515
...@@ -32,9 +32,7 @@ class MainActivity : BaseActivity(), View.OnClickListener { ...@@ -32,9 +32,7 @@ class MainActivity : BaseActivity(), View.OnClickListener {
private var myFragment: Fragment? = null private var myFragment: Fragment? = null
private var currentFragment: Fragment? = null private var currentFragment: Fragment? = null
override fun getContentViewLayoutID(): Int { override fun getContentViewLayoutID() = R.layout.activity_main
return R.layout.activity_main
}
override fun initViewsAndEvents() { override fun initViewsAndEvents() {
DPHolderManager.initDpSdk(MintsApplication.getContext()); DPHolderManager.initDpSdk(MintsApplication.getContext());
......
video/app/src/main/java/com/duben/dayplaylet/ui/fragment/MainFragment.kt
View file @ 3edf7515
...@@ -279,7 +279,7 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR ...@@ -279,7 +279,7 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
this.userInfo = user.userMsg this.userInfo = user.userMsg
UserManager.getInstance().saveUserInfo(user) UserManager.getInstance().saveUserInfo(user)
tv_cash.text = "${FormatUtil.getCashFormaet(user.userMsg.rewardCoin)}元" tv_cash.text = "${FormatUtil.getCashFormaet(user.userMsg.coin)}元"
tv_gold.text = "${user.userMsg.diamonds}个" tv_gold.text = "${user.userMsg.diamonds}个"
// 新人红包只执行一次 // 新人红包只执行一次
...@@ -510,12 +510,7 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR ...@@ -510,12 +510,7 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
*/ */
private fun addAnimation(view: View, targetView: View, pic: Int) { private fun addAnimation(view: View, targetView: View, pic: Int) {
val goods = ImageView(requireContext()) val goods = ImageView(requireContext())
goods.setImageDrawable( goods.setImageDrawable(resources.getDrawable(pic, null))
resources.getDrawable(
pic,
null
)
)
val params = ConstraintLayout.LayoutParams(BubbleUtils.dp2px(30), BubbleUtils.dp2px(30)) val params = ConstraintLayout.LayoutParams(BubbleUtils.dp2px(30), BubbleUtils.dp2px(30))
rl.addView(goods, params) rl.addView(goods, params)
val parentLocation = IntArray(2) val parentLocation = IntArray(2)
......
video/app/src/main/java/com/duben/dayplaylet/ui/fragment/MusicFragment.kt
View file @ 3edf7515
...@@ -41,6 +41,7 @@ import com.duben.dayplaylet.ui.activitys.SongAwardActivity ...@@ -41,6 +41,7 @@ import com.duben.dayplaylet.ui.activitys.SongAwardActivity
import com.duben.dayplaylet.ui.fragment.base.LazyLoadBaseFragment import com.duben.dayplaylet.ui.fragment.base.LazyLoadBaseFragment
import com.duben.dayplaylet.ui.widgets.countdowntimer.CountDownTimerSupport import com.duben.dayplaylet.ui.widgets.countdowntimer.CountDownTimerSupport
import com.duben.dayplaylet.ui.widgets.countdowntimer.OnCountDownTimerListener import com.duben.dayplaylet.ui.widgets.countdowntimer.OnCountDownTimerListener
import com.duben.dayplaylet.utils.FormatUtil
import com.duben.dayplaylet.utils.LogUtil import com.duben.dayplaylet.utils.LogUtil
import com.duben.dayplaylet.utils.RxBus import com.duben.dayplaylet.utils.RxBus
import com.duben.dayplaylet.utils.RxBus.MsgEvent import com.duben.dayplaylet.utils.RxBus.MsgEvent
...@@ -72,6 +73,9 @@ class MusicFragment : LazyLoadBaseFragment(), MusicView { ...@@ -72,6 +73,9 @@ class MusicFragment : LazyLoadBaseFragment(), MusicView {
private var mTimer: CountDownTimerSupport? = null private var mTimer: CountDownTimerSupport? = null
private var rope: YoYoString? = null private var rope: YoYoString? = null
private var mCash = 0
private var mGold = 0
private var mPos = 0 private var mPos = 0
override fun getContentViewLayoutID() = R.layout.fragment_music override fun getContentViewLayoutID() = R.layout.fragment_music
...@@ -514,6 +518,12 @@ class MusicFragment : LazyLoadBaseFragment(), MusicView { ...@@ -514,6 +518,12 @@ class MusicFragment : LazyLoadBaseFragment(), MusicView {
mMusicBean = data mMusicBean = data
mMusicBean?.let { mMusicBean?.let {
mCash = it.userMsg?.coin ?: 0
mGold = it.userMsg?.diamonds ?: 0
tv_cash.text = "${FormatUtil.getCashFormaet(mCash)}元"
tv_gold.text = "${mGold}个"
if (it.openCash) { if (it.openCash) {
rl_open_cash.visibility = View.VISIBLE rl_open_cash.visibility = View.VISIBLE
tv_open_cash_progress.text = tv_open_cash_progress.text =
...@@ -556,6 +566,12 @@ class MusicFragment : LazyLoadBaseFragment(), MusicView { ...@@ -556,6 +566,12 @@ class MusicFragment : LazyLoadBaseFragment(), MusicView {
private fun showRewardAnim(cashReward: Int, goldReward: Int) { private fun showRewardAnim(cashReward: Int, goldReward: Int) {
if (cashReward <= 0 && goldReward <= 0) return if (cashReward <= 0 && goldReward <= 0) return
mCash += cashReward
mGold += goldReward
tv_cash.text = "${FormatUtil.getCashFormaet(mCash)}元"
tv_gold.text = "${mGold}个"
cl_reward.visibility = View.VISIBLE cl_reward.visibility = View.VISIBLE
iv_cash_reward.visibility = View.VISIBLE iv_cash_reward.visibility = View.VISIBLE
tv_cash_reward.visibility = View.VISIBLE tv_cash_reward.visibility = View.VISIBLE
...@@ -618,7 +634,6 @@ class MusicFragment : LazyLoadBaseFragment(), MusicView { ...@@ -618,7 +634,6 @@ class MusicFragment : LazyLoadBaseFragment(), MusicView {
SongAwardActivity.ACTIVITY_REQUEST_CODE, SongAwardActivity.ACTIVITY_REQUEST_CODE,
bundle bundle
) )
// showRewardAnim(coin, di)
} }
Constant.CARRIERTYPE_SONG_ALL -> { Constant.CARRIERTYPE_SONG_ALL -> {
showRewardAnim(coin, di) showRewardAnim(coin, di)
......
video/app/src/main/java/com/duben/dayplaylet/ui/fragment/MyFragment.kt
View file @ 3edf7515
...@@ -5,7 +5,6 @@ import android.os.Handler ...@@ -5,7 +5,6 @@ import android.os.Handler
import android.os.Looper import android.os.Looper
import android.text.TextUtils import android.text.TextUtils
import android.view.View import android.view.View
import com.duben.dayplaylet.MintsApplication
import com.duben.dayplaylet.R import com.duben.dayplaylet.R
import com.duben.dayplaylet.ad.AdManager import com.duben.dayplaylet.ad.AdManager
import com.duben.dayplaylet.ad.AdStatusListener import com.duben.dayplaylet.ad.AdStatusListener
...@@ -25,6 +24,7 @@ import com.duben.dayplaylet.ui.adapter.TasksAdapter ...@@ -25,6 +24,7 @@ import com.duben.dayplaylet.ui.adapter.TasksAdapter
import com.duben.dayplaylet.ui.fragment.base.LazyLoadBaseFragment import com.duben.dayplaylet.ui.fragment.base.LazyLoadBaseFragment
import com.duben.dayplaylet.ui.fragment.draw.DrawCashDialog import com.duben.dayplaylet.ui.fragment.draw.DrawCashDialog
import com.duben.dayplaylet.utils.ConsumerToastUtil import com.duben.dayplaylet.utils.ConsumerToastUtil
import com.duben.dayplaylet.utils.FormatUtil
import com.duben.dayplaylet.utils.SpanUtils import com.duben.dayplaylet.utils.SpanUtils
import com.duben.library.utils.nodoubleclick.AntiShake import com.duben.library.utils.nodoubleclick.AntiShake
import kotlinx.android.synthetic.main.fragment_main_my.* import kotlinx.android.synthetic.main.fragment_main_my.*
...@@ -135,22 +135,34 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener { ...@@ -135,22 +135,34 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
override fun getUserSuc(data: UserBean) { override fun getUserSuc(data: UserBean) {
tv_my_id.text = "用户ID:${data.userMsg.idcode}" tv_my_id.text = "用户ID:${data.userMsg.idcode}"
tv_my_money.text = SpanUtils()
.append(FormatUtil.getCashFormaet(UserManager.getInstance().redpkg))
.setFontSize(40, true)
.append(" ≈ ${UserManager.getInstance().redpkg}个")
.setFontSize(14, true)
.create()
} }
override fun getHallListSuc(data: TaskInfoBean) { override fun getHallListSuc(data: TaskInfoBean) {
tasksAdapter?.taskData = data.list tasksAdapter?.taskData = data.list
recy_tasks.adapter?.notifyDataSetChanged() recy_tasks.adapter?.notifyDataSetChanged()
tv_task_count.text = SpanUtils() if (rb_my_cash.isChecked) {
.append("今日剩余") tv_my_money.text = SpanUtils()
.setForegroundColor(mContext.resources.getColor(R.color.title_bg)) .append(FormatUtil.getCashFormaet(UserManager.getInstance().redpkg))
.append((data.diMsg.max - data.diMsg.complete).toString()) .setFontSize(40, true)
.setForegroundColor(mContext.resources.getColor(R.color.red)) .append(" ≈ ${UserManager.getInstance().redpkg}个")
.append("次") .setFontSize(14, true)
.setForegroundColor(mContext.resources.getColor(R.color.title_bg)) .create()
.create() } else {
pb_task.max = data.diMsg.max tv_my_money.text = SpanUtils()
pb_task.progress = data.diMsg.complete .append("" + UserManager.getInstance().yuanbao)
.setFontSize(40, true)
.append(" ≈ ${FormatUtil.getCashFormaet(UserManager.getInstance().yuanbao)}元")
.setFontSize(14, true)
.create()
}
} }
private fun initListener() { private fun initListener() {
...@@ -165,20 +177,20 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener { ...@@ -165,20 +177,20 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
tv_my_gold.visibility = View.INVISIBLE tv_my_gold.visibility = View.INVISIBLE
tv_my_title.text = "红包余额(元)" tv_my_title.text = "红包余额(元)"
tv_my_money.text = SpanUtils() tv_my_money.text = SpanUtils()
.setFontSize(30, true) .append(FormatUtil.getCashFormaet(UserManager.getInstance().redpkg))
.append(" ") .setFontSize(40, true)
.append(" ≈ ${UserManager.getInstance().redpkg}个")
.setFontSize(14, true) .setFontSize(14, true)
.append(" ≈ ")
.create() .create()
} else { } else {
tv_my_cash.visibility = View.INVISIBLE tv_my_cash.visibility = View.INVISIBLE
tv_my_gold.visibility = View.VISIBLE tv_my_gold.visibility = View.VISIBLE
tv_my_title.text = "金元宝余额(个)" tv_my_title.text = "金元宝余额(个)"
tv_my_money.text = SpanUtils() tv_my_money.text = SpanUtils()
.setFontSize(30, true) .append("" + UserManager.getInstance().yuanbao)
.append(" ") .setFontSize(40, true)
.append(" ≈ ${FormatUtil.getCashFormaet(UserManager.getInstance().yuanbao)}元")
.setFontSize(14, true) .setFontSize(14, true)
.append(" ≈ ")
.create() .create()
} }
} }
......
video/app/src/main/java/com/duben/dayplaylet/ui/fragment/draw/DrawCashFragment.kt
View file @ 3edf7515
package com.duben.dayplaylet.ui.fragment.draw package com.duben.dayplaylet.ui.fragment.draw
import android.os.Bundle import android.os.Bundle
import android.text.Spannable
import android.text.style.ImageSpan
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.duben.dayplaylet.R import com.duben.dayplaylet.R
import com.duben.dayplaylet.ui.fragment.base.BaseFragment import com.duben.dayplaylet.mvp.presenters.DrawCashPresenter
import com.duben.dayplaylet.mvp.views.DrawCashView
import com.duben.dayplaylet.ui.fragment.base.LazyLoadBaseFragment import com.duben.dayplaylet.ui.fragment.base.LazyLoadBaseFragment
import com.duben.dayplaylet.utils.SpanUtils import com.duben.dayplaylet.utils.SpanUtils
import com.duben.dayplaylet.utils.SpanUtils.ALIGN_BASELINE
import kotlinx.android.synthetic.main.fragment_draw.* import kotlinx.android.synthetic.main.fragment_draw.*
/** /**
* 提现 * 提现
*/ */
class DrawCashFragment : LazyLoadBaseFragment() { class DrawCashFragment : LazyLoadBaseFragment(), DrawCashView {
companion object { companion object {
...@@ -34,6 +31,8 @@ class DrawCashFragment : LazyLoadBaseFragment() { ...@@ -34,6 +31,8 @@ class DrawCashFragment : LazyLoadBaseFragment() {
} }
} }
private val drawCashPresenter by lazy { DrawCashPresenter() }
private var drawType = DRAW_TYPE_CASH private var drawType = DRAW_TYPE_CASH
private var mDrawCashData = arrayListOf<String>() private var mDrawCashData = arrayListOf<String>()
...@@ -42,6 +41,8 @@ class DrawCashFragment : LazyLoadBaseFragment() { ...@@ -42,6 +41,8 @@ class DrawCashFragment : LazyLoadBaseFragment() {
override fun getContentViewLayoutID() = R.layout.fragment_draw override fun getContentViewLayoutID() = R.layout.fragment_draw
override fun initViewsAndEvents() { override fun initViewsAndEvents() {
drawCashPresenter.attachView(this)
arguments?.let { arguments?.let {
drawType = it.getInt(DRAW_TYPE, DRAW_TYPE_CASH) drawType = it.getInt(DRAW_TYPE, DRAW_TYPE_CASH)
} }
...@@ -59,17 +60,17 @@ class DrawCashFragment : LazyLoadBaseFragment() { ...@@ -59,17 +60,17 @@ class DrawCashFragment : LazyLoadBaseFragment() {
tv_title.text = "红包余额(元)" tv_title.text = "红包余额(元)"
tv_cash.text = SpanUtils() tv_cash.text = SpanUtils()
.append("90.00") .append("90.00")
.setFontSize(30, true) .setFontSize(28, true)
.append("≈ 900000个") .append("≈ 900000个")
.setFontSize(16, true) .setFontSize(20, true)
.create() .create()
} else { } else {
tv_title.text = "金元宝余额(个)" tv_title.text = "金元宝余额(个)"
tv_cash.text = SpanUtils() tv_cash.text = SpanUtils()
.append("90.00") .append("90.00")
.setFontSize(30, true) .setFontSize(28, true)
.append("≈ 0.00元") .append("≈ 0.00元")
.setFontSize(16, true) .setFontSize(20, true)
.create() .create()
} }
} }
......
video/app/src/main/java/com/duben/dayplaylet/ui/widgets/VideoRewardDialog.kt
View file @ 3edf7515
...@@ -24,8 +24,7 @@ class VideoRewardDialog( ...@@ -24,8 +24,7 @@ class VideoRewardDialog(
context: Context, context: Context,
currentCash: Float, currentCash: Float,
listener: DialogListener listener: DialogListener
) : ) : Dialog(context, R.style.dialog) {
Dialog(context, R.style.dialog) {
private val lp: WindowManager.LayoutParams private val lp: WindowManager.LayoutParams
...@@ -63,7 +62,7 @@ class VideoRewardDialog( ...@@ -63,7 +62,7 @@ class VideoRewardDialog(
tvInfo.text = SpanUtils() tvInfo.text = SpanUtils()
.append("还差") .append("还差")
.append("${currentCash}元") .append("${(100f - currentCash)}元")
.setForegroundColor(ContextCompat.getColor(context, R.color.red)) .setForegroundColor(ContextCompat.getColor(context, R.color.red))
.append("即可提现") .append("即可提现")
.append("100元") .append("100元")
......
video/app/src/main/java/com/duben/dayplaylet/video/csj/DramaApiDetailActivity.kt
View file @ 3edf7515
package com.duben.dayplaylet.video.csj package com.duben.dayplaylet.video.csj
import android.animation.Animator
import android.animation.ValueAnimator
import android.app.Dialog import android.app.Dialog
import android.graphics.Path
import android.graphics.PathMeasure
import android.os.Bundle import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.util.Log import android.util.Log
import android.view.View import android.view.View
import android.view.animation.LinearInterpolator
import android.widget.ImageView
import android.widget.RelativeLayout
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import com.bytedance.sdk.dp.* import com.bytedance.sdk.dp.*
import com.google.gson.Gson import com.google.gson.Gson
...@@ -21,6 +30,7 @@ import com.duben.dayplaylet.mvp.views.VideoView ...@@ -21,6 +30,7 @@ import com.duben.dayplaylet.mvp.views.VideoView
import com.duben.dayplaylet.ui.activitys.base.BaseActivity import com.duben.dayplaylet.ui.activitys.base.BaseActivity
import com.duben.dayplaylet.ui.adapter.VideoEpisodeAdapter import com.duben.dayplaylet.ui.adapter.VideoEpisodeAdapter
import com.duben.dayplaylet.ui.widgets.* import com.duben.dayplaylet.ui.widgets.*
import com.duben.dayplaylet.utils.FormatUtil
import com.duben.dayplaylet.utils.SpanUtils import com.duben.dayplaylet.utils.SpanUtils
import com.duben.library.utils.nodoubleclick.AntiShake import com.duben.library.utils.nodoubleclick.AntiShake
import kotlinx.android.synthetic.main.drama_activity_api_detail.* import kotlinx.android.synthetic.main.drama_activity_api_detail.*
...@@ -53,6 +63,8 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic ...@@ -53,6 +63,8 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
private var mInitUnlockIndex = 0 private var mInitUnlockIndex = 0
private val mainHandler = Handler(Looper.getMainLooper())
//可免费观看的最大集数 //可免费观看的最大集数
private var mUnlockIndexMap = mutableMapOf<Long, Int>() private var mUnlockIndexMap = mutableMapOf<Long, Int>()
...@@ -74,6 +86,9 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic ...@@ -74,6 +86,9 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
private var mCurrentIndex = 0 private var mCurrentIndex = 0
private var mCash = 0
private var mGold = 0
override fun getBundleExtras(extras: Bundle?) { override fun getBundleExtras(extras: Bundle?) {
val json = extras?.getString(Constant.VEDIO_BEAN) val json = extras?.getString(Constant.VEDIO_BEAN)
isThirdId = extras?.getBoolean(Constant.VEDIO_THIRD, false) == true isThirdId = extras?.getBoolean(Constant.VEDIO_THIRD, false) == true
...@@ -136,11 +151,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic ...@@ -136,11 +151,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
} }
isInited = true isInited = true
cl_red_box.visibility = View.VISIBLE
cdvv.setTime(10)
cdvv.setCountDownVideoListener(this)
cdvv.start()
} }
private fun initWidget() { private fun initWidget() {
...@@ -178,7 +188,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic ...@@ -178,7 +188,6 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
videoPresenter.rdVedioMsg() videoPresenter.rdVedioMsg()
} }
...@@ -384,6 +393,11 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic ...@@ -384,6 +393,11 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
override fun getIndexListSuc(indexList: IndexList) { override fun getIndexListSuc(indexList: IndexList) {
tipList = indexList.tip tipList = indexList.tip
mCash = indexList.userMsg.coin
mGold = indexList.userMsg.diamonds
tv_cash.text = "${FormatUtil.getCashFormaet(mCash)}元"
tv_gold.text = "${mGold}个"
} }
override fun getIndexListFail() { override fun getIndexListFail() {
...@@ -409,20 +423,25 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic ...@@ -409,20 +423,25 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
tv_tips.visibility = View.GONE tv_tips.visibility = View.GONE
triangle.visibility = View.GONE triangle.visibility = View.GONE
cdvv.setTime(surplusSeconds) cdvv.setTime(surplusSeconds)
cdvv.start()
cdvv.setCountDownVideoListener(this) cdvv.setCountDownVideoListener(this)
cl_red_box.isClickable = false
cl_red_box.setOnClickListener {
dpWidget?.fragment?.onPause()
showRedboxDialog()
}
} else { } else {
cl_red_box.visibility = View.GONE cl_red_box.visibility = View.GONE
} }
} }
override fun reportAddCoinMsgSuc(coin: Int, di: Int) { override fun reportAddCoinMsgSuc(coin: Int, di: Int) {
videoPresenter.rdVedioMsg()
showRewardAnim(coin, di)
} }
override fun onLoadingFinish() { override fun onLoadingFinish() {
cl_red_box.setOnClickListener { cl_red_box.isClickable = true
showRedboxDialog()
}
tv_tips.visibility = View.VISIBLE tv_tips.visibility = View.VISIBLE
triangle.visibility = View.VISIBLE triangle.visibility = View.VISIBLE
} }
...@@ -467,12 +486,14 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic ...@@ -467,12 +486,14 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
private fun showRedboxDialog() { private fun showRedboxDialog() {
mVideoRewardDialog = VideoRewardDialog( mVideoRewardDialog = VideoRewardDialog(
this, this,
30f, FormatUtil.getCashFormaet(mCash).toFloat(),
object : DialogListener() { object : DialogListener() {
override fun onClick(dialog: Dialog?, v: View?) { override fun onClick(dialog: Dialog?, v: View?) {
super.onClick(dialog, v) super.onClick(dialog, v)
dialog?.dismiss() dialog?.dismiss()
showAd(Constant.CARRIERTYPE_VEDIO) showAd(Constant.CARRIERTYPE_VEDIO)
cl_red_box.isClickable = false
} }
} }
) )
...@@ -513,7 +534,9 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic ...@@ -513,7 +534,9 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
} }
} }
Constant.CARRIERTYPE_VEDIO -> { Constant.CARRIERTYPE_VEDIO -> {
videoPresenter.reportAddCoinMsg(
carrierType, vo?.get("ecpmId") as String
)
} }
else -> {} else -> {}
} }
...@@ -529,7 +552,9 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic ...@@ -529,7 +552,9 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
} }
} }
Constant.CARRIERTYPE_VEDIO -> { Constant.CARRIERTYPE_VEDIO -> {
videoPresenter.reportAddCoinMsg(
carrierType, vo?.get("ecpmId") as String
)
} }
else -> {} else -> {}
} }
...@@ -565,4 +590,183 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic ...@@ -565,4 +590,183 @@ class DramaApiDetailActivity : BaseActivity(), VideoEpisodeAdapter.OnEpisodeClic
LocalVedioManager.commitVedio(mVedioBean!!) LocalVedioManager.commitVedio(mVedioBean!!)
unlockCallback?.onDramaRewardArrived() // 解锁当前集 unlockCallback?.onDramaRewardArrived() // 解锁当前集
} }
private fun showRewardAnim(cashReward: Int, goldReward: Int) {
if (cashReward <= 0 && goldReward <= 0) return
mCash += cashReward
mGold += goldReward
tv_cash.text = "${FormatUtil.getCashFormaet(mCash)}元"
tv_gold.text = "${mGold}个"
cl_reward.visibility = View.VISIBLE
iv_cash_reward.visibility = View.VISIBLE
tv_cash_reward.visibility = View.VISIBLE
iv_gold_reward.visibility = View.VISIBLE
tv_gold_reward.visibility = View.VISIBLE
if (cashReward <= 0) {
iv_cash_reward.visibility = View.GONE
tv_cash_reward.visibility = View.GONE
} else {
tv_cash_reward.text = "+$cashReward"
mainHandler.postDelayed({
addAnimation(iv_cash_reward, iv_cash)
mainHandler.postDelayed({
addAnimation(iv_cash_reward, iv_cash)
}, 200)
mainHandler.postDelayed({
addAnimation(iv_cash_reward, iv_cash)
}, 400)
mainHandler.postDelayed({
addAnimation(iv_cash_reward, iv_cash)
}, 800)
}, 100)
}
if (goldReward <= 0) {
iv_gold_reward.visibility = View.GONE
tv_gold_reward.visibility = View.GONE
} else {
tv_gold_reward.text = "+$goldReward"
mainHandler.postDelayed({
addAnimation(iv_gold_reward, iv_gold)
mainHandler.postDelayed({
addAnimation(iv_gold_reward, iv_gold)
}, 200)
mainHandler.postDelayed({
addAnimation(iv_gold_reward, iv_gold)
}, 400)
mainHandler.postDelayed({
addAnimation(iv_gold_reward, iv_gold)
}, 800)
}, 100)
}
mainHandler.postDelayed({
cl_reward.visibility = View.GONE
}, 1500)
}
/**
* 动画
*/
private fun addAnimation(view: ImageView, targetView: View) {
/**
* 贝塞尔曲线中间过程的点的坐标
*/
val mCurrentPosition = FloatArray(2)
// 一、创造出执行动画的主题---imageview
//代码new一个imageview，图片资源是上面的imageview的图片
// (这个图片就是执行动画的图片，从开始位置出发，经过一个抛物线（贝塞尔曲线），移动到购物车里)
val goods = ImageView(this)
goods.setImageDrawable(view.drawable)
val params = RelativeLayout.LayoutParams(view.width, view.height)
container.addView(goods, params)
val offsetWidth = if (view.width >= targetView.width) {
view.width - targetView.width
} else {
targetView.width - view.width
}
// val offsetHeight = if (view.height >= targetView.height) {
// view.height - targetView.height
// } else {
// targetView.height - view.height
// }
// 二、计算动画开始/结束点的坐标的准备工作
//得到父布局的起始点坐标（用于辅助计算动画开始/结束时的点的坐标）
val parentLocation = IntArray(2)
container.getLocationInWindow(parentLocation)
//得到商品图片的坐标（用于计算动画开始的坐标）
val startLoc = IntArray(2)
view.getLocationInWindow(startLoc)
//得到购物车图片的坐标(用于计算动画结束后的坐标)
val endLoc = IntArray(2)
targetView.getLocationInWindow(endLoc)
// 三、正式开始计算动画开始/结束的坐标
//开始掉落的商品的起始点：商品起始点-父布局起始点+该商品图片的一半
val startX =
startLoc[0] - parentLocation[0] + goods.width / 2.toFloat()
val startY =
startLoc[1] - parentLocation[1] + goods.height / 2.toFloat()
//商品掉落后的终点坐标：购物车起始点-父布局起始点+购物车图片的1/5
val toX =
endLoc[0] - parentLocation[0].toFloat()
// + targetView.width / 5.toFloat()
val toY =
endLoc[1] - parentLocation[1].toFloat() + targetView.height / 5.toFloat()
//四、计算中间动画的插值坐标（贝塞尔曲线）（其实就是用贝塞尔曲线来完成起终点的过程）
//开始绘制贝塞尔曲线
val path = Path()
//移动到起始点（贝塞尔曲线的起点）
path.moveTo(startX, startY)
//使用二次萨贝尔曲线：注意第一个起始坐标越大，贝塞尔曲线的横向距离就会越大，一般按照下面的式子取即可
//想实现类似抛物线的形式，这里的控制点取的是(startX+toX)/2,startY
path.quadTo((startX + toX) / 2, startY, toX, toY)
//mPathMeasure用来计算贝塞尔曲线的曲线长度和贝塞尔曲线中间插值的坐标，
// 如果是true，path会形成一个闭环,Path用来计算path路径中的点的坐标
//计算path路径中点的坐标
val mPathMeasure = PathMeasure(path, false)
//★★★属性动画实现（从0到贝塞尔曲线的长度之间进行插值计算，获取中间过程的距离值）
val valueAnimator = ValueAnimator.ofFloat(0f, mPathMeasure.length)
valueAnimator.duration = 500
// 匀速线性插值器
valueAnimator.interpolator = LinearInterpolator()
valueAnimator.addUpdateListener { animation -> // 当插值计算进行时，获取中间的每个值，
// 这里这个值是中间过程中的曲线长度（下面根据这个值来得出中间点的坐标值）
val value = animation.animatedValue as Float
// ★★★★★获取当前点坐标封装到mCurrentPosition
// boolean getPosTan(float distance, float[] pos, float[] tan) ：
// 传入一个距离distance(0<=distance<=getLength())，然后会计算当前距
// 离的坐标点和切线，pos会自动填充上坐标，这个方法很重要。
mPathMeasure.getPosTan(
value,
mCurrentPosition,
null
) //mCurrentPosition此时就是中间距离点的坐标值
// 移动的商品图片（动画图片）的坐标设置为该中间点的坐标
goods.translationX = mCurrentPosition[0]
goods.translationY = mCurrentPosition[1]
val transWidth = if (view.width > targetView.width) {
(targetView.width + (offsetWidth * ((mPathMeasure.length - value) / mPathMeasure.length))).toInt()
} else {
(targetView.width - (offsetWidth * ((mPathMeasure.length - value) / mPathMeasure.length))).toInt()
}
// val transHeight = if (view.height > targetView.height) {
// (targetView.height + (offsetHeight * ((mPathMeasure.length - value) / mPathMeasure.length))).toInt()
// } else {
// (targetView.height - (offsetHeight * ((mPathMeasure.length - value) / mPathMeasure.length))).toInt()
// }
val ls = goods.layoutParams
ls.width = transWidth
ls.height = transWidth
goods.layoutParams = ls
}
// 五、 开始执行动画
valueAnimator.start()
// 六、动画结束后的处理
valueAnimator.addListener(object : Animator.AnimatorListener {
override fun onAnimationStart(animation: Animator) {}
//当动画结束后：
override fun onAnimationEnd(animation: Animator) {
// 把移动的图片imageview从父布局里移除
container.removeView(goods)
}
override fun onAnimationCancel(animation: Animator) {}
override fun onAnimationRepeat(animation: Animator) {}
})
}
} }
\ No newline at end of file
video/app/src/main/res/drawable/bg_task_item.xml 0 → 100644
View file @ 3edf7515
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/color_F9F9F9" />
<corners android:radius="10dp" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/bg_task_list.xml
View file @ 3edf7515
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#f9f9f9" /> <solid android:color="@color/white" />
<corners android:radius="9dp" /> <corners android:radius="10dp" />
</shape> </shape>
\ No newline at end of file
video/app/src/main/res/drawable/item_txt_sel.xml
View file @ 3edf7515
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Non focused states --> <!-- Non focused states -->
<item android:color="@color/main_mints" android:state_selected="true" /> <item android:color="@color/color_FA6013" android:state_selected="true" />
<item android:color="@color/black" android:state_selected="false" /> <item android:color="@color/black" android:state_selected="false" />
</selector> </selector>
\ No newline at end of file
video/app/src/main/res/drawable/progressbar_versus_vedio_bg.xml
View file @ 3edf7515
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<item android:id="@android:id/background"> <item android:id="@android:id/background">
<shape> <shape>
<corners android:radius="30dp" /> <corners android:radius="30dp" />
<solid android:color="#FFE9E9" /> <solid android:color="@color/color_A24240" />
</shape> </shape>
</item> </item>
<item android:id="@android:id/secondaryProgress"> <item android:id="@android:id/secondaryProgress">
......
video/app/src/main/res/drawable/selector_withdraw_wx.xml 0 → 100755
View file @ 3edf7515
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/ic_withdraw_wx_selected" android:state_checked="true" />
<item android:drawable="@mipmap/ic_withdraw_wx_unselected" android:state_checked="false" />
</selector>
\ No newline at end of file
video/app/src/main/res/drawable/selector_withdraw_zfb.xml 0 → 100755
View file @ 3edf7515
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/ic_withdraw_zfb_selected" android:state_checked="true" />
<item android:drawable="@mipmap/ic_withdraw_zfb_unselected" android:state_checked="false" />
</selector>
\ No newline at end of file
video/app/src/main/res/drawable/shape_draw_adapter.xml
View file @ 3edf7515
...@@ -8,6 +8,6 @@ ...@@ -8,6 +8,6 @@
<solid android:color="@color/white" /> <solid android:color="@color/white" />
<!-- 设置按钮的四个角为弧形 --> <!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 --> <!-- android:radius 弧形的半径 -->
<corners android:radius="5dip" /> <corners android:radius="8dip" />
</shape> </shape>
\ No newline at end of file
video/app/src/main/res/drawable/shape_draw_adapter_none.xml
View file @ 3edf7515
...@@ -9,6 +9,6 @@ ...@@ -9,6 +9,6 @@
<solid android:color="@color/white" /> <solid android:color="@color/white" />
<!-- 设置按钮的四个角为弧形 --> <!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 --> <!-- android:radius 弧形的半径 -->
<corners android:radius="5dip" /> <corners android:radius="8dip" />
</shape> </shape>
\ No newline at end of file
video/app/src/main/res/drawable/shape_white_trans_half.xml 0 → 100644
View file @ 3edf7515
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners
android:bottomLeftRadius="30dp"
android:topLeftRadius="30dp" />
<solid android:color="@color/color_30FFFFFFF" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/shape_withdraw_half.xml 0 → 100644
View file @ 3edf7515
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/color_FDE7CF" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="20dip" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/shape_withdraw_header.xml 0 → 100644
View file @ 3edf7515
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- android:radius 弧形的半径 -->
<corners android:radius="30dip" />
<gradient
android:endColor="#FE6704"
android:startColor="#FFC123" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/tab_main_btn.xml
View file @ 3edf7515
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/ic_my_enable" android:state_selected="true" /> <item android:drawable="@mipmap/ic_main_enable" android:state_selected="true" />
<item android:drawable="@mipmap/ic_my_none" /> <item android:drawable="@mipmap/ic_main_none" />
</selector> </selector>
\ No newline at end of file
video/app/src/main/res/drawable/tab_music_btn.xml
View file @ 3edf7515
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/ic_my_enable" android:state_selected="true" /> <item android:drawable="@mipmap/ic_music_enable" android:state_selected="true" />
<item android:drawable="@mipmap/ic_my_none" /> <item android:drawable="@mipmap/ic_music_none" />
</selector> </selector>
\ No newline at end of file
video/app/src/main/res/drawable/tab_my_btn.xml
View file @ 3edf7515
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/ic_my_enable" android:state_selected="true" /> <item android:drawable="@mipmap/ic_withdraw_enable" android:state_selected="true" />
<item android:drawable="@mipmap/ic_my_none" /> <item android:drawable="@mipmap/ic_withdraw_none" />
</selector> </selector>
\ No newline at end of file
video/app/src/main/res/drawable/tab_redpkg_btn.xml
View file @ 3edf7515
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/ic_my_enable" android:state_selected="true" /> <item android:drawable="@mipmap/ic_redpkg_enable" android:state_selected="true" />
<item android:drawable="@mipmap/ic_my_none" /> <item android:drawable="@mipmap/ic_redpkg_none" />
</selector> </selector>
\ No newline at end of file
video/app/src/main/res/layout/dialog_video_reward.xml
View file @ 3edf7515
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/block_view" android:id="@+id/block_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
...@@ -10,123 +9,45 @@ ...@@ -10,123 +9,45 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignEnd="@id/ll" android:layout_alignEnd="@id/ll"
android:layout_marginEnd="30dp"
android:background="@mipmap/ic_close_circle" /> android:background="@mipmap/ic_close_circle" />
<RelativeLayout <RelativeLayout
android:id="@+id/ll" android:id="@+id/ll"
android:layout_width="280dp" android:layout_width="340dp"
android:layout_height="344dp" android:layout_height="340dp"
android:layout_below="@id/ib_close" android:layout_below="@id/ib_close"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:background="@mipmap/bg_circle_red"> android:background="@mipmap/bg_circle_red">
<ImageView <ImageView
android:id="@+id/iv_logo" android:id="@+id/iv_logo"
android:layout_width="wrap_content" android:layout_width="40dp"
android:layout_height="wrap_content" android:layout_height="40dp"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="30dp" android:layout_marginTop="60dp"
android:src="@mipmap/ic_launcher_main" /> android:src="@mipmap/ic_launcher_main" />
<androidx.constraintlayout.widget.ConstraintLayout <ImageView
android:layout_width="wrap_content" android:layout_width="12dp"
android:layout_height="wrap_content" android:layout_height="12dp"
android:layout_below="@id/iv_logo" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="20dp">
<TextView
android:id="@+id/tv_info1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="10"
android:textColor="@color/color_FFFC9F"
android:textSize="70sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/tv_info2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="18dp"
android:text="元"
android:textColor="@color/color_FFFC9F"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/tv_info1" />
<TextView
android:id="@+id/tv_info3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18sp"
android:text="最高"
android:textColor="@color/btn_enabled"
android:textSize="16sp"
app:layout_constraintStart_toEndOf="@id/tv_info1"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/unlock"
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:background="@drawable/shape_half_trans"
android:paddingStart="16dp"
android:paddingTop="2dp"
android:paddingEnd="16dp"
android:paddingBottom="2dp"
android:text="领取追剧奖励"
android:textColor="@color/color_FFFC9F" />
<Button
android:id="@+id/unlock"
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_above="@id/tv_bottom"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="6dp" android:layout_marginBottom="58dp"
android:background="@mipmap/btn_open_red" /> android:src="@mipmap/ic_envelope_video" />
<com.airbnb.lottie.LottieAnimationView <com.airbnb.lottie.LottieAnimationView
android:id="@+id/lav" android:id="@+id/lav"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" android:layout_height="80dp"
android:layout_alignEnd="@id/unlock"
android:layout_alignBottom="@id/unlock"
android:layout_marginEnd="-20dp"
android:layout_marginBottom="-20dp" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignBottom="@id/unlock"
android:layout_centerHorizontal="true"
android:layout_marginBottom="6dp"
android:src="@mipmap/ic_envelope_video" />
<TextView
android:id="@+id/tv_bottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_marginStart="160dp" />
android:layout_marginBottom="15dp"
android:text="看的越多，赚的越多"
android:textColor="@color/color_FFFC9F" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_width="290dp" android:layout_width="260dp"
android:layout_height="80dp" android:layout_height="70dp"
android:layout_below="@id/ll" android:layout_below="@id/ll"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
...@@ -137,17 +58,17 @@ ...@@ -137,17 +58,17 @@
android:id="@+id/tv_progress_info" android:id="@+id/tv_progress_info"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="2dp"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="16sp" /> android:textSize="14sp" />
<ProgressBar <ProgressBar
android:id="@+id/pb" android:id="@+id/pb"
style="@android:style/Widget.ProgressBar.Horizontal" style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="20dp" android:layout_height="16dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginEnd="36dp" android:layout_marginEnd="46dp"
android:layout_marginBottom="2dp" android:layout_marginBottom="2dp"
android:max="100" android:max="100"
android:progress="50" android:progress="50"
...@@ -163,7 +84,7 @@ ...@@ -163,7 +84,7 @@
android:gravity="center" android:gravity="center"
android:text="10/100" android:text="10/100"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" /> android:textSize="12sp" />
<ImageView <ImageView
android:layout_width="51dp" android:layout_width="51dp"
......
video/app/src/main/res/layout/drama_activity_api_detail.xml
View file @ 3edf7515
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#77090909"> android:background="#77090909">
...@@ -110,4 +112,76 @@ ...@@ -110,4 +112,76 @@
</FrameLayout> </FrameLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_reward"
android:layout_width="match_parent"
android:layout_height="260dp"
android:layout_gravity="center"
android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
android:background="@drawable/shape_half_trans"
android:visibility="gone">
<TextView
android:id="@+id/tv_reward"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:drawablePadding="15dp"
android:text="恭喜获得"
android:textColor="@color/white"
android:textSize="22sp"
app:drawableEndCompat="@mipmap/vs_icon_anim_star"
app:drawableStartCompat="@mipmap/vs_icon_anim_star"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_cash_reward"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_marginTop="40dp"
android:layout_marginEnd="20dp"
android:src="@mipmap/ic_redpkg"
app:layout_constraintEnd_toStartOf="@id/iv_gold_reward"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_reward" />
<ImageView
android:id="@+id/iv_gold_reward"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_marginStart="20dp"
android:layout_marginTop="40dp"
android:src="@mipmap/ic_yuanbao"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/iv_cash_reward"
app:layout_constraintTop_toBottomOf="@id/tv_reward" />
<TextView
android:id="@+id/tv_cash_reward"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="+5"
android:textColor="@color/red"
android:textSize="30sp"
app:layout_constraintEnd_toEndOf="@id/iv_cash_reward"
app:layout_constraintStart_toStartOf="@id/iv_cash_reward"
app:layout_constraintTop_toBottomOf="@id/iv_cash_reward" />
<TextView
android:id="@+id/tv_gold_reward"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="+5"
android:textColor="@color/red"
android:textSize="30sp"
app:layout_constraintEnd_toEndOf="@id/iv_gold_reward"
app:layout_constraintStart_toStartOf="@id/iv_gold_reward"
app:layout_constraintTop_toBottomOf="@id/iv_gold_reward" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout> </FrameLayout>
\ No newline at end of file
video/app/src/main/res/layout/fragment_draw.xml
View file @ 3edf7515
...@@ -4,28 +4,43 @@ ...@@ -4,28 +4,43 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_marginStart="12dp"
android:padding="16dp"> android:layout_marginTop="10dp"
android:layout_marginEnd="12dp"
android:background="@drawable/shape_withdraw_half"
android:padding="6dp">
<TextView <TextView
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_marginStart="@dimen/dp_10"
android:layout_marginTop="10dp"
android:text="红包余额(元)" /> android:text="红包余额(元)" />
<TextView <TextView
android:id="@+id/tv_cash" android:id="@+id/tv_cash"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_below="@id/tv_title"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="6dp"
android:text="90.00 ≈ 900000个" android:text="90.00 ≈ 900000个"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="20sp" /> android:textSize="20sp" />
</LinearLayout> <ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_10"
android:src="@mipmap/ic_withdraw_pop" />
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/ry_draw" android:id="@+id/ry_draw"
...@@ -43,9 +58,11 @@ ...@@ -43,9 +58,11 @@
<RadioGroup <RadioGroup
android:id="@+id/rg_draw" android:id="@+id/rg_draw"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="46dp"
android:layout_marginTop="10dp"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="10dp"> android:paddingStart="15dp"
android:paddingEnd="15dp">
<RadioButton <RadioButton
android:id="@+id/rb_wechat" android:id="@+id/rb_wechat"
...@@ -53,31 +70,19 @@ ...@@ -53,31 +70,19 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="@dimen/dp_10" android:layout_marginEnd="@dimen/dp_10"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/shape_draw_adapter_none" android:background="@drawable/selector_withdraw_wx"
android:button="@null" android:button="@null"
android:checked="true" android:checked="true" />
android:drawableStart="@mipmap/withdraw_wx"
android:drawableEnd="@drawable/selector_withdraw"
android:gravity="start|center_vertical"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:text=" 微信" />
<RadioButton <RadioButton
android:id="@+id/rb_alipay" android:id="@+id/rb_alipay"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginEnd="@dimen/dp_10" android:layout_marginStart="@dimen/dp_10"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/shape_draw_adapter_none" android:background="@drawable/selector_withdraw_zfb"
android:button="@null" android:button="@null"
android:checked="false" android:checked="false" />
android:drawableStart="@mipmap/withdraw_zfb"
android:drawableEnd="@drawable/selector_withdraw"
android:gravity="start|center_vertical"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:text=" 支付宝" />
</RadioGroup> </RadioGroup>
...@@ -85,9 +90,16 @@ ...@@ -85,9 +90,16 @@
android:id="@+id/btn_draw" android:id="@+id/btn_draw"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10" android:layout_marginStart="15dp"
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_10" android:layout_marginEnd="15dp"
android:text="去提现" /> android:background="@drawable/shape_withdraw_half"
android:text="去提现"
android:textColor="@color/white"
android:textSize="@dimen/font_size_16" />
<View
android:layout_width="wrap_content"
android:layout_height="6dp" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
video/app/src/main/res/layout/fragment_main_my.xml
View file @ 3edf7515
...@@ -3,297 +3,365 @@ ...@@ -3,297 +3,365 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/my_color_gray"> android:background="@color/color_F9F9F9">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:background="@mipmap/bg_my"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout <ImageView
android:id="@+id/ll_my_info"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="50dp"> android:scaleType="fitXY"
android:src="@mipmap/bg_my" />
<com.duben.dayplaylet.ui.widgets.CircleImageView
android:id="@+id/civ_my" <LinearLayout
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_marginStart="20dp"
android:src="@mipmap/ic_my_avat"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_my_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_toEndOf="@id/civ_my"
android:text="昵称：游客"
android:textColor="@color/black_text"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@id/tv_my_id"
app:layout_constraintStart_toEndOf="@id/civ_my"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_my_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="用户ID:"
android:textColor="@color/black_text"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/civ_my"
app:layout_constraintTop_toBottomOf="@id/tv_my_name" />
<TextView
android:id="@+id/tv_my_explain"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_round_trans"
android:paddingStart="@dimen/dp_10"
android:paddingTop="6dp"
android:paddingEnd="@dimen/dp_10"
android:paddingBottom="6dp"
android:text="收益说明"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" android:layout_height="wrap_content"
android:layout_marginTop="20dp"> android:orientation="vertical">
<RadioGroup <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/rg_my_income" android:id="@+id/ll_my_info"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="wrap_content"
android:layout_marginTop="20dp" android:layout_marginTop="50dp">
android:background="@drawable/shape_bg_write"
android:orientation="horizontal"> <com.duben.dayplaylet.ui.widgets.CircleImageView
android:id="@+id/civ_my"
<RadioButton android:layout_width="60dp"
android:id="@+id/rb_my_cash" android:layout_height="60dp"
android:layout_width="0dp" android:layout_marginStart="20dp"
android:layout_height="50dp" android:src="@mipmap/ic_my_avat"
android:layout_gravity="bottom" app:layout_constraintBottom_toBottomOf="parent"
android:layout_weight="1" app:layout_constraintStart_toStartOf="parent"
android:button="@null" app:layout_constraintTop_toTopOf="parent" />
android:checked="true"
android:drawableStart="@mipmap/ic_redpkg_small"
android:drawablePadding="-30dp"
android:gravity="center"
android:paddingStart="30dp"
android:text="红包券收益"
android:textColor="@color/red"
android:textSize="@dimen/font_size_16"
android:textStyle="bold" />
<RadioButton <TextView
android:id="@+id/rb_my_gold" android:id="@+id/tv_my_name"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="50dp" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_marginStart="10dp"
android:layout_weight="1" android:layout_toEndOf="@id/civ_my"
android:button="@null" android:text="昵称：游客"
android:drawableStart="@mipmap/ic_yuanbao_small" android:textColor="@color/white"
android:drawablePadding="-26dp" android:textSize="18sp"
android:gravity="center" app:layout_constraintBottom_toTopOf="@id/tv_my_id"
android:paddingStart="30dp" app:layout_constraintStart_toEndOf="@id/civ_my"
android:text="金元宝收益" app:layout_constraintTop_toTopOf="parent" />
android:textColor="@color/red"
android:textSize="@dimen/font_size_16"
android:textStyle="bold" />
</RadioGroup> <TextView
android:id="@+id/tv_my_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="用户ID:"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/civ_my"
app:layout_constraintTop_toBottomOf="@id/tv_my_name" />
<LinearLayout <TextView
android:id="@+id/tv_my_explain"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_white_trans_half"
android:drawablePadding="4dp"
android:paddingStart="@dimen/dp_10"
android:paddingTop="4dp"
android:paddingEnd="@dimen/dp_10"
android:paddingBottom="4dp"
android:text="收益说明"
android:textColor="@color/white"
app:drawableStartCompat="@mipmap/ic_question"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="70dp"
android:layout_marginTop="20dp">
<RadioGroup
android:id="@+id/rg_my_income"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginTop="20dp"
android:background="@drawable/shape_withdraw_half"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rb_my_cash"
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_gravity="bottom"
android:layout_weight="1"
android:button="@null"
android:checked="true"
android:drawableStart="@mipmap/ic_redpkg_small"
android:drawablePadding="-30dp"
android:gravity="center"
android:paddingStart="30dp"
android:text="红包券收益"
android:textColor="@color/color_D78E0C"
android:textSize="@dimen/font_size_16"
android:textStyle="bold" />
<RadioButton
android:id="@+id/rb_my_gold"
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_gravity="bottom"
android:layout_weight="1"
android:button="@null"
android:drawableStart="@mipmap/ic_yuanbao_small"
android:drawablePadding="-26dp"
android:gravity="center"
android:paddingStart="30dp"
android:text="金元宝收益"
android:textColor="@color/color_D78E0C"
android:textSize="@dimen/font_size_16"
android:textStyle="bold" />
</RadioGroup>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/tv_my_cash"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="bottom"
android:layout_marginEnd="-20dp"
android:layout_weight="1"
android:background="@mipmap/ic_withdraw_tab_left"
android:checked="true"
android:drawablePadding="-30dp"
android:gravity="center"
android:paddingStart="30dp"
android:text="红包券收益"
android:textColor="@color/color_D78E0C"
android:textSize="18sp"
android:textStyle="bold"
app:drawableStartCompat="@mipmap/ic_redpkg_small" />
<TextView
android:id="@+id/tv_my_gold"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="bottom"
android:layout_marginStart="-20dp"
android:layout_weight="1"
android:background="@mipmap/ic_withdraw_tab_right"
android:drawablePadding="-30dp"
android:gravity="center"
android:paddingStart="30dp"
android:text="金元宝收益"
android:textColor="@color/color_D78E0C"
android:textSize="18sp"
android:textStyle="bold"
android:visibility="invisible"
app:drawableStartCompat="@mipmap/ic_yuanbao_small" />
</LinearLayout>
</FrameLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="150dp"
android:layout_margin="@dimen/dp_10"
android:background="@mipmap/bg_withdraw_label"
android:padding="20dp">
<TextView <TextView
android:id="@+id/tv_my_cash" android:id="@+id/tv_my_title"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:text="红包余额(元)"
android:layout_marginEnd="-20dp" android:textColor="@color/white"
android:layout_weight="1"
android:background="@drawable/shape_bg_blue"
android:checked="true"
android:drawablePadding="-30dp"
android:gravity="center"
android:paddingStart="30dp"
android:text="红包券收益"
android:textColor="@color/red"
android:textSize="@dimen/font_size_16" android:textSize="@dimen/font_size_16"
android:textStyle="bold" app:layout_constraintStart_toStartOf="parent"
app:drawableStartCompat="@mipmap/ic_redpkg_small" /> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/tv_my_gold" android:id="@+id/tv_my_money"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_marginTop="20dp"
android:layout_marginStart="-20dp" android:textColor="@color/white"
android:layout_weight="1" app:layout_constraintStart_toStartOf="parent"
android:background="@drawable/shape_bg_blue" app:layout_constraintTop_toBottomOf="@id/tv_my_title" />
android:drawablePadding="-30dp"
android:gravity="center" <Button
android:paddingStart="30dp" android:id="@+id/btn_my_draw"
android:text="金元宝收益" android:layout_width="wrap_content"
android:textColor="@color/red" android:layout_height="40dp"
android:background="@drawable/shape_write"
android:text="提现"
android:textColor="@color/color_F1533A"
android:textSize="@dimen/font_size_16" android:textSize="@dimen/font_size_16"
android:textStyle="bold" android:textStyle="bold"
android:visibility="invisible" app:layout_constraintBottom_toBottomOf="parent"
app:drawableStartCompat="@mipmap/ic_yuanbao_small" /> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout> <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_margin="@dimen/dp_10"
android:background="@drawable/shape_bg_write"
android:padding="@dimen/dp_10">
<TextView
android:id="@+id/tv_my_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="红包余额(元)" android:layout_marginStart="16dp"
app:layout_constraintStart_toStartOf="parent" android:layout_marginEnd="16dp"
app:layout_constraintTop_toTopOf="parent" /> android:layout_marginBottom="@dimen/dp_10"
android:background="@drawable/bg_task_list"
android:elevation="2dp"
android:paddingLeft="10dp"
android:paddingTop="20dp"
android:paddingRight="10dp"
android:paddingBottom="20dp">
<ImageView
android:id="@+id/iv_task_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_yuanbao_my"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/tv_my_money" android:id="@+id/tv_task_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp" android:layout_marginStart="@dimen/dp_10"
app:layout_constraintStart_toStartOf="parent" android:text="观看视频得金元宝"
app:layout_constraintTop_toBottomOf="@id/tv_my_title" /> android:textColor="@color/black_text"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@id/iv_task_icon"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_task_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="2dp"
android:text="无门槛秒到账"
android:textSize="12sp"
app:layout_constraintStart_toEndOf="@id/iv_task_icon"
app:layout_constraintTop_toBottomOf="@id/tv_task_title" />
<ProgressBar
android:id="@+id/pb_task"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="150dp"
android:layout_height="10dp"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="6dp"
android:progressDrawable="@drawable/progressbar_versus_changevedio_bg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/iv_task_icon"
app:layout_constraintTop_toBottomOf="@id/tv_task_label" />
<Button
android:id="@+id/btn_task"
android:layout_width="80dp"
android:layout_height="30dp"
android:layout_gravity="right|bottom"
android:layout_marginBottom="10dp"
android:background="@drawable/shape_task_btn"
android:gravity="center"
android:text="领金元宝"
android:textColor="@color/white"
android:textSize="13dp"
app:layout_constraintBottom_toTopOf="@id/tv_task_count"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button <TextView
android:id="@+id/btn_my_draw" android:id="@+id/tv_task_count"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="提现" android:text="今日剩余10次"
app:layout_constraintBottom_toBottomOf="parent" android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintEnd_toEndOf="@id/btn_task"
app:layout_constraintStart_toStartOf="@id/btn_task"
app:layout_constraintTop_toBottomOf="@id/btn_task" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout </LinearLayout>
android:layout_width="match_parent"
</FrameLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@drawable/bg_task_list"
android:elevation="2dp"
android:paddingStart="10dp"
android:paddingTop="10dp"
android:paddingEnd="10dp"
android:paddingBottom="10dp">
<View
android:id="@+id/view"
android:layout_width="5dp"
android:layout_height="20dp"
android:background="@drawable/shape_red"
app:layout_constraintBottom_toBottomOf="@id/iv_task"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/iv_task" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10" android:layout_marginStart="10dp"
android:layout_marginEnd="@dimen/dp_10" android:text="极速赚钱"
android:layout_marginBottom="@dimen/dp_10" android:textColor="@color/black"
android:background="@drawable/bg_task_list" android:textSize="16sp"
android:paddingLeft="10dp" android:textStyle="bold"
android:paddingTop="20dp" app:layout_constraintBottom_toBottomOf="@id/iv_task"
android:paddingRight="10dp" app:layout_constraintStart_toEndOf="@id/view"
android:paddingBottom="20dp"> app:layout_constraintTop_toTopOf="@id/iv_task" />
<ImageView <ImageView
android:id="@+id/iv_task_icon" android:id="@+id/iv_task"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@mipmap/ic_yuanbao_my" android:src="@mipmap/ic_draw_task"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_task_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:text="观看视频得金元宝"
android:textColor="@color/black_text"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@id/iv_task_icon"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_task_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:text="无门槛秒到账"
android:textSize="13sp"
app:layout_constraintStart_toEndOf="@id/iv_task_icon"
app:layout_constraintTop_toBottomOf="@id/tv_task_title" />
<ProgressBar
android:id="@+id/pb_task"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="150dp"
android:layout_height="10dp"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="4dp"
android:progressDrawable="@drawable/progressbar_versus_changevedio_bg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/iv_task_icon"
app:layout_constraintTop_toBottomOf="@id/tv_task_label" />
<Button
android:id="@+id/btn_task"
android:layout_width="80dp"
android:layout_height="30dp"
android:layout_gravity="right|bottom"
android:layout_marginBottom="10dp"
android:background="@drawable/shape_task_btn"
android:gravity="center"
android:text="领金元宝"
android:textColor="@color/white"
android:textSize="13dp"
app:layout_constraintBottom_toTopOf="@id/tv_task_count"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_task_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="今日剩余10次"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/btn_task"
app:layout_constraintStart_toStartOf="@id/btn_task"
app:layout_constraintTop_toBottomOf="@id/btn_task" />
</androidx.constraintlayout.widget.ConstraintLayout> <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recy_tasks"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:nestedScrollingEnabled="false"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintTop_toBottomOf="@id/iv_task" />
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.recyclerview.widget.RecyclerView <View
android:id="@+id/recy_tasks" android:layout_width="wrap_content"
android:layout_width="match_parent" android:layout_height="@dimen/dp_10" />
android:layout_height="match_parent"
android:background="@null"
android:nestedScrollingEnabled="false"
android:paddingBottom="10dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
......
video/app/src/main/res/layout/fragment_music.xml
View file @ 3edf7515
...@@ -34,7 +34,9 @@ ...@@ -34,7 +34,9 @@
android:layout_height="14dp" android:layout_height="14dp"
android:layout_alignBottom="@id/iv_open_cash" android:layout_alignBottom="@id/iv_open_cash"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:padding="1dp"
android:layout_marginBottom="22dp" android:layout_marginBottom="22dp"
android:background="@drawable/shape_write"
android:progressDrawable="@drawable/progressbar_versus_changevedio_bg" /> android:progressDrawable="@drawable/progressbar_versus_changevedio_bg" />
<TextView <TextView
......
video/app/src/main/res/layout/item_draw_cash.xml
View file @ 3edf7515
...@@ -10,10 +10,11 @@ ...@@ -10,10 +10,11 @@
android:id="@+id/tv_label" android:id="@+id/tv_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@mipmap/ic_vip_lable" android:background="@mipmap/ic_withdraw_label"
android:gravity="center" android:gravity="center"
android:paddingLeft="2dp" android:paddingLeft="2dp"
android:paddingRight="2dp" android:paddingRight="2dp"
android:text="新人福利"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="10sp" /> android:textSize="10sp" />
...@@ -23,6 +24,7 @@ ...@@ -23,6 +24,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="0.3元" android:text="0.3元"
android:textColor="@color/black"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" /> android:textStyle="bold" />
......
video/app/src/main/res/layout/item_fragment_adapter_task.xml
View file @ 3edf7515
...@@ -5,16 +5,13 @@ ...@@ -5,16 +5,13 @@
android:id="@+id/ll_task_root" android:id="@+id/ll_task_root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:background="@drawable/bg_task_list" android:background="@drawable/bg_task_item"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="16dp" android:paddingTop="16dp"
android:paddingBottom="16dp" android:paddingRight="10dp"
> android:paddingBottom="16dp">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
......
video/app/src/main/res/layout/layout_draw_header.xml
View file @ 3edf7515
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="30dp" android:layout_marginStart="30dp"
android:gravity="center" android:gravity="center"
android:maxWidth="60dp" android:maxWidth="66dp"
android:minWidth="40dp" android:minWidth="50dp"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="26dp" android:layout_height="26dp"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:background="@drawable/shape_green" android:background="@drawable/shape_withdraw_header"
android:text="@string/draw_cash" android:text="@string/draw_cash"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="15sp" /> android:textSize="15sp" />
...@@ -79,8 +79,8 @@ ...@@ -79,8 +79,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="30dp" android:layout_marginStart="30dp"
android:gravity="center" android:gravity="center"
android:maxWidth="60dp" android:maxWidth="66dp"
android:minWidth="40dp" android:minWidth="50dp"
android:text="-" android:text="-"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="14sp" /> android:textSize="14sp" />
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="26dp" android:layout_height="26dp"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:background="@drawable/shape_green" android:background="@drawable/shape_withdraw_header"
android:text="@string/draw_cash" android:text="@string/draw_cash"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="15sp" /> android:textSize="15sp" />
......
video/app/src/main/res/layout/media_layout_quiz.xml
View file @ 3edf7515
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:textColor="@color/main_mints" android:textColor="@color/color_3F2F8F"
android:textStyle="bold" android:textStyle="bold"
tools:text="心太软" /> tools:text="心太软" />
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:textColor="@color/main_mints" android:textColor="@color/color_3F2F8F"
android:textStyle="bold" android:textStyle="bold"
tools:text="伤心太平洋" /> tools:text="伤心太平洋" />
......
video/app/src/main/res/mipmap-xhdpi/bg_circle_red.png 100755 → 100644
View replaced file @ 916b59c3 View file @ 3edf7515
video/app/src/main/res/mipmap-xhdpi/bg_circle_red.png

98.3 KB | W: | H:

video/app/src/main/res/mipmap-xhdpi/bg_circle_red.png

416 KB | W: | H:

video/app/src/main/res/mipmap-xhdpi/bg_circle_red.png
video/app/src/main/res/mipmap-xhdpi/bg_circle_red.png
video/app/src/main/res/mipmap-xhdpi/bg_circle_red.png
video/app/src/main/res/mipmap-xhdpi/bg_circle_red.png
  • 2-up
  • Swipe
  • Onion skin
video/app/src/main/res/values/colors.xml
View file @ 3edf7515
...@@ -6,11 +6,12 @@ ...@@ -6,11 +6,12 @@
<color name="black">#000000</color> <color name="black">#000000</color>
<color name="gray">#808080</color> <color name="gray">#808080</color>
<color name="green">#09BB07</color> <color name="green">#09BB07</color>
<color name="red">#FC3629</color> <color name="red">#f00</color>
<color name="graya">#AAAAAA</color> <color name="graya">#AAAAAA</color>
<color name="full_transparent">#00000000</color> <color name="full_transparent">#00000000</color>
<color name="half_transparent">#80000000</color> <color name="half_transparent">#80000000</color>
<color name="color_20000000">#10000000</color> <color name="color_20000000">#10000000</color>
<color name="color_30FFFFFFF">#4DFFFFFF</color>
<color name="color_30_trans">#4D000000</color> <color name="color_30_trans">#4D000000</color>
<color name="title_bg">#2B3238</color> <color name="title_bg">#2B3238</color>
<color name="btn_enabled">#F1F2F8</color> <color name="btn_enabled">#F1F2F8</color>
...@@ -24,7 +25,13 @@ ...@@ -24,7 +25,13 @@
<color name="color_F61F03">#FD563B</color> <color name="color_F61F03">#FD563B</color>
<color name="color_3F2F8F">#3F2F8F</color>
<color name="color_F9F9F9">#F9F9F9</color>
<color name="color_FDE7CF">#FDE7CF</color>
<color name="color_fea54c">#fea54c</color> <color name="color_fea54c">#fea54c</color>
<color name="color_F1533A">#F1533A</color>
<color name="color_D78E0C">#D78E0C</color>
<color name="color_FA6013">#FA6013</color>
<color name="color_FFFC9F">#FFFC9F</color> <color name="color_FFFC9F">#FFFC9F</color>
<color name="color_8D8F90">#7F8182</color> <color name="color_8D8F90">#7F8182</color>
......
video/app/src/main/res/values/strings.xml
View file @ 3edf7515
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<string name="update_load">正在下载</string> <string name="update_load">正在下载</string>
<string name="update_app">APP更新</string> <string name="update_app">APP更新</string>
<string name="bottom_tab_main">福利</string> <string name="bottom_tab_main">刷剧</string>
<string name="bottom_tab_music">猜歌</string> <string name="bottom_tab_music">猜歌</string>
<string name="bottom_tab_redpkg">红包</string> <string name="bottom_tab_redpkg">红包</string>
<string name="bottom_tab_my">提现</string> <string name="bottom_tab_my">提现</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment