출석 시작, 종료 api 완료

mkw8263 · mkw8263 · commit 3a3fd3b23439 · 2019-02-14T22:54:16.000+09:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -66,7 +66,7 @@ dependencies {
     // retrofit2
     implementation 'com.squareup.retrofit2:retrofit:2.5.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.1'
     implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
 
     // gson
diff --git a/app/src/main/java/com/ddd/attendance/check/api/ApiService.kt b/app/src/main/java/com/ddd/attendance/check/api/ApiService.kt
@@ -1,5 +1,6 @@
 package com.ddd.attendance.check.api
 
+import com.ddd.attendance.check.model.Attendance
 import com.ddd.attendance.check.model.LoginResponse
 import kotlinx.coroutines.Deferred
 import retrofit2.Response
@@ -12,4 +13,10 @@ interface ApiService {
     @FormUrlEncoded
     @POST("/auth/login")
     fun login(@Field("account") id: String, @Field("password") password: String): Deferred<Response<LoginResponse>>
+
+    @POST("/attends/start")
+    fun attendsStart(): Deferred<Response<Attendance>>
+
+    @POST("/attends/end")
+    fun attendsEnd(): Deferred<Response<Attendance>>
 }
diff --git a/app/src/main/java/com/ddd/attendance/check/common/AttendanceStatus.kt b/app/src/main/java/com/ddd/attendance/check/common/AttendanceStatus.kt
@@ -0,0 +1,5 @@
+package com.ddd.attendance.check.common
+
+enum class AttendanceStatus {
+    START, STOP
+}
diff --git a/app/src/main/java/com/ddd/attendance/check/common/DDDDialog.kt b/app/src/main/java/com/ddd/attendance/check/common/DDDDialog.kt
@@ -7,26 +7,42 @@ import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.util.DisplayMetrics
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import com.ddd.attendance.check.R
 import kotlinx.android.synthetic.main.dialog_ddd.*
 
 
-class DDDDialog(context: Context, userType: UserType) : Dialog(context) {
+class DDDDialog(context: Context, private val data: Pair<UserType, String>) : Dialog(context) {
     private lateinit var dddDialogEventListener: DDDDialogEventListener
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
         setContentView(com.ddd.attendance.check.R.layout.dialog_ddd)
-        val metrics = DisplayMetrics()
-        window?.windowManager?.defaultDisplay?.getMetrics(metrics)
-        val width = (metrics.widthPixels * 0.8).toInt()
-        window?.setLayout(width, ViewGroup.LayoutParams.WRAP_CONTENT)
 
+        setInitView()
+        setBackGround()
+
+        tvMessage.text = data.second
         btnOK.setOnClickListener {
             dddDialogEventListener.onClick(this)
             dismiss()
         }
     }
 
+    private fun setInitView() {
+        val metrics = DisplayMetrics()
+        window?.windowManager?.defaultDisplay?.getMetrics(metrics)
+        val width = (metrics.widthPixels * 0.8).toInt()
+        window?.setLayout(width, ViewGroup.LayoutParams.WRAP_CONTENT)
+    }
+
+    private fun setBackGround() {
+        linearDialog.background = ContextCompat.getDrawable(
+            context,
+            if (data.first == UserType.BASIC) R.drawable.dialog_ddd_background else R.drawable.dialog_ddd_background_admin
+        )
+    }
+
     fun setDialogListener(dddDialogEventListener: DDDDialogEventListener): DDDDialog {
         this.dddDialogEventListener = dddDialogEventListener
         return this
diff --git a/app/src/main/java/com/ddd/attendance/check/data/repository/AttendanceRepository.kt b/app/src/main/java/com/ddd/attendance/check/data/repository/AttendanceRepository.kt
@@ -0,0 +1,18 @@
+package com.ddd.attendance.check.data.repository
+
+import com.ddd.attendance.check.data.Repository
+import com.ddd.attendance.check.data.source.attendance.AttendanceRemoteDataSource
+import com.ddd.attendance.check.model.Attendance
+import retrofit2.Response
+import javax.inject.Inject
+
+class AttendanceRepository @Inject constructor(private val attendanceRemoteDataSource: AttendanceRemoteDataSource) :
+    Repository {
+    suspend fun attendanceStart(): Response<Attendance> {
+        return attendanceRemoteDataSource.attendanceStart()
+    }
+
+    suspend fun attendsEnd(): Response<Attendance> {
+        return attendanceRemoteDataSource.attendsEnd()
+    }
+}
diff --git a/app/src/main/java/com/ddd/attendance/check/data/repository/LoginRepository.kt b/app/src/main/java/com/ddd/attendance/check/data/repository/LoginRepository.kt
@@ -1,5 +1,6 @@
-package com.ddd.attendance.check.data
+package com.ddd.attendance.check.data.repository
 
+import com.ddd.attendance.check.data.Repository
 import com.ddd.attendance.check.data.source.login.LoginRemoteDataSource
 import com.ddd.attendance.check.model.LoginResponse
 import retrofit2.Response
diff --git a/app/src/main/java/com/ddd/attendance/check/data/repository/UserRepository.kt b/app/src/main/java/com/ddd/attendance/check/data/repository/UserRepository.kt
@@ -1,10 +1,12 @@
-package com.ddd.attendance.check.data
+package com.ddd.attendance.check.data.repository
 
+import com.ddd.attendance.check.data.Repository
 import com.ddd.attendance.check.data.source.user.UserLocalDataSource
 import com.ddd.attendance.check.db.entity.User
 import javax.inject.Inject
 
-class UserRepository @Inject constructor(private val userLocalDataSource: UserLocalDataSource) : Repository {
+class UserRepository @Inject constructor(private val userLocalDataSource: UserLocalDataSource) :
+    Repository {
     suspend fun saveUsers(user: User) {
         userLocalDataSource.saveUser(user)
     }
diff --git a/app/src/main/java/com/ddd/attendance/check/data/source/attendance/AttendanceLocalDataSource.kt b/app/src/main/java/com/ddd/attendance/check/data/source/attendance/AttendanceLocalDataSource.kt
@@ -0,0 +1,3 @@
+package com.ddd.attendance.check.data.source.attendance
+
+class AttendanceLocalDataSource
diff --git a/app/src/main/java/com/ddd/attendance/check/data/source/attendance/AttendanceRemoteDataSource.kt b/app/src/main/java/com/ddd/attendance/check/data/source/attendance/AttendanceRemoteDataSource.kt
@@ -0,0 +1,15 @@
+package com.ddd.attendance.check.data.source.attendance
+
+import com.ddd.attendance.check.api.ApiService
+import com.ddd.attendance.check.model.Attendance
+import retrofit2.Response
+
+class AttendanceRemoteDataSource(private val apiService: ApiService) {
+    suspend fun attendanceStart(): Response<Attendance> {
+        return apiService.attendsStart().await()
+    }
+
+    suspend fun attendsEnd(): Response<Attendance> {
+        return apiService.attendsEnd().await()
+    }
+}
diff --git a/app/src/main/java/com/ddd/attendance/check/data/source/login/LoginLocalDataSource.kt b/app/src/main/java/com/ddd/attendance/check/data/source/login/LoginLocalDataSource.kt
@@ -0,0 +1,2 @@
+package com.ddd.attendance.check.data.source.login
+
diff --git a/app/src/main/java/com/ddd/attendance/check/data/source/user/UserRemoteDataSource.kt b/app/src/main/java/com/ddd/attendance/check/data/source/user/UserRemoteDataSource.kt
@@ -0,0 +1,4 @@
+package com.ddd.attendance.check.data.source.user
+
+class UserRemoteDataSource {
+}
diff --git a/app/src/main/java/com/ddd/attendance/check/di/module/DataSource.kt b/app/src/main/java/com/ddd/attendance/check/di/module/DataSource.kt
@@ -1,6 +1,7 @@
 package com.ddd.attendance.check.di.module
 
 import com.ddd.attendance.check.api.ApiService
+import com.ddd.attendance.check.data.source.attendance.AttendanceRemoteDataSource
 import com.ddd.attendance.check.data.source.login.LoginRemoteDataSource
 import com.ddd.attendance.check.data.source.user.UserLocalDataSource
 import com.ddd.attendance.check.db.DDDDataBase
@@ -22,4 +23,10 @@ class DataSource {
     fun loginRemoteDataSource(apiService: ApiService): LoginRemoteDataSource {
         return LoginRemoteDataSource(apiService)
     }
+
+    @Provides
+    @Singleton
+    fun attendanceRemoteDataSource(apiService: ApiService): AttendanceRemoteDataSource {
+        return AttendanceRemoteDataSource(apiService)
+    }
 }
diff --git a/app/src/main/java/com/ddd/attendance/check/di/module/RepositoryModule.kt b/app/src/main/java/com/ddd/attendance/check/di/module/RepositoryModule.kt
@@ -1,8 +1,8 @@
 package com.ddd.attendance.check.di.module
 
-import com.ddd.attendance.check.data.LoginRepository
+import com.ddd.attendance.check.data.repository.LoginRepository
 import com.ddd.attendance.check.data.Repository
-import com.ddd.attendance.check.data.UserRepository
+import com.ddd.attendance.check.data.repository.UserRepository
 import com.ddd.attendance.check.data.source.login.LoginRemoteDataSource
 import com.ddd.attendance.check.data.source.user.UserLocalDataSource
 import dagger.Module
diff --git a/app/src/main/java/com/ddd/attendance/check/model/AttendResponse.kt b/app/src/main/java/com/ddd/attendance/check/model/AttendResponse.kt
@@ -0,0 +1,8 @@
+package com.ddd.attendance.check.model
+
+data class Attendance(
+    val expire: String? = "",
+    val number: Int? = 0,
+    val status: String? = "",
+    val message: String? = ""
+)
diff --git a/app/src/main/java/com/ddd/attendance/check/model/LoginReponse.kt b/app/src/main/java/com/ddd/attendance/check/model/LoginReponse.kt
@@ -1,11 +1,12 @@
 package com.ddd.attendance.check.model
 
 data class LoginResponse(
-        val accessToken: String,
-        val refreshToken: String,
-        val status: String,
-        val user: User,
-        val message: String? = null
+    val accessToken: String,
+    val refreshToken: String,
+    val isProgress: Boolean,
+    val status: String,
+    val user: User,
+    val message: String? = null
 )
 
 data class User(
diff --git a/app/src/main/java/com/ddd/attendance/check/ui/MainActivity.kt b/app/src/main/java/com/ddd/attendance/check/ui/MainActivity.kt
@@ -5,17 +5,18 @@ import android.graphics.Color
 import android.os.Bundle
 import android.view.View
 import android.view.WindowManager
+import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelProviders
 import com.ddd.attendance.check.R
 import com.ddd.attendance.check.base.DDDActivity
 import com.ddd.attendance.check.common.DDDDialog
+import com.ddd.attendance.check.common.UserType
 import com.ddd.attendance.check.databinding.ActivityMainBinding
 import com.ddd.attendance.check.utill.lazyThreadSafetyNone
 import com.ddd.attendance.check.vm.MainViewModel
-import kotlinx.android.synthetic.main.activity_main.*
 import javax.inject.Inject
 
 
@@ -31,22 +32,22 @@ class MainActivity : DDDActivity<ActivityMainBinding, MainViewModel>() {
         setDataBinding()
         setUpLiveData()
         viewModel.checkUserType()
-
-        btnAttendance.setOnClickListener {
-            viewModel.showDDDDialog()
-        }
     }
 
     private fun setUpLiveData() {
-        viewModel.showDDDDialog.observe(this, Observer { userType ->
-            DDDDialog(this, userType)
+        viewModel.showDDDDialog.observe(this, Observer { data: Pair<UserType, String> ->
+            DDDDialog(this, data)
                 .setDialogListener(object : DDDDialog.DDDDialogEventListener {
                     override fun onClick(dialog: Dialog) {
                         dialog.dismiss()
                     }
                 }).show()
         })
 
+        viewModel.showToastError.observe(this, Observer {
+            Toast.makeText(this, it, Toast.LENGTH_SHORT).show()
+        })
+
         viewModel.isAdmin.observe(this, Observer { isAdmin ->
             val view = window.decorView
             if (isAdmin) {
diff --git a/app/src/main/java/com/ddd/attendance/check/vm/LoginViewModel.kt b/app/src/main/java/com/ddd/attendance/check/vm/LoginViewModel.kt
@@ -5,8 +5,8 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import com.ddd.attendance.check.common.NetworkHelper
 import com.ddd.attendance.check.common.NetworkHelper.SUCCESS
-import com.ddd.attendance.check.data.LoginRepository
-import com.ddd.attendance.check.data.UserRepository
+import com.ddd.attendance.check.data.repository.LoginRepository
+import com.ddd.attendance.check.data.repository.UserRepository
 import com.ddd.attendance.check.db.entity.User
 import com.ddd.attendance.check.ui.MainActivity
 import com.ddd.attendance.check.utill.SingleLiveEvent
diff --git a/app/src/main/java/com/ddd/attendance/check/vm/MainViewModel.kt b/app/src/main/java/com/ddd/attendance/check/vm/MainViewModel.kt
@@ -4,23 +4,37 @@ import androidx.databinding.ObservableField
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+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.UserRepository
+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.SingleLiveEvent
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import java.io.IOException
 import javax.inject.Inject
 
-class MainViewModel @Inject constructor(private val userRepository: UserRepository) : ViewModel() {
-
+class MainViewModel @Inject constructor(
+    private val userRepository: UserRepository,
+    private val attendanceRepository: AttendanceRepository
+) : ViewModel() {
 
     private val _isAdmin = MutableLiveData<Boolean>()
+    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 isAttendanceNumber: LiveData<Int> = _isAttendanceNumber
+    val isAttendanceStart: LiveData<Boolean> = _isAttendanceStart
     val editNumberAttendance = ObservableField<String>()
     val btnEnableAttendance: LiveData<Boolean> get() = _btnEnableLogin
-    val showDDDDialog = SingleLiveEvent<UserType>()
+    val showToastError: LiveData<String> get() = _showToastError
+
+    val showDDDDialog = SingleLiveEvent<Pair<UserType, String>>()
 
     fun onInputNumberTextChanged(input: CharSequence) {
         editNumberAttendance.set(input.toString())
@@ -48,10 +62,57 @@ class MainViewModel @Inject constructor(private val userRepository: UserReposito
     }
 
     fun attendance() {
+        GlobalScope.launch {
+            try {
+                if (isAdmin.value == true) {
+                    if (_isAttendanceStart.value == null || _isAttendanceStart.value == false) attendanceStart()
+                    else attendanceEnd()
+                } else attendanceCheck()
+            } catch (e: IOException) {
+                _showToastError.postValue(ERROR_MSG)
+            }
+        }
 
     }
 
-    fun showDDDDialog() {
+    private suspend fun attendanceStart() {
+        val response = attendanceRepository.attendanceStart()
+        if (response.isSuccessful) attendanceStartUI(response.body())
+        else _showToastError.postValue(response.body()?.message)
+    }
+
+    private suspend fun attendanceEnd() {
+        val response = attendanceRepository.attendsEnd()
+        if (response.isSuccessful) attendanceEndUI()
+        else _showToastError.postValue(response.body()?.message)
+    }
+
+    private fun attendanceStartUI(attendanceStart: Attendance?) {
+        attendanceStart?.let { result ->
+            if (result.status == NetworkHelper.SUCCESS) {
+                _isAttendanceNumber.postValue(result.number)
+                _isAttendanceStart.postValue(true)
+            }
+        }
+        showDDDDialog(MSG_ATTENDANCE_START)
+    }
+
+    private fun attendanceEndUI() {
+        _isAttendanceNumber.postValue(0)
+        _isAttendanceStart.postValue(false)
+        showDDDDialog(MSG_ATTENDANCE_END)
+    }
+
+    private fun attendanceCheck() {
+
+    }
+
+    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 = "출석체크가 종료되었습니다."
     }
 }
diff --git a/app/src/main/java/com/ddd/attendance/check/vm/SplashViewModel.kt b/app/src/main/java/com/ddd/attendance/check/vm/SplashViewModel.kt
@@ -2,7 +2,7 @@ package com.ddd.attendance.check.vm
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
-import com.ddd.attendance.check.data.UserRepository
+import com.ddd.attendance.check.data.repository.UserRepository
 import com.ddd.attendance.check.ui.LoginActivity
 import com.ddd.attendance.check.ui.MainActivity
 import com.ddd.attendance.check.utill.SingleLiveEvent
diff --git a/app/src/main/res/drawable/dialog_ddd_background_admin.xml b/app/src/main/res/drawable/dialog_ddd_background_admin.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <solid
+            android:color="@color/attendance_admin_dialog_color"/>
+    <corners android:radius="10dp"/>
+</shape>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
diff --git a/app/src/main/res/layout/dialog_ddd.xml b/app/src/main/res/layout/dialog_ddd.xml
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package com.ddd.attendance.check.data.source.attendance`
	`2`	`+`
	`3`	`+class AttendanceLocalDataSource`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+package com.ddd.attendance.check.data.source.login`
	`2`	`+`