Forráskód Böngészése

修复编译错误问题

weizhengliang 2 éve
szülő
commit
4294285f35

+ 2 - 2
android_bed/src/main/h10_w_yld/java/com/wdkl/app/ncs/callingbed/fragment/CostFragment.kt

@@ -12,8 +12,8 @@ import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.logic.contract.callingbed.CostFragmentContract
 import com.wdkl.ncs.android.middleware.logic.presenter.callingbed.CostFragmentPresenter
+import com.wdkl.ncs.android.middleware.model.vo.CustomerFeeConfig
 import com.wdkl.ncs.android.middleware.model.vo.CustomerFeeConfigByGroupNameVO
-import com.wdkl.ncs.android.middleware.model.vo.CustomerFeeConfigVO
 import kotlinx.android.synthetic.main.cost_view_lay.*
 
 class CostFragment : BaseFragment<CostFragmentPresenter, CostViewLayBinding>(), CostFragmentContract.View {
@@ -48,7 +48,7 @@ class CostFragment : BaseFragment<CostFragmentPresenter, CostViewLayBinding>(),
         rv_cost_main_view.adapter = CostItemAdapter(activity, cost)
     }
 
-    override fun showCustomCost2(customFees: ArrayList<CustomerFeeConfigVO>) {
+    override fun showCustomCost2(customFees: CustomerFeeConfig) {
         //
     }
 

+ 2 - 1
android_bed/src/main/h7_3128/java/com/wdkl/app/ncs/callingbed/fragment/CostFragment.kt

@@ -12,6 +12,7 @@ import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.logic.contract.callingbed.CostFragmentContract
 import com.wdkl.ncs.android.middleware.logic.presenter.callingbed.CostFragmentPresenter
+import com.wdkl.ncs.android.middleware.model.vo.CustomerFeeConfig
 import com.wdkl.ncs.android.middleware.model.vo.CustomerFeeConfigByGroupNameVO
 import com.wdkl.ncs.android.middleware.model.vo.CustomerFeeConfigVO
 import kotlinx.android.synthetic.main.cost_view_lay.*
@@ -69,7 +70,7 @@ class CostFragment : BaseFragment<CostFragmentPresenter, CostViewLayBinding>(),
         rv_cost_main_view.adapter = CostItemAdapter(activity, cost)
     }
 
-    override fun showCustomCost2(customFees: ArrayList<CustomerFeeConfigVO>) {
+    override fun showCustomCost2(customFees: CustomerFeeConfig) {
         //
     }
 

+ 4 - 3
android_bed/src/main/h7_3128/java/com/wdkl/app/ncs/callingbed/fragment/CostFragment2.kt

@@ -12,6 +12,7 @@ import com.wdkl.ncs.android.lib.vo.filter
 import com.wdkl.ncs.android.middleware.common.Constant
 import com.wdkl.ncs.android.middleware.logic.contract.callingbed.CostFragmentContract
 import com.wdkl.ncs.android.middleware.logic.presenter.callingbed.CostFragmentPresenter
+import com.wdkl.ncs.android.middleware.model.vo.CustomerFeeConfig
 import com.wdkl.ncs.android.middleware.model.vo.CustomerFeeConfigByGroupNameVO
 import com.wdkl.ncs.android.middleware.model.vo.CustomerFeeConfigVO
 import kotlinx.android.synthetic.main.cost_view_lay.*
@@ -70,14 +71,14 @@ class CostFragment2 : BaseFragment<CostFragmentPresenter, CostViewLayBinding>(),
         //
     }
 
-    override fun showCustomCost2(customFees: ArrayList<CustomerFeeConfigVO>) {
+    override fun showCustomCost2(customFees: CustomerFeeConfig) {
         cost_refresh.finishRefresh()
         cost_refresh.finishLoadMore()
 
         if (pageNo == 1) {
-            adapter.updateCostData(customFees, true)
+            adapter.updateCostData(customFees.data, true)
         } else {
-            adapter.updateCostData(customFees, false)
+            adapter.updateCostData(customFees.data, false)
         }
     }