renhaoting
/
VidiDin-Android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: renhaoting:2ef5e5deab28d632f20add77d35ca01368c5c840
Branches Tags
renhaoting:main
renhaoting:develop_withdraw17_debug
renhaoting:develop_withdraw17
renhaoting:develop_notify
renhaoting:develop_bill
renhaoting:develop_request
renhaoting:develop
..
compare: renhaoting:d92216bfddbaf218b202051a6b114ac2b1dd628f
Branches Tags
renhaoting:develop_withdraw17_debug
renhaoting:develop_withdraw17
renhaoting:develop_notify
renhaoting:develop_bill
renhaoting:develop_request
renhaoting:develop
renhaoting:main

No commits in common. "2ef5e5deab28d632f20add77d35ca01368c5c840" and "d92216bfddbaf218b202051a6b114ac2b1dd628f" have entirely different histories.
2ef5e5deab ... d92216bfdd

8 changed files with 16 additions and 81 deletions
Show Stats Expand all files Collapse all files

4
app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt
View File

@ -9,7 +9,6 @@ import com.gamedog.vididin.widget.DailySignItemView
class DailySignDialog(context: Context) : BindingDialog<DialogDailySignBinding>(context, DialogDailySignBinding::inflate) {
private var mCurDayIndex: Int = 0
private var mDataList: List<RewardDetail>? = emptyList()
private var mSignItemList: MutableList<DailySignItemView> = mutableListOf()
@ -68,8 +67,7 @@ class DailySignDialog(context: Context) : BindingDialog<DialogDailySignBinding>(
}
private fun initSignState() {
mCurDayIndex = TaskManager.instance().getCurDayIndexOfDailyCheckIn()
mSignItemList[mCurDayIndex].setSelectState(true)
val todayIndex = TaskManager.instance().getCurDayIndexOfDailyCheckIn()
}
private fun handleItemSelectStateChanged(itemIndex: Int, selected: Boolean) {

27
app/src/main/java/com/gamedog/vididin/manager/TaskManager.kt
View File

@ -1,6 +1,5 @@
package com.gamedog.vididin.manager
import com.ama.core.architecture.util.DateUtil
import com.ama.core.architecture.util.FileUtil
import com.ama.core.architecture.util.SpUtil
import com.gamedog.vididin.main.fragments.task.Task
@ -40,13 +39,11 @@ class TaskManager private constructor() {
}
}
private val mutex = Mutex()
@Volatile
private var initialized = false
private var mTaskConfig: TaskBean? = null
private var mTaskBean: TaskStateBean = TaskStateBean(DailySignBean())
private val mGson = GsonBuilder().create()
@ -84,12 +81,7 @@ class TaskManager private constructor() {
private suspend fun loadTaskStateFromSp() {
return withContext(Dispatchers.IO) {
val taskStateBeanInSp = SpUtil.instance().getObject<TaskStateBean>(SpUtil.KEY_TASK_BEAN)
if (taskStateBeanInSp == null) {
SpUtil.instance().putObject(SpUtil.KEY_TASK_BEAN, mTaskBean)
} else {
mTaskBean = taskStateBeanInSp
}
// TODO ------------
}
}
@ -137,21 +129,8 @@ class TaskManager private constructor() {
}
fun getCurDayIndexOfDailyCheckIn() : Int {
val periodStartMs = mTaskBean.dailySignBean.startMs
if (periodStartMs > 0) {
val dayIndexOfPeriod = DateUtil.getPassedDayNum(periodStartMs, DateUtil.getCurTimeMs())
if (dayIndexOfPeriod > 6) {
mTaskBean.dailySignBean.startMs = DateUtil.getCurTimeMs()
SpUtil.instance().putObject(SpUtil.KEY_TASK_BEAN, mTaskBean)
}
return dayIndexOfPeriod
} else {
mTaskBean.dailySignBean.startMs = DateUtil.getCurTimeMs()
SpUtil.instance().putObject(SpUtil.KEY_TASK_BEAN, mTaskBean)
return 0
}
fun getCurDayIndexOfDailyCheckIn() {
//...
}

6
app/src/main/java/com/gamedog/vididin/manager/TaskStateBean.kt
View File

@ -1,6 +1,5 @@
package com.gamedog.vididin.manager
import com.ama.core.architecture.util.DateUtil
import java.io.Serializable
@ -10,9 +9,8 @@ data class TaskStateBean(
data class DailySignBean(
var startMs: Long = 0,
val startMs: Long = 0L,
val signStateList: MutableList<Int> = mutableListOf()
): Serializable {
companion object{
const val SIGN_STATE_ENABLE = 1
@ -21,7 +19,7 @@ data class DailySignBean(
}
init {
signStateList.add(SIGN_STATE_ENABLE)
signStateList.add(SIGN_STATE_WAIT)
signStateList.add(SIGN_STATE_WAIT)
signStateList.add(SIGN_STATE_WAIT)
signStateList.add(SIGN_STATE_WAIT)

5
app/src/main/java/com/gamedog/vididin/widget/DailySignItemView.kt
View File

@ -5,7 +5,6 @@ import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import android.widget.LinearLayout
import com.ama.core.architecture.util.ResUtil
import com.ama.core.architecture.util.setOnClickBatch
import com.gamedog.vididin.R
import com.gamedog.vididin.databinding.DailySignItemBinding
@ -57,9 +56,9 @@ class DailySignItemView @JvmOverloads constructor(
fun setSelectState(isSelect: Boolean) {
mIsSelected = isSelect
if (mIsSelected) {
mBinding.rlRoot.foreground = ResUtil.getDrawable(R.drawable.bg_daily_sign_day_item)
mBinding.rlRoot.setBackgroundResource(R.drawable.bg_daily_sign_day_item)
} else {
mBinding.rlRoot.foreground = null
mBinding.rlRoot.background = null
}
}

3
app/src/main/res/layout/daily_sign_item.xml
View File

@ -11,7 +11,8 @@
<RelativeLayout
android:id="@+id/rl_root"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:padding="2dp">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_bg"

43
core/architecture/src/main/java/com/ama/core/architecture/util/DateUtil.kt
View File

@ -4,14 +4,12 @@ package com.ama.core.architecture.util
import java.text.SimpleDateFormat
import java.util.*
import java.util.concurrent.TimeUnit
import java.util.Calendar
import java.util.TimeZone
class DateUtil private constructor() {
companion object {
private const val MS_NUM_ONE_DAY = (24 * 60 * 60 * 1000)
private const val FORMAT_DATE = "yyyy-MM-dd"
private const val FORMAT_DATETIME = "yyyy-MM-dd HH:mm:ss"
@ -86,7 +84,9 @@ class DateUtil private constructor() {
return TimeUnit.MILLISECONDS.toDays(diffMillis)
}
fun getCurTimeMs(): Long {
return System.currentTimeMillis()
}
/**
* 两个时间点之间的天数差
@ -164,41 +164,6 @@ class DateUtil private constructor() {
else -> 0L
}
}
//--------------------------- New added methods ----------------------------//
fun getCurTimeMs(): Long {
return System.currentTimeMillis()
}
fun getPassedDayNum(periodStartMs: Long, currentMs: Long): Int {
val utcTimeZone = TimeZone.getTimeZone("UTC") // 使用UTC时区
val calendarStart = Calendar.getInstance(utcTimeZone).apply {
timeInMillis = periodStartMs
}
val calendarCurrent = Calendar.getInstance(utcTimeZone).apply {
timeInMillis = currentMs
}
// 清除时分秒毫秒信息
fun Calendar.clearTime() {
set(Calendar.HOUR_OF_DAY, 0)
set(Calendar.MINUTE, 0)
set(Calendar.SECOND, 0)
set(Calendar.MILLISECOND, 0)
}
calendarStart.clearTime()
calendarCurrent.clearTime()
return ((calendarCurrent.timeInMillis - calendarStart.timeInMillis) / MS_NUM_ONE_DAY).toInt()
}
}
}

6
core/architecture/src/main/java/com/ama/core/architecture/util/ResUtil.kt
View File

@ -1,12 +1,10 @@
package com.ama.core.architecture.util
import android.graphics.Color
import android.graphics.drawable.Drawable
import android.util.TypedValue
import androidx.annotation.AttrRes
import androidx.annotation.ColorRes
import androidx.annotation.DimenRes
import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import androidx.core.content.ContextCompat
import com.ama.core.architecture.BaseApp
@ -113,10 +111,6 @@ object ResUtil {
return typedValue.data
}
fun getDrawable(@DrawableRes iconRes: Int): Drawable? {
return ContextCompat.getDrawable(appContext, iconRes)
}
//==================== 扩展函数 ====================

3
core/architecture/src/main/java/com/ama/core/architecture/util/SpUtil.kt
View File

@ -14,7 +14,8 @@ class SpUtil private constructor(spFileName: String) {
companion object {
const val KEY_ACCOUNT = "KEY_ACCOUNT"
const val KEY_ACCOUNT_TOKEN = "KEY_ACCOUNT_TOKEN"
const val KEY_TASK_BEAN = "KEY_TASK_BEAN"
const val KEY_X2 = "22222"
private const val DEFAULT_SP_NAME = "enhanced_prefs"
@Volatile