스플래시 화면 교체및 타이머 동작

Author: mkw8263

app/src/main/java/com/ddd/attendance/check/db/dao/UserDao.kt

@@ -2,6 +2,7 @@ package com.ddd.attendance.check.db.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
+import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import com.ddd.attendance.check.db.entity.User
 
@@ -10,6 +11,6 @@ interface UserDao {
     @Query("SELECT * FROM USER")
     fun getUsers(): List<User>
 
-    @Insert
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun addUser(user: User)
 }

app/src/main/java/com/ddd/attendance/check/di/module/AppModule.kt

@@ -1,7 +1,6 @@
 package com.ddd.attendance.check.di.module
 
 import android.content.Context
-import android.util.Log
 import androidx.room.Room
 import com.ddd.attendance.check.DDDApplication
 import com.ddd.attendance.check.db.DDDDataBase

app/src/main/java/com/ddd/attendance/check/model/AttendResponse.kt

@@ -4,5 +4,5 @@ data class Attendance(
     val expire: String? = "",
     val number: Int? = 0,
     val status: String? = "",
-    val message: String? = ""
+    val message: String? = "이미 출석 체크가 시작되었습니다."
 )

app/src/main/java/com/ddd/attendance/check/utill/SharedPreferences.kt

@@ -0,0 +1,23 @@
+package com.ddd.attendance.check.utill
+
+import android.content.Context
+import android.content.Context.MODE_PRIVATE
+
+
+object SharedPreferences {
+
+    fun saveStatus(context: Context, isStatus: Boolean) {
+        val pref = context.getSharedPreferences(NAME_SHARED, MODE_PRIVATE)
+        val editor = pref.edit()
+        editor.putBoolean(KEY_STATUS, isStatus)
+        editor.apply()
+    }
+
+    fun getStatus(context: Context): Boolean {
+        val pref = context.getSharedPreferences(NAME_SHARED, MODE_PRIVATE)
+        return pref.getBoolean(KEY_STATUS, false)
+    }
+
+    private const val KEY_STATUS = "status"
+    private const val NAME_SHARED = "ddd_admin_status"
+}

app/src/main/java/com/ddd/attendance/check/vm/MainViewModel.kt

@@ -4,30 +4,34 @@ import androidx.databinding.ObservableField
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import com.ddd.attendance.check.DDDApplication
 import com.ddd.attendance.check.common.NetworkHelper
 import com.ddd.attendance.check.common.NetworkHelper.ERROR_MSG
 import com.ddd.attendance.check.common.UserType
 import com.ddd.attendance.check.data.repository.AttendanceRepository
 import com.ddd.attendance.check.data.repository.UserRepository
 import com.ddd.attendance.check.model.Attendance
