+ WA888 change UI Main in progress

app/src/main/java/com/khmer9/sbcmain/app/DownloadController.kt

@@ -14,7 +14,7 @@ import com.khmer9.sbcmain.R
 import java.io.File
 
 
-class DownloadController(private val context: Context, private val url: String) {
+class DownloadController(private val context: Context, private val url: String, private val token: String? = null) {
     companion object {
         private const val FILE_NAME = "SampleDownloadApp.apk"
         private const val FILE_BASE_PATH = "file://"
@@ -66,8 +66,13 @@ class DownloadController(private val context: Context, private val url: String)
                     install.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
                     install.putExtra(Intent.EXTRA_NOT_UNKNOWN_SOURCE, true)
                     install.data = contentUri
+                    install.putExtra("token", token)
+                    Toast.makeText(context, "ដោនឡូតបានជោគជ័យ", Toast.LENGTH_LONG).show()
                     context.startActivity(install)
                     context.unregisterReceiver(this)
+                    (context as ShareActivity).apply {
+                        finish()
+                    }
                     // finish()
                 } else {
                     val install = Intent(Intent.ACTION_VIEW)
@@ -76,8 +81,13 @@ class DownloadController(private val context: Context, private val url: String)
                         uri,
                         APP_INSTALL_PATH
                     )
+                    install.putExtra("token", token)
+                    Toast.makeText(context, "ដោនឡូតបានជោគជ័យ", Toast.LENGTH_LONG).show()
                     context.startActivity(install)
                     context.unregisterReceiver(this)
+                    (context as ShareActivity).apply {
+                        finish()
+                    }
                     // finish()
                 }
             }

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

@@ -263,11 +263,11 @@ class ShareViewModel(
         )
     }
 
-    fun getModuleToken(invoiceNum: String, moduleIntent: Intent? = null) {
+    fun getModuleToken(appId: String, moduleIntent: Intent? = null) {
         if (_stateToken.value!!.isProgress) return
         _stateToken.value = prev().copy(isProgress = true)
         disposables.add(
-            apiService.getToken(invoiceNum)
+            apiService.getToken(appId)
                 .timeout(60, TimeUnit.SECONDS)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -277,7 +277,8 @@ class ShareViewModel(
                             isProgress = false,
                             error = null,
                             tokenData = it.data,
-                            intent = moduleIntent
+                            intent = moduleIntent,
+                            appId = appId
                         )
                     } else {
                         _stateToken.value =

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

@@ -35,19 +35,19 @@ class MainFragment : BaseFragment(R.layout.layout_fragment_main_yuki) {
     private val YUKI_DOWNLOAD = "https://www.dropbox.com/s/uzvfo7jahmcl8pe/Khmer9_Yuki_devDebug_1.0.1-dev.apk?dl=1"
     private val YUKI_PACKAGE = "com.khmer9.yuki"
 
-    private val LOTTO_APP_ID = ""
-    private val LOTTO_DOWNLOAD = ""
-    private val LOTTO_PACKAGE = ""
+    private val LOTTO_APP_ID = "630780f0f635dd035329f5b7"
+    private val LOTTO_DOWNLOAD = "https://www.dropbox.com/s/j3h5d3bjp91nsmr/Khmer9_Lotto_devDebug_1.0.3-dev.apk?dl=1"
+    private val LOTTO_PACKAGE = "com.khmer9.lotto"
 
-    private val LOTTO_PLUS_APP_ID = ""
-    private val LOTTO_PLUS_DOWNLOAD = ""
-    private val LOTTO_PLUS_PACKAGE = ""
+    private val LOTTO_PLUS_APP_ID = "62e397edae71cfa8782aa3a0"
+    private val LOTTO_PLUS_DOWNLOAD = "https://www.dropbox.com/s/3rz6v50tjn6f2jg/Lottery-Mobile_devDebug_1.0.30-dev.apk?dl=1"
+    private val LOTTO_PLUS_PACKAGE = "com.sambath.sbc"
 
-    private val COCK_FIGHT_APP_ID = ""
+    private val COCK_FIGHT_APP_ID = "631c17831da02749e7e23f35"
     private val COCK_FIGHT_DOWNLOAD = ""
     private val COCK_FIGHT_PACKAGE = ""
 
-    private val APONG_APP_ID = ""
+    private val APONG_APP_ID = "631c1d1a0d213229fc5fd11a"
     private val APONG_DOWNLOAD = ""
     private val APONG_PACKAGE = ""
 
@@ -131,9 +131,31 @@ class MainFragment : BaseFragment(R.layout.layout_fragment_main_yuki) {
                         val launchIntent = it.intent
                         launchIntent?.putExtra("token", it.tokenData?.token)
                         startActivity(launchIntent)
+                        Log.d("XXXXXXXXXXXXXX", it.tokenData?.token.toString())
+                        it.intent = null
+                        it.tokenData = null
+                    } else if (it.intent == null && it.tokenData != null && it.appId != null) {
+                        when (it.appId) {
+                            LOTTO_APP_ID -> {
+                                doDownload(LOTTO_DOWNLOAD, it.tokenData?.token)
+                            }
+                            LOTTO_PLUS_APP_ID -> {
+                                doDownload(LOTTO_PLUS_DOWNLOAD, it.tokenData?.token)
+                            }
+                            YUKI_APP_ID -> {
+                                doDownload(YUKI_DOWNLOAD, it.tokenData?.token)
+                            }
+                            APONG_APP_ID -> {
+                                doDownload(APONG_DOWNLOAD, it.tokenData?.token)
+                            }
+                            COCK_FIGHT_APP_ID -> {
+                                doDownload(COCK_FIGHT_DOWNLOAD, it.tokenData?.token)
+                            }
+                        }
 
                         it.intent = null
                         it.tokenData = null
+                        it.appId = null
                     }
                 }
             }
@@ -178,27 +200,8 @@ class MainFragment : BaseFragment(R.layout.layout_fragment_main_yuki) {
                                         shareViewModel.getModuleToken(appId, launchIntent)
                                     } else {
                                         //installed
-                                        doDownload(YUKI_DOWNLOAD)
-                                    }
-                                }
-                            }
-                            LOTTO_APP_ID -> {
-                                (requireActivity() as ShareActivity).apply {
-                                    val launchIntent = packageManager.getLaunchIntentForPackage(LOTTO_PACKAGE)
-                                    if (launchIntent != null) {
-                                        shareViewModel.getModuleToken(appId, launchIntent)
-                                    } else {
-                                        doDownload(LOTTO_DOWNLOAD)
-                                    }
-                                }
-                            }
-                            LOTTO_PLUS_APP_ID -> {
-                                (requireActivity() as ShareActivity).apply {
-                                    val launchIntent = packageManager.getLaunchIntentForPackage(LOTTO_PLUS_PACKAGE)
-                                    if (launchIntent != null) {
-                                        shareViewModel.getModuleToken(appId, launchIntent)
-                                    } else {
-                                        doDownload(LOTTO_PLUS_DOWNLOAD)
+                                        shareViewModel.getModuleToken(appId, null)
+                                        //doDownload(YUKI_DOWNLOAD)
                                     }
                                 }
                             }
