Skip to content

A
android_vedio
Commit 41edb128 authored by mengcuiguang's avatar mengcuiguang
Browse files
Options

优化首页弹窗

parent d117c866
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 573 additions and 102 deletions
video/app/src/main/java/com/duben/dayplaylet/common/Constant.kt
View file @ 41edb128
......@@ -33,6 +33,7 @@ object Constant {
const val CARRIERTYPE_CSJ_VEDIO = "VEDIO_UNLOCK"
const val CARRIERTYPE_TX_VEDIO = "VEDIO_UNLOCK"
const val CARRIERTYPE_REWARD_FIRST = "REWARD_FIRST" //新人红包视频
const val CARRIERTYPE_SIGN = "REWARD_FIRST" //签到
const val FRAGMENT_CLICK_ONE = 0
......
video/app/src/main/java/com/duben/dayplaylet/ui/activitys/LoadingActivity.kt
View file @ 41edb128
......@@ -15,10 +15,12 @@ class LoadingActivity : BaseActivity() {
companion object {
const val TYPE = "TYPE"
const val TEXT = "TEXT"
}
var timer: CountDownTimerSupport? = null
var type = ""
var content = ""
override fun getContentViewLayoutID() = R.layout.activity_loading
......@@ -32,10 +34,12 @@ class LoadingActivity : BaseActivity() {
super.getBundleExtras(extras)
extras?.let {
type = it.getString(TYPE, "")
content = it.getString(TEXT, "")
}
}
override fun initViewsAndEvents() {
tv_loading_text.text = content
mProgressBar?.startOneAnim()
startTimer()
}
......
video/app/src/main/java/com/duben/dayplaylet/ui/widgets/DrawAlipayDialog.kt 0 → 100644
View file @ 41edb128
package com.duben.dayplaylet.ui.widgets
import android.app.Dialog
import android.content.Context
import android.os.Handler
import android.view.Gravity
import android.view.KeyEvent
import android.view.WindowManager
import com.duben.dayplaylet.R
import com.duben.dayplaylet.ui.widgets.countdowntimer.CountDownTimerSupport
import com.duben.dayplaylet.ui.widgets.countdowntimer.OnCountDownTimerListener
import com.duben.dayplaylet.utils.BubbleUtils
import com.duben.dayplaylet.utils.SpanUtils
import kotlinx.android.synthetic.main.dialog_draw_alipay.*
import kotlinx.android.synthetic.main.dialog_sign_draw.*
class DrawAlipayDialog(private val context: Context, val cash: Double) :
Dialog(
context, R.style.dialog
) {
private val lp: WindowManager.LayoutParams
init {
setContentView(R.layout.dialog_draw_alipay)
// 设置window属性
lp = window!!.attributes
lp.gravity = Gravity.CENTER
lp.width = WindowManager.LayoutParams.MATCH_PARENT
lp.windowAnimations = R.style.DialogAnimBottom
window!!.attributes = lp
// 设置外部不可关闭
setCancelable(false)
setCanceledOnTouchOutside(false)
setOnKeyListener { dialogInterface, i, keyEvent ->
if (i == KeyEvent.KEYCODE_BACK) {
true
} else false
}
val cashStr = cash.toString()
if (cashStr.length >= 4) {
tv_draw_cash1.text = cashStr.subSequence(0, 1)
tv_draw_cash2.text = cashStr.subSequence(2, 3)
tv_draw_cash3.text = cashStr.subSequence(3, 4)
}
}
}
\ No newline at end of file
video/app/src/main/java/com/duben/dayplaylet/ui/widgets/LoadingProgress.java
View file @ 41edb128
......@@ -53,7 +53,7 @@ public class LoadingProgress extends View {
mBgPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
mBgPaint.setStyle(Paint.Style.FILL);
mBgPaint.setStrokeWidth(mHeight);
mBgPaint.setColor(Color.parseColor("#2F2F2F"));
mBgPaint.setColor(Color.parseColor("#E6E6E6"));
Paint mStrokePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
mStrokePaint.setStyle(Paint.Style.STROKE);
......@@ -104,7 +104,7 @@ public class LoadingProgress extends View {
pathMeasure.getSegment(0, pathMeasure.getLength() * mAnimatorValue, dstPath, true);
//渐变
Shader mShader = new LinearGradient(mStrokeWidth / 2, mStrokeWidth / 2, mProgressWidth, mHeight - mStrokeWidth / 2,
Color.parseColor("#2cdeed"), Color.parseColor("#2cdeed"), Shader.TileMode.REPEAT);
Color.parseColor("#FF7563"), Color.parseColor("#FF7563"), Shader.TileMode.REPEAT);
//遮罩
mProgressPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
mProgressPaint.setShader(mShader);
......
video/app/src/main/java/com/duben/dayplaylet/utils/ConsumerToastUtil.kt 0 → 100644
View file @ 41edb128
package com.duben.dayplaylet.utils
import android.content.Context
import android.os.Handler
import android.view.Gravity
import android.view.LayoutInflater
import android.view.View
import android.widget.LinearLayout
import android.widget.TextView
import android.widget.Toast
import com.duben.dayplaylet.R
object ConsumerToastUtil {
@JvmStatic
fun showAwardText(context: Context?, redPkgInt: Int, yuanbaoInt: Int) {
if (context == null) return
try {
val toastview = LayoutInflater.from(context).inflate(R.layout.toast_text_layout, null)
val ll_toast_redpkg = toastview.findViewById<View>(R.id.ll_toast_redpkg) as LinearLayout
val redPkg = toastview.findViewById<View>(R.id.tv_toast_redpkg) as TextView
val yuanbao = toastview.findViewById<View>(R.id.tv_toast_yuanbao) as TextView
if (redPkgInt > 0) {
redPkg.text = "+${redPkgInt}"
ll_toast_redpkg.visibility = View.VISIBLE
} else {
ll_toast_redpkg.visibility = View.GONE
}
if (yuanbaoInt > 0) {
yuanbao.text = "+${yuanbaoInt}"
yuanbao.visibility = View.VISIBLE
} else {
yuanbao.visibility = View.GONE
}
val toast = Toast(context)
toast.setGravity(Gravity.CENTER, 0, 0)
toast.duration = Toast.LENGTH_LONG
toast.view = toastview
toast.show()
Handler().postDelayed(Runnable { toast.cancel() }, 1500)
} catch (e: Exception) {
e.printStackTrace()
}
}
}
\ No newline at end of file
video/app/src/main/java/com/duben/dayplaylet/utils/StringUtil.kt
View file @ 41edb128
......@@ -3,6 +3,7 @@ package com.duben.dayplaylet.utils
import android.content.Context
import android.content.pm.PackageManager
import android.text.TextUtils
import java.math.BigDecimal
object StringUtil {
/**
......@@ -14,11 +15,12 @@ object StringUtil {
if (ctx == null || TextUtils.isEmpty(key)) {
return ""
}
var resultData=""
var resultData = ""
try {
val packageManager = ctx.packageManager
if (packageManager != null) {
val applicationInfo = packageManager.getApplicationInfo(ctx.packageName, PackageManager.GET_META_DATA)
val applicationInfo =
packageManager.getApplicationInfo(ctx.packageName, PackageManager.GET_META_DATA)
if (applicationInfo != null) {
if (applicationInfo.metaData != null) {
resultData = applicationInfo.metaData.getString(key)!!
......@@ -32,4 +34,11 @@ object StringUtil {
return resultData
}
fun getCashFormaet(rewardCoin: Int): String {
val sumCoin = rewardCoin.toString()
val allcoinBig = BigDecimal(sumCoin)
val rateBig = BigDecimal("10000")
val cashStr = allcoinBig.divide(rateBig).setScale(2, BigDecimal.ROUND_DOWN).toString()
return cashStr
}
}
\ No newline at end of file
video/app/src/main/res/drawable/shape_bg_blue.xml 0 → 100644
View file @ 41edb128
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="#0000ff" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="15dip" />
</shape>
\ No newline at end of file
video/app/src/main/res/drawable/shape_btn_black.xml 0 → 100644
View file @ 41edb128
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#90000000" />
<corners android:radius="10dp" />
</shape>
\ No newline at end of file
video/app/src/main/res/layout/activity_loading.xml
View file @ 41edb128
......@@ -5,36 +5,58 @@
android:layout_height="match_parent"
android:background="#90000000">
<LinearLayout
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:orientation="vertical">
android:layout_marginLeft="30dp"
android:layout_marginTop="200dp"
android:layout_marginRight="30dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_marginTop="40dp"
android:background="@drawable/shape_banner_write"
android:orientation="vertical">
<TextView
android:id="@+id/tv_loading_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="90dp"
android:text="8元现金红包马上到账"
android:textColor="@color/black"
android:textSize="22sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:text="看完广告即可到账"
android:textColor="@color/gray"
android:textSize="18sp" />
<com.duben.dayplaylet.ui.widgets.LoadingProgress
android:id="@+id/mProgressBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="40dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:layout_marginRight="40dp" />
</LinearLayout>
<ImageView
android:id="@+id/ivLoading"
android:layout_width="140dp"
android:layout_height="140dp"
android:layout_gravity="center_horizontal"
android:src="@mipmap/ic_launcher_main" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="100dp"
android:text="执行中….."
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold" />
<com.duben.dayplaylet.ui.widgets.LoadingProgress
android:id="@+id/mProgressBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="40dp"
android:layout_marginTop="20dp"
android:layout_marginRight="40dp" />
</LinearLayout>
android:layout_marginTop="-20dp"
android:src="@mipmap/ic_loading_top" />
</FrameLayout>
</RelativeLayout>
video/app/src/main/res/layout/dialog_draw_alipay.xml 0 → 100644
View file @ 41edb128
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:src="@mipmap/bg_vip_btn"></ImageView>
<LinearLayout
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:background="@drawable/shape_bg_nine"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_draw_cash1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:background="@drawable/shape_bg_blue"
android:gravity="center"
android:paddingLeft="14dp"
android:paddingTop="10dp"
android:paddingRight="14dp"
android:paddingBottom="10dp"
android:text="0"
android:textColor="@color/white"
android:textSize="40sp"
android:textStyle="bold"></TextView>
<View
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="bottom"
android:layout_margin="10dp"
android:background="@drawable/shape_bg_blue"></View>
<TextView
android:id="@+id/tv_draw_cash2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:background="@drawable/shape_bg_blue"
android:gravity="center"
android:paddingLeft="14dp"
android:paddingTop="10dp"
android:paddingRight="14dp"
android:paddingBottom="10dp"
android:text="0"
android:textColor="@color/white"
android:textSize="40sp"
android:textStyle="bold"></TextView>
<TextView
android:id="@+id/tv_draw_cash3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:background="@drawable/shape_bg_blue"
android:gravity="center"
android:paddingLeft="14dp"
android:paddingTop="10dp"
android:paddingRight="14dp"
android:paddingBottom="10dp"
android:text="0"
android:textColor="@color/white"
android:textSize="40sp"
android:textStyle="bold"></TextView>
</LinearLayout>
<TextView
android:id="@+id/tv_draw_text"
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>
</LinearLayout>
</RelativeLayout>
video/app/src/main/res/layout/fragment_main.xml
View file @ 41edb128
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/rl"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#f0f2f5">
......@@ -174,9 +175,20 @@
android:id="@+id/iv_main_sign"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="200dp"
android:layout_marginTop="400dp"
android:layout_marginRight="20dp"
android:src="@mipmap/ic_launcher_main"
android:src="@mipmap/ic_main_sign"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_main_tempanim"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_main_sign"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......
video/app/src/main/res/layout/layout_draw_header.xml
View file @ 41edb128
......@@ -5,71 +5,94 @@
android:paddingTop="40dp"
android:paddingBottom="10dp">
<LinearLayout
android:id="@+id/ll_draw_cash"
android:layout_width="140dp"
android:layout_height="40dp"
android:layout_marginStart="20dp"
android:background="@drawable/shape_half_trans"
android:gravity="center_vertical">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp">
<ImageView
android:id="@+id/iv_cash"
android:layout_width="30dp"
android:layout_height="wrap_content"
android:src="@mipmap/ic_launcher_main" />
<LinearLayout
android:id="@+id/ll_draw_cash"
android:layout_width="150dp"
android:layout_height="40dp"
android:layout_marginStart="12dp"
android:background="@drawable/shape_half_trans"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_cash"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="50元"
android:textColor="@color/white" />
<Button
android:layout_width="60dp"
android:layout_height="28dp"
android:layout_marginEnd="6dp"
android:background="@drawable/shape_green"
android:text="提现"
android:textColor="@color/white" />
<TextView
android:id="@+id/tv_cash"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:paddingLeft="30dp"
android:text="0元"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
<Button
android:layout_width="50dp"
android:layout_height="28dp"
android:layout_marginEnd="6dp"
android:background="@drawable/shape_green"
android:text="提现"
android:textColor="@color/white"
android:textSize="15sp" />
<LinearLayout
android:id="@+id/ll_draw_gold"
android:layout_width="140dp"
android:layout_height="40dp"
android:layout_gravity="end"
android:layout_marginEnd="20dp"
android:background="@drawable/shape_half_trans"
android:gravity="center_vertical">
</LinearLayout>
<ImageView
android:id="@+id/iv_gold"
android:layout_width="30dp"
android:id="@+id/iv_cash"
android:layout_width="wrap_content"
android:layout_marginBottom="-4dp"
android:layout_height="wrap_content"
android:src="@mipmap/ic_launcher_main" />
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:src="@mipmap/ic_redpkg" />
</RelativeLayout>
<TextView
android:id="@+id/tv_gold"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="37个"
android:textColor="@color/white" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginRight="3dp">
<LinearLayout
android:id="@+id/ll_draw_gold"
android:layout_width="150dp"
android:layout_height="40dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="10dp"
android:background="@drawable/shape_half_trans"
android:gravity="center_vertical">
<Button
android:layout_width="60dp"
android:layout_height="28dp"
android:layout_marginEnd="6dp"
android:background="@drawable/shape_green"
android:text="提现"
android:textColor="@color/white" />
<TextView
android:id="@+id/tv_gold"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:paddingLeft="30dp"
android:text="0个"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
<Button
android:layout_width="50dp"
android:layout_height="28dp"
android:layout_marginEnd="6dp"
android:background="@drawable/shape_green"
android:text="提现"
android:textColor="@color/white"
android:textSize="15sp" />
</LinearLayout>
<ImageView
android:id="@+id/iv_gold"
android:layout_width="46dp"
android:layout_height="46dp"
android:layout_centerVertical="true"
android:layout_marginBottom="-4dp"
android:src="@mipmap/ic_yuanbao" />
</RelativeLayout>
</FrameLayout>
\ No newline at end of file
video/app/src/main/res/layout/toast_text_layout.xml 0 → 100644
View file @ 41edb128
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_btn_black"
android:gravity="center"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/ll_toast_redpkg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:orientation="vertical">
<ImageView
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center_horizontal"
android:src="@mipmap/ic_redpkg" />
<TextView
android:id="@+id/tv_toast_redpkg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="4dp"
android:textColor="@color/white"
android:textSize="18sp"
android:textStyle="bold"
tools:text="+10" />
</LinearLayout>
<TextView
android:id="@+id/tv_toast_yuanbao"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="30dp"
android:drawableTop="@mipmap/ic_yuanbao"
android:drawablePadding="14dp"
android:gravity="center_horizontal"
android:textColor="@color/white"
android:textSize="18sp"
android:textStyle="bold"
tools:text="+10" />
</LinearLayout>
\ No newline at end of file
video/gradle.properties
View file @ 41edb128
......@@ -31,7 +31,7 @@ RELEASE_KEY_ALIAS=mints_dayplaylet
RELEASE_STORE_PASSWORD=mintsdayplaylet
RELEASE_STORE_FILE=mints_dayplaylet.jks
SM_APP_ID="goldpub"
SM_APP_ID="dayplaylet"
#ShareSDK
RELEASE_SHARESDK_KEY=3845c0fde1969
......@@ -43,7 +43,7 @@ WEIXIN_APP_ID =wx7e946f66585ca00a
WEIXIN_APP_SECRET =6fe41783e736bea36504b271cea484f1
#TalkingData
RELEASE_TALKING_DATA_KEY="E91735A7978140A8ABD1BB32D337CCAB"
RELEASE_TALKING_DATA_KEY="50775FE6C0D44F4AB21B640BDF71E306"
#umeng
RELEASE_UMENG_KEY=64b8de13a1a164591b5133df
......
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