+import com.ddd.attendance.check.utill.SharedPreferences
 import com.ddd.attendance.check.utill.SingleLiveEvent
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 import java.io.IOException
 import javax.inject.Inject
 
 class MainViewModel @Inject constructor(
-    private val userRepository: UserRepository,
-    private val attendanceRepository: AttendanceRepository
+        private val userRepository: UserRepository,
+        private val attendanceRepository: AttendanceRepository,
+        private val dddApplication: DDDApplication
 ) : ViewModel() {
 
     private val _isAdmin = MutableLiveData<Boolean>()
+    private val _isAttendanceNumberCount = MutableLiveData<Int>()
     private val _isAttendanceNumber = MutableLiveData<Int>()
     private val _isAttendanceStart = MutableLiveData<Boolean>()
     private val _btnEnableLogin = MutableLiveData<Boolean>()
     private val _showToastError = MutableLiveData<String>()
 
     val isAdmin: LiveData<Boolean> = _isAdmin
+    val isAttendanceNumberCount: LiveData<Int> = _isAttendanceNumberCount
     val isAttendanceNumber: LiveData<Int> = _isAttendanceNumber
     val isAttendanceStart: LiveData<Boolean> = _isAttendanceStart
     val editNumberAttendance = ObservableField<String>()
@@ -36,6 +40,11 @@ class MainViewModel @Inject constructor(
 
     val showDDDDialog = SingleLiveEvent<Pair<UserType, String>>()
 
+
+    init {
+        _isAttendanceStart.value = SharedPreferences.getStatus(dddApplication)
+    }
+
     fun onInputNumberTextChanged(input: CharSequence) {
         editNumberAttendance.set(input.toString())
         _btnEnableLogin.value = !editNumberAttendance.get().isNullOrEmpty()
@@ -73,6 +82,7 @@ class MainViewModel @Inject constructor(
 
     private fun attendanceEndUI() {
         _isAttendanceNumber.postValue(EMPTY_NUMBER)
+        _isAttendanceNumberCount.postValue(EMPTY_NUMBER)
         _isAttendanceStart.postValue(false)
         showDDDDialog(MSG_ATTENDANCE_END)
     }
@@ -93,27 +103,55 @@ class MainViewModel @Inject constructor(
 
     private suspend fun attendanceStart() {
         val response = attendanceRepository.attendanceStart()
-        if (response.isSuccessful) attendanceStartUI(response.body())
-        else _showToastError.postValue(response.body()?.message)
+        if (response.isSuccessful) {
+            SharedPreferences.saveStatus(dddApplication, true)
+            attendanceStartUI(response.body())
+            startTimer()
+        } else {
+            _showToastError.postValue(MSG_ALREADY_START)
+        }
+    }
+
+    private var job: Job? = null
+    private suspend fun startTimer() {
+        CoroutineScope(Dispatchers.Default).launch {
+            job = launch(Dispatchers.Main) {
+                60.countDown()
+            }
+            job?.join()
+        }
     }
 
     private suspend fun attendanceEnd() {
         val response = attendanceRepository.attendsEnd()
-        if (response.isSuccessful) attendanceEndUI()
-        else _showToastError.postValue(response.body()?.message)
+        if (response.isSuccessful) {
+            SharedPreferences.saveStatus(dddApplication, false)
+            attendanceEndUI()
+            if (job != null) job!!.cancel()
+        } else _showToastError.postValue(MSG_ALREADY_START)
     }
 
+    //일반 팀원 출첵 함수
     private fun attendanceCheck() {
 
     }
 
+    private suspend fun Int.countDown() {
+        for (index in this downTo 1) {
+            _isAttendanceNumberCount.postValue(index)
+            delay(COUNT_DELAY)
+        }
+    }
+
     private fun showDDDDialog(message: String) {
         showDDDDialog.postValue(Pair(if (_isAdmin.value == true) UserType.ADMIN else UserType.BASIC, message))
     }
 
     companion object {
         const val MSG_ATTENDANCE_START = "출석체크가 시작되었습니다."
         const val MSG_ATTENDANCE_END = "출석체크가 종료되었습니다."
+        const val MSG_ALREADY_START = "이미 출석 체크가 시작되었습니다.\n 잠시후 다시 시도 해주세요."
         const val EMPTY_NUMBER = 0
+        const val COUNT_DELAY: Long = 1000
     }
 }

app/src/main/java/com/ddd/attendance/check/vm/SplashViewModel.kt

@@ -32,6 +32,6 @@ class SplashViewModel @Inject constructor(private val userRepository: UserReposi
     }
 
     companion object {
-        const val DELAY_TIME: Long = 900
+        const val DELAY_TIME: Long = 1500
     }
 }

app/src/main/res/drawable/splash.gif

@@ -15,6 +15,18 @@
         android:background="@{safeUnbox(mainViewModel.isAdmin)?@color/attendance_admin_background_color:@color/attendance_basic_background_color}"
         android:focusableInTouchMode="true">
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="20dp"
+        android:text="@{String.valueOf(safeUnbox(mainViewModel.isAttendanceNumberCount))}"
+        android:textColor="@color/white"
+        android:textSize="20dp"
+        android:visibility="@{safeUnbox(mainViewModel.isAttendanceNumberCount>0)?View.VISIBLE:View.GONE}"
+        app:layout_constraintBottom_toTopOf="@+id/imgAttendanceInput"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        tools:ignore="SpUsage" />
     <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/imgAttendanceInput"
             android:layout_width="wrap_content"
@@ -100,7 +112,6 @@
             android:text="@{safeUnbox(mainViewModel.isAdmin)?@string/attendance_admin_guide_bottom:@string/attendance_guide_bottom}"
             android:textColor="@{safeUnbox(mainViewModel.isAdmin)?@color/white:@color/login_sub_title}"
             android:textSize="13dp"
-
             app:layout_constraintBottom_toTopOf="@+id/btnAdminAttendance"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"

app/src/main/res/layout/activity_main.xml

@@ -5,7 +5,7 @@
                   type="com.ddd.attendance.check.vm.SplashViewModel"/>
     </data>
 <androidx.constraintlayout.widget.ConstraintLayout
-        android:background="@android:color/black"
+        android:background="@color/attendance_admin_background_color"
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"

app/src/main/res/layout/activity_splash.xml

@@ -19,7 +19,7 @@
     <style name="SplashTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/attendance_admin_background_color</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="colorPrimaryDark">@color/black</item>
+        <item name="colorPrimaryDark">@color/attendance_admin_background_color</item>
     </style>
 
     <style name="LoginEditTheme" parent="Widget.AppCompat.EditText">