@@ -208,7 +211,8 @@ class MainFragment : BaseFragment(R.layout.layout_fragment_main_yuki) {
                                     if (launchIntent != null) {
                                         shareViewModel.getModuleToken(appId, launchIntent)
                                     } else {
-                                        doDownload(COCK_FIGHT_DOWNLOAD)
+                                        //doDownload(COCK_FIGHT_DOWNLOAD)
+                                        shareViewModel.getModuleToken(appId, null)
                                     }
                                 }
                             }
@@ -218,7 +222,8 @@ class MainFragment : BaseFragment(R.layout.layout_fragment_main_yuki) {
                                     if (launchIntent != null) {
                                         shareViewModel.getModuleToken(appId, launchIntent)
                                     } else {
-                                        doDownload(APONG_DOWNLOAD)
+                                        //doDownload(APONG_DOWNLOAD)
+                                        shareViewModel.getModuleToken(appId, null)
                                     }
                                 }
                             }
@@ -229,10 +234,10 @@ class MainFragment : BaseFragment(R.layout.layout_fragment_main_yuki) {
         }
     }
 
-    private fun doDownload(url: String) {
+    private fun doDownload(url: String, token: String? = null) {
         try {
             (requireActivity() as ShareActivity).apply {
-                downloadController = DownloadController(this, url)
+                downloadController = DownloadController(this, url, token)
                 checkStoragePermission()
             }
 

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

@@ -24,11 +24,11 @@ class SubModuleFragment : BaseFragment(R.layout.layout_sub_module) {
     private val ARG_PARAM1 = "module_id"
 
     private val LOTTO_APP_ID = "630780f0f635dd035329f5b7"
-    private val LOTTO_DOWNLOAD = ""
+    private val LOTTO_DOWNLOAD = "https://www.dropbox.com/s/j3h5d3bjp91nsmr/Khmer9_Lotto_devDebug_1.0.3-dev.apk?dl=1"
     private val LOTTO_PACKAGE = "com.khmer9.lotto"
 
     private val LOTTO_PLUS_APP_ID = "62e397edae71cfa8782aa3a0"
-    private val LOTTO_PLUS_DOWNLOAD = ""
+    private val LOTTO_PLUS_DOWNLOAD = "https://www.dropbox.com/s/3rz6v50tjn6f2jg/Lottery-Mobile_devDebug_1.0.30-dev.apk?dl=1"
     private val LOTTO_PLUS_PACKAGE = "com.sambath.sbc"
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -72,7 +72,8 @@ class SubModuleFragment : BaseFragment(R.layout.layout_sub_module) {
                                 if (launchIntent != null) {
                                     shareViewModel.getModuleToken(appId, launchIntent)
                                 } else {
-                                    doDownload(LOTTO_DOWNLOAD)
+                                    shareViewModel.getModuleToken(appId, null)
+                                    //doDownload(LOTTO_DOWNLOAD)
                                 }
                             }
                         }
@@ -82,7 +83,8 @@ class SubModuleFragment : BaseFragment(R.layout.layout_sub_module) {
                                 if (launchIntent != null) {
                                     shareViewModel.getModuleToken(appId, launchIntent)
                                 } else {
-                                    doDownload(LOTTO_PLUS_DOWNLOAD)
+                                    shareViewModel.getModuleToken(appId, null)
+                                    //doDownload(LOTTO_PLUS_DOWNLOAD)
                                 }
                             }
                         }

app/src/main/java/com/khmer9/sbcmain/screen/main/TokenViewState.kt

@@ -7,5 +7,6 @@ data class TokenViewState(
     val isProgress: Boolean = false,
     val error: String? = null,
     var tokenData: TokenData? = null,
-    var intent: Intent? = null
+    var intent: Intent? = null,
+    var appId: String? = null
 )