Dola TENG %!s(int64=2) %!d(string=hai) anos
pai
achega
54e6393fb5

+ 1 - 0
.idea/misc.xml

@@ -6,6 +6,7 @@
         <entry key="../../../../../../layout/custom_preview.xml" value="0.182370820668693" />
         <entry key="..\:/3-Work/Android/klaklouk-android/app/src/main/res/layout/activity_main.xml" value="0.36666666666666664" />
         <entry key="..\:/3-Work/Android/klaklouk-android/app/src/main/res/layout/content_main.xml" value="0.36666666666666664" />
+        <entry key="..\:/3-Work/Android/klaklouk-android/app/src/main/res/layout/fragment_cf_betting.xml" value="0.36666666666666664" />
         <entry key="..\:/3-Work/Android/rat-android/app/src/main/res/drawable/app_background.xml" value="0.3675" />
         <entry key="..\:/3-Work/Android/rat-android/app/src/main/res/drawable/bg_cicle_result_status.xml" value="0.3675" />
         <entry key="..\:/3-Work/Android/rat-android/app/src/main/res/drawable/bg_circle_white.xml" value="0.3675" />

+ 1 - 5
app/src/main/java/com/sambath/klaklouk_main/app/ShareActivity.kt

@@ -56,6 +56,7 @@ class ShareActivity : AutoLogoutBaseActivity() {
     private var chList: List<Int> = mutableListOf()
     private val shareViewModel = App.injectShareViewModel()
     private lateinit var mainViewModel: MainViewModel
+
     override fun onCreate(savedInstanceState: Bundle?) {
         moshi = Moshi.Builder().build()
         mainViewModel = MainViewModel(App.injectApiService(), App.injectPrefHelper())
@@ -258,11 +259,6 @@ class ShareActivity : AutoLogoutBaseActivity() {
         alertDialog.setTitle("Logout Alert!")//for set Title
         alertDialog.setMessage("សូមទំនាក់ទំនងទៅកាន់ភ្នាក់ងាររបស់អ្នក!")// for Message
         val alert = alertDialog.create()
-//        alertDialog.setNegativeButton(getString(R.string.ok)) { dialog, id ->
-//            timer.cancel()
-//            dialog.dismiss()
-//            logout()
-//        }
         alert.setCanceledOnTouchOutside(false)
         alert.setOnShowListener {
             val timer = object : CountDownTimer(1500, 100) {

+ 0 - 3
app/src/main/java/com/sambath/klaklouk_main/screen/main/MainFragment.kt

@@ -23,9 +23,6 @@ import com.sambath.klaklouk_main.screen.report.StatementFragment
 import com.sambath.klaklouk_main.screen.setting.SettingFragment
 import com.sambath.klaklouk_main.view.SettingButtonView
 
-/**
- * A simple [Fragment] subclass as the default destination in the navigation.
- */
 class MainFragment : BaseFragment(R.layout.fragment_main) {
     private val TAB_TITLES = arrayOf(
         R.string.current_bets,

+ 1 - 1
app/src/main/java/com/sambath/klaklouk_main/screen/main/cflive/betting/CfBetFragment.kt

@@ -156,7 +156,7 @@ class CfBetFragment : BaseFragment(R.layout.fragment_cf_betting) {
                         fishId = it.bettingTypeData[5]._id
 
                         tiger_title.text = "X" + it.bettingTypeData[0].payoutDisplay
-                        tiger_title.text = "X" + it.bettingTypeData[1].payoutDisplay
+                        khlok_title.text = "X" + it.bettingTypeData[1].payoutDisplay
                         chicken_title.text = "X" + it.bettingTypeData[2].payoutDisplay
                         lobster_title.text = "X" + it.bettingTypeData[3].payoutDisplay
                         crab_title.text = "X" + it.bettingTypeData[4].payoutDisplay

+ 3 - 45
app/src/main/java/com/sambath/klaklouk_main/screen/main/cflive/result/CfResultFragment.kt

@@ -64,51 +64,9 @@ class CfResultFragment : BaseFragment(R.layout.fragment_cf_result) {
             }
         }
         shareViewModel.getDefinedResultAndChannel.observe(viewLifecycleOwner, Observer {
-            /*if (!it.isNullOrEmpty()) {
-                if (newStartColumn > startColumn) {
-                    itemsTable1?.clear()
-                    for (n in 0..119) {
-                        itemsTable1?.add(Table1ListItem(n, ""))
-                    }
-                    startColumn = newStartColumn
-                }
-                val obj = JSONObject(it)
-                val resultArr = obj.getJSONArray("objCoResult")
-                val sumObj = obj.getJSONObject("objSummaryCoResult")
-                val sumType = object : TypeToken<ResultSummary>() {}.type
-                val summary = gson.fromJson<ResultSummary>(sumObj.toString(), sumType)
-
-                txt_one.text = summary.number_1.toString()
-                txt_two.text = summary.number_2.toString()
-                txt_three.text = summary.number_3.toString()
-                txt_four.text = summary.number_4.toString()
-                txt_five.text = summary.number_5.toString()
-                txt_six.text = summary.number_6.toString()
-                txt_seven.text = summary.number_7.toString()
-                txt_eight.text = summary.number_8.toString()
-
-                if (resultArr.length() > 0) {
-                    val resultType = object : TypeToken<List<Results>>() {}.type
-                    val cfResultList =
-                        gson.fromJson<List<Results>>(resultArr.toString(), resultType)
-                    shareViewModel.setResult(cfResultList[0].name)
-                    for (i in 0 until (cfResultList.size)) {
-                        val rowNum = i//cfResultList[i].rid as Int
-                        val colNum = i//cfResultList[i].cid as Int
-                        val index = if (rowNum == 1) {
-                            (19 * rowNum.minus(1)).plus(colNum.minus(startColumn.plus(1)))
-                        } else {
-                            (20 * rowNum.minus(1)).plus(colNum.minus(startColumn.plus(1)))
-                        }
-                        if (index in 0..120) {
-                            itemsTable1[index].color = cfResultList[i].color.toString()
-                            itemsTable1[index].fightNo = cfResultList[i].fightNo
-                        }
-                    }
-                    adapterTable1.submitList(itemsTable1 as List<BaseListItem>?)
-                    adapterTable1.notifyDataSetChanged()
-                }
-            }*/
+            if (!it.isNullOrEmpty()) {
+                cfResultViewModel.getCfResuleData()
+            }
         })
         shareViewModel.getChannelInfo.observe(viewLifecycleOwner, Observer {
             if (it != null) {