2024-09-29 修改

修改：
1. 部分UI逻辑修改

app/src/main/java/com/pan_american/android/data/model/common/adapter/SiftListAdapter.kt

@@ -31,7 +31,7 @@ class SiftListAdapter(private val listItem: List<SiftListItem>, private val layo
         holder.checkedTextView.isChecked = item.isChecked
         holder.checkedTextView.setOnClickListener {
             onRecyclerViewItemClick.onItemClick(position)
-            if(item.isChecked) {
+            if (item.isChecked) {
                 holder.checkedTextView.isChecked = false
                 item.isChecked = false
             } else {

app/src/main/java/com/pan_american/android/ui/customer_resource/market_sales_revenue/SalesCustomerVisitListActivity.kt

@@ -2,11 +2,9 @@ package com.pan_american.android.ui.customer_resource.market_sales_revenue
 
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.View
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.google.gson.Gson
 import com.pan_american.android.OASystem
 import com.pan_american.android.R
 import com.pan_american.android.base.BaseActivity
@@ -46,8 +44,6 @@ class SalesCustomerVisitListActivity : BaseActivity<ActivitySalesCustomerVisitLi
 
     private val historyList = ArrayList<VisitHistoryListItem>()
 
-    private var listInit = false
-
     override fun getViewBinding() = ActivitySalesCustomerVisitListBinding.inflate(layoutInflater)
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -95,75 +91,68 @@ class SalesCustomerVisitListActivity : BaseActivity<ActivitySalesCustomerVisitLi
         getVisitHistoryData(1)
     }
 
-    override fun onResume() {
-        super.onResume()
+    override fun onStart() {
+        super.onStart()
 
         if (OASystem.needRefresh) {
             pageIndex = 1
             marketSalesVisitHistoryRequest.pageIndex = pageIndex
             binding.visitHistoryList.adapter!!.notifyItemRangeRemoved(0, historyList.size)
             historyList.clear()
-            listInit = false
-            getVisitHistoryData(2)
-
             OASystem.needRefresh = false
+            getVisitHistoryData(2)
         }
     }
 
     private fun getVisitHistoryData(type: Int) {
 
-        if (!listInit) {
-            apiService.getMarketSalesVisitHistory(marketSalesVisitHistoryRequest).enqueue(object : Callback<MarketSalesVisitHistoryResponse> {
-                override fun onResponse(
-                    p0: Call<MarketSalesVisitHistoryResponse>,
-                    response: Response<MarketSalesVisitHistoryResponse>
-                ) {
-                    val listResponse = response.body()
-
-                    if (listResponse != null) {
-                        if (listResponse.code == 200) {
-
-                            for (item in listResponse.data) {
-                                item.beginDt = item.beginDt.substring(0, 16)
-                                item.endDt = item.endDt.substring(0, 16)
-                                historyList.add(item)
+        apiService.getMarketSalesVisitHistory(marketSalesVisitHistoryRequest).enqueue(object : Callback<MarketSalesVisitHistoryResponse> {
+            override fun onResponse(
+                p0: Call<MarketSalesVisitHistoryResponse>,
+                response: Response<MarketSalesVisitHistoryResponse>
+            ) {
+                val listResponse = response.body()
+
+                if (listResponse != null) {
+                    if (listResponse.code == 200) {
+
+                        for (item in listResponse.data) {
+                            item.beginDt = item.beginDt.substring(0, 16)
+                            item.endDt = item.endDt.substring(0, 16)
+                            historyList.add(item)
+                        }
+
+                        when(type) {
+                            1 -> {
+                                totalPage = getTotalPage(listResponse.count)
+                                binding.visitHistoryContainer.setEnableLoadMore(totalPage > pageIndex)
+                                initList()
                             }
 
-                            when(type) {
-                                1 -> {
-                                    totalPage = getTotalPage(listResponse.count)
-                                    binding.visitHistoryContainer.setEnableLoadMore(totalPage > pageIndex)
-                                    initList()
-                                    listInit = true
-                                }
-
-                                2 -> {
-                                    binding.visitHistoryContainer.finishRefresh()
-                                    totalPage = getTotalPage(listResponse.count)
-                                    binding.visitHistoryContainer.setEnableLoadMore(pageIndex < totalPage)
-                                    initList()
-                                    listInit = true
-                                }
-
-                                3 -> {
-                                    binding.visitHistoryContainer.finishLoadMore()
-                                    binding.visitHistoryContainer.setEnableLoadMore(pageIndex < totalPage)
-                                    binding.visitHistoryList.adapter!!.notifyItemInserted(historyList.size)
-                                    listInit = true
-                                }
+                            2 -> {
+                                binding.visitHistoryContainer.finishRefresh()
+                                totalPage = getTotalPage(listResponse.count)
+                                binding.visitHistoryContainer.setEnableLoadMore(pageIndex < totalPage)
+                                initList()
                             }
 
-                        } else {
-                            showMessage(listResponse.msg)
+                            3 -> {
+                                binding.visitHistoryContainer.finishLoadMore()
+                                binding.visitHistoryContainer.setEnableLoadMore(pageIndex < totalPage)
+                                binding.visitHistoryList.adapter!!.notifyItemInserted(historyList.size)
+                            }
                         }
+
+                    } else {
+                        showMessage(listResponse.msg)
                     }
                 }
+            }
 
-                override fun onFailure(p0: Call<MarketSalesVisitHistoryResponse>, p1: Throwable) {
-                    showErrorInfo(R.string.visit_history_list_get_error)
-                }
-            })
-        }
+            override fun onFailure(p0: Call<MarketSalesVisitHistoryResponse>, p1: Throwable) {
+                showErrorInfo(R.string.visit_history_list_get_error)
+            }
+        })
     }
 
     private fun initList() {
@@ -234,7 +223,6 @@ class SalesCustomerVisitListActivity : BaseActivity<ActivitySalesCustomerVisitLi
                 marketSalesVisitHistoryRequest.pageIndex = pageIndex
                 binding.visitHistoryList.adapter!!.notifyItemRangeRemoved(0, historyList.size)
                 historyList.clear()
-                listInit = false
                 getVisitHistoryData(2)
             }
 
@@ -242,7 +230,6 @@ class SalesCustomerVisitListActivity : BaseActivity<ActivitySalesCustomerVisitLi
                 if (pageIndex < totalPage) {
                     pageIndex += 1
                     marketSalesVisitHistoryRequest.pageIndex = pageIndex
-                    listInit = false
                     getVisitHistoryData(3)
                 }
             }

app/src/main/java/com/pan_american/android/ui/efficiency_tools/daily_payment/DailyPaymentListActivity.kt

@@ -52,8 +52,6 @@ class DailyPaymentListActivity : BaseActivity<ActivityDaliyPaymentListBinding>()
 
     private var siftInit = false
 
-    private var listInit = false
-
     private var selectorList = ArrayList<Selector>()
 
     override fun getViewBinding() = ActivityDaliyPaymentListBinding.inflate(layoutInflater)
@@ -99,6 +97,18 @@ class DailyPaymentListActivity : BaseActivity<ActivityDaliyPaymentListBinding>()
 
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        if (OASystem.needRefresh) {
+            pageIndex = 1
+            dailyPaymentListRequest.pageIndex = pageIndex
+            dailyPaymentCardListItems.clear()
+            OASystem.needRefresh = false
+            initDailyPaymentList(2)
+        }
+    }
+
     override fun initViews() {
         binding.commit.setText(resources.getString(R.string.sift))
     }
@@ -398,8 +408,6 @@ class DailyPaymentListActivity : BaseActivity<ActivityDaliyPaymentListBinding>()
 
             dailyPaymentListRequest.pageIndex = pageIndex
 
-            listInit = false
-
             dailyPaymentCardListItems.clear()
 
             binding.commit.setButtonStatus(CommitButton.STATUS_IN_COMMITING)
@@ -409,79 +417,66 @@ class DailyPaymentListActivity : BaseActivity<ActivityDaliyPaymentListBinding>()
     }
 
     private fun initDailyPaymentList(type: Int) {
+        apiService.getDailyPaymentList(dailyPaymentListRequest)
+            .enqueue(object : Callback<DailyPaymentListResponse> {
+                override fun onResponse(
+                    call: Call<DailyPaymentListResponse>,
+                    response: Response<DailyPaymentListResponse>
+                ) {
+                    val dailyPaymentResponse = response.body()
+                    if (dailyPaymentResponse != null) {
+                        if (dailyPaymentResponse.code == 200) {
 
-        if (!listInit) {
-            apiService.getDailyPaymentList(dailyPaymentListRequest)
-                .enqueue(object : Callback<DailyPaymentListResponse> {
-                    override fun onResponse(
-                        call: Call<DailyPaymentListResponse>,
-                        response: Response<DailyPaymentListResponse>
-                    ) {
-                        val dailyPaymentResponse = response.body()
-                        if (dailyPaymentResponse != null) {
-                            if (dailyPaymentResponse.code == 200) {
+                            for (item in dailyPaymentResponse.data.dataList) {
+                                dailyPaymentCardListItems.add(item)
+                            }
 
-                                for (item in dailyPaymentResponse.data.dataList) {
-                                    dailyPaymentCardListItems.add(item)
-                                }
+                            if (dailyPaymentCardListItems.size == 0) {
+                                showMessage(resources.getString(R.string.no_data))
+                            }
 
-                                if (dailyPaymentCardListItems.size == 0) {
-                                    showMessage(resources.getString(R.string.no_data))
+                            when (type) {
+                                1 -> {
+                                    totalPage = getTotalPage(
+                                        dailyPaymentResponse.data.dataCount,
+                                        dailyPaymentResponse.data.currPageSize
+                                    )
+                                    binding.dailyPaymentContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    initList()
                                 }
 
-                                when (type) {
-                                    1 -> {
-                                        totalPage = getTotalPage(
-                                            dailyPaymentResponse.data.dataCount,
-                                            dailyPaymentResponse.data.currPageSize
-                                        )
-                                        binding.dailyPaymentContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    2 -> {
-                                        binding.dailyPaymentContainer.finishRefresh()
-                                        totalPage = getTotalPage(
-                                            dailyPaymentResponse.data.dataCount,
-                                            dailyPaymentResponse.data.currPageSize
-                                        )
-                                        binding.dailyPaymentContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        initList()
-                                        listInit = true
-                                    }
+                                2 -> {
+                                    binding.dailyPaymentContainer.finishRefresh()
+                                    totalPage = getTotalPage(
+                                        dailyPaymentResponse.data.dataCount,
+                                        dailyPaymentResponse.data.currPageSize
+                                    )
+                                    binding.dailyPaymentContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    initList()
+                                }
 
-                                    3 -> {
-                                        binding.dailyPaymentContainer.finishLoadMore()
-                                        binding.dailyPaymentContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        binding.dailyPaymentList.adapter!!.notifyItemInserted(
-                                            dailyPaymentCardListItems.size
-                                        )
-                                        listInit = true
-                                    }
+                                3 -> {
+                                    binding.dailyPaymentContainer.finishLoadMore()
+                                    binding.dailyPaymentContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    binding.dailyPaymentList.adapter!!.notifyItemInserted(
+                                        dailyPaymentCardListItems.size
+                                    )
                                 }
-                            } else {
-                                showMessage(dailyPaymentResponse.msg)
                             }
+                        } else {
+                            showMessage(dailyPaymentResponse.msg)
                         }
-
-                        binding.commit.setButtonStatus(CommitButton.STATUS_COMMITTED)
                     }
 
-                    override fun onFailure(call: Call<DailyPaymentListResponse>, t: Throwable) {
-                        binding.commit.setButtonStatus(CommitButton.STATUS_COMMITTED)
-                        showMessage(resources.getString(R.string.network_error))
-                    }
-                })
-        } else {
-            if (OASystem.needRefresh) {
-                pageIndex = 1
-                dailyPaymentListRequest.pageIndex = pageIndex
-                dailyPaymentCardListItems.clear()
-                listInit = false
-                initDailyPaymentList(2)
-            }
-        }
+                    binding.commit.setButtonStatus(CommitButton.STATUS_COMMITTED)
+                }
+
+                override fun onFailure(call: Call<DailyPaymentListResponse>, t: Throwable) {
+                    binding.commit.setButtonStatus(CommitButton.STATUS_COMMITTED)
+                    showMessage(resources.getString(R.string.network_error))
+                }
+            })
+
     }
 
     private fun getTotalPage(dataCount: Int, pageSize: Int): Int {
@@ -567,7 +562,6 @@ class DailyPaymentListActivity : BaseActivity<ActivityDaliyPaymentListBinding>()
                 dailyPaymentListRequest.pageIndex = pageIndex
                 binding.dailyPaymentList.adapter!!.notifyItemRangeRemoved(0, dailyPaymentCardListItems.size)
                 dailyPaymentCardListItems.clear()
-                listInit = false
                 initDailyPaymentList(2)
             }
 
@@ -575,7 +569,6 @@ class DailyPaymentListActivity : BaseActivity<ActivityDaliyPaymentListBinding>()
                 if (pageIndex < totalPage) {
                     pageIndex += 1
                     dailyPaymentListRequest.pageIndex = pageIndex
-                    listInit = false
                     initDailyPaymentList(3)
                 }
             }

app/src/main/java/com/pan_american/android/ui/group_airplane_ticket/airplane_payment_insert/AirplaneTicketListFragment.kt

@@ -79,9 +79,8 @@ class AirplaneTicketListFragment : BaseFragment<FragmentAirplaneTicketListBindin
             pageIndex = 1
             airplaneTicketListRequest.pageIndex = pageIndex
             airplaneTicketList.clear()
-            getAirplaneTicketPaymentList(2)
-
             OASystem.needRefresh = false
+            getAirplaneTicketPaymentList(2)
         }
     }
 

app/src/main/java/com/pan_american/android/ui/group_hotel/hotel_predetermine/HotelPredetermineBaseFragment.kt

@@ -151,7 +151,7 @@ class HotelPredetermineBaseFragment : BaseFragment<FragmentHotelPredetermineBase
 
                 binding.checkInEndTime.text = checkOutDate
 
-                days = if(binding.checkInStartTime.text.isNotBlank() && binding.checkInEndTime.text.isNotBlank()) {
+                days = if (binding.checkInStartTime.text.isNotBlank() && binding.checkInEndTime.text.isNotBlank()) {
 
                     val startTime = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).parse(binding.checkInStartTime.text.toString())
                     val endTime = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).parse(binding.checkInEndTime.text.toString())
@@ -400,7 +400,7 @@ class HotelPredetermineBaseFragment : BaseFragment<FragmentHotelPredetermineBase
 
             if (canBeEdit) {
                 if (hotelBaseDataVerify()) {
-                    days = if(binding.checkInStartTime.text.isNotBlank() && binding.checkInEndTime.text.isNotBlank()) {
+                    days = if (binding.checkInStartTime.text.isNotBlank() && binding.checkInEndTime.text.isNotBlank()) {
 
                         val startTime = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).parse(binding.checkInStartTime.text.toString())
                         val endTime = SimpleDateFormat("yyyy-MM-dd", Locale.CHINA).parse(binding.checkInEndTime.text.toString())

app/src/main/java/com/pan_american/android/ui/group_hotel/hotel_predetermine/HotelPredetermineListFragment.kt

@@ -39,8 +39,6 @@ class HotelPredetermineListFragment : BaseFragment<FragmentHotelPredetermineList
 
     private val apiService = ServiceCreator.create<APIService>()
 
-    private var listInit = false
-
     private var hotelPredetermineList = ArrayList<HotelPredetermineListItem>()
 
     override fun getViewBinding(
@@ -65,9 +63,18 @@ class HotelPredetermineListFragment : BaseFragment<FragmentHotelPredetermineList
         initEvents()
     }
 
+    override fun onStart() {
+        super.onStart()
 
-    override fun initViews() {
+        if (OASystem.needRefresh) {
+            binding.hotelPredetermineList.adapter!!.notifyItemRangeRemoved(0, hotelPredetermineList.size)
+            hotelPredetermineList.clear()
+            OASystem.needRefresh = false
+            getHotelPredetermineList(2)
+        }
+    }
 
+    override fun initViews() {
         if (OASystem.authorization(OASystem.HOTEL_PREDETERMINE, OASystem.ADD)) {
             binding.addPaymentItem.apply {
 
@@ -117,60 +124,50 @@ class HotelPredetermineListFragment : BaseFragment<FragmentHotelPredetermineList
             return
         }
 
-        if (!listInit) {
-            apiService.getHotelPredetermineList(hotelPredetermineListRequest)
-                .enqueue(object : Callback<HotelPredetermineListResponse> {
-                    override fun onResponse(
-                        call: Call<HotelPredetermineListResponse>,
-                        response: Response<HotelPredetermineListResponse>
-                    ) {
-                        val hotelPredetermineResponse = response.body()
+        apiService.getHotelPredetermineList(hotelPredetermineListRequest)
+            .enqueue(object : Callback<HotelPredetermineListResponse> {
+                override fun onResponse(
+                    call: Call<HotelPredetermineListResponse>,
+                    response: Response<HotelPredetermineListResponse>
+                ) {
+                    val hotelPredetermineResponse = response.body()
 
-                        if (hotelPredetermineResponse != null) {
-                            if (hotelPredetermineResponse.code == 200) {
+                    if (hotelPredetermineResponse != null) {
+                        if (hotelPredetermineResponse.code == 200) {
 
-                                for (item in hotelPredetermineResponse.data) {
-                                    hotelPredetermineList.add(item)
-                                }
+                            for (item in hotelPredetermineResponse.data) {
+                                hotelPredetermineList.add(item)
+                            }
 
-                                if (hotelPredetermineList.size == 0) {
-                                    showMessage(resources.getString(R.string.no_data))
-                                }
+                            if (hotelPredetermineList.size == 0) {
+                                showMessage(resources.getString(R.string.no_data))
+                            }
 
-                                when (type) {
-                                    1 -> {
-                                        binding.hotelPredetermineContainer.setEnableLoadMore(false)
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    2 -> {
-                                        binding.hotelPredetermineContainer.finishRefresh()
-                                        binding.hotelPredetermineContainer.setEnableLoadMore(false)
-                                        initList()
-                                        listInit = true
-                                    }
+                            when (type) {
+                                1 -> {
+                                    binding.hotelPredetermineContainer.setEnableLoadMore(false)
+                                    initList()
                                 }
 
-                            } else {
-                                showMessage(hotelPredetermineResponse.msg)
+                                2 -> {
+                                    binding.hotelPredetermineContainer.finishRefresh()
+                                    binding.hotelPredetermineContainer.setEnableLoadMore(false)
+                                    initList()
+                                }
                             }
+
+                        } else {
+                            showMessage(hotelPredetermineResponse.msg)
                         }
                     }
+                }
 
-                    override fun onFailure(
-                        call: Call<HotelPredetermineListResponse>, t: Throwable
-                    ) {
-                        showErrorInfo(R.string.hotel_predetermine_list_get_failed)
-                    }
-                })
-        } else {
-            if (OASystem.needRefresh) {
-                hotelPredetermineList.clear()
-                listInit = false
-                getHotelPredetermineList(2)
-            }
-        }
+                override fun onFailure(
+                    call: Call<HotelPredetermineListResponse>, t: Throwable
+                ) {
+                    showErrorInfo(R.string.hotel_predetermine_list_get_failed)
+                }
+            })
     }
 
     private fun initList() {
@@ -263,8 +260,8 @@ class HotelPredetermineListFragment : BaseFragment<FragmentHotelPredetermineList
             }
 
         binding.hotelPredetermineContainer.setOnRefreshListener {
+            binding.hotelPredetermineList.adapter!!.notifyItemRangeRemoved(0, hotelPredetermineList.size)
             hotelPredetermineList.clear()
-            listInit = false
             getHotelPredetermineList(2)
         }
     }

app/src/main/java/com/pan_american/android/ui/group_invite_official/invite_data/InviteDataListFragment.kt

@@ -38,8 +38,6 @@ class InviteDataListFragment : BaseFragment<FragmentInviteDataListBinding>() {
 
     private val apiService = ServiceCreator.create<APIService>()
 
-    private var listInit = false
-
     private val inviteDataList = ArrayList<InviteDataListItem>()
 
     override fun getViewBinding(
@@ -75,6 +73,18 @@ class InviteDataListFragment : BaseFragment<FragmentInviteDataListBinding>() {
         initInviteDataList(1)
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        if (OASystem.needRefresh) {
+            pageIndex = 1
+            inviteDataListRequest.pageIndex = pageIndex
+            inviteDataList.clear()
+            OASystem.needRefresh = false
+            initInviteDataList(2)
+        }
+    }
+
     private fun initInviteDataList(type: Int) {
 
         //避免Fragment not attached to a context.
@@ -82,69 +92,56 @@ class InviteDataListFragment : BaseFragment<FragmentInviteDataListBinding>() {
             return
         }
 
-        if (!listInit) {
-            apiService.getInviteDataList(inviteDataListRequest).enqueue(object :
-                Callback<InviteDataListResponse> {
-                override fun onResponse(
-                    call: Call<InviteDataListResponse>,
-                    response: Response<InviteDataListResponse>
-                ) {
-                    val listResponse = response.body()
+        apiService.getInviteDataList(inviteDataListRequest).enqueue(object :
+            Callback<InviteDataListResponse> {
+            override fun onResponse(
+                call: Call<InviteDataListResponse>,
+                response: Response<InviteDataListResponse>
+            ) {
+                val listResponse = response.body()
 
-                    if (listResponse != null) {
-                        if (listResponse.code == 200) {
+                if (listResponse != null) {
+                    if (listResponse.code == 200) {
 
-                            if (listResponse.data.size == 0) {
-                                showMessage(resources.getString(R.string.no_data))
-                            }
+                        if (listResponse.data.size == 0) {
+                            showMessage(resources.getString(R.string.no_data))
+                        }
 
-                            for (item in listResponse.data) {
-                                inviteDataList.add(item)
+                        for (item in listResponse.data) {
+                            inviteDataList.add(item)
+                        }
+
+                        when (type) {
+                            1 -> {
+                                totalPage = getTotalPage(listResponse.count)
+                                binding.inviteDataContainer.setEnableLoadMore(pageIndex < totalPage)
+                                initList()
                             }
 
-                            when (type) {
-                                1 -> {
-                                    totalPage = getTotalPage(listResponse.count)
-                                    binding.inviteDataContainer.setEnableLoadMore(pageIndex < totalPage)
-                                    initList()
-                                    listInit = true
-                                }
-
-                                2 -> {
-                                    binding.inviteDataContainer.finishRefresh()
-                                    totalPage = getTotalPage(listResponse.count)
-                                    binding.inviteDataContainer.setEnableLoadMore(pageIndex < totalPage)
-                                    initList()
-                                    listInit = true
-                                }
-
-                                3 -> {
-                                    binding.inviteDataContainer.finishLoadMore()
-                                    binding.inviteDataContainer.setEnableLoadMore(pageIndex < totalPage)
-                                    binding.inviteDataList.adapter!!.notifyItemInserted(inviteDataList.size)
-                                    listInit = true
-                                }
+                            2 -> {
+                                binding.inviteDataContainer.finishRefresh()
+                                totalPage = getTotalPage(listResponse.count)
+                                binding.inviteDataContainer.setEnableLoadMore(pageIndex < totalPage)
+                                initList()
                             }
 
-                        } else {
-                            showMessage(listResponse.msg)
+                            3 -> {
+                                binding.inviteDataContainer.finishLoadMore()
+                                binding.inviteDataContainer.setEnableLoadMore(pageIndex < totalPage)
+                                binding.inviteDataList.adapter!!.notifyItemInserted(inviteDataList.size)
+                            }
                         }
+
+                    } else {
+                        showMessage(listResponse.msg)
                     }
                 }
+            }
 
-                override fun onFailure(call: Call<InviteDataListResponse>, t: Throwable) {
-                    showErrorInfo(R.string.invite_data_list_get_failed)
-                }
-            })
-        } else {
-            if (OASystem.needRefresh) {
-                pageIndex = 1
-                inviteDataListRequest.pageIndex = pageIndex
-                inviteDataList.clear()
-                listInit = false
-                initInviteDataList(2)
+            override fun onFailure(call: Call<InviteDataListResponse>, t: Throwable) {
+                showErrorInfo(R.string.invite_data_list_get_failed)
             }
-        }
+        })
     }
 
     private fun getTotalPage(dataCount: Int): Int {
@@ -227,7 +224,6 @@ class InviteDataListFragment : BaseFragment<FragmentInviteDataListBinding>() {
                 inviteDataListRequest.pageIndex = pageIndex
                 binding.inviteDataList.adapter!!.notifyItemRangeRemoved(0, inviteDataList.size)
                 inviteDataList.clear()
-                listInit = false
                 initInviteDataList(2)
             }
 
@@ -235,7 +231,6 @@ class InviteDataListFragment : BaseFragment<FragmentInviteDataListBinding>() {
                 if (pageIndex < totalPage) {
                     pageIndex += 1
                     inviteDataListRequest.pageIndex = pageIndex
-                    listInit = false
                     initInviteDataList(3)
                 }
             }

app/src/main/java/com/pan_american/android/ui/group_invite_official/invite_data/InviteDataSearchFragment.kt

@@ -50,8 +50,6 @@ class InviteDataSearchFragment : BaseFragment<FragmentInviteDataSearchBinding>()
 
     private var createUserId = 0
 
-    private var dataInit = false
-
     private var inStuck = false
 
     private var selectedCountry = ""
@@ -77,36 +75,13 @@ class InviteDataSearchFragment : BaseFragment<FragmentInviteDataSearchBinding>()
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        if (dataInit) {
-            initEvents()
-        } else {
-            getInviteDataResource()
-        }
+        getInviteDataResource()
 
     }
 
     override fun onStart() {
         super.onStart()
 
-        initViews()
-    }
-
-    override fun onStop() {
-        super.onStop()
-
-        selectedCountry = binding.inviteCountry.text.toString()
-        selectedInvitee = binding.inviteeName.text.toString()
-        selectedContact = binding.contractName.text.toString()
-        selectedGroupName = binding.groupName.text.toString()
-        selectedIndustry = binding.industry.text.toString()
-        selectedStartTime = binding.inviteStartTime.text.toString()
-        selectedEndTime = binding.inviteEndTime.text.toString()
-
-        inStuck = true
-    }
-
-    override fun initViews() {
-
         if (inStuck) {
             binding.inviteCountry.text = selectedCountry
             binding.inviteeName.text = selectedInvitee
@@ -127,6 +102,20 @@ class InviteDataSearchFragment : BaseFragment<FragmentInviteDataSearchBinding>()
         }
     }
 
+    override fun onStop() {
+        super.onStop()
+
+        selectedCountry = binding.inviteCountry.text.toString()
+        selectedInvitee = binding.inviteeName.text.toString()
+        selectedContact = binding.contractName.text.toString()
+        selectedGroupName = binding.groupName.text.toString()
+        selectedIndustry = binding.industry.text.toString()
+        selectedStartTime = binding.inviteStartTime.text.toString()
+        selectedEndTime = binding.inviteEndTime.text.toString()
+
+        inStuck = true
+    }
+
     override fun initEvents() {
         binding.inviteCountry.setOnClickListener {
             val selectorList = ArrayList<String>()
@@ -733,70 +722,66 @@ class InviteDataSearchFragment : BaseFragment<FragmentInviteDataSearchBinding>()
             return
         }
 
-        if (!dataInit) {
-            apiService.getInviteDataResource(InviteDataResourceRequest()).enqueue(object : Callback<InviteDataResourceResponse> {
-                override fun onResponse(
-                    call: Call<InviteDataResourceResponse>,
-                    response: Response<InviteDataResourceResponse>
-                ) {
-                    val resourceResponse = response.body()
+        apiService.getInviteDataResource(InviteDataResourceRequest()).enqueue(object : Callback<InviteDataResourceResponse> {
+            override fun onResponse(
+                call: Call<InviteDataResourceResponse>,
+                response: Response<InviteDataResourceResponse>
+            ) {
+                val resourceResponse = response.body()
 
-                    if (resourceResponse != null) {
-                        if (resourceResponse.code == 200) {
+                if (resourceResponse != null) {
+                    if (resourceResponse.code == 200) {
 
-                            countryData.add(resources.getString(R.string.all))
+                        countryData.add(resources.getString(R.string.all))
 
-                            for (item in resourceResponse.data.countryData) {
-                                countryData.add(item)
-                            }
-
-                            inviterData.add(resources.getString(R.string.all))
-
-                            for (item in resourceResponse.data.inviterData) {
-                                inviterData.add(item)
-                            }
+                        for (item in resourceResponse.data.countryData) {
+                            countryData.add(item)
+                        }
 
-                            domainData.add(resources.getString(R.string.all))
+                        inviterData.add(resources.getString(R.string.all))
 
-                            for (item in resourceResponse.data.domainData) {
-                                domainData.add(item)
-                            }
+                        for (item in resourceResponse.data.inviterData) {
+                            inviterData.add(item)
+                        }
 
-                            contactData.add(resources.getString(R.string.all))
+                        domainData.add(resources.getString(R.string.all))
 
-                            for (item in resourceResponse.data.contactData) {
-                                contactData.add(item)
-                            }
+                        for (item in resourceResponse.data.domainData) {
+                            domainData.add(item)
+                        }
 
-                            groupNameData.add(Selector().apply {
-                                id = 0
-                                teamName = resources.getString(R.string.all)
-                            })
+                        contactData.add(resources.getString(R.string.all))
 
-                            for (item in resourceResponse.data.groupNameData) {
-                                groupNameData.add(item)
-                            }
+                        for (item in resourceResponse.data.contactData) {
+                            contactData.add(item)
+                        }
 
-                            userNameData.add(Selector().apply {
-                                id = 0
-                                cnName = resources.getString(R.string.all)
-                            })
+                        groupNameData.add(Selector().apply {
+                            id = 0
+                            teamName = resources.getString(R.string.all)
+                        })
 
-                            for (item in resourceResponse.data.userNameData) {
-                                userNameData.add(item)
-                            }
+                        for (item in resourceResponse.data.groupNameData) {
+                            groupNameData.add(item)
+                        }
 
-                            dataInit = true
+                        userNameData.add(Selector().apply {
+                            id = 0
+                            cnName = resources.getString(R.string.all)
+                        })
 
-                            initEvents()
+                        for (item in resourceResponse.data.userNameData) {
+                            userNameData.add(item)
                         }
+
+                        initEvents()
                     }
                 }
+            }
 
-                override fun onFailure(call: Call<InviteDataResourceResponse>, t: Throwable) {
-                    showErrorInfo(R.string.base_resource_data_get_failed)
-                }
-            })
-        }
+            override fun onFailure(call: Call<InviteDataResourceResponse>, t: Throwable) {
+                showErrorInfo(R.string.base_resource_data_get_failed)
+            }
+        })
     }
 }

app/src/main/java/com/pan_american/android/ui/group_invite_official/invite_official_payment_insert/GroupInvitePaymentListFragment.kt

@@ -41,8 +41,6 @@ class GroupInvitePaymentListFragment : BaseFragment<FragmentGroupInvitePaymentLi
 
     private var inviteOfficialList = ArrayList<InviteOfficialListItem>()
 
-    private var listInit = false
-
     private lateinit var inviteOfficialListRequest: InviteOfficialListRequest
 
     private var pageIndex = 1
@@ -100,6 +98,18 @@ class GroupInvitePaymentListFragment : BaseFragment<FragmentGroupInvitePaymentLi
         initInviteOfficialList(1)
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        if (OASystem.needRefresh) {
+            pageIndex = 1
+            inviteOfficialListRequest.pageIndex = pageIndex
+            inviteOfficialList.clear()
+            OASystem.needRefresh = false
+            initInviteOfficialList(2)
+        }
+    }
+
     override fun initEvents() {
         binding.baseInfoSwitch.setOnClickListener {
             if (isShow) {
@@ -166,8 +176,6 @@ class GroupInvitePaymentListFragment : BaseFragment<FragmentGroupInvitePaymentLi
 
             inviteOfficialList.clear()
 
-            listInit = false
-
             initInviteOfficialList(1)
         }
     }
@@ -179,78 +187,64 @@ class GroupInvitePaymentListFragment : BaseFragment<FragmentGroupInvitePaymentLi
             return
         }
 
-        if (!listInit) {
-            apiService.getInviteOfficialListItem(inviteOfficialListRequest)
-                .enqueue(object : Callback<InviteOfficialListResponse> {
-                    override fun onResponse(
-                        call: Call<InviteOfficialListResponse>,
-                        response: Response<InviteOfficialListResponse>
-                    ) {
-                        val inviteOfficialListResponse = response.body()
+        apiService.getInviteOfficialListItem(inviteOfficialListRequest)
+            .enqueue(object : Callback<InviteOfficialListResponse> {
+                override fun onResponse(
+                    call: Call<InviteOfficialListResponse>,
+                    response: Response<InviteOfficialListResponse>
+                ) {
+                    val inviteOfficialListResponse = response.body()
+
+                    if (inviteOfficialListResponse != null) {
+                        if (inviteOfficialListResponse.code == 200) {
 
-                        if (inviteOfficialListResponse != null) {
-                            if (inviteOfficialListResponse.code == 200) {
+                            for (item in inviteOfficialListResponse.data.dataList) {
+                                inviteOfficialList.add(item)
+                            }
+
+                            if (inviteOfficialList.size == 0) {
+                                showMessage(resources.getString(R.string.no_data))
+                            }
 
-                                for (item in inviteOfficialListResponse.data.dataList) {
-                                    inviteOfficialList.add(item)
+                            when (type) {
+                                1 -> {
+                                    totalPage = getTotalPage(
+                                        inviteOfficialListResponse.data.dataCount,
+                                        inviteOfficialListResponse.data.currPageSize
+                                    )
+                                    binding.invitePaymentContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    initList()
                                 }
 
-                                if (inviteOfficialList.size == 0) {
-                                    showMessage(resources.getString(R.string.no_data))
+                                2 -> {
+                                    binding.invitePaymentContainer.finishRefresh()
+                                    totalPage = getTotalPage(
+                                        inviteOfficialListResponse.data.dataCount,
+                                        inviteOfficialListResponse.data.currPageSize
+                                    )
+                                    binding.invitePaymentContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    initList()
                                 }
 
-                                when (type) {
-                                    1 -> {
-                                        totalPage = getTotalPage(
-                                            inviteOfficialListResponse.data.dataCount,
-                                            inviteOfficialListResponse.data.currPageSize
-                                        )
-                                        binding.invitePaymentContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    2 -> {
-                                        binding.invitePaymentContainer.finishRefresh()
-                                        totalPage = getTotalPage(
-                                            inviteOfficialListResponse.data.dataCount,
-                                            inviteOfficialListResponse.data.currPageSize
-                                        )
-                                        binding.invitePaymentContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    3 -> {
-                                        binding.invitePaymentContainer.finishLoadMore()
-                                        binding.invitePaymentContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        binding.invitePaymentList.adapter!!.notifyItemInserted(
-                                            inviteOfficialList.size
-                                        )
-                                        listInit = true
-                                    }
+                                3 -> {
+                                    binding.invitePaymentContainer.finishLoadMore()
+                                    binding.invitePaymentContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    binding.invitePaymentList.adapter!!.notifyItemInserted(
+                                        inviteOfficialList.size
+                                    )
                                 }
-                            } else {
-                                showMessage(inviteOfficialListResponse.msg)
                             }
+                        } else {
+                            showMessage(inviteOfficialListResponse.msg)
                         }
                     }
+                }
 
-                    override fun onFailure(call: Call<InviteOfficialListResponse>, t: Throwable) {
-                        showErrorInfo(R.string.invite_official_payment_list_get_failed)
-                    }
-
-                })
+                override fun onFailure(call: Call<InviteOfficialListResponse>, t: Throwable) {
+                    showErrorInfo(R.string.invite_official_payment_list_get_failed)
+                }
 
-        } else {
-            if (OASystem.needRefresh) {
-                pageIndex = 1
-                inviteOfficialListRequest.pageIndex = pageIndex
-                inviteOfficialList.clear()
-                listInit = false
-                initInviteOfficialList(2)
-            }
-        }
+            })
     }
 
     private fun getTotalPage(dataCount: Int, pageSize: Int): Int {
@@ -290,12 +284,12 @@ class GroupInvitePaymentListFragment : BaseFragment<FragmentGroupInvitePaymentLi
                     data.translateCurrency
                 )
                 itemView.findViewById<TextView>(R.id.activity_payment).text = String.format(
-                    resources.getString(R.string.currency_name_code_format),
+                    resources.getString(R.string.price_and_currency_format),
                     data.eventsCost,
                     data.eventsCurrency
                 )
                 itemView.findViewById<TextView>(R.id.payment_total).text = String.format(
-                    resources.getString(R.string.currency_name_code_format),
+                    resources.getString(R.string.price_and_currency_format),
                     data.payMoney,
                     data.paymentCurrency
                 )
@@ -393,7 +387,6 @@ class GroupInvitePaymentListFragment : BaseFragment<FragmentGroupInvitePaymentLi
                 inviteOfficialListRequest.pageIndex = pageIndex
                 binding.invitePaymentList.adapter!!.notifyItemRangeRemoved(0, inviteOfficialList.size)
                 inviteOfficialList.clear()
-                listInit = false
                 initInviteOfficialList(2)
             }
 
@@ -401,7 +394,6 @@ class GroupInvitePaymentListFragment : BaseFragment<FragmentGroupInvitePaymentLi
                 if (pageIndex < totalPage) {
                     pageIndex += 1
                     inviteOfficialListRequest.pageIndex = pageIndex
-                    listInit = false
                     initInviteOfficialList(3)
                 }
             }

app/src/main/java/com/pan_american/android/ui/group_invite_official/invite_official_payment_insert/InviteOfficialPaymentInsertActivity.kt

@@ -35,7 +35,7 @@ class InviteOfficialPaymentInsertActivity : BaseActivity<ActivityInviteOfficialP
 
 
         supportFragmentManager.beginTransaction().addToBackStack(null)
-            .replace(binding.inviteOfficialFragmentContainer.id, groupSimpleInfoFragment).commit()
+            .add(binding.inviteOfficialFragmentContainer.id, groupSimpleInfoFragment).commit()
     }
 
     override fun initEvents() {

app/src/main/java/com/pan_american/android/ui/group_invite_official/official_visits/InviteVisitsActivity.kt

@@ -153,13 +153,14 @@ class InviteVisitsActivity : BaseActivity<ActivityInviteVisitsBinding>() {
         }
     }
 
-    override fun onResume() {
-        super.onResume()
+    override fun onStart() {
+        super.onStart()
 
         if (OASystem.needRefresh) {
             binding.officialVisitsList.adapter!!.notifyItemRangeRemoved(0, officialVisitList.size)
             officialVisitListRequest.pageIndex = 1
             officialVisitList.clear()
+            OASystem.needRefresh = false
             getGroupOfficialVisitsList(2)
         }
     }

app/src/main/java/com/pan_american/android/ui/group_management/group_info/AddGroupInfoActivity.kt

@@ -198,7 +198,7 @@ class AddGroupInfoActivity : BaseActivity<ActivityAddGroupInfoBinding>() {
                             OASystem.groupInfoBerthType = selectorResponse.data
 
                             supportFragmentManager.beginTransaction().addToBackStack(null)
-                                .replace(binding.addGroupInfoContainer.id, GroupInfoBaseFragment())
+                                .add(binding.addGroupInfoContainer.id, GroupInfoBaseFragment())
                                 .commit()
 
                         } else {

app/src/main/java/com/pan_american/android/ui/group_management/group_info/GroupInfoBaseFragment.kt

@@ -557,7 +557,7 @@ class GroupInfoBaseFragment : BaseFragment<FragmentGroupInfoBaseBinding>() {
                 R.anim.slide_left_in,
                 R.anim.slide_right_out
             ).addToBackStack(null)
-                .replace(R.id.add_group_info_container, GroupCustomerListFragment()).commit()
+                .add(R.id.add_group_info_container, GroupCustomerListFragment()).commit()
         }
     }
 

app/src/main/java/com/pan_american/android/ui/group_management/group_info/GroupInfoListFragment.kt

@@ -35,8 +35,6 @@ class GroupInfoListFragment : BaseFragment<FragmentGroupInfoListBinding>() {
 
     private var groupInfoList = ArrayList<GroupInfoSimple>()
 
-    private var listInit = false
-
     private var groupInfoListRequest = GroupInfoListRequest()
 
     private var pageIndex = 1
@@ -74,6 +72,18 @@ class GroupInfoListFragment : BaseFragment<FragmentGroupInfoListBinding>() {
         initGroupInfoList(1)
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        if (OASystem.needRefresh) {
+            pageIndex = 1
+            groupInfoListRequest.pageIndex = pageIndex
+            groupInfoList.clear()
+            OASystem.needRefresh = false
+            initGroupInfoList(2)
+        }
+    }
+
     private fun initGroupInfoList(type: Int) {
 
         ///避免Fragment not attached to a context.
@@ -81,72 +91,58 @@ class GroupInfoListFragment : BaseFragment<FragmentGroupInfoListBinding>() {
             return
         }
 
-        if (!listInit) {
+        apiService.getGroupInfoList(groupInfoListRequest)
+            .enqueue(object : Callback<GroupInfoListResponse> {
+
+                override fun onResponse(
+                    call: Call<GroupInfoListResponse>, response: Response<GroupInfoListResponse>
+                ) {
+                    val groupInfoListResponse = response.body()
 
-            apiService.getGroupInfoList(groupInfoListRequest)
-                .enqueue(object : Callback<GroupInfoListResponse> {
+                    if (groupInfoListResponse != null) {
+                        if (groupInfoListResponse.code == 200) {
 
-                    override fun onResponse(
-                        call: Call<GroupInfoListResponse>, response: Response<GroupInfoListResponse>
-                    ) {
-                        val groupInfoListResponse = response.body()
+                            for (item in groupInfoListResponse.data.data) {
+                                groupInfoList.add(item)
+                            }
 
-                        if (groupInfoListResponse != null) {
-                            if (groupInfoListResponse.code == 200) {
+                            if (groupInfoList.size == 0) {
+                                showMessage(resources.getString(R.string.no_data))
+                            }
 
-                                for (item in groupInfoListResponse.data.data) {
-                                    groupInfoList.add(item)
+                            when (type) {
+                                1 -> {
+                                    totalPage = getTotalPage(groupInfoListResponse.count)
+                                    binding.groupInfoContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    initList()
                                 }
 
-                                if (groupInfoList.size == 0) {
-                                    showMessage(resources.getString(R.string.no_data))
+                                2 -> {
+                                    binding.groupInfoContainer.finishRefresh()
+                                    totalPage = getTotalPage(groupInfoListResponse.count)
+                                    binding.groupInfoContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    initList()
                                 }
 
-                                when (type) {
-                                    1 -> {
-                                        totalPage = getTotalPage(groupInfoListResponse.count)
-                                        binding.groupInfoContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    2 -> {
-                                        binding.groupInfoContainer.finishRefresh()
-                                        totalPage = getTotalPage(groupInfoListResponse.count)
-                                        binding.groupInfoContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    3 -> {
-                                        binding.groupInfoContainer.finishLoadMore()
-                                        binding.groupInfoContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        binding.groupInfoList.adapter!!.notifyItemInserted(
-                                            groupInfoList.size
-                                        )
-                                        listInit = true
-                                    }
+                                3 -> {
+                                    binding.groupInfoContainer.finishLoadMore()
+                                    binding.groupInfoContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    binding.groupInfoList.adapter!!.notifyItemInserted(
+                                        groupInfoList.size
+                                    )
                                 }
-
-                            } else {
-                                showMessage(groupInfoListResponse.msg)
                             }
+
+                        } else {
+                            showMessage(groupInfoListResponse.msg)
                         }
                     }
+                }
 
-                    override fun onFailure(call: Call<GroupInfoListResponse>, t: Throwable) {
-                        showMessage(resources.getString(R.string.network_error))
-                    }
-                })
-        } else {
-            if (OASystem.needRefresh) {
-                pageIndex = 1
-                groupInfoListRequest.pageIndex = pageIndex
-                groupInfoList.clear()
-                listInit = false
-                initGroupInfoList(2)
-            }
-        }
+                override fun onFailure(call: Call<GroupInfoListResponse>, t: Throwable) {
+                    showMessage(resources.getString(R.string.network_error))
+                }
+            })
     }
 
     private fun getTotalPage(dataCount: Int): Int {
@@ -231,7 +227,6 @@ class GroupInfoListFragment : BaseFragment<FragmentGroupInfoListBinding>() {
                 groupInfoListRequest.pageIndex = pageIndex
                 binding.groupInfoList.adapter!!.notifyItemRangeRemoved(0, groupInfoList.size)
                 groupInfoList.clear()
-                listInit = false
                 initGroupInfoList(2)
             }
 
@@ -239,7 +234,6 @@ class GroupInfoListFragment : BaseFragment<FragmentGroupInfoListBinding>() {
                 if (pageIndex < totalPage) {
                     pageIndex += 1
                     groupInfoListRequest.pageIndex = pageIndex
-                    listInit = false
                     initGroupInfoList(3)
                 }
             }

app/src/main/java/com/pan_american/android/ui/group_management/group_info/GroupInfoRequireFragment.kt

@@ -81,7 +81,7 @@ class GroupInfoRequireFragment : BaseFragment<FragmentGroupInfoRequireBinding>()
                 R.anim.slide_left_in,
                 R.anim.slide_right_out
             ).addToBackStack(null)
-                .replace(R.id.add_group_info_container, GroupInfoExaminationFragment()).commit()
+                .add(R.id.add_group_info_container, GroupInfoExaminationFragment()).commit()
         }
     }
 

app/src/main/java/com/pan_american/android/ui/group_management/group_info/GroupInfoSearchFragment.kt

@@ -57,23 +57,6 @@ class GroupInfoSearchFragment : BaseFragment<FragmentGroupInfoSearchBinding>() {
     override fun onStart() {
         super.onStart()
 
-        initViews()
-    }
-
-    override fun onStop() {
-        super.onStop()
-
-        //保存当前界面的数据
-        groupName = binding.groupName.text.toString()
-        clientName = binding.customerName.text.toString()
-        clientUnit = binding.customerDepartment.text.toString()
-        visitDate = binding.visitDate.text.toString()
-
-        inStack = true
-    }
-
-    override fun initViews() {
-
         if (inStack) {
 
             if (groupTypeId != 0) {
@@ -97,7 +80,18 @@ class GroupInfoSearchFragment : BaseFragment<FragmentGroupInfoSearchBinding>() {
             binding.customerDepartment.setText(clientUnit)
             binding.visitDate.text = visitDate
         }
+    }
 
+    override fun onStop() {
+        super.onStop()
+
+        //保存当前界面的数据
+        groupName = binding.groupName.text.toString()
+        clientName = binding.customerName.text.toString()
+        clientUnit = binding.customerDepartment.text.toString()
+        visitDate = binding.visitDate.text.toString()
+
+        inStack = true
     }
 
     override fun initEvents() {

app/src/main/java/com/pan_american/android/ui/group_op/ground_convey_payment_insert/GroundConveyPaymentInsertActivity.kt

@@ -34,7 +34,7 @@ class GroundConveyPaymentInsertActivity : BaseActivity<ActivityGroupOpPaymentBin
         groupSimpleInfoFragment.arguments = bundle
 
         supportFragmentManager.beginTransaction().addToBackStack(null)
-            .replace(binding.groupOpFragmentContainer.id, groupSimpleInfoFragment).commit()
+            .add(binding.groupOpFragmentContainer.id, groupSimpleInfoFragment).commit()
     }
 
     override fun initEvents() {

app/src/main/java/com/pan_american/android/ui/group_op/ground_convey_payment_insert/GroundConveyPaymentListFragment.kt

@@ -39,8 +39,6 @@ class GroundConveyPaymentListFragment : BaseFragment<FragmentGroupOpPaymentListB
 
     private val apiService = ServiceCreator.create<APIService>()
 
-    private var listInit = false
-
     private var pageIndex = 1
 
     private var totalPage = 0
@@ -103,6 +101,18 @@ class GroundConveyPaymentListFragment : BaseFragment<FragmentGroupOpPaymentListB
 
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        if (OASystem.needRefresh) {
+            pageIndex = 1
+            groundConveyListRequest.pageIndex = pageIndex
+            groundConveyPaymentList.clear()
+            OASystem.needRefresh = false
+            getGroundConveyPaymentList(2)
+        }
+    }
+
     override fun initEvents() {
         binding.baseInfoSwitch.setOnClickListener {
             if (isShow) {
@@ -124,83 +134,70 @@ class GroundConveyPaymentListFragment : BaseFragment<FragmentGroupOpPaymentListB
             return
         }
 
-        if (!listInit) {
-            apiService.getGroundConveyPaymentList(groundConveyListRequest)
-                .enqueue(object : Callback<GroundConveyListResponse> {
-                    override fun onResponse(
-                        call: Call<GroundConveyListResponse>,
-                        response: Response<GroundConveyListResponse>
-                    ) {
-                        val groundConveyResponse = response.body()
+        apiService.getGroundConveyPaymentList(groundConveyListRequest)
+            .enqueue(object : Callback<GroundConveyListResponse> {
+                override fun onResponse(
+                    call: Call<GroundConveyListResponse>,
+                    response: Response<GroundConveyListResponse>
+                ) {
+                    val groundConveyResponse = response.body()
+
+                    if (groundConveyResponse != null) {
+                        if (groundConveyResponse.code == 200) {
+
+                            for (item in groundConveyResponse.data.dataList) {
+                                groundConveyPaymentList.add(item)
+                            }
 
-                        if (groundConveyResponse != null) {
-                            if (groundConveyResponse.code == 200) {
+                            if (groundConveyPaymentList.size == 0) {
+                                showMessage(resources.getString(R.string.no_data))
+                            }
 
-                                for (item in groundConveyResponse.data.dataList) {
-                                    groundConveyPaymentList.add(item)
+                            when (type) {
+                                1 -> {
+                                    totalPage = getTotalPage(
+                                        groundConveyResponse.data.dataCount,
+                                        groundConveyResponse.data.currPageSize
+                                    )
+                                    binding.groundConveyPaymentContainer.setEnableLoadMore(
+                                        pageIndex < totalPage
+                                    )
+                                    initList()
                                 }
 
-                                if (groundConveyPaymentList.size == 0) {
-                                    showMessage(resources.getString(R.string.no_data))
+                                2 -> {
+                                    binding.groundConveyPaymentContainer.finishRefresh()
+                                    totalPage = getTotalPage(
+                                        groundConveyResponse.data.dataCount,
+                                        groundConveyResponse.data.currPageSize
+                                    )
+                                    binding.groundConveyPaymentContainer.setEnableLoadMore(
+                                        pageIndex < totalPage
+                                    )
+                                    initList()
                                 }
 
-                                when (type) {
-                                    1 -> {
-                                        totalPage = getTotalPage(
-                                            groundConveyResponse.data.dataCount,
-                                            groundConveyResponse.data.currPageSize
-                                        )
-                                        binding.groundConveyPaymentContainer.setEnableLoadMore(
-                                            pageIndex < totalPage
-                                        )
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    2 -> {
-                                        binding.groundConveyPaymentContainer.finishRefresh()
-                                        totalPage = getTotalPage(
-                                            groundConveyResponse.data.dataCount,
-                                            groundConveyResponse.data.currPageSize
-                                        )
-                                        binding.groundConveyPaymentContainer.setEnableLoadMore(
-                                            pageIndex < totalPage
-                                        )
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    3 -> {
-                                        binding.groundConveyPaymentContainer.finishLoadMore()
-                                        binding.groundConveyPaymentContainer.setEnableLoadMore(
-                                            pageIndex < totalPage
-                                        )
-                                        binding.groundConveyPaymentList.adapter!!.notifyItemInserted(
-                                            groundConveyPaymentList.size
-                                        )
-                                        listInit = true
-                                    }
+                                3 -> {
+                                    binding.groundConveyPaymentContainer.finishLoadMore()
+                                    binding.groundConveyPaymentContainer.setEnableLoadMore(
+                                        pageIndex < totalPage
+                                    )
+                                    binding.groundConveyPaymentList.adapter!!.notifyItemInserted(
+                                        groundConveyPaymentList.size
+                                    )
                                 }
-
-                            } else {
-                                showMessage(groundConveyResponse.msg)
                             }
+
+                        } else {
+                            showMessage(groundConveyResponse.msg)
                         }
                     }
+                }
 
-                    override fun onFailure(call: Call<GroundConveyListResponse>, t: Throwable) {
-                        showErrorInfo(R.string.ground_convey_list_get_failed)
-                    }
-                })
-        } else {
-            if (OASystem.needRefresh) {
-                pageIndex = 1
-                groundConveyListRequest.pageIndex = pageIndex
-                groundConveyPaymentList.clear()
-                listInit = false
-                getGroundConveyPaymentList(2)
-            }
-        }
+                override fun onFailure(call: Call<GroundConveyListResponse>, t: Throwable) {
+                    showErrorInfo(R.string.ground_convey_list_get_failed)
+                }
+            })
     }
 
     private fun getTotalPage(dataCount: Int, pageSize: Int): Int {
@@ -278,7 +275,6 @@ class GroundConveyPaymentListFragment : BaseFragment<FragmentGroupOpPaymentListB
                 groundConveyListRequest.pageIndex = pageIndex
                 binding.groundConveyPaymentList.adapter!!.notifyItemRangeRemoved(0, groundConveyPaymentList.size)
                 groundConveyPaymentList.clear()
-                listInit = false
                 getGroundConveyPaymentList(2)
             }
 
@@ -286,7 +282,6 @@ class GroundConveyPaymentListFragment : BaseFragment<FragmentGroupOpPaymentListB
                 if (pageIndex < totalPage) {
                     pageIndex += 1
                     groundConveyListRequest.pageIndex = pageIndex
-                    listInit = false
                     getGroundConveyPaymentList(3)
                 }
             }

app/src/main/java/com/pan_american/android/ui/group_simple_info/GroupSimpleInfoFragment.kt

@@ -19,10 +19,10 @@ import com.pan_american.android.data.network.APIService
 import com.pan_american.android.data.network.ServiceCreator
 import com.pan_american.android.databinding.FragmentSimpleGroupBinding
 import com.pan_american.android.ui.group_airplane_ticket.airplane_payment_insert.AirplaneTicketListFragment
-import com.pan_american.android.ui.group_visa.insurance_payment_insert.InsuranceListFragment
 import com.pan_american.android.ui.group_hotel.hotel_predetermine.HotelPredetermineListFragment
 import com.pan_american.android.ui.group_invite_official.invite_official_payment_insert.GroupInvitePaymentListFragment
 import com.pan_american.android.ui.group_op.ground_convey_payment_insert.GroundConveyPaymentListFragment
+import com.pan_american.android.ui.group_visa.insurance_payment_insert.InsuranceListFragment
 import com.pan_american.android.ui.group_visa.visa_payment_insert.VisaPaymentListFragment
 import com.scwang.smart.refresh.footer.ClassicsFooter
 import com.scwang.smart.refresh.header.ClassicsHeader
@@ -40,8 +40,6 @@ class GroupSimpleInfoFragment : BaseFragment<FragmentSimpleGroupBinding>() {
 
     private var groupSimpleInfoList = ArrayList<SimpleGroupData>()
 
-    private var listInit = false
-
     private lateinit var groupSimpleInfoRequest: GroupSimpleInfoRequest
 
     private var pageIndex = 1
@@ -99,7 +97,6 @@ class GroupSimpleInfoFragment : BaseFragment<FragmentSimpleGroupBinding>() {
 
                 binding.groupInfoList.adapter!!.notifyItemRangeRemoved(0, groupSimpleInfoList.size)
                 groupSimpleInfoList.clear()
-                listInit = false
                 initSimpleGroupDataList(1)
             }
         })
@@ -112,65 +109,57 @@ class GroupSimpleInfoFragment : BaseFragment<FragmentSimpleGroupBinding>() {
             return
         }
 
-        if (!listInit) {
-            apiService.getGroupSimpleInfo(groupSimpleInfoRequest)
-                .enqueue(object : Callback<GroupSimpleInfoResponse> {
-                    override fun onResponse(
-                        call: Call<GroupSimpleInfoResponse>,
-                        response: Response<GroupSimpleInfoResponse>
-                    ) {
-                        val simpleGroupDataResponse = response.body()
-                        if (simpleGroupDataResponse != null) {
-                            if (simpleGroupDataResponse.code == 200) {
-
-                                for (item in simpleGroupDataResponse.data) {
-                                    groupSimpleInfoList.add(item)
-                                }
+        apiService.getGroupSimpleInfo(groupSimpleInfoRequest)
+            .enqueue(object : Callback<GroupSimpleInfoResponse> {
+                override fun onResponse(
+                    call: Call<GroupSimpleInfoResponse>,
+                    response: Response<GroupSimpleInfoResponse>
+                ) {
+                    val simpleGroupDataResponse = response.body()
+                    if (simpleGroupDataResponse != null) {
+                        if (simpleGroupDataResponse.code == 200) {
+
+                            for (item in simpleGroupDataResponse.data) {
+                                groupSimpleInfoList.add(item)
+                            }
+
+                            if (groupSimpleInfoList.size == 0) {
+                                showMessage(resources.getString(R.string.no_data))
+                            }
 
-                                if (groupSimpleInfoList.size == 0) {
-                                    showMessage(resources.getString(R.string.no_data))
+                            when (type) {
+                                1 -> {
+                                    totalPage = getTotalPage(simpleGroupDataResponse.count)
+                                    binding.groupInfoContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    initList()
                                 }
 
-                                when (type) {
-                                    1 -> {
-                                        totalPage = getTotalPage(simpleGroupDataResponse.count)
-                                        binding.groupInfoContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    2 -> {
-                                        binding.groupInfoContainer.finishRefresh()
-                                        totalPage = getTotalPage(simpleGroupDataResponse.count)
-                                        binding.groupInfoContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    3 -> {
-                                        binding.groupInfoContainer.finishLoadMore()
-                                        binding.groupInfoContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        binding.groupInfoList.adapter!!.notifyItemInserted(
-                                            groupSimpleInfoList.size
-                                        )
-                                        listInit = true
-                                    }
+                                2 -> {
+                                    binding.groupInfoContainer.finishRefresh()
+                                    totalPage = getTotalPage(simpleGroupDataResponse.count)
+                                    binding.groupInfoContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    initList()
                                 }
 
-                            } else {
-                                showMessage(simpleGroupDataResponse.msg)
+                                3 -> {
+                                    binding.groupInfoContainer.finishLoadMore()
+                                    binding.groupInfoContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    binding.groupInfoList.adapter!!.notifyItemInserted(
+                                        groupSimpleInfoList.size
+                                    )
+                                }
                             }
+
+                        } else {
+                            showMessage(simpleGroupDataResponse.msg)
                         }
                     }
+                }
 
-                    override fun onFailure(call: Call<GroupSimpleInfoResponse>, t: Throwable) {
-                        showErrorInfo(R.string.group_list_get_failed)
-                    }
-                })
-        } else {
-            binding.groupInfoContainer.setEnableLoadMore(pageIndex < totalPage)
-            initList()
-        }
+                override fun onFailure(call: Call<GroupSimpleInfoResponse>, t: Throwable) {
+                    showErrorInfo(R.string.group_list_get_failed)
+                }
+            })
     }
 
     private fun getTotalPage(dataCount: Int): Int {
@@ -303,7 +292,7 @@ class GroupSimpleInfoFragment : BaseFragment<FragmentSimpleGroupBinding>() {
                                 R.anim.slide_left_in,
                                 R.anim.slide_right_out
                             ).addToBackStack(null)
-                                .replace(R.id.insurance_insert_container, insuranceListFragment)
+                                .add(R.id.insurance_insert_container, insuranceListFragment)
                                 .commit()
                         }
 
@@ -331,7 +320,6 @@ class GroupSimpleInfoFragment : BaseFragment<FragmentSimpleGroupBinding>() {
                 groupSimpleInfoRequest.pageIndex = pageIndex
                 binding.groupInfoList.adapter!!.notifyItemRangeRemoved(0, groupSimpleInfoList.size)
                 groupSimpleInfoList.clear()
-                listInit = false
                 initSimpleGroupDataList(2)
             }
 
@@ -339,7 +327,6 @@ class GroupSimpleInfoFragment : BaseFragment<FragmentSimpleGroupBinding>() {
                 if (pageIndex < totalPage) {
                     pageIndex += 1
                     groupSimpleInfoRequest.pageIndex = pageIndex
-                    listInit = false
                     initSimpleGroupDataList(3)
                 }
             }

app/src/main/java/com/pan_american/android/ui/group_visa/insurance_payment_insert/InsuranceListFragment.kt

@@ -41,8 +41,6 @@ class InsuranceListFragment : BaseFragment<FragmentInsuranceListBinding>() {
 
     private val apiService = ServiceCreator.create<APIService>()
 
-    private var listInit = false
-
     private var pageIndex = 1
 
     private var totalPage = 0
@@ -104,6 +102,18 @@ class InsuranceListFragment : BaseFragment<FragmentInsuranceListBinding>() {
         getInsurancePaymentList(1)
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        if (OASystem.needRefresh) {
+            pageIndex = 1
+            insurancePaymentListRequest.pageIndex = pageIndex
+            insurancePaymentList.clear()
+            OASystem.needRefresh = false
+            getInsurancePaymentList(2)
+        }
+    }
+
     override fun initEvents() {
         binding.baseInfoSwitch.setOnClickListener {
             if (isShow) {
@@ -119,81 +129,73 @@ class InsuranceListFragment : BaseFragment<FragmentInsuranceListBinding>() {
     }
 
     private fun getInsurancePaymentList(type: Int) {
-        if (!listInit) {
-            apiService.getInsurancePaymentList(insurancePaymentListRequest)
-                .enqueue(object : Callback<InsurancePaymentListResponse> {
-                    override fun onResponse(
-                        call: Call<InsurancePaymentListResponse>,
-                        response: Response<InsurancePaymentListResponse>
-                    ) {
-                        val insuranceListResponse = response.body()
-
-                        if (insuranceListResponse != null) {
-                            if (insuranceListResponse.code == 200) {
-                                for (item in insuranceListResponse.data.dataList) {
-                                    insurancePaymentList.add(item)
+
+        if (!isAdded) {
+            return
+        }
+
+        apiService.getInsurancePaymentList(insurancePaymentListRequest)
+            .enqueue(object : Callback<InsurancePaymentListResponse> {
+                override fun onResponse(
+                    call: Call<InsurancePaymentListResponse>,
+                    response: Response<InsurancePaymentListResponse>
+                ) {
+                    val insuranceListResponse = response.body()
+
+                    if (insuranceListResponse != null) {
+                        if (insuranceListResponse.code == 200) {
+                            for (item in insuranceListResponse.data.dataList) {
+                                insurancePaymentList.add(item)
+                            }
+
+                            if (insurancePaymentList.size == 0) {
+                                showMessage(resources.getString(R.string.no_data))
+                            }
+
+                            when (type) {
+                                1 -> {
+                                    totalPage = getTotalPage(
+                                        insuranceListResponse.data.dataCount,
+                                        insuranceListResponse.data.currPageSize
+                                    )
+                                    binding.insurancePaymentContainer.setEnableLoadMore(
+                                        pageIndex < totalPage
+                                    )
+                                    initList()
                                 }
 
-                                if (insurancePaymentList.size == 0) {
-                                    showMessage(resources.getString(R.string.no_data))
+                                2 -> {
+                                    binding.insurancePaymentContainer.finishRefresh()
+                                    totalPage = getTotalPage(
+                                        insuranceListResponse.data.dataCount,
+                                        insuranceListResponse.data.currPageSize
+                                    )
+                                    binding.insurancePaymentContainer.setEnableLoadMore(
+                                        pageIndex < totalPage
+                                    )
+                                    initList()
                                 }
 
-                                when (type) {
-                                    1 -> {
-                                        totalPage = getTotalPage(
-                                            insuranceListResponse.data.dataCount,
-                                            insuranceListResponse.data.currPageSize
-                                        )
-                                        binding.insurancePaymentContainer.setEnableLoadMore(
-                                            pageIndex < totalPage
-                                        )
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    2 -> {
-                                        binding.insurancePaymentContainer.finishRefresh()
-                                        totalPage = getTotalPage(
-                                            insuranceListResponse.data.dataCount,
-                                            insuranceListResponse.data.currPageSize
-                                        )
-                                        binding.insurancePaymentContainer.setEnableLoadMore(
-                                            pageIndex < totalPage
-                                        )
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    3 -> {
-                                        binding.insurancePaymentContainer.finishLoadMore()
-                                        binding.insurancePaymentContainer.setEnableLoadMore(
-                                            pageIndex < totalPage
-                                        )
-                                        binding.insurancePaymentList.adapter!!.notifyItemInserted(
-                                            insurancePaymentList.size
-                                        )
-                                        listInit = true
-                                    }
+                                3 -> {
+                                    binding.insurancePaymentContainer.finishLoadMore()
+                                    binding.insurancePaymentContainer.setEnableLoadMore(
+                                        pageIndex < totalPage
+                                    )
+                                    binding.insurancePaymentList.adapter!!.notifyItemInserted(
+                                        insurancePaymentList.size
+                                    )
                                 }
-                            } else {
-                                showMessage(insuranceListResponse.msg)
                             }
+                        } else {
+                            showMessage(insuranceListResponse.msg)
                         }
                     }
+                }
 
-                    override fun onFailure(call: Call<InsurancePaymentListResponse>, t: Throwable) {
-                        showErrorInfo(R.string.insurance_list_get_failed)
-                    }
-                })
-        } else {
-            if (OASystem.needRefresh) {
-                pageIndex = 1
-                insurancePaymentListRequest.pageIndex = pageIndex
-                insurancePaymentList.clear()
-                listInit = false
-                getInsurancePaymentList(2)
-            }
-        }
+                override fun onFailure(call: Call<InsurancePaymentListResponse>, t: Throwable) {
+                    showErrorInfo(R.string.insurance_list_get_failed)
+                }
+            })
     }
 
     private fun getTotalPage(dataCount: Int, pageSize: Int): Int {
@@ -320,7 +322,6 @@ class InsuranceListFragment : BaseFragment<FragmentInsuranceListBinding>() {
                 insurancePaymentListRequest.pageIndex = pageIndex
                 binding.insurancePaymentList.adapter!!.notifyItemRangeRemoved(0, insurancePaymentList.size)
                 insurancePaymentList.clear()
-                listInit = false
                 getInsurancePaymentList(2)
             }
 
@@ -328,7 +329,6 @@ class InsuranceListFragment : BaseFragment<FragmentInsuranceListBinding>() {
                 if (pageIndex < totalPage) {
                     pageIndex += 1
                     insurancePaymentListRequest.pageIndex = pageIndex
-                    listInit = false
                     getInsurancePaymentList(3)
                 }
             }

app/src/main/java/com/pan_american/android/ui/group_visa/insurance_payment_insert/InsurancePaymentInsertActivity.kt

@@ -39,6 +39,6 @@ class InsurancePaymentInsertActivity : BaseActivity<ActivityInsurancePaymentInse
         groupSimpleInfoFragment.arguments = bundle
 
         supportFragmentManager.beginTransaction().addToBackStack(null)
-            .replace(binding.insuranceInsertContainer.id, groupSimpleInfoFragment).commit()
+            .add(binding.insuranceInsertContainer.id, groupSimpleInfoFragment).commit()
     }
 }

app/src/main/java/com/pan_american/android/ui/group_visa/visa_payment_insert/VisaPaymentInsertActivity.kt

@@ -34,7 +34,7 @@ class VisaPaymentInsertActivity : BaseActivity<ActivityVisaPaymentInsertBinding>
         groupSimpleInfoFragment.arguments = bundle
 
         supportFragmentManager.beginTransaction().addToBackStack(null)
-            .replace(binding.visaPaymentFragmentContainer.id, groupSimpleInfoFragment).commit()
+            .add(binding.visaPaymentFragmentContainer.id, groupSimpleInfoFragment).commit()
     }
 
     override fun initEvents() {

app/src/main/java/com/pan_american/android/ui/group_visa/visa_payment_insert/VisaPaymentListFragment.kt

@@ -41,8 +41,6 @@ class VisaPaymentListFragment : BaseFragment<FragmentVisaPaymentListBinding>() {
 
     private lateinit var visaPaymentListRequest: VisaPaymentListRequest
 
-    private var listInit = false
-
     private var pageIndex = 1
 
     private var totalPage = 0
@@ -104,6 +102,18 @@ class VisaPaymentListFragment : BaseFragment<FragmentVisaPaymentListBinding>() {
         getVisaPaymentList(1)
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        if (OASystem.needRefresh) {
+            pageIndex = 1
+            visaPaymentListRequest.pageIndex = pageIndex
+            visaPaymentList.clear()
+            OASystem.needRefresh = false
+            getVisaPaymentList(2)
+        }
+    }
+
     override fun initEvents() {
 
         binding.baseInfoSwitch.setOnClickListener {
@@ -120,76 +130,68 @@ class VisaPaymentListFragment : BaseFragment<FragmentVisaPaymentListBinding>() {
     }
 
     private fun getVisaPaymentList(type: Int) {
-        if (!listInit) {
-            apiService.getVisaPaymentListById(visaPaymentListRequest)
-                .enqueue(object : Callback<VisaPaymentListResponse> {
-                    override fun onResponse(
-                        call: Call<VisaPaymentListResponse>,
-                        response: Response<VisaPaymentListResponse>
-                    ) {
-                        val visaListResponse = response.body()
-
-                        if (visaListResponse != null) {
-                            if (visaListResponse.code == 200) {
-                                for (item in visaListResponse.data.dataList) {
-                                    visaPaymentList.add(item)
-                                }
 
-                                if (visaPaymentList.size == 0) {
-                                    showMessage(resources.getString(R.string.no_data))
+        if (!isAdded) {
+            return
+        }
+
+        apiService.getVisaPaymentListById(visaPaymentListRequest)
+            .enqueue(object : Callback<VisaPaymentListResponse> {
+                override fun onResponse(
+                    call: Call<VisaPaymentListResponse>,
+                    response: Response<VisaPaymentListResponse>
+                ) {
+                    val visaListResponse = response.body()
+
+                    if (visaListResponse != null) {
+                        if (visaListResponse.code == 200) {
+                            for (item in visaListResponse.data.dataList) {
+                                visaPaymentList.add(item)
+                            }
+
+                            if (visaPaymentList.size == 0) {
+                                showMessage(resources.getString(R.string.no_data))
+                            }
+
+                            when (type) {
+                                1 -> {
+                                    totalPage = getTotalPage(
+                                        visaListResponse.data.dataCount,
+                                        visaListResponse.data.currPageSize
+                                    )
+                                    binding.visaPaymentContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    initList()
                                 }
 
-                                when (type) {
-                                    1 -> {
-                                        totalPage = getTotalPage(
-                                            visaListResponse.data.dataCount,
-                                            visaListResponse.data.currPageSize
-                                        )
-                                        binding.visaPaymentContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    2 -> {
-                                        binding.visaPaymentContainer.finishRefresh()
-                                        totalPage = getTotalPage(
-                                            visaListResponse.data.dataCount,
-                                            visaListResponse.data.currPageSize
-                                        )
-                                        binding.visaPaymentContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    3 -> {
-                                        binding.visaPaymentContainer.finishLoadMore()
-                                        binding.visaPaymentContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        binding.visaPaymentList.adapter!!.notifyItemInserted(
-                                            visaPaymentList.size
-                                        )
-                                        listInit = true
-                                    }
+                                2 -> {
+                                    binding.visaPaymentContainer.finishRefresh()
+                                    totalPage = getTotalPage(
+                                        visaListResponse.data.dataCount,
+                                        visaListResponse.data.currPageSize
+                                    )
+                                    binding.visaPaymentContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    initList()
                                 }
 
-                            } else {
-                                showMessage(visaListResponse.msg)
+                                3 -> {
+                                    binding.visaPaymentContainer.finishLoadMore()
+                                    binding.visaPaymentContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    binding.visaPaymentList.adapter!!.notifyItemInserted(
+                                        visaPaymentList.size
+                                    )
+                                }
                             }
+
+                        } else {
+                            showMessage(visaListResponse.msg)
                         }
                     }
+                }
 
-                    override fun onFailure(call: Call<VisaPaymentListResponse>, t: Throwable) {
-                        showErrorInfo(R.string.visa_payment_list_get_failed)
-                    }
-                })
-        } else {
-            if (OASystem.needRefresh) {
-                pageIndex = 1
-                visaPaymentListRequest.pageIndex = pageIndex
-                visaPaymentList.clear()
-                listInit = false
-                getVisaPaymentList(2)
-            }
-        }
+                override fun onFailure(call: Call<VisaPaymentListResponse>, t: Throwable) {
+                    showErrorInfo(R.string.visa_payment_list_get_failed)
+                }
+            })
     }
 
     private fun getTotalPage(dataCount: Int, pageSize: Int): Int {
@@ -327,7 +329,6 @@ class VisaPaymentListFragment : BaseFragment<FragmentVisaPaymentListBinding>() {
                 visaPaymentListRequest.pageIndex = pageIndex
                 binding.visaPaymentList.adapter!!.notifyItemRangeRemoved(0, visaPaymentList.size)
                 visaPaymentList.clear()
-                listInit = false
                 getVisaPaymentList(2)
             }
 
@@ -335,7 +336,6 @@ class VisaPaymentListFragment : BaseFragment<FragmentVisaPaymentListBinding>() {
                 if (pageIndex < totalPage) {
                     pageIndex += 1
                     visaPaymentListRequest.pageIndex = pageIndex
-                    listInit = false
                     getVisaPaymentList(3)
                 }
             }

app/src/main/java/com/pan_american/android/ui/personnel_module/materials_operate/MaterialApplicationHistoryActivity.kt

@@ -31,6 +31,6 @@ class MaterialApplicationHistoryActivity : BaseActivity<ActivityMaterialApplicat
 
     override fun initViews() {
         supportFragmentManager.beginTransaction().addToBackStack(null)
-            .replace(binding.materialHistoryContainer.id, MaterialHistorySearchFragment()).commit()
+            .add(binding.materialHistoryContainer.id, MaterialHistorySearchFragment()).commit()
     }
 }

app/src/main/java/com/pan_american/android/ui/personnel_module/materials_operate/MaterialOperateActivity.kt

@@ -95,14 +95,15 @@ class MaterialOperateActivity : BaseActivity<ActivityMaterialOperateBinding>() {
         binding.materialContainer.setRefreshFooter(ClassicsFooter(OASystem.context))
     }
 
-    override fun onResume() {
-        super.onResume()
+    override fun onStart() {
+        super.onStart()
 
         if (OASystem.needRefresh) {
             pageIndex = 1
             materialSearchRequest.pageIndex = pageIndex
             binding.materialList.adapter!!.notifyItemRangeRemoved(0, materialList.size)
             materialList.clear()
+            OASystem.needRefresh = false
             materialSearch(2)
         }
     }

app/src/main/java/com/pan_american/android/ui/resource_management/airplane_three_code/AirplaneThreeCodeActivity.kt

@@ -47,7 +47,7 @@ class AirplaneThreeCodeActivity : BaseActivity<ActivityAirplaneThreeCodeBinding>
     override fun initViews() {
 
         supportFragmentManager.beginTransaction().addToBackStack(null)
-            .replace(binding.airplaneThreeCodeContainer.id, AirplaneThreeCodeSearchFragment())
+            .add(binding.airplaneThreeCodeContainer.id, AirplaneThreeCodeSearchFragment())
             .commit()
     }
 }

app/src/main/java/com/pan_american/android/ui/resource_management/airplane_three_code/AirplaneThreeCodeListFragment.kt

@@ -34,8 +34,6 @@ class AirplaneThreeCodeListFragment : BaseFragment<FragmentAirplaneThreeCodeList
 
     private var airplaneList = ArrayList<AirplaneThreeCode>()
 
-    private var listInit = false
-
     private lateinit var airplaneThreeCodeRequest: AirplaneThreeCodeRequest
 
     private var pageIndex = 1
@@ -66,6 +64,18 @@ class AirplaneThreeCodeListFragment : BaseFragment<FragmentAirplaneThreeCodeList
         initAirplaneThreeCodeList(1)
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        if (OASystem.needRefresh) {
+            pageIndex = 1
+            airplaneThreeCodeRequest.pageIndex = pageIndex
+            airplaneList.clear()
+            OASystem.needRefresh = false
+            initAirplaneThreeCodeList(2)
+        }
+    }
+
     private fun initAirplaneThreeCodeList(type: Int) {
 
         //避免Fragment not attached to a context.
@@ -73,69 +83,56 @@ class AirplaneThreeCodeListFragment : BaseFragment<FragmentAirplaneThreeCodeList
             return
         }
 
-        if (!listInit) {
-            apiService.getAirplaneThreeCodeData(airplaneThreeCodeRequest)
-                .enqueue(object : Callback<AirplaneThreeCodeResponse> {
-                    override fun onResponse(
-                        call: Call<AirplaneThreeCodeResponse>,
-                        response: Response<AirplaneThreeCodeResponse>
-                    ) {
-                        val airplaneThreeCodeResponse = response.body()
-                        if (airplaneThreeCodeResponse != null) {
-                            if (airplaneThreeCodeResponse.code == 200) {
-                                for (item in airplaneThreeCodeResponse.data.pageSource) {
-                                    airplaneList.add(item)
+        apiService.getAirplaneThreeCodeData(airplaneThreeCodeRequest)
+            .enqueue(object : Callback<AirplaneThreeCodeResponse> {
+                override fun onResponse(
+                    call: Call<AirplaneThreeCodeResponse>,
+                    response: Response<AirplaneThreeCodeResponse>
+                ) {
+                    val airplaneThreeCodeResponse = response.body()
+                    if (airplaneThreeCodeResponse != null) {
+                        if (airplaneThreeCodeResponse.code == 200) {
+                            for (item in airplaneThreeCodeResponse.data.pageSource) {
+                                airplaneList.add(item)
+                            }
+                            when (type) {
+                                1 -> {
+                                    totalPage = airplaneThreeCodeResponse.data.totalPage
+                                    binding.airplaneThreeCodeContainer.setEnableLoadMore(
+                                        pageIndex < totalPage
+                                    )
+                                    initList()
                                 }
-                                when (type) {
-                                    1 -> {
-                                        totalPage = airplaneThreeCodeResponse.data.totalPage
-                                        binding.airplaneThreeCodeContainer.setEnableLoadMore(
-                                            pageIndex < totalPage
-                                        )
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    2 -> {
-                                        binding.airplaneThreeCodeContainer.finishRefresh()
-                                        totalPage = airplaneThreeCodeResponse.data.totalPage
-                                        binding.airplaneThreeCodeContainer.setEnableLoadMore(
-                                            pageIndex < totalPage
-                                        )
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    3 -> {
-                                        binding.airplaneThreeCodeContainer.finishLoadMore()
-                                        binding.airplaneThreeCodeContainer.setEnableLoadMore(
-                                            pageIndex < totalPage
-                                        )
-                                        binding.airplaneResourceList.adapter!!.notifyItemInserted(
-                                            airplaneList.size
-                                        )
-                                        listInit = true
-                                    }
+
+                                2 -> {
+                                    binding.airplaneThreeCodeContainer.finishRefresh()
+                                    totalPage = airplaneThreeCodeResponse.data.totalPage
+                                    binding.airplaneThreeCodeContainer.setEnableLoadMore(
+                                        pageIndex < totalPage
+                                    )
+                                    initList()
+                                }
+
+                                3 -> {
+                                    binding.airplaneThreeCodeContainer.finishLoadMore()
+                                    binding.airplaneThreeCodeContainer.setEnableLoadMore(
+                                        pageIndex < totalPage
+                                    )
+                                    binding.airplaneResourceList.adapter!!.notifyItemInserted(
+                                        airplaneList.size
+                                    )
                                 }
-                            } else {
-                                showMessage(airplaneThreeCodeResponse.msg)
                             }
+                        } else {
+                            showMessage(airplaneThreeCodeResponse.msg)
                         }
                     }
+                }
 
-                    override fun onFailure(call: Call<AirplaneThreeCodeResponse>, t: Throwable) {
-                        showErrorInfo(R.string.airplane_three_code_list_get_failed)
-                    }
-                })
-        } else {
-            if (OASystem.needRefresh) {
-                pageIndex = 1
-                airplaneThreeCodeRequest.pageIndex = pageIndex
-                airplaneList.clear()
-                listInit = false
-                initAirplaneThreeCodeList(2)
-            }
-        }
+                override fun onFailure(call: Call<AirplaneThreeCodeResponse>, t: Throwable) {
+                    showErrorInfo(R.string.airplane_three_code_list_get_failed)
+                }
+            })
     }
 
     private fun initList() {
@@ -206,7 +203,6 @@ class AirplaneThreeCodeListFragment : BaseFragment<FragmentAirplaneThreeCodeList
                 airplaneThreeCodeRequest.pageIndex = pageIndex
                 binding.airplaneResourceList.adapter!!.notifyItemRangeRemoved(0, airplaneList.size)
                 airplaneList.clear()
-                listInit = false
                 initAirplaneThreeCodeList(2)
             }
 
@@ -214,7 +210,6 @@ class AirplaneThreeCodeListFragment : BaseFragment<FragmentAirplaneThreeCodeList
                 if (pageIndex < totalPage) {
                     pageIndex += 1
                     airplaneThreeCodeRequest.pageIndex = pageIndex
-                    listInit = false
                     initAirplaneThreeCodeList(3)
                 }
             }

app/src/main/java/com/pan_american/android/ui/resource_management/airplane_three_code/AirplaneThreeCodeSearchFragment.kt

@@ -33,8 +33,6 @@ class AirplaneThreeCodeSearchFragment : BaseFragment<FragmentAirplaneThreeCodeSe
 
     private var selectorItems = ArrayList<Selector>()
 
-    private var listInit = false
-
     private var inStack = false
 
     //当前界面的数据保存
@@ -104,7 +102,7 @@ class AirplaneThreeCodeSearchFragment : BaseFragment<FragmentAirplaneThreeCodeSe
                 R.anim.slide_left_in,
                 R.anim.slide_right_out
             ).addToBackStack(null)
-                .replace(R.id.airplane_three_code_container, airplaneThreeCodeListFragment).commit()
+                .add(R.id.airplane_three_code_container, airplaneThreeCodeListFragment).commit()
         }
 
         binding.airplaneCity.setOnClickListener {
@@ -216,31 +214,28 @@ class AirplaneThreeCodeSearchFragment : BaseFragment<FragmentAirplaneThreeCodeSe
             return
         }
 
-        if (!listInit) {
-            val apiService = ServiceCreator.create<APIService>()
-            apiService.getAirplaneSelect().enqueue(object : Callback<SelectorResponse> {
-                override fun onResponse(
-                    call: Call<SelectorResponse>, response: Response<SelectorResponse>
-                ) {
-                    val areaSelectorResponse = response.body()
-                    if (areaSelectorResponse != null) {
-                        if (areaSelectorResponse.code == 200) {
-                            for (item in areaSelectorResponse.data) {
-                                selectorItems.add(item)
-                            }
-                            listInit = true
-
-                            initEvents()
-                        } else {
-                            showMessage(areaSelectorResponse.msg)
+        val apiService = ServiceCreator.create<APIService>()
+        apiService.getAirplaneSelect().enqueue(object : Callback<SelectorResponse> {
+            override fun onResponse(
+                call: Call<SelectorResponse>, response: Response<SelectorResponse>
+            ) {
+                val areaSelectorResponse = response.body()
+                if (areaSelectorResponse != null) {
+                    if (areaSelectorResponse.code == 200) {
+                        for (item in areaSelectorResponse.data) {
+                            selectorItems.add(item)
                         }
+
+                        initEvents()
+                    } else {
+                        showMessage(areaSelectorResponse.msg)
                     }
                 }
+            }
 
-                override fun onFailure(call: Call<SelectorResponse>, t: Throwable) {
-                    showErrorInfo(R.string.base_resource_data_get_failed)
-                }
-            })
-        }
+            override fun onFailure(call: Call<SelectorResponse>, t: Throwable) {
+                showErrorInfo(R.string.base_resource_data_get_failed)
+            }
+        })
     }
 }

app/src/main/java/com/pan_american/android/ui/resource_management/car_resource/CarResourceActivity.kt

@@ -46,6 +46,6 @@ class CarResourceActivity : BaseActivity<ActivityCarResourceBinding>() {
 
     override fun initViews() {
         supportFragmentManager.beginTransaction().addToBackStack(null)
-            .replace(binding.carResourceContainer.id, CarResourceSearchFragment()).commit()
+            .add(binding.carResourceContainer.id, CarResourceSearchFragment()).commit()
     }
 }

app/src/main/java/com/pan_american/android/ui/resource_management/car_resource/CarResourceListFragment.kt

@@ -34,8 +34,6 @@ class CarResourceListFragment : BaseFragment<FragmentCarResourceListBinding>() {
 
     private var carList = ArrayList<CarResource>()
 
-    private var listInit = false
-
     private lateinit var carResourceRequest: ResourceRequest
 
     private var pageIndex = 1
@@ -71,6 +69,18 @@ class CarResourceListFragment : BaseFragment<FragmentCarResourceListBinding>() {
         initCarResourceList(1)
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        if (OASystem.needRefresh) {
+            pageIndex = 1
+            carResourceRequest.pageIndex = pageIndex
+            carList.clear()
+            OASystem.needRefresh = false
+            initCarResourceList(2)
+        }
+    }
+
     private fun initCarResourceList(type: Int) {
 
         //避免Fragment not attached to a context.
@@ -78,65 +88,52 @@ class CarResourceListFragment : BaseFragment<FragmentCarResourceListBinding>() {
             return
         }
 
-        if (!listInit) {
-            apiService.getCarData(carResourceRequest)
-                .enqueue(object : Callback<CarResourceResponse> {
-                    override fun onResponse(
-                        call: Call<CarResourceResponse>, response: Response<CarResourceResponse>
-                    ) {
-                        val carResourceResponse = response.body()
-                        if (carResourceResponse != null) {
-                            if (carResourceResponse.code == 200) {
-                                for (item in carResourceResponse.data.pageSource) {
-                                    carList.add(item)
+        apiService.getCarData(carResourceRequest)
+            .enqueue(object : Callback<CarResourceResponse> {
+                override fun onResponse(
+                    call: Call<CarResourceResponse>, response: Response<CarResourceResponse>
+                ) {
+                    val carResourceResponse = response.body()
+                    if (carResourceResponse != null) {
+                        if (carResourceResponse.code == 200) {
+                            for (item in carResourceResponse.data.pageSource) {
+                                carList.add(item)
+                            }
+
+                            if (carList.size == 0) {
+                                showMessage(resources.getString(R.string.no_data))
+                            }
+
+                            when (type) {
+                                1 -> {
+                                    totalPage = carResourceResponse.data.totalPage
+                                    binding.carResourceContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    initList()
                                 }
 
-                                if (carList.size == 0) {
-                                    showMessage(resources.getString(R.string.no_data))
+                                2 -> {
+                                    binding.carResourceContainer.finishRefresh()
+                                    totalPage = carResourceResponse.data.totalPage
+                                    binding.carResourceContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    initList()
                                 }
 
-                                when (type) {
-                                    1 -> {
-                                        totalPage = carResourceResponse.data.totalPage
-                                        binding.carResourceContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        listInit = true
-                                        initList()
-                                    }
-
-                                    2 -> {
-                                        binding.carResourceContainer.finishRefresh()
-                                        totalPage = carResourceResponse.data.totalPage
-                                        binding.carResourceContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    3 -> {
-                                        binding.carResourceContainer.finishLoadMore()
-                                        binding.carResourceContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        binding.carResourceList.adapter!!.notifyItemInserted(carList.size)
-                                        listInit = true
-                                    }
+                                3 -> {
+                                    binding.carResourceContainer.finishLoadMore()
+                                    binding.carResourceContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    binding.carResourceList.adapter!!.notifyItemInserted(carList.size)
                                 }
-                            } else {
-                                showMessage(carResourceResponse.msg)
                             }
+                        } else {
+                            showMessage(carResourceResponse.msg)
                         }
                     }
+                }
 
-                    override fun onFailure(call: Call<CarResourceResponse>, t: Throwable) {
-                        showErrorInfo(R.string.car_resource_list_get_failed)
-                    }
-                })
-        } else {
-            if (OASystem.needRefresh) {
-                pageIndex = 1
-                carResourceRequest.pageIndex = pageIndex
-                carList.clear()
-                listInit = false
-                initCarResourceList(2)
-            }
-        }
+                override fun onFailure(call: Call<CarResourceResponse>, t: Throwable) {
+                    showErrorInfo(R.string.car_resource_list_get_failed)
+                }
+            })
     }
 
     private fun initList() {
@@ -209,7 +206,6 @@ class CarResourceListFragment : BaseFragment<FragmentCarResourceListBinding>() {
                 carResourceRequest.pageIndex = pageIndex
                 binding.carResourceList.adapter!!.notifyItemRangeRemoved(0, carList.size)
                 carList.clear()
-                listInit = false
                 initCarResourceList(2)
             }
 
@@ -217,7 +213,6 @@ class CarResourceListFragment : BaseFragment<FragmentCarResourceListBinding>() {
                 if (pageIndex < totalPage) {
                     pageIndex += 1
                     carResourceRequest.pageIndex = pageIndex
-                    listInit = false
                     initCarResourceList(3)
                 }
             }

app/src/main/java/com/pan_american/android/ui/resource_management/car_resource/CarResourceSearchFragment.kt

@@ -33,8 +33,6 @@ class CarResourceSearchFragment : BaseFragment<FragmentCarResourceSearchBinding>
 
     private var selectorItems = ArrayList<Selector>()
 
-    private var listInit = false
-
     private var inStack = false
 
     //当前界面的数据保存
@@ -229,33 +227,30 @@ class CarResourceSearchFragment : BaseFragment<FragmentCarResourceSearchBinding>
             return
         }
 
-        if (!listInit) {
-            val apiService = ServiceCreator.create<APIService>()
-
-            apiService.getCarSelect().enqueue(object : Callback<SelectorResponse> {
-                override fun onResponse(
-                    call: Call<SelectorResponse>, response: Response<SelectorResponse>
-                ) {
-                    val areaSelectorResponse = response.body()
-                    if (areaSelectorResponse != null) {
-                        if (areaSelectorResponse.code == 200) {
-                            for (item in areaSelectorResponse.data) {
-                                selectorItems.add(item)
-                            }
-                            listInit = true
+        val apiService = ServiceCreator.create<APIService>()
+
+        apiService.getCarSelect().enqueue(object : Callback<SelectorResponse> {
+            override fun onResponse(
+                call: Call<SelectorResponse>, response: Response<SelectorResponse>
+            ) {
+                val areaSelectorResponse = response.body()
+                if (areaSelectorResponse != null) {
+                    if (areaSelectorResponse.code == 200) {
+                        for (item in areaSelectorResponse.data) {
+                            selectorItems.add(item)
+                        }
 
-                            initEvents()
+                        initEvents()
 
-                        } else {
-                            showMessage(areaSelectorResponse.msg)
-                        }
+                    } else {
+                        showMessage(areaSelectorResponse.msg)
                     }
                 }
+            }
 
-                override fun onFailure(call: Call<SelectorResponse>, t: Throwable) {
-                    showErrorInfo(R.string.base_resource_data_get_failed)
-                }
-            })
-        }
+            override fun onFailure(call: Call<SelectorResponse>, t: Throwable) {
+                showErrorInfo(R.string.base_resource_data_get_failed)
+            }
+        })
     }
 }

app/src/main/java/com/pan_american/android/ui/resource_management/guide_resource/GuideResourceActivity.kt

@@ -47,6 +47,6 @@ class GuideResourceActivity : BaseActivity<ActivityGuideResourceBinding>() {
     override fun initViews() {
 
         supportFragmentManager.beginTransaction().addToBackStack(null)
-            .replace(binding.guideResourceContainer.id, GuideResourceSearchFragment()).commit()
+            .add(binding.guideResourceContainer.id, GuideResourceSearchFragment()).commit()
     }
 }

app/src/main/java/com/pan_american/android/ui/resource_management/guide_resource/GuideResourceListFragment.kt

@@ -34,8 +34,6 @@ class GuideResourceListFragment : BaseFragment<FragmentGuideResourceListBinding>
 
     private var guideList = ArrayList<GuideResource>()
 
-    private var listInit = false
-
     private lateinit var guideResourceRequest: ResourceRequest
 
     private var pageIndex = 1
@@ -70,6 +68,18 @@ class GuideResourceListFragment : BaseFragment<FragmentGuideResourceListBinding>
         initGuideResourceList(1)
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        if (OASystem.needRefresh) {
+            pageIndex = 1
+            guideResourceRequest.pageIndex = pageIndex
+            guideList.clear()
+            OASystem.needRefresh = false
+            initGuideResourceList(2)
+        }
+    }
+
     private fun initGuideResourceList(type: Int) {
 
         ///避免Fragment not attached to a context.
@@ -77,68 +87,56 @@ class GuideResourceListFragment : BaseFragment<FragmentGuideResourceListBinding>
             return
         }
 
-        if (!listInit) {
-            apiService.getGuideData(guideResourceRequest)
-                .enqueue(object : Callback<GuideResourceResponse> {
-                    override fun onResponse(
-                        call: Call<GuideResourceResponse>, response: Response<GuideResourceResponse>
-                    ) {
-                        val guideResourceResponse = response.body()
-                        if (guideResourceResponse != null) {
-                            if (guideResourceResponse.code == 200) {
-                                for (item in guideResourceResponse.data.pageSource) {
-                                    guideList.add(item)
+        apiService.getGuideData(guideResourceRequest)
+            .enqueue(object : Callback<GuideResourceResponse> {
+                override fun onResponse(
+                    call: Call<GuideResourceResponse>, response: Response<GuideResourceResponse>
+                ) {
+                    val guideResourceResponse = response.body()
+                    if (guideResourceResponse != null) {
+                        if (guideResourceResponse.code == 200) {
+                            for (item in guideResourceResponse.data.pageSource) {
+                                guideList.add(item)
+                            }
+
+                            if (guideList.size == 0) {
+                                showMessage(resources.getString(R.string.no_data))
+                                return
+                            }
+
+                            when (type) {
+                                1 -> {
+                                    totalPage = guideResourceResponse.data.totalPage
+                                    binding.guideResourceContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    initList()
                                 }
 
-                                if (guideList.size == 0) {
-                                    showMessage(resources.getString(R.string.no_data))
-                                    return
+                                2 -> {
+                                    binding.guideResourceContainer.finishRefresh()
+                                    totalPage = guideResourceResponse.data.totalPage
+                                    binding.guideResourceContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    initList()
                                 }
 
-                                when (type) {
-                                    1 -> {
-                                        totalPage = guideResourceResponse.data.totalPage
-                                        binding.guideResourceContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    2 -> {
-                                        binding.guideResourceContainer.finishRefresh()
-                                        totalPage = guideResourceResponse.data.totalPage
-                                        binding.guideResourceContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    3 -> {
-                                        binding.guideResourceContainer.finishLoadMore()
-                                        binding.guideResourceContainer.setEnableLoadMore(pageIndex < totalPage)
-                                        binding.guideResourceList.adapter!!.notifyItemInserted(
-                                            guideList.size
-                                        )
-                                        listInit = true
-                                    }
+                                3 -> {
+                                    binding.guideResourceContainer.finishLoadMore()
+                                    binding.guideResourceContainer.setEnableLoadMore(pageIndex < totalPage)
+                                    binding.guideResourceList.adapter!!.notifyItemInserted(
+                                        guideList.size
+                                    )
                                 }
-                            } else {
-                                showMessage(guideResourceResponse.msg)
                             }
+                        } else {
+                            showMessage(guideResourceResponse.msg)
                         }
                     }
+                }
+
+                override fun onFailure(call: Call<GuideResourceResponse>, t: Throwable) {
+                    showErrorInfo(R.string.guide_resource_list_get_failed)
+                }
+            })
 
-                    override fun onFailure(call: Call<GuideResourceResponse>, t: Throwable) {
-                        showErrorInfo(R.string.guide_resource_list_get_failed)
-                    }
-                })
-        } else {
-            if (OASystem.needRefresh) {
-                pageIndex = 1
-                guideResourceRequest.pageIndex = pageIndex
-                guideList.clear()
-                listInit = false
-                initGuideResourceList(2)
-            }
-        }
     }
 
     private fun initList() {
@@ -212,7 +210,6 @@ class GuideResourceListFragment : BaseFragment<FragmentGuideResourceListBinding>
                 guideResourceRequest.pageIndex = pageIndex
                 binding.guideResourceList.adapter!!.notifyItemRangeRemoved(0, guideList.size)
                 guideList.clear()
-                listInit = false
                 initGuideResourceList(2)
             }
 
@@ -220,7 +217,6 @@ class GuideResourceListFragment : BaseFragment<FragmentGuideResourceListBinding>
                 if (pageIndex < totalPage) {
                     pageIndex += 1
                     guideResourceRequest.pageIndex = pageIndex
-                    listInit = false
                     initGuideResourceList(3)
                 }
             }

app/src/main/java/com/pan_american/android/ui/resource_management/guide_resource/GuideResourceSearchFragment.kt

@@ -33,8 +33,6 @@ class GuideResourceSearchFragment : BaseFragment<FragmentGuideResourceSearchBind
 
     private var selectorItems = ArrayList<Selector>()
 
-    private var listInit = false
-
     private var inStack = false
 
     //当前界面的数据保存
@@ -229,33 +227,30 @@ class GuideResourceSearchFragment : BaseFragment<FragmentGuideResourceSearchBind
             return
         }
 
-        if (!listInit) {
-            val apiService = ServiceCreator.create<APIService>()
-
-            apiService.getGuideSelect().enqueue(object : Callback<SelectorResponse> {
-                override fun onResponse(
-                    call: Call<SelectorResponse>, response: Response<SelectorResponse>
-                ) {
-                    val areaSelectorResponse = response.body()
-                    if (areaSelectorResponse != null) {
-                        if (areaSelectorResponse.code == 200) {
-                            for (item in areaSelectorResponse.data) {
-                                selectorItems.add(item)
-                            }
-                            listInit = true
+        val apiService = ServiceCreator.create<APIService>()
+
+        apiService.getGuideSelect().enqueue(object : Callback<SelectorResponse> {
+            override fun onResponse(
+                call: Call<SelectorResponse>, response: Response<SelectorResponse>
+            ) {
+                val areaSelectorResponse = response.body()
+                if (areaSelectorResponse != null) {
+                    if (areaSelectorResponse.code == 200) {
+                        for (item in areaSelectorResponse.data) {
+                            selectorItems.add(item)
+                        }
 
-                            initEvents()
+                        initEvents()
 
-                        } else {
-                            showMessage(areaSelectorResponse.msg)
-                        }
+                    } else {
+                        showMessage(areaSelectorResponse.msg)
                     }
                 }
+            }
 
-                override fun onFailure(call: Call<SelectorResponse>, t: Throwable) {
-                    showErrorInfo(R.string.base_resource_data_get_failed)
-                }
-            })
-        }
+            override fun onFailure(call: Call<SelectorResponse>, t: Throwable) {
+                showErrorInfo(R.string.base_resource_data_get_failed)
+            }
+        })
     }
 }

app/src/main/java/com/pan_american/android/ui/resource_management/hotel_resource/HotelResourceActivity.kt

@@ -46,6 +46,6 @@ class HotelResourceActivity : BaseActivity<ActivityHotelResourceBinding>() {
 
     override fun initViews() {
         supportFragmentManager.beginTransaction().addToBackStack(null)
-            .replace(binding.hotelResourceContainer.id, HotelResourceSearchFragment()).commit()
+            .add(binding.hotelResourceContainer.id, HotelResourceSearchFragment()).commit()
     }
 }

app/src/main/java/com/pan_american/android/ui/resource_management/hotel_resource/HotelResourceListFragment.kt

@@ -34,8 +34,6 @@ class HotelResourceListFragment : BaseFragment<FragmentHotelResourceListBinding>
 
     private var hotelList = ArrayList<UpdateHotelResource>()
 
-    private var listInit = false
-
     private lateinit var hotelResourceListRequest: HotelResourceListRequest
 
     private var pageIndex = 1
@@ -64,6 +62,18 @@ class HotelResourceListFragment : BaseFragment<FragmentHotelResourceListBinding>
         initViews()
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        if (OASystem.needRefresh) {
+            pageIndex = 1
+            hotelResourceListRequest.pageIndex = pageIndex
+            hotelList.clear()
+            OASystem.needRefresh = false
+            initHotelResourceList(2)
+        }
+    }
+
     override fun initViews() {
         binding.hotelResourceListContainer.setRefreshHeader(ClassicsHeader(OASystem.context))
         binding.hotelResourceListContainer.setRefreshFooter(ClassicsFooter(OASystem.context))
@@ -77,74 +87,61 @@ class HotelResourceListFragment : BaseFragment<FragmentHotelResourceListBinding>
             return
         }
 
-        if (!listInit) {
-            apiService.getHotelResourceList(hotelResourceListRequest)
-                .enqueue(object : Callback<HotelResourceListResponse> {
-                    override fun onResponse(
-                        call: Call<HotelResourceListResponse>, response: Response<HotelResourceListResponse>
-                    ) {
-                        val guideResourceResponse = response.body()
-                        if (guideResourceResponse != null) {
-                            if (guideResourceResponse.code == 200) {
-                                for (item in guideResourceResponse.data) {
-                                    hotelList.add(item)
+        apiService.getHotelResourceList(hotelResourceListRequest)
+            .enqueue(object : Callback<HotelResourceListResponse> {
+                override fun onResponse(
+                    call: Call<HotelResourceListResponse>, response: Response<HotelResourceListResponse>
+                ) {
+                    val guideResourceResponse = response.body()
+                    if (guideResourceResponse != null) {
+                        if (guideResourceResponse.code == 200) {
+                            for (item in guideResourceResponse.data) {
+                                hotelList.add(item)
+                            }
+
+                            if (hotelList.size == 0) {
+                                showMessage(resources.getString(R.string.no_data))
+                                return
+                            }
+
+                            when (type) {
+                                1 -> {
+                                    totalPage = getTotalPage(guideResourceResponse.count)
+                                    binding.hotelResourceListContainer.setEnableLoadMore(
+                                        pageIndex < totalPage
+                                    )
+                                    initList()
                                 }
 
-                                if (hotelList.size == 0) {
-                                    showMessage(resources.getString(R.string.no_data))
-                                    return
+                                2 -> {
+                                    binding.hotelResourceListContainer.finishRefresh()
+                                    totalPage = getTotalPage(guideResourceResponse.count)
+                                    binding.hotelResourceListContainer.setEnableLoadMore(
+                                        pageIndex < totalPage
+                                    )
+                                    initList()
                                 }
 
-                                when (type) {
-                                    1 -> {
-                                        totalPage = getTotalPage(guideResourceResponse.count)
-                                        binding.hotelResourceListContainer.setEnableLoadMore(
-                                            pageIndex < totalPage
-                                        )
-                                        listInit = true
-                                        initList()
-                                    }
-
-                                    2 -> {
-                                        binding.hotelResourceListContainer.finishRefresh()
-                                        totalPage = getTotalPage(guideResourceResponse.count)
-                                        binding.hotelResourceListContainer.setEnableLoadMore(
-                                            pageIndex < totalPage
-                                        )
-                                        initList()
-                                        listInit = true
-                                    }
-
-                                    3 -> {
-                                        binding.hotelResourceListContainer.finishLoadMore()
-                                        binding.hotelResourceListContainer.setEnableLoadMore(
-                                            pageIndex < totalPage
-                                        )
-                                        binding.hotelResourceList.adapter!!.notifyItemInserted(
-                                            hotelList.size
-                                        )
-                                        listInit = true
-                                    }
+                                3 -> {
+                                    binding.hotelResourceListContainer.finishLoadMore()
+                                    binding.hotelResourceListContainer.setEnableLoadMore(
+                                        pageIndex < totalPage
+                                    )
+                                    binding.hotelResourceList.adapter!!.notifyItemInserted(
+                                        hotelList.size
+                                    )
                                 }
-                            } else {
-                                showMessage(guideResourceResponse.msg)
                             }
+                        } else {
+                            showMessage(guideResourceResponse.msg)
                         }
                     }
+                }
 
-                    override fun onFailure(call: Call<HotelResourceListResponse>, t: Throwable) {
-                        showErrorInfo(R.string.hotel_resource_list_get_failed)
-                    }
-                })
-        } else {
-            if (OASystem.needRefresh) {
-                pageIndex = 1
-                hotelResourceListRequest.pageIndex = pageIndex
-                hotelList.clear()
-                listInit = false
-                initHotelResourceList(2)
-            }
-        }
+                override fun onFailure(call: Call<HotelResourceListResponse>, t: Throwable) {
+                    showErrorInfo(R.string.hotel_resource_list_get_failed)
+                }
+            })
     }
 
     private fun initList() {
@@ -216,7 +213,6 @@ class HotelResourceListFragment : BaseFragment<FragmentHotelResourceListBinding>
                 hotelResourceListRequest.pageIndex = pageIndex
                 binding.hotelResourceList.adapter!!.notifyItemRangeRemoved(0, hotelList.size)
                 hotelList.clear()
-                listInit = false
                 initHotelResourceList(2)
             }
 
@@ -224,7 +220,6 @@ class HotelResourceListFragment : BaseFragment<FragmentHotelResourceListBinding>
                 if (pageIndex < totalPage) {
                     pageIndex += 1
                     hotelResourceListRequest.pageIndex = pageIndex
-                    listInit = false
                     initHotelResourceList(3)
                 }
             }

app/src/main/java/com/pan_american/android/ui/resource_management/hotel_resource/HotelResourceSearchFragment.kt

@@ -33,8 +33,6 @@ class HotelResourceSearchFragment : BaseFragment<FragmentHotelResourceSearchBind
 
     private var selectorItems = ArrayList<Selector>()
 
-    private var listInit = false
-
     private var inStack = false
 
     //当前界面的数据保存
@@ -241,33 +239,30 @@ class HotelResourceSearchFragment : BaseFragment<FragmentHotelResourceSearchBind
             return
         }
 
-        if (!listInit) {
-            val apiService = ServiceCreator.create<APIService>()
-
-            apiService.getHotelSelect().enqueue(object : Callback<SelectorResponse> {
-                override fun onResponse(
-                    call: Call<SelectorResponse>, response: Response<SelectorResponse>
-                ) {
-                    val areaSelectorResponse = response.body()
-                    if (areaSelectorResponse != null) {
-                        if (areaSelectorResponse.code == 200) {
-                            for (item in areaSelectorResponse.data) {
-                                selectorItems.add(item)
-                            }
-                            listInit = true
-
-                            initEvents()
-                        } else {
-                            showMessage(areaSelectorResponse.msg)
+        val apiService = ServiceCreator.create<APIService>()
+
+        apiService.getHotelSelect().enqueue(object : Callback<SelectorResponse> {
+            override fun onResponse(
+                call: Call<SelectorResponse>, response: Response<SelectorResponse>
+            ) {
+                val areaSelectorResponse = response.body()
+                if (areaSelectorResponse != null) {
+                    if (areaSelectorResponse.code == 200) {
+                        for (item in areaSelectorResponse.data) {
+                            selectorItems.add(item)
                         }
+
+                        initEvents()
+                    } else {
+                        showMessage(areaSelectorResponse.msg)
                     }
                 }
+            }
 
-                override fun onFailure(call: Call<SelectorResponse>, t: Throwable) {
-                    showErrorInfo(R.string.base_resource_data_get_failed)
-                }
-            })
-        }
+            override fun onFailure(call: Call<SelectorResponse>, t: Throwable) {
+                showErrorInfo(R.string.base_resource_data_get_failed)
+            }
+        })
     }
 
 }