Skip to content

A
android_vedio
Commit 98d483b2 authored by mengcuiguang's avatar mengcuiguang
Browse files
Options

代码优化

parent d6ff98d9
Hide whitespace changes
Inline Side-by-side
Showing with 274 additions and 100 deletions
video/app/src/main/assets/SDK_Setting_5412556.json → video/app/src/main/assets/SDK_Setting_5434788.json
View file @ 98d483b2
{
"init": {
"site_id": "5412556",
"app_id": "514006",
"partner": "pangle_514006",
"secure_key": "ffe90c9bf1c304e33b6fe1fd95392a1e"
"site_id": "5434788",
"app_id": "541974",
"partner": "pangle_541974",
"secure_key": "19669a6e4bf2e85ec427557feea65876"
},
"feed": {
"news_list_ad_code_id": "",
......@@ -12,37 +12,37 @@
"video_first_ad_code_id": "",
"video_second_ad_code_id": "",
"related_ad_code_id": "",
"news_draw_ad_code_id": "952978110",
"news_draw_native_ad_code_id": "952978113",
"news_draw_ad_code_id": "953680741",
"news_draw_native_ad_code_id": "953680747",
"news_outer_list_ad_code_id": "",
"news_outer_first_ad_code_id": "",
"news_outer_second_ad_code_id": "",
"outer_video_second_ad_code_id": "",
"outer_related_ad_code_id": "",
"news_outer_draw_ad_code_id": "952978123",
"news_outer_draw_native_ad_code_id": "952978119",
"news_outer_draw_ad_code_id": "953680750",
"news_outer_draw_native_ad_code_id": "953680748",
"news_interstitial_code_id": ""
},
"small_video": {
"draw_ad_code_id": "952978111",
"draw_native_ad_code_id": "952978126",
"grid_ad_code_id": "952978118",
"grid_draw_ad_code_id": "952978109",
"grid_draw_native_ad_code_id": "952978122",
"video_card_ad_code_id": "952978121",
"video_card_draw_ad_code_id": "952978120",
"video_card_draw_native_ad_code_id": "952978108",
"draw_ad_code_id": "953680740",
"draw_native_ad_code_id": "953680756",
"grid_ad_code_id": "953680755",
"grid_draw_ad_code_id": "953680759",
"grid_draw_native_ad_code_id": "953680751",
"video_card_ad_code_id": "953680754",
"video_card_draw_ad_code_id": "953680758",
"video_card_draw_native_ad_code_id": "953680753",
"interstitial_ad_code_id": "",
"interstitial_note_ad_code_id": "952978124",
"staggered_grid_ad_code_id": "952978127",
"staggered_grid_draw_ad_code_id": "952978111",
"staggered_grid_draw_native_ad_code_id": "952978126",
"draw_interstitial_ad_code_id": "952978116",
"draw_fullscreen_interstitial_ad_code_id": "952978117",
"draw_banner_code_id": "952978112",
"drama_rewarded_ad_code_id": "952978114",
"drama_rewarded_ad_code_id_02": "952978125",
"drama_draw_ad_code_id": "952978115"
"interstitial_note_ad_code_id": "953680757",
"staggered_grid_ad_code_id": "953680743",
"staggered_grid_draw_ad_code_id": "953680740",
"staggered_grid_draw_native_ad_code_id": "953680756",
"draw_interstitial_ad_code_id": "953680752",
"draw_fullscreen_interstitial_ad_code_id": "953680742",
"draw_banner_code_id": "953680746",
"drama_rewarded_ad_code_id": "953680749",
"drama_rewarded_ad_code_id_02": "953680744",
"drama_draw_ad_code_id": "953680745"
},
"novel": {
"status": 0,
......
video/app/src/main/java/com/duben/dayplaylet/ad/video/InMoneyVideoNoPre.java
View file @ 98d483b2
......@@ -154,6 +154,9 @@ public class InMoneyVideoNoPre {
HashMap<String, Object> vo = new HashMap<>();
vo.put("carrierType", carrierType);
vo.put("ecpmId", AppConfig.gromoreId);
if (AppConfig.taskListId != -1) {
vo.put("list_id", AppConfig.taskListId);
}
TrackManager.getInstance().reportAddCoinMsg(vo);
if (adStatusListener != null) {
......
video/app/src/main/java/com/duben/dayplaylet/common/Constant.kt
View file @ 98d483b2
......@@ -26,6 +26,7 @@ object Constant {
const val CARRIERTYPE_SIGN = "FORCASH_SIGN" //签到
const val CARRIERTYPE_SIGN_DRAW = "FORCASH_SIGN_MORE" //签到第二次提现
const val CARRIERTYPE_SIGN_7 = "FORCASH_SIGN_AFTER7" //签到7天后的视频
const val CARRIERTYPE_TASK_YUANBAO = "REWARD_DI" //签到7天后的视频
const val CARRIERTYPE_SONG_CLICK = "REWARD_GUESS_SONG_CLICK" //不看视频点击答题 的入参
......
video/app/src/main/java/com/duben/dayplaylet/ui/activitys/TaskAwardActivity.kt
View file @ 98d483b2
package com.duben.dayplaylet.ui.activitys
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.view.KeyEvent
import android.view.View
import com.duben.dayplaylet.MintsApplication
import com.duben.dayplaylet.R
import com.duben.dayplaylet.ad.AdManager
import com.duben.dayplaylet.ad.AdStatusListener
import com.duben.dayplaylet.ad.NoPreAdManager
import com.duben.dayplaylet.common.AppConfig
import com.duben.dayplaylet.manager.TrackManager
import com.duben.dayplaylet.ui.activitys.base.BaseActivity
import com.duben.dayplaylet.utils.ConsumerToastUtil
import com.duben.dayplaylet.utils.SpanUtils
import com.duben.library.utils.nodoubleclick.AntiShake
import kotlinx.android.synthetic.main.activity_task_award.*
/**
* 个人中心-任务奖励
......@@ -41,7 +49,7 @@ class TaskAwardActivity : BaseActivity(), View.OnClickListener {
override fun toggleOverridePendingTransition() = true
override fun getOverridePendingTransitionMode() = TransitionMode.SCALE
override fun getOverridePendingTransitionMode() = TransitionMode.FADE
override fun getBundleExtras(extras: Bundle?) {
super.getBundleExtras(extras)
......@@ -58,12 +66,40 @@ class TaskAwardActivity : BaseActivity(), View.OnClickListener {
}
override fun initViewsAndEvents() {
tv_award_hint.text = SpanUtils()
.append("金元宝")
.setForegroundColor(context.resources.getColor(R.color.red))
.append("可以")
.setForegroundColor(context.resources.getColor(R.color.title_bg))
.append("无门槛")
.setForegroundColor(context.resources.getColor(R.color.red))
.append("提现哦~")
.setForegroundColor(context.resources.getColor(R.color.title_bg))
.create()
tv_award_next.text = SpanUtils()
.append("只领${redPacket}红包")
.setUnderline()
.create()
if (redPacketFlag) {
iv_award_redpkg.visibility = View.VISIBLE
}
if (yuanbaoFlag) {
iv_award_yuanbao.visibility = View.VISIBLE
}
tv_award_redpkg.text = "+${redPacketMore}"
tv_award_yuanbao.text = "+${yuanbaoMore}"
initListener()
}
private fun initListener() {
// tv_nine_know_next.setOnClickListener(this)
iv_award_quit.setOnClickListener(this)
iv_task_award_ad.setOnClickListener(this)
tv_award_next.setOnClickListener(this)
}
override fun onResume() {
......@@ -97,9 +133,26 @@ class TaskAwardActivity : BaseActivity(), View.OnClickListener {
if (AntiShake.check(v.id)) return
when (v.id) {
// R.id.tv_nine_know_next -> {
// finish()
// }
R.id.iv_award_quit -> {
finish()
}
R.id.iv_task_award_ad -> {
showAd(carrierTypeAll)
}
R.id.tv_award_next -> {
val vo = java.util.HashMap<String, Any>()
vo["carrierType"] = carrierType
TrackManager.getInstance().reportAddCoinMsg(vo)
finish()
Handler(Looper.getMainLooper()).postDelayed({
ConsumerToastUtil.showAwardText(
MintsApplication.getContext(),
redPacket,
0
)
}, 500)
}
}
}
......@@ -108,6 +161,7 @@ class TaskAwardActivity : BaseActivity(), View.OnClickListener {
object : AdStatusListener {
var canFail = false
override fun adSuccess() {
AppConfig.taskListId = listId
canFail = true
}
......@@ -124,6 +178,7 @@ class TaskAwardActivity : BaseActivity(), View.OnClickListener {
}
override fun adSuccess() {
AppConfig.taskListId = listId
hideLoading()
}
......@@ -144,10 +199,15 @@ class TaskAwardActivity : BaseActivity(), View.OnClickListener {
* 点击关闭广告
*/
private fun adCloseNext(carrierType: String) {
when (carrierType) {
// Constant.CARRIERTYPE_REWARD_FIRST -> {
//
// }
finish()
if (AppConfig.awardRedpkg > 0 || AppConfig.awardYuanbao > 0) {
Handler(Looper.getMainLooper()).postDelayed({
ConsumerToastUtil.showAwardText(
MintsApplication.getContext(),
AppConfig.awardRedpkg,
AppConfig.awardYuanbao
)
}, 500)
}
}
}
\ No newline at end of file
video/app/src/main/java/com/duben/dayplaylet/ui/adapter/TasksAdapter.kt
View file @ 98d483b2
......@@ -4,17 +4,12 @@ import android.content.Context
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.FrameLayout
import android.widget.ProgressBar
import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView
import com.duben.dayplaylet.R
import com.duben.dayplaylet.mvp.model.BannerBean
import com.duben.dayplaylet.mvp.model.TaskInfoBean
import com.duben.dayplaylet.utils.BubbleUtils
import com.duben.dayplaylet.utils.SpanUtils
import kotlinx.android.synthetic.main.dialog_sign.*
/**
* 任务中心-列表适配器
......@@ -71,7 +66,13 @@ class TasksAdapter(context: Context, var taskData: MutableList<TaskInfoBean.Task
holder.itemTaskClick.background= ContextCompat.getDrawable(mContext, R.drawable.shape_task_btn_green)
}
}
holder.itemView.setOnClickListener {
itemListener?.onItemClick(bean)
}
}
}
inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
......@@ -86,7 +87,7 @@ class TasksAdapter(context: Context, var taskData: MutableList<TaskInfoBean.Task
}
interface ItemListener {
fun onItemClick(bean: TaskInfoBean.TaskItemBean)
fun onItemClick(bean: TaskInfoBean.TaskItemBean.TaskBaseBean)
}
}
\ No newline at end of file
video/app/src/main/java/com/duben/dayplaylet/ui/fragment/MyFragment.kt
View file @ 98d483b2
......@@ -17,9 +17,11 @@ import com.duben.dayplaylet.mvp.views.MyView
import com.duben.dayplaylet.ui.activitys.MainActivity
import com.duben.dayplaylet.ui.activitys.SettingsActivity
import com.duben.dayplaylet.ui.activitys.TaskAwardActivity
import com.duben.dayplaylet.ui.activitys.WebActivity
import com.duben.dayplaylet.ui.adapter.TasksAdapter
import com.duben.dayplaylet.ui.fragment.base.LazyLoadBaseFragment
import com.duben.dayplaylet.ui.fragment.draw.DrawCashDialog
import com.duben.dayplaylet.utils.ConsumerToastUtil
import com.duben.dayplaylet.utils.SpanUtils
import com.duben.library.utils.nodoubleclick.AntiShake
import kotlinx.android.synthetic.main.fragment_main_my.*
......@@ -50,31 +52,30 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
tasksAdapter = TasksAdapter(mContext)
recy_tasks.adapter = tasksAdapter
tasksAdapter?.setItemListener(object : TasksAdapter.ItemListener {
override fun onItemClick(bean: TaskInfoBean.TaskItemBean) {
// AppConfig.taskListId = bean.base.list_id
override fun onItemClick(bean: TaskInfoBean.TaskItemBean.TaskBaseBean) {
//状态 0未完成，1 待领取 2 已领取
when (bean.base.rewardStatus) {
when (bean.rewardStatus) {
0 -> {
(requireActivity() as MainActivity).clickTab1Layout()
}
1 -> {
val bundle = Bundle()
bundle.putInt(TaskAwardActivity.LIST_ID, bean.base.list_id)
bundle.putInt(TaskAwardActivity.MORE_REDPACKET, bean.base.moreCoin)
bundle.putInt(TaskAwardActivity.MORE_YUANBAO, bean.base.moreDi)
bundle.putInt(TaskAwardActivity.REDPACKET, bean.base.rewardCoin)
bundle.putString(TaskAwardActivity.CARRIERTYPE, bean.base.rewardCarrier)
bundle.putInt(TaskAwardActivity.LIST_ID, bean.list_id)
bundle.putInt(TaskAwardActivity.MORE_REDPACKET, bean.moreCoin)
bundle.putInt(TaskAwardActivity.MORE_YUANBAO, bean.moreDi)
bundle.putInt(TaskAwardActivity.REDPACKET, bean.rewardCoin)
bundle.putString(TaskAwardActivity.CARRIERTYPE, bean.rewardCarrier)
bundle.putString(
TaskAwardActivity.CARRIERTYPE_ALL,
bean.base.rewardMoreCarrier
bean.rewardMoreCarrier
)
bundle.putBoolean(
TaskAwardActivity.FLAG_REDPACKET,
bean.base.isRewardMoreCoinShowTip
bean.isRewardMoreCoinShowTip
)
bundle.putBoolean(
TaskAwardActivity.FLAG_YUANBAO,
bean.base.isRewardMoreDiShowTip
bean.isRewardMoreDiShowTip
)
readyGo(TaskAwardActivity::class.java, bundle)
}
......@@ -118,8 +119,13 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
showDrawCashDialog()
}
R.id.btn_task -> { // 任务，领金元宝
showAd(Constant.CARRIERTYPE_TASK_YUANBAO)
}
R.id.tv_my_explain -> { // 收益说明
val bundle = Bundle()
bundle.putString(WebActivity.WEB_TITLE, "收益说明")
bundle.putString(WebActivity.WEB_URL, Constant.INCOME_URL)
readyGo(WebActivity::class.java, bundle)
}
}
}
......@@ -131,6 +137,17 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
override fun getHallListSuc(data: TaskInfoBean) {
tasksAdapter?.taskData = data.list
recy_tasks.adapter?.notifyDataSetChanged()
tv_task_count.text = SpanUtils()
.append("今日剩余")
.setForegroundColor(mContext.resources.getColor(R.color.title_bg))
.append((data.diMsg.max - data.diMsg.complete).toString())
.setForegroundColor(mContext.resources.getColor(R.color.red))
.append("次")
.setForegroundColor(mContext.resources.getColor(R.color.title_bg))
.create()
pb_task.max = data.diMsg.max
pb_task.progress = data.diMsg.complete
}
private fun initListener() {
......@@ -222,9 +239,9 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
*/
private fun adCloseNext(carrierType: String) {
when (carrierType) {
// Constant.CARRIERTYPE_REWARD_FIRST -> {
//
// }
Constant.CARRIERTYPE_TASK_YUANBAO -> {
ConsumerToastUtil.showAwardText(requireContext(), 0, AppConfig.awardYuanbao)
}
}
}
}
\ No newline at end of file
video/app/src/main/java/com/duben/dayplaylet/ui/widgets/SignDrawDialog.kt
View file @ 98d483b2
......@@ -73,7 +73,7 @@ class SignDrawDialog(
// * 1-7天内 第二次进入.不用定时
// * 2-7天后 第一次进入.不用定时
when(times){
0 ->{
0 ,2->{
// 用定时器，第一次打款
Handler().postDelayed({
startTimer()
......@@ -104,9 +104,6 @@ class SignDrawDialog(
.create()
tv_sign_draw.text="明日再来"
}
2 ->{
}
}
}
......
video/app/src/main/java/com/duben/dayplaylet/video/csj/DPHolderManager.kt
View file @ 98d483b2
......@@ -18,7 +18,7 @@ object DPHolderManager {
//1. 初始化，最好放到application.onCreate()执行
val configBuilder = DPSdkConfig.Builder().debug(true)
DPSdk.init(context, "SDK_Setting_5412556.json", configBuilder.build())
DPSdk.init(context, "SDK_Setting_5434788.json", configBuilder.build())
startDpSdk()
}
......
video/app/src/main/res/drawable/shape_bg_task.xml 0 → 100644
View file @ 98d483b2
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="#feeddc" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="10dip" />
</shape>
\ No newline at end of file
video/app/src/main/res/layout/activity_task_award.xml
View file @ 98d483b2
......@@ -2,6 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#99000000"
android:orientation="vertical">
<LinearLayout
......@@ -10,25 +11,28 @@
android:layout_centerInParent="true"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_award_quit"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:src="@mipmap/ic_quit_yuan" />
<LinearLayout
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:background="@drawable/shape_bg_nine"
android:background="@mipmap/bg_task"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_award_quit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:src="@mipmap/ic_draw_quit" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:background="@drawable/shape_bg_nine"
android:layout_height="150dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="100dp"
android:layout_marginRight="20dp"
android:background="@drawable/shape_bg_task"
android:orientation="horizontal"
android:paddingLeft="20dp"
android:paddingRight="20dp">
......@@ -37,7 +41,7 @@
android:id="@+id/ll_award_redpkg"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_gravity="center_horizontal|center_vertical"
android:layout_weight="1"
android:orientation="vertical"
android:paddingLeft="10dp"
......@@ -46,33 +50,49 @@
android:paddingBottom="6dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center_horizontal"
android:src="@mipmap/ic_launcher_main"></ImageView>
android:src="@mipmap/ic_redpkg" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_award_redpkg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="18dp"
android:background="@drawable/shape_banner_write"
android:gravity="center"
android:paddingLeft="18dp"
android:paddingTop="3dp"
android:paddingRight="18dp"
android:paddingBottom="3dp"
android:text="+10"
android:textColor="@color/red"
android:textSize="18sp"></TextView>
<ImageView
android:id="@+id/iv_award_redpkg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="20dp"
android:layout_marginTop="2dp"
android:src="@mipmap/ic_quit_yuan"
android:visibility="invisible"></ImageView>
</FrameLayout>
<TextView
android:id="@+id/tv_award_redpkg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="18dp"
android:background="@drawable/shape_banner_write"
android:gravity="center"
android:paddingLeft="14dp"
android:paddingTop="3dp"
android:paddingRight="14dp"
android:paddingBottom="3dp"
android:text="+10"
android:textColor="@color/red"
android:textSize="13sp"></TextView>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_award_yuanbao"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_gravity="center_horizontal|center_vertical"
android:layout_weight="1"
android:orientation="vertical"
android:paddingLeft="10dp"
......@@ -81,10 +101,10 @@
android:paddingBottom="6dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center_horizontal"
android:src="@mipmap/ic_launcher_main"></ImageView>
android:src="@mipmap/ic_yuanbao" />
<FrameLayout
android:layout_width="match_parent"
......@@ -98,36 +118,34 @@
android:layout_marginTop="18dp"
android:background="@drawable/shape_banner_write"
android:gravity="center"
android:paddingLeft="14dp"
android:paddingLeft="18dp"
android:paddingTop="3dp"
android:paddingRight="14dp"
android:paddingRight="18dp"
android:paddingBottom="3dp"
android:text="+10"
android:textColor="@color/red"
android:textSize="13sp"></TextView>
android:textSize="18sp"></TextView>
<ImageView
android:id="@+id/iv_award_yuanbao"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="20dp"
android:layout_marginTop="2dp"
android:src="@mipmap/ic_quit_yuan"></ImageView>
android:src="@mipmap/ic_quit_yuan"
android:visibility="invisible"></ImageView>
</FrameLayout>
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/tv_award_ad"
<ImageView
android:id="@+id/iv_task_award_ad"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:background="@drawable/shape_bg_recommend"
android:gravity="center"
android:text="秒后自动领取"
android:textColor="@color/white"
android:textSize="13sp"></TextView>
android:layout_marginTop="20dp"
android:src="@mipmap/bg_task_award_next"></ImageView>
<TextView
android:id="@+id/tv_award_hint"
......@@ -136,8 +154,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="秒后自动领取"
android:textColor="@color/white"
android:textColor="@color/black"
android:textSize="13sp"></TextView>
</LinearLayout>
......@@ -146,13 +163,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:layout_marginTop="6dp"
android:gravity="center"
android:text="秒后自动领取"
android:textColor="@color/black"
android:textColor="@color/graya"
android:textSize="13sp"></TextView>
</LinearLayout>
</RelativeLayout>
video/app/src/main/res/layout/dialog_sign_draw.xml
View file @ 98d483b2
......@@ -18,13 +18,14 @@
android:id="@+id/iv_sign_draw_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_gravity="center_horizontal"
android:src="@mipmap/bg_draw_title"></ImageView>
<ImageView
android:id="@+id/iv_closetop"
android:visibility="gone"
android:layout_width="wrap_content"
android:visibility="gone"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:src="@mipmap/ic_draw_quit" />
......@@ -42,7 +43,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:layout_marginTop="-70dp"
android:layout_marginBottom="10dp"
android:text="我的签到余额"
android:textColor="@color/switch_blue"
......@@ -83,7 +84,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:layout_marginTop="16dp"
android:background="@mipmap/bg_draw_next"
android:gravity="center"
android:orientation="horizontal">
......@@ -95,7 +96,7 @@
android:layout_gravity="center_vertical"
android:layout_marginRight="14dp"
android:visibility="gone"
android:src="@mipmap/ic_quit_yuan"></ImageView>
android:src="@mipmap/ic_ad"></ImageView>
<TextView
android:id="@+id/tv_sign_draw"
......
video/app/src/main/res/layout/fragment_main_my.xml
View file @ 98d483b2
......@@ -207,14 +207,17 @@
android:layout_marginStart="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10"
android:background="@drawable/shape_bg_write"
android:padding="@dimen/dp_10">
android:background="@drawable/bg_task_list"
android:paddingLeft="10dp"
android:paddingTop="20dp"
android:paddingRight="10dp"
android:paddingBottom="20dp">
<ImageView
android:id="@+id/iv_task_icon"
android:layout_width="30dp"
android:layout_height="30dp"
android:src="@mipmap/ic_launcher_main"
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" />
......@@ -226,7 +229,8 @@
android:layout_marginStart="@dimen/dp_10"
android:text="观看视频得金元宝"
android:textColor="@color/black_text"
android:textSize="16sp"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@id/iv_task_icon"
app:layout_constraintTop_toTopOf="parent" />
......@@ -236,6 +240,7 @@
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" />
......@@ -245,6 +250,7 @@
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"
......@@ -252,9 +258,15 @@
<Button
android:id="@+id/btn_task"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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" />
......
video/app/src/main/res/layout/item_fragment_adapter_task.xml
View file @ 98d483b2
......@@ -36,7 +36,7 @@
android:singleLine="true"
android:text="领金币"
android:textColor="@color/black"
android:textSize="14sp"
android:textSize="15sp"
android:textStyle="bold" />
<LinearLayout
......
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