|
@@ -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) {
|