refactor(sampling): 移除注释代码

app/src/main/java/com/shuwei/dish/match/ui/SamplingModeActivity.kt

@@ -70,12 +70,8 @@ class SamplingModeActivity : BaseActivity() {
 
     @SuppressLint("NotifyDataSetChanged")
     fun getCookFoodList() {
-        //val checkedId = binding.dishRadioGroup.checkedRadioButtonId
-//        if (checkedId == R.id.rbSamplingCooking) {
-//        if (binding.rbSamplingCooking.isChecked) {
             appViewModel.getCookFoodListWithCallback(cookMode = 1) { cookFoodEntities ->
                 // 回调期间用户可能已切换 Tab，需再次校验
-//                if (binding.dishRadioGroup.checkedRadioButtonId != R.id.rbSamplingCooking) return@getCookFoodListWithCallback
                 if (binding.rbSamplingCooking.isChecked.not()) return@getCookFoodListWithCallback
                 delayDismissLoading()
                 if (cookFoodEntities.isNullOrEmpty()) {
@@ -212,7 +208,6 @@ class SamplingModeActivity : BaseActivity() {
         }
         binding.refreshLayout.setOnRefreshListener {
             pageNo = 1
-//            if (binding.dishRadioGroup.checkedRadioButtonId == R.id.rbSamplingFinished) {
             if (binding.rbSamplingFinished.isChecked) {
                 getSamplingList()
             } else {
@@ -221,7 +216,6 @@ class SamplingModeActivity : BaseActivity() {
             }
         }
         binding.refreshLayout.setOnLoadMoreListener {
-//            if (binding.dishRadioGroup.checkedRadioButtonId == R.id.rbSamplingFinished) {
             if (binding.rbSamplingFinished.isChecked) {
                 getSamplingList()
             } else {
@@ -230,30 +224,23 @@ class SamplingModeActivity : BaseActivity() {
         }
 
         binding.rbSamplingCooking.let {
-            it.setOnClickListener { _->
-//            Log.d(TAG, "addViewListener: cooking:${binding.rbSamplingCooking.isChecked}")
-//            if (it.tag == true) {
+            it.setOnClickListener { _ ->
                 if (it.isChecked) {
                     return@setOnClickListener
                 }
                 binding.rbSamplingCooking.isChecked = true
                 binding.rbSamplingFinished.isChecked = false
-                binding.rbSamplingCooking.tag = binding.rbSamplingCooking.isChecked
-                binding.rbSamplingFinished.tag = binding.rbSamplingFinished.isChecked
                 requestData(true)
             }
         }
         binding.rbSamplingFinished.let {
-            it.setOnClickListener { _->
+            it.setOnClickListener { _ ->
 //            Log.d(TAG, "addViewListener: finish:${binding.rbSamplingFinished.isChecked}")
-//                if (it.tag == true) {
                 if (it.isChecked) {
                     return@setOnClickListener
                 }
                 binding.rbSamplingCooking.isChecked = false
                 binding.rbSamplingFinished.isChecked = true
-                binding.rbSamplingCooking.tag = binding.rbSamplingCooking.isChecked
-                binding.rbSamplingFinished.tag = binding.rbSamplingFinished.isChecked
                 requestData(false)
             }
         }
@@ -275,7 +262,6 @@ class SamplingModeActivity : BaseActivity() {
             when (state) {
                 is UiState.Success -> {
                     // 回调期间用户可能已切换 Tab，需再次校验
-//                    if (binding.dishRadioGroup.checkedRadioButtonId != R.id.rbSamplingFinished) {
                     if (binding.rbSamplingFinished.isChecked.not()) {
                         delayDismissLoading()
                         return@getSamplingListWithCallback
@@ -283,7 +269,6 @@ class SamplingModeActivity : BaseActivity() {
                     loadDishList(state.data)
                 }
                 is UiState.Error -> {
-//                    if (binding.dishRadioGroup.checkedRadioButtonId != R.id.rbSamplingFinished) {
                     if (binding.rbSamplingFinished.isChecked.not()) {
                         delayDismissLoading()
                         return@getSamplingListWithCallback
@@ -334,20 +319,16 @@ class SamplingModeActivity : BaseActivity() {
         //dishAdapter.setStateViewLayout(requireContext(), R.layout-sw800dp.layout_empty_view)
 
         binding.refreshLayout.run {
-//            setEnableRefresh(binding.dishRadioGroup.checkedRadioButtonId == R.id.rbSamplingFinished)
             setEnableRefresh(binding.rbSamplingFinished.isChecked)
             setEnableLoadMore(false)
         }
     }
 
     fun refreshPage(isCooking: Boolean) {
-//        val checkedId = binding.dishRadioGroup.checkedRadioButtonId
-//        if (checkedId == R.id.rbSamplingFinished) {
         if (binding.rbSamplingFinished.isChecked) {
             //当前是已采样
             if (isCooking) {
                 //需要切换到烹饪中
-                //binding.dishRadioGroup.check(R.id.rbSamplingCooking)
                 binding.rbSamplingCooking.isChecked = true
                 binding.rbSamplingFinished.isChecked = false
                 requestData(true)
@@ -360,7 +341,6 @@ class SamplingModeActivity : BaseActivity() {
         //当前是烹饪中
         if (isCooking.not()) {
             //需要切换到已采样
-//            binding.dishRadioGroup.check(R.id.rbSamplingFinished)
             binding.rbSamplingCooking.isChecked = false
             binding.rbSamplingFinished.isChecked = true
             requestData(false)

app/src/main/res/layout/activity_sampling_mode.xml

@@ -6,46 +6,6 @@
     android:orientation="vertical"
     tools:background="@drawable/bg_other_page">
 
-<!--    <RadioGroup-->
-<!--        android:id="@+id/dishRadioGroup"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="88dp"-->
-<!--        android:layout_marginTop="15dp"-->
-<!--        android:orientation="horizontal">-->
-
-<!--        <RadioButton-->
-<!--            android:id="@+id/rbSamplingCooking"-->
-<!--            android:layout_width="0dp"-->
-<!--            android:layout_height="match_parent"-->
-<!--            android:layout_marginStart="30dp"-->
-<!--            android:layout_weight="1"-->
-<!--            android:background="@drawable/breakfast_bg"-->
-<!--            android:button="@null"-->
-<!--            android:checked="true"-->
-<!--            android:gravity="center"-->
-<!--            android:text="@string/rb_sampling_cooking"-->
-<!--            android:textColor="@color/breakfast_font"-->
-<!--            android:textSize="30sp"-->
-<!--            android:textStyle="bold" />-->
-
-
-<!--        <RadioButton-->
-<!--            android:id="@+id/rbSamplingFinished"-->
-<!--            android:layout_width="0dp"-->
-<!--            android:layout_height="match_parent"-->
-<!--            android:layout_marginStart="9dp"-->
-<!--            android:layout_marginEnd="30dp"-->
-<!--            android:layout_weight="1"-->
-<!--            android:background="@drawable/breakfast_bg"-->
-<!--            android:button="@null"-->
-<!--            android:checked="false"-->
-<!--            android:gravity="center"-->
-<!--            android:text="@string/rb_sampling_finished"-->
-<!--            android:textColor="@color/breakfast_font"-->
-<!--            android:textSize="30sp"-->
-<!--            android:textStyle="bold" />-->
-<!--    </RadioGroup>-->
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="88dp"
@@ -60,6 +20,7 @@
             android:layout_weight="1"
             android:background="@drawable/breakfast_bg"
             android:button="@null"
+            android:checkMark="@null"
             android:checked="true"
             android:gravity="center"
             android:textAlignment="center"
@@ -78,6 +39,7 @@
             android:layout_weight="1"
             android:background="@drawable/breakfast_bg"
             android:button="@null"
+            android:checkMark="@null"
             android:checked="false"
             android:gravity="center"
             android:textAlignment="center"