commit

app/src/dev/java/com/khmer9/yuki/config/Config.kt

@@ -1,28 +1,59 @@
 package com.khmer9.wa855main.config
 
 object Config {
-    const val BASE_URL = "http://playerapi.cf2888.net"
+    const val BASE_URL = "http://143.198.207.249:30101"
     const val SOCKET_URL = ""
 
     const val MAIN_PACKAGE = "com.khmer9.wa855main"
 
-    const val YUKI_APP_ID = "630478c22983a591133f0492"
+    const val YUKI_APP_ID = "62dfdfb85ef1fb28515a1a72"
+    const val YUKI_APP_NAME = "Yuki"
     const val YUKI_DOWNLOAD = ""
     const val YUKI_PACKAGE = "com.khmer9.yuki"
 
-    const val LOTTO_APP_ID = "630780f0f635dd035329f5b7"
+    const val LOTTO_APP_ID = "62e48485abc48561de3a470f"
+    const val LOTTO_APP_NAME = "EE7777"
     const val LOTTO_DOWNLOAD = ""
     const val LOTTO_PACKAGE = "com.khmer9.lotto"
 
-    const val LOTTO_PLUS_APP_ID = "62e397edae71cfa8782aa3a0"
+    const val LOTTO_PLUS_APP_ID = "62dfe1d65ef1fb28515a1a75"
+    const val LOTTO_PLUS_APP_NAME = "PP78"
     const val LOTTO_PLUS_DOWNLOAD = ""
     const val LOTTO_PLUS_PACKAGE = "com.sambath.lottoplus"
 
     const val COCK_FIGHT_APP_ID = "631c17831da02749e7e23f35"
     const val COCK_FIGHT_DOWNLOAD = ""
     const val COCK_FIGHT_PACKAGE = "com.sambath.sbc"
+    const val COCK_APP_NAME = "CockFight"
+
+    const val MACHINE_APP_ID = "62dfdf6b5ef1fb28515a1a70"
+    const val MACHINE_APP_NAME = "Machine Game"
+
+    const val KD855_APP_ID = "6352aa5ebe6f42032c160bed"
+    const val KD855_APP_NAME = "KD855 Casino Online"
 
     const val APONG_APP_ID = "631c1d1a0d213229fc5fd11a"
+    const val APONG_APP_NAME = "Apong"
     const val APONG_DOWNLOAD = ""
     const val APONG_PACKAGE = "com.sambath.apong"
+
+    const val CARD_APP_ID = "6352aa5ebe6f42032c160bed"
+    const val CARD_APP_NAME = "Card"
+    const val CARD_DOWNLOAD = ""
+    const val CARD_PACKAGE = ""
+
+    const val SNK_APP_ID = "6352aa81be6f4281bc160bfc"
+    const val SNK_APP_NAME = "SNK Online"
+    const val SNK_DOWNLOAD = ""
+    const val SNK_PACKAGE = ""
+
+    const val RAT_APP_ID = "6352aa5ebe6f42032c160bed"
+    const val RAT_APP_NAME = "Rat"
+    const val RAT_DOWNLOAD = ""
+    const val RAT_PACKAGE = ""
+
+    const val Klaklouk_APP_ID = "6371f53073798150886bc23b"
+    const val Klaklouk_APP_NAME = "Klaklouk"
+    const val Klaklouk_DOWNLOAD = ""
+    const val Klaklouk_PACKAGE = ""
 }

app/src/main/java/com/khmer9/wa855main/adapter/MainModuleAdapter.kt

