[Release] 1.1.9 (11) (#175)

* fix: 메뉴 리스트가 비었으면 식당 아이템 자체를 빼버림

* version: 1.1.9(11)

* setting: timber

* fix: 앱 업데이트 로직을 변경

버전 네임 -> 버전 코드

* Revert "version: 1.1.9(11)"

This reverts commit c393543.

* version: 1.1.9

app/build.gradle

@@ -22,8 +22,8 @@ android {
         minSdk 23
         compileSdkVersion 34
         targetSdk 34
-        versionCode 10
-        versionName "1.1.8"
+        versionCode 11
+        versionName "1.1.9"
 
 
         buildConfigField "String", "BASE_URL", properties["BASE_URL"]
@@ -125,6 +125,9 @@ dependencies {
     implementation platform('com.google.firebase:firebase-bom:32.2.2')
     implementation 'com.google.firebase:firebase-analytics-ktx'
     implementation 'com.google.firebase:firebase-crashlytics'
+
+    //Timer
+    implementation "com.jakewharton.timber:timber:5.0.1"
 }
 
 kapt {

app/src/main/java/com/eatssu/android/App.kt

@@ -5,22 +5,21 @@ import android.content.Context
 import com.google.firebase.FirebaseApp
 import com.kakao.sdk.common.KakaoSdk
 import dagger.hilt.android.HiltAndroidApp
+import timber.log.Timber
 
 @HiltAndroidApp
 class App: Application() {
     companion object{
         lateinit var appContext : Context
-//        lateinit var token_prefs : TokenSharedPreferences
     }
 
     override fun onCreate() {
         super.onCreate()
         FirebaseApp.initializeApp(this)
 
-//        token_prefs = TokenSharedPreferences(applicationContext)
-
         appContext = this
         KakaoSdk.init(this,BuildConfig.KAKAO_NATIVE_APP_KEY)
 
+        Timber.plant(Timber.DebugTree())
     }
 }

app/src/main/java/com/eatssu/android/data/repository/FirebaseRemoteConfigRepository.kt

@@ -1,13 +1,13 @@
 package com.eatssu.android.data.repository
 
-import android.util.Log
 import com.eatssu.android.R
 import com.eatssu.android.data.model.AndroidMessage
 import com.eatssu.android.data.model.RestaurantInfo
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings
 import com.google.gson.Gson
 import org.json.JSONArray
+import timber.log.Timber
 
 class FirebaseRemoteConfigRepository {
     private val instance = FirebaseRemoteConfig.getInstance()
@@ -23,10 +23,10 @@ class FirebaseRemoteConfigRepository {
         // Set the default values locally
         instance.fetchAndActivate().addOnCompleteListener { task ->
             if (task.isSuccessful) {
-                Log.d("FirebaseRemoteConfigRepository", "fetchAndActivate 성공")
+                Timber.d("fetchAndActivate 성공")
             } else {
                 // Handle error
-                Log.d("FirebaseRemoteConfigRepository", "fetchAndActivate error")
+                Timber.d("fetchAndActivate error")
                 instance.setDefaultsAsync(R.xml.firebase_remote_config)
 //                throw RuntimeException("fetchAndActivate 실패")
             }
@@ -53,6 +53,10 @@ class FirebaseRemoteConfigRepository {
         return instance.getString("app_version")
     }
 
+    fun getVersionCode(): Long {
+        return instance.getLong("android_version_code")
+    }
+
     fun getCafeteriaInfo(): ArrayList<RestaurantInfo> {
         return parsingJson(instance.getString("cafeteria_info"))
     }
@@ -70,7 +74,7 @@ class FirebaseRemoteConfigRepository {
             val etc = jsonObject.optString("etc", "")
 
             val restaurantInfo = RestaurantInfo(name, location, time, etc)
-            Log.d("FirebaseRemoteConfigRepository", restaurantInfo.toString())
+            Timber.d(restaurantInfo.toString())
             list.add(restaurantInfo)
         }
         return list

app/src/main/java/com/eatssu/android/ui/common/VersionViewModel.kt

@@ -1,9 +1,10 @@
 package com.eatssu.android.ui.common
 
 import androidx.lifecycle.ViewModel
-import com.eatssu.android.BuildConfig.VERSION_NAME
+import com.eatssu.android.BuildConfig.VERSION_CODE
 import com.eatssu.android.data.model.AndroidMessage
 import com.eatssu.android.data.repository.FirebaseRemoteConfigRepository
+import timber.log.Timber
 
 class VersionViewModel(private val repository: FirebaseRemoteConfigRepository) : ViewModel() {
 
@@ -13,14 +14,30 @@ class VersionViewModel(private val repository: FirebaseRemoteConfigRepository) :
     }
 
     fun checkForceUpdate(): Boolean {
-        val lastVersion = checkAppVersion()
-        return VERSION_NAME != lastVersion && repository.getForceUpdate()
+
+        val versionCode = checkVersionCode() //얘가 파이어베이스에 있는 최신 버전
+        val thisCheckVersionCode = VERSION_CODE
+
+        Timber.d("앱의 versionCode는 " + thisCheckVersionCode + " 배포된 최신 버전은 " + versionCode)
+
+        if (thisCheckVersionCode < versionCode) { //배포된 버전이 크면 강제 업데이트
+            Timber.d("강제업데이트")
+            return true
+        } else if (thisCheckVersionCode >= versionCode) { //이 버전이 더 크거나 같으면 강제 업데이트 할 필요 x
+            Timber.d("업데이트 패스~")
+            return false
+        }
+        return false
     }
 
     fun checkAppVersion(): String {
         return repository.getAppVersion()
     }
 
+    fun checkVersionCode(): Long {
+        return repository.getVersionCode()
+    }
+
     fun checkAndroidMessage(): AndroidMessage {
         return repository.getAndroidMessage()
     }

app/src/main/java/com/eatssu/android/ui/main/menu/MenuFragment.kt

@@ -83,7 +83,7 @@ class MenuFragment : Fragment() {
     }
 
     @RequiresApi(Build.VERSION_CODES.O)
-    fun observeViewModel(){
+    fun observeViewModel() {
         menuService = RetrofitImpl.retrofit.create(MenuService::class.java)
         mealService = RetrofitImpl.retrofit.create(MealService::class.java)
 
@@ -108,7 +108,8 @@ class MenuFragment : Fragment() {
         // ViewModel에서 데이터 가져오기
         calendarViewModel.getData().observe(viewLifecycleOwner) { dataReceived ->
 
-            val parsedDate = LocalDate.parse(dataReceived.toString(), DateTimeFormatter.ofPattern("yyyy-MM-dd"))
+            val parsedDate =
+                LocalDate.parse(dataReceived.toString(), DateTimeFormatter.ofPattern("yyyy-MM-dd"))
             menuDate = parsedDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"))
 
             // Assuming menuDate is a String in the format "yyyyMMdd"
@@ -122,30 +123,37 @@ class MenuFragment : Fragment() {
                 //푸드코트
                 menuViewModel.loadFixedMenu(Restaurant.FOOD_COURT)
                 menuViewModel.fixedMenuDataFood.observe(viewLifecycleOwner) { result ->
-                    totalMenuList.add(
-                        Section(
-                            MenuType.FIXED,
-                            Restaurant.FOOD_COURT,
-                            result.mapFixedMenuResponseToMenu()
+                    if (result.mapFixedMenuResponseToMenu().isNotEmpty()) {
+                        Log.d("menu", result.categoryMenuListCollection.toString())
+                        totalMenuList.add(
+                            Section(
+                                MenuType.FIXED,
+                                Restaurant.FOOD_COURT,
+                                result.mapFixedMenuResponseToMenu()
+                            )
                         )
-                    )
+                    }
                     foodCourtDataLoaded.value = true
                     checkDataLoaded()
+//
                 }
 
                 //스낵코너
                 menuViewModel.loadFixedMenu(Restaurant.SNACK_CORNER)
                 menuViewModel.fixedMenuDataSnack.observe(viewLifecycleOwner) { result ->
-                    totalMenuList.add(
-                        Section(
-                            MenuType.FIXED,
-                            Restaurant.SNACK_CORNER,
-                            result.mapFixedMenuResponseToMenu()
+                    if (result.mapFixedMenuResponseToMenu().isNotEmpty()) {
+                        totalMenuList.add(
+                            Section(
+                                MenuType.FIXED,
+                                Restaurant.SNACK_CORNER,
+                                result.mapFixedMenuResponseToMenu()
+                            )
                         )
-                    )
+                    }
                     snackCornerDataLoaded.value = true
                     checkDataLoaded()
                 }
+
                 Log.d("MenuFragment", "The date $menuDate is not on a weekend.")
             }
 
@@ -157,14 +165,13 @@ class MenuFragment : Fragment() {
                 Log.d("MenuFragment", "The date $menuDate is not on a weekend.")
             }
 
-            if(time!= Time.LUNCH){
+            if (time != Time.LUNCH) {
                 foodCourtDataLoaded.value = true //푸드코트
                 snackCornerDataLoaded.value = true //스낵코너
                 checkDataLoaded()
             }
 
 
-
             //학생식당
             menuViewModel.loadTodayMeal(menuDate, Restaurant.HAKSIK, time)
             menuViewModel.todayMealDataHaksik.observe(viewLifecycleOwner) { result ->

app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt

@@ -3,7 +3,6 @@ package com.eatssu.android.ui.mypage
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.util.Log
 import androidx.activity.viewModels
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.ViewModelProvider
@@ -25,6 +24,7 @@ import com.eatssu.android.util.extension.startActivity
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
+import timber.log.Timber
 
 @AndroidEntryPoint
 class MyPageActivity : BaseActivity<ActivityMyPageBinding>(ActivityMyPageBinding::inflate) {
@@ -100,13 +100,13 @@ class MyPageActivity : BaseActivity<ActivityMyPageBinding>(ActivityMyPageBinding
     }
 
     private fun setData() {
-        binding.tvAppVersion.text = BuildConfig.VERSION_NAME
-        binding.tvStoreAppVersion.text = versionViewModel.checkAppVersion()
+        binding.tvAppVersion.text = BuildConfig.VERSION_NAME + " (" + BuildConfig.VERSION_CODE + ")"
+        binding.tvStoreAppVersion.text = versionViewModel.checkVersionCode().toString()
 
         myPageViewModel.getMyInfo()
 
         lifecycleScope.launch {
-            Log.d(TAG, "관찰시작")
+            Timber.d("관찰시작")
             myPageViewModel.uiState.collectLatest {
                 if (!it.error && !it.loading) {
                     binding.tvNickname.text = it.nickname
@@ -202,8 +202,4 @@ class MyPageActivity : BaseActivity<ActivityMyPageBinding>(ActivityMyPageBinding
             )
         }
     }
-
-    companion object {
-        val TAG = "MyPageActivity"
-    }
 }

app/src/main/res/xml/firebase_remote_config.xml

@@ -4,6 +4,10 @@
         <key>force_update_required</key>
         <value>false</value>
     </entry>
+    <entry>
+        <key>android_version_code</key>
+        <value>1</value>
+    </entry>
     <entry>
         <key>latest_app_version</key>
         <value>1.0.0</value>