d

app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "com.swago.app"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 1110
-        versionName "1.1.1.0"
+        versionCode 1120
+        versionName "1.1.2.0"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

baseswago/src/main/java/com/swago/baseswago/util/SwagoInfo.kt

@@ -15,6 +15,7 @@ object SwagoInfo {
 
     private var versionCode = ""
     private var languageCode = "en"
+    var languageId = 0
     private var appClient = "android"
     private var channel = "DDD01"
     private var imei = ""
@@ -25,21 +26,26 @@ object SwagoInfo {
 
     fun getLanguageCode(): String {
         val language = Locale.getDefault().language
-        languageCode = when (language) {
+        when (language) {
             "en" -> {
-                "en"
+                languageCode = "en"
+                languageId = 2
             }
             "in" -> {
-                "id"
+                languageCode = "id"
+                languageId = 3
             }
             "ms" -> {
-                "ms"
+                languageCode = "ms"
+                languageId = 4
             }
             "ar" -> {
-                "ar"
+                languageCode = "ar"
+                languageId = 5
             }
             else -> {
-                "en"
+                languageCode = "en"
+                languageId = 2
             }
         }
         return languageCode

home/src/main/java/com/swago/home/innerhome/HotFragment.kt

@@ -21,6 +21,7 @@ import com.swago.baseswago.model.BlackListModel
 import com.swago.baseswago.model.MomentModel
 import com.swago.baseswago.model.home.BannerModel
 import com.swago.baseswago.model.home.HomeModel
+import com.swago.baseswago.util.SwagoInfo
 import com.swago.home.databinding.FragmentHotBinding
 import com.swago.home.databinding.LayoutViewHeaderBinding
 import com.youth.banner.Banner
@@ -74,13 +75,14 @@ class HotFragment : BaseListFragment<FragmentHotBinding, MomentModel>() {
                     val labelAdapter = LabelAdapter()
                     binding.rvLabel.layoutManager = LinearLayoutManager(context,RecyclerView.HORIZONTAL,false)
                     binding.rvLabel.adapter = labelAdapter
-                    it.language_lables?.let { list ->
-                        list[0].isSelected = true
-                        labelValue = list[0].id
-                        selectedPosition = 0
-                        labelAdapter.setNewData(list)
+                    it.language_lables?.forEachIndexed { index, label ->
+                        if (SwagoInfo.languageId==label.id){
+                            label.isSelected = true
+                            labelValue = label.id
+                            selectedPosition = index
+                        }
                     }
-
+                    labelAdapter.setNewData(it.language_lables)
 
                     labelAdapter.setOnItemClickListener { _, _, position ->
                         labelAdapter.data[selectedPosition].isSelected = false

home/src/main/java/com/swago/home/innerhome/NewFragment.kt

@@ -13,6 +13,7 @@ import com.swago.baseswago.fragment.BaseListFragment
 import com.swago.baseswago.fragment.BaseXFragment
 import com.swago.baseswago.model.MomentModel
 import com.swago.baseswago.model.home.HomeModel
+import com.swago.baseswago.util.SwagoInfo
 import com.swago.home.databinding.FragmentHotBinding
 import com.swago.home.databinding.FragmentNewBinding
 
@@ -52,12 +53,14 @@ class NewFragment  : BaseListFragment<FragmentHotBinding, MomentModel>(){
                     val labelAdapter = LabelAdapter()
                     binding.rvLabel.layoutManager = LinearLayoutManager(context,RecyclerView.HORIZONTAL,false)
                     binding.rvLabel.adapter = labelAdapter
-                    it.language_lables?.let { list ->
-                        list[0].isSelected = true
-                        labelValue = list[0].id
-                        selectedPosition = 0
-                        labelAdapter.setNewData(list)
+                    it.language_lables?.forEachIndexed { index, label ->
+                        if (SwagoInfo.languageId==label.id){
+                            label.isSelected = true
+                            labelValue = label.id
+                            selectedPosition = index
+                        }
                     }
+                    labelAdapter.setNewData(it.language_lables)
 
 
                     labelAdapter.setOnItemClickListener { _, _, position ->