@@ -8,7 +8,7 @@ import com.khmer9.wa855main.R
 import com.khmer9.wa855main.screen.main.MainModuleViewHolder
 
 class MainModuleAdapter : BaseListAdapter() {
-    var detailButtonListener: ((String, String, Int) -> Unit)? = null
+    var detailButtonListener: ((String, String, Int, Boolean) -> Unit)? = null
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return MainModuleViewHolder(

app/src/main/java/com/khmer9/wa855main/app/ShareViewModel.kt

@@ -281,7 +281,7 @@ class ShareViewModel(
                 .subscribe({ response ->
                     if (response.resultCode == "1") {
                         response.data?.let {
-                            val sortedList = it.sortedWith(compareBy { it.order })
+                            val sortedList = it
                             subModuleState.value = prevSubModule().copy(
                                 isProgress = false,
                                 resultList = sortedList,

app/src/main/java/com/khmer9/wa855main/remote/MainModuleDataModel.kt

@@ -39,6 +39,9 @@ data class ModuleData(
     @Json(name = "large_icon")
     val largeIcon: String,
 
+    @Json(name = "coming_soon")
+    val comingSoon: Boolean,
+
     @Json(name = "small_icon")
     val smallIcon: String,
 

app/src/main/java/com/khmer9/wa855main/remote/SubModuleDataModel.kt

@@ -30,9 +30,6 @@ data class SubModuleData(
     @Json(name = "_id")
     val id: String,
 
-    @Json(name = "order")
-    val order: Int,
-
     @Json(name = "is_enable")
     val isEnable: Boolean,
 

app/src/main/java/com/khmer9/wa855main/screen/main/MainFragment.kt

@@ -180,60 +180,64 @@ class MainFragment : BaseFragment(R.layout.layout_fragment_main_yuki) {
             recyclerView.layoutManager = LinearLayoutManager(context)
             recyclerView.adapter = adapter
 
-            adapter.detailButtonListener = { id, appId, sub ->
+            adapter.detailButtonListener = { id, appId, sub, comingSoon ->
                 if (!id.isNullOrEmpty()) {
                     Log.d("MainModuleClick", id + "-" + appId + "-" + sub)
-                    if (sub > 1) {
-                        (requireActivity() as ShareActivity).apply {
-                            supportFragmentManager.beginTransaction()
-                                .setCustomAnimations(
-                                    R.anim.slide_in,
-                                    R.anim.slide_out,
-                                    R.anim.slide_in_exit,
-                                    R.anim.slide_out_exit
-                                )
-                                .add(R.id.container, SubModuleFragment().apply {
-                                    arguments = Bundle().apply {
-                                        putString("module_id", id)
-                                    }
-                                })
-                                .addToBackStack("MainFragment")
-                                .commit()
-                        }
+                    if (comingSoon) {
+                        Toast.makeText(context, "Coming Soon", Toast.LENGTH_LONG).show()
                     } else {
-                        when (appId) {
-                            Config.YUKI_APP_ID -> {
-                                (requireActivity() as ShareActivity).apply {
-                                    val launchIntent = packageManager.getLaunchIntentForPackage(Config.YUKI_PACKAGE)
-                                    if (launchIntent != null) {
-                                        //launch
-                                        shareViewModel.getModuleToken(appId, launchIntent)
-                                    } else {
-                                        //installed
-                                        shareViewModel.getModuleToken(appId, null)
-                                        //doDownload(YUKI_DOWNLOAD)
+                        if (sub > 1) {
+                            (requireActivity() as ShareActivity).apply {
+                                supportFragmentManager.beginTransaction()
+                                    .setCustomAnimations(
+                                        R.anim.slide_in,
+                                        R.anim.slide_out,
+                                        R.anim.slide_in_exit,
+                                        R.anim.slide_out_exit
+                                    )
+                                    .add(R.id.container, SubModuleFragment().apply {
+                                        arguments = Bundle().apply {
+                                            putString("module_id", id)
+                                        }
+                                    })
+                                    .addToBackStack("MainFragment")
+                                    .commit()
+                            }
+                        } else {
+                            when (appId) {
+                                Config.YUKI_APP_ID -> {
+                                    (requireActivity() as ShareActivity).apply {
+                                        val launchIntent = packageManager.getLaunchIntentForPackage(Config.YUKI_PACKAGE)
+                                        if (launchIntent != null) {
+                                            //launch
+                                            shareViewModel.getModuleToken(appId, launchIntent)
+                                        } else {
+                                            //installed
+                                            shareViewModel.getModuleToken(appId, null)
+                                            //doDownload(YUKI_DOWNLOAD)
+                                        }
                                     }
                                 }
-                            }
-                            Config.COCK_FIGHT_APP_ID -> {
-                                (requireActivity() as ShareActivity).apply {
-                                    val launchIntent = packageManager.getLaunchIntentForPackage(Config.COCK_FIGHT_PACKAGE)
-                                    if (launchIntent != null) {
-                                        shareViewModel.getModuleToken(appId, launchIntent)
-                                    } else {
-                                        //doDownload(COCK_FIGHT_DOWNLOAD)
-                                        shareViewModel.getModuleToken(appId, null)
+                                Config.COCK_FIGHT_APP_ID -> {
+                                    (requireActivity() as ShareActivity).apply {
+                                        val launchIntent = packageManager.getLaunchIntentForPackage(Config.COCK_FIGHT_PACKAGE)
+                                        if (launchIntent != null) {
+                                            shareViewModel.getModuleToken(appId, launchIntent)
+                                        } else {
+                                            //doDownload(COCK_FIGHT_DOWNLOAD)
+                                            shareViewModel.getModuleToken(appId, null)
+                                        }
                                     }
                                 }
-                            }
-                            Config.APONG_APP_ID -> {
-                                (requireActivity() as ShareActivity).apply {
-                                    val launchIntent = packageManager.getLaunchIntentForPackage(Config.APONG_PACKAGE)
-                                    if (launchIntent != null) {
-                                        shareViewModel.getModuleToken(appId, launchIntent)
-                                    } else {
-                                        //doDownload(APONG_DOWNLOAD)
-                                        shareViewModel.getModuleToken(appId, null)
+                                Config.APONG_APP_ID -> {
+                                    (requireActivity() as ShareActivity).apply {
+                                        val launchIntent = packageManager.getLaunchIntentForPackage(Config.APONG_PACKAGE)
+                                        if (launchIntent != null) {
+                                            shareViewModel.getModuleToken(appId, launchIntent)
+                                        } else {
+                                            //doDownload(APONG_DOWNLOAD)
+                                            shareViewModel.getModuleToken(appId, null)
+                                        }
                                     }
                                 }
                             }

app/src/main/java/com/khmer9/wa855main/screen/main/MainModuleViewHolder.kt

@@ -15,7 +15,7 @@ import com.khmer9.wa855main.remote.ModuleData
 import com.khmer9.wa855main.remote.SubModuleData
 import com.squareup.picasso.Picasso
 
-class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((String, String, Int) -> Unit)? = null) : BaseListViewHolder(itemView) {
+class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((String, String, Int, Boolean) -> Unit)? = null) : BaseListViewHolder(itemView) {
     private val picasso = Picasso.get()
 
     override fun bindView(item: BaseListItem) {
@@ -45,20 +45,8 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
                 imgIcon.layoutParams.height = height.toInt()
                 imgIcon.layoutParams.width = height.toInt()
 
-                when (item.appId) {
-                    Config.LOTTO_APP_ID -> {
-                        picasso
-                            .load(R.drawable.ic_lotto_80)
-                            .placeholder(R.drawable.ic_lotto_80)
-                            .into(imgIcon)
-                    }
-                    Config.LOTTO_PLUS_APP_ID -> {
-                        picasso
-                            .load(R.drawable.ic_lotto_plus)
-                            .placeholder(R.drawable.animal_seven)
-                            .into(imgIcon)
-                    }
-                    Config.COCK_FIGHT_APP_ID -> {
+                when (item.name.trim().toLowerCase()) {
+                    Config.COCK_APP_NAME.trim().toLowerCase() -> {
                         picasso
                             .load(R.drawable.ic_logo_cock)
                             .placeholder(R.drawable.animal_seven)
@@ -66,38 +54,31 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
 
                         backgroundModule.setBackgroundResource(R.drawable.chickenbg)
                     }
-                    Config.YUKI_APP_ID -> {
+                    Config.MACHINE_APP_NAME.trim().toLowerCase() -> {
                         picasso
-                            .load(R.drawable.ic_yuki)
-                            .placeholder(R.drawable.animal_seven)
-                            .into(imgIcon)
-
-                        backgroundModule.setBackgroundResource(R.drawable.yukibg)
-                    }
-                    Config.APONG_APP_ID -> {
-                        picasso
-                            .load(R.drawable.ic_apong)
-                            .placeholder(R.drawable.animal_seven)
+                            .load(R.drawable.ic_lotto_main)
+                            .placeholder(R.drawable.ic_lotto_80)
                             .into(imgIcon)
 
-                        backgroundModule.setBackgroundResource(R.drawable.apongbg)
+                        backgroundModule.setBackgroundResource(R.drawable.lottobg)
                     }
-                    Config.CARD_APP_ID -> {
+                    Config.KD855_APP_NAME.trim().toLowerCase() -> {
                         picasso
                             .load(R.drawable.ic_card)
                             .placeholder(R.drawable.ic_card)
                             .into(imgIcon)
 
-                        backgroundModule.setBackgroundResource(R.drawable.bg_card)
+                        backgroundModule.setBackgroundResource(R.drawable.bg22)
                     }
-                    Config.SNK_APP_ID -> {
+                    Config.SNK_APP_NAME.trim().toLowerCase() -> {
                         picasso
                             .load(R.drawable.ic_snk)
-                            .placeholder(R.drawable.ic_card)
+                            .placeholder(R.drawable.ic_snk)
                             .into(imgIcon)
 
-                        backgroundModule.setBackgroundResource(R.drawable.bg_snk)
+                        backgroundModule.setBackgroundResource(R.drawable.bg11)
                     }
+
                     else -> {
                         picasso
                             .load(R.drawable.ic_lotto_main)
@@ -112,7 +93,7 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
 
             itemModule.setSafeOnClickListener {
                 it.btnClick().subscribe {
-                    detailButtonListener?.invoke(item.id, item.appId, item.numberSub)
+                    detailButtonListener?.invoke(item.id, item.appId, item.numberSub, item.comingSoon)
                 }
             }
         } else if (item is SubModuleData) {
@@ -136,8 +117,8 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
             imgIcon.layoutParams.width = height.toInt()
 
             try {
-                when (item.appId) {
-                    Config.LOTTO_APP_ID -> {
+                when (item.name.trim().toLowerCase()) {
+                    Config.LOTTO_APP_NAME.trim().toLowerCase() -> {
                         picasso
                             .load(R.drawable.ic_lotto_80)
                             .placeholder(R.drawable.ic_lotto_80)
@@ -145,7 +126,7 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
 
                         backgroundModule.setBackgroundResource(R.drawable.lottobg)
                     }
-                    Config.LOTTO_PLUS_APP_ID -> {
+                    Config.LOTTO_PLUS_APP_NAME.trim().toLowerCase() -> {
                         picasso
                             .load(R.drawable.ic_lotto_plus)
                             .placeholder(R.drawable.ic_lotto_plus)
@@ -153,7 +134,7 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
 
                         backgroundModule.setBackgroundResource(R.drawable.lottobg)
                     }
-                    Config.YUKI_APP_ID -> {
+                    Config.YUKI_APP_NAME.trim().toLowerCase() -> {
                         picasso
                             .load(R.drawable.ic_yuki)
                             .placeholder(R.drawable.ic_yuki)
@@ -161,7 +142,7 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
 
                         backgroundModule.setBackgroundResource(R.drawable.yukibg)
                     }
-                    Config.APONG_APP_ID -> {
+                    Config.APONG_APP_NAME.trim().toLowerCase() -> {
                         picasso
                             .load(R.drawable.ic_apong)
                             .placeholder(R.drawable.ic_apong)
@@ -170,13 +151,29 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
                         backgroundModule.setBackgroundResource(R.drawable.apongbg)
                     }
 
-                    Config.CARD_APP_ID -> {
+                    Config.CARD_APP_NAME.trim().toLowerCase() -> {
                         picasso
                             .load(R.drawable.ic_card)
                             .placeholder(R.drawable.ic_card)
                             .into(imgIcon)
 
-                        backgroundModule.setBackgroundResource(R.drawable.bg_card)
+                        backgroundModule.setBackgroundResource(R.drawable.bg22)
+                    }
+                    Config.RAT_APP_NAME.trim().toLowerCase() -> {
+                        picasso
+                            .load(R.drawable.ic_snk)
+                            .placeholder(R.drawable.ic_snk)
+                            .into(imgIcon)
+
+                        backgroundModule.setBackgroundResource(R.drawable.bg11)
+                    }
+                    Config.Klaklouk_APP_NAME.trim().toLowerCase() -> {
+                        picasso
+                            .load(R.drawable.ic_snk)
+                            .placeholder(R.drawable.ic_snk)
+                            .into(imgIcon)
+
+                        backgroundModule.setBackgroundResource(R.drawable.bg11)
                     }
                     else -> {
                         picasso
@@ -190,7 +187,7 @@ class MainModuleViewHolder(itemView: View, private val detailButtonListener: ((S
 
             itemModule.setSafeOnClickListener {
                 it.btnClick().subscribe {
-                    detailButtonListener?.invoke(item.id, item.appId, 0)
+                    detailButtonListener?.invoke(item.id, item.appId, 0, false)
                 }
             }
         }

app/src/main/java/com/khmer9/wa855main/screen/main/SubModuleFragment.kt

@@ -65,7 +65,7 @@ class SubModuleFragment : BaseFragment(R.layout.layout_sub_module) {
             recyclerView.layoutManager = LinearLayoutManager(context)
             recyclerView.adapter = adapter
 
-            adapter.detailButtonListener = { id, appId, sub ->
+            adapter.detailButtonListener = { id, appId, sub, comingSoon ->
                 if (!id.isNullOrEmpty()) {
                     Log.d("SubModuleClick", id + "-" + appId + "-" + sub)
                     when (appId) {

app/src/prod/java/com/khmer9/lotto/config/Config.kt

@@ -6,31 +6,54 @@ object Config {
 
     const val MAIN_PACKAGE = "com.khmer9.wa855main"
 
-    const val LOTTO_PLUS_APP_ID = "635fda1c1142ebf1754ad671"
-    const val LOTTO_PLUS_DOWNLOAD = "https://www.dropbox.com/s/b0v8cnpvwymk0hf/Lottery-Mobile_prodDebug_1.0.30.apk?dl=1"
-    const val LOTTO_PLUS_PACKAGE = "com.sambath.lottoplus_wa855"
+    const val YUKI_APP_ID = "62dfdfb85ef1fb28515a1a72"
+    const val YUKI_APP_NAME = "Yuki"
+    const val YUKI_DOWNLOAD = ""
+    const val YUKI_PACKAGE = "com.khmer9.yuki"
 
-    const val LOTTO_APP_ID = "635fd6aad3d45ee768d7448b"
-    const val LOTTO_DOWNLOAD = "https://www.dropbox.com/s/ebboak0h8dbdpk9/Khmer9_Lotto_prodDebug_1.0.4.apk?dl=1"
-    const val LOTTO_PACKAGE = "com.khmer9.lotto_wa855"
+    const val LOTTO_APP_ID = "62e48485abc48561de3a470f"
+    const val LOTTO_APP_NAME = "EE7777"
+    const val LOTTO_DOWNLOAD = ""
+    const val LOTTO_PACKAGE = "com.khmer9.lotto"
 
-    const val APONG_APP_ID = "631c1d1a0d213229fc5fd11a"
-    const val APONG_DOWNLOAD = "https://www.dropbox.com/s/htgzyuc0mv04w7s/APONG_prodDebug_1.0.12.apk?dl=1"
-    const val APONG_PACKAGE = "com.sambath.apong_wa855"
+    const val LOTTO_PLUS_APP_ID = "62dfe1d65ef1fb28515a1a75"
+    const val LOTTO_PLUS_APP_NAME = "PP78"
+    const val LOTTO_PLUS_DOWNLOAD = ""
+    const val LOTTO_PLUS_PACKAGE = "com.sambath.lottoplus"
+
+    const val COCK_FIGHT_APP_ID = "631c17831da02749e7e23f35"
+    const val COCK_FIGHT_DOWNLOAD = ""
+    const val COCK_FIGHT_PACKAGE = "com.sambath.sbc"
+    const val COCK_APP_NAME = "CockFight"
+
+    const val MACHINE_APP_ID = "62dfdf6b5ef1fb28515a1a70"
+    const val MACHINE_APP_NAME = "Machine Game"
 
-    const val YUKI_APP_ID = "635fddba2d019b2f306a1109"
-    const val YUKI_DOWNLOAD = "https://www.dropbox.com/s/rf8v2ais27wom7x/Khmer9_Yuki_prodDebug_1.0.1.apk?dl=1"
-    const val YUKI_PACKAGE = "com.khmer9.yuki_wa855"
+    const val KD855_APP_ID = "6352aa5ebe6f42032c160bed"
+    const val KD855_APP_NAME = "KD855 Casino Online"
 
-    const val COCK_FIGHT_APP_ID = "635fd69d6511e264c7fa56e6"
-    const val COCK_FIGHT_DOWNLOAD = "https://www.dropbox.com/s/o3xvyuo2mnur8q5/SBC-Mobile_prodDebug_1.1.2.apk?dl=1"
-    const val COCK_FIGHT_PACKAGE = "com.sambath.sbc_wa855"
+    const val APONG_APP_ID = "631c1d1a0d213229fc5fd11a"
+    const val APONG_APP_NAME = "Apong"
+    const val APONG_DOWNLOAD = ""
+    const val APONG_PACKAGE = "com.sambath.apong"
 
-    const val CARD_APP_ID = "kd855"
+    const val CARD_APP_ID = "6352aa5ebe6f42032c160bed"
+    const val CARD_APP_NAME = "Card"
     const val CARD_DOWNLOAD = ""
     const val CARD_PACKAGE = ""
 
-    const val SNK_APP_ID = "snk"
+    const val SNK_APP_ID = "6352aa81be6f4281bc160bfc"
+    const val SNK_APP_NAME = "SNK Online"
     const val SNK_DOWNLOAD = ""
     const val SNK_PACKAGE = ""
+
+    const val RAT_APP_ID = "6352aa5ebe6f42032c160bed"
+    const val RAT_APP_NAME = "Card"
+    const val RAT_DOWNLOAD = ""
+    const val RAT_PACKAGE = ""
+
+    const val Klaklouk_APP_ID = "6371f53073798150886bc23b"
+    const val Klaklouk_APP_NAME = "Klaklouk"
+    const val Klaklouk_DOWNLOAD = ""
+    const val Klaklouk_PACKAGE = ""